Просмотр исходного кода

update submodules, add small adjustments to .rc's

Weiyi Lou 13 лет назад
Родитель
Сommit
91e7c5a28c
6 измененных файлов с 17 добавлено и 11 удалено
  1. 1 1
      vim/bundle/nerdcommenter
  2. 1 1
      vim/bundle/nerdtree
  3. 1 1
      vim/bundle/pathogen
  4. 1 1
      vim/bundle/supertab
  5. 9 2
      vim/vimrc
  6. 4 5
      zsh/zshrc

+ 1 - 1
vim/bundle/nerdcommenter

@@ -1 +1 @@
-Subproject commit e777829d34af17a1d851178c23c1c6ad62e7493f
+Subproject commit cb242a9cb41e9fc9884caa2235c67d18b18e9067

+ 1 - 1
vim/bundle/nerdtree

@@ -1 +1 @@
-Subproject commit 30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc
+Subproject commit 2cb0fc78fb4c7a1db5f51c042a447cc50f09983d

+ 1 - 1
vim/bundle/pathogen

@@ -1 +1 @@
-Subproject commit ab64b4ddd0c184a528780b498a0b0a5b40248f7c
+Subproject commit 09f2c3b7d3666124157de759a68afe47d0bb8d25

+ 1 - 1
vim/bundle/supertab

@@ -1 +1 @@
-Subproject commit 688b5d706c21fbc6b2db6499f3cfbdeb35309b5a
+Subproject commit 8302775fc2dee4935c35f3436e59486940dba3b8

+ 9 - 2
vim/vimrc

@@ -132,9 +132,16 @@ imap ii <Esc>
 imap II <Esc>
 imap II <Esc>
 
 
 " Add extra lines up and down
 " Add extra lines up and down
-map <leader>j o<Esc>k
-map <leader>k O<Esc>j
+nmap <leader>j o<Esc>k
+nmap <leader>k O<Esc>j
 
 
+" Toggle NERDTree instead of the normal dir browser
+nmap <silent> <leader>d   :NERDTreeToggle<CR>
+
+" Comment out lines with NERDCommenter
+
+" Edit .vimrc
+map <leader>v   :e $MYVIMRC<CR>
 
 
 """"""""
 """"""""
 "" Key Remaps - Movement and Windows
 "" Key Remaps - Movement and Windows

+ 4 - 5
zsh/zshrc

@@ -205,11 +205,10 @@ alias blackomelette='ssh cinaeco@10.0.1.1'
 
 
 ## shortcuts for development
 ## shortcuts for development
 alias migrate='li3 migration db:migrate'
 alias migrate='li3 migration db:migrate'
-alias hr-psych-log='tail -F /jails/kerobokan/usr/local/www-conf/logs/hr-psych-phplog'
 alias oars-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/oars-phplog'
 alias oars-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/oars-phplog'
-alias acerfoundation-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/acerfoundation-phplog'
+alias schools-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/schools-phplog'
+alias delivery-log='tail -F /jails/alcatraz/usr/local/www-conf/logs/delivery-phplog'
 alias cdo='cd /jails/alcatraz/usr/local/www/oars'
 alias cdo='cd /jails/alcatraz/usr/local/www/oars'
-alias cda='cd /jails/alcatraz/usr/local/www/acerfoundation'
-alias cdh='cd /jails/kerobokan/usr/local/www/hr-psych'
+alias cds='cd /jails/alcatraz/usr/local/www/schools'
+alias cdd='cd /jails/alcatraz/usr/local/www/delivery'
 alias sqlo='mysql -u oars -p'
 alias sqlo='mysql -u oars -p'
-alias sqla='mysql -u acerfoundation -p'