Fixed vimrc and added nload to desktop and server.txt

This commit is contained in:
Austen Adler 2014-07-09 15:57:52 -04:00
parent 3298f3380f
commit 7e82933b25
3 changed files with 6 additions and 4 deletions

View File

@ -65,6 +65,7 @@ owncloud-client
exiv2 exiv2
xdotool xdotool
htop htop
nload
#IN STARTUP ITEMS: gtk-redshift -l 36.3:-80.3 -t 6500:4000 #IN STARTUP ITEMS: gtk-redshift -l 36.3:-80.3 -t 6500:4000
#FOR CAFFEINE sudo add-apt-repository ppa:caffeine-developers/ppa #FOR CAFFEINE sudo add-apt-repository ppa:caffeine-developers/ppa
#caffeine #caffeine

View File

@ -31,3 +31,4 @@ lynx-cur
lm-sensors lm-sensors
openvpn openvpn
autojump autojump
nload

8
vimrc
View File

@ -8,7 +8,7 @@ au VimResized * exe "normal! \<c-w>="
"match Error /\s\+$/ "match Error /\s\+$/
"nnoremap s xa "nnoremap s xa
"nnoremap <F5> :UndotreeToggle<CR> "nnoremap <F5> :UndotreeToggle<CR>
inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<TAB>" inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Right>"
imap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>" imap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>" smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
nnoremap <C-w>\| <C-w>v nnoremap <C-w>\| <C-w>v
@ -101,7 +101,6 @@ inoremap <C-l> <Right>
inoremap <C-h> <Left> inoremap <C-h> <Left>
inoremap <C-k> <Up> inoremap <C-k> <Up>
inoremap <C-j> <Down> inoremap <C-j> <Down>
inoremap <Tab> <Right>
nnoremap Y y$ nnoremap Y y$
set guicursor+=n-v-c:blinkon0 set guicursor+=n-v-c:blinkon0
set formatoptions-=r set formatoptions-=r
@ -227,12 +226,13 @@ augroup END
if has('gui_running') if has('gui_running')
set guioptions-=T set guioptions-=T
set lines=40 set lines=40
colorscheme fruity "colorscheme fruity
else else
if &term == 'xterm' || &term == 'screen' if &term == 'xterm' || &term == 'screen'
set t_Co=256 set t_Co=256
endif endif
colorscheme torte "colorscheme torte
endif endif
colorscheme fruity
nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr> nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr>
nnoremap <Leader>H *<C-O>:AckFromSearch!<CR> nnoremap <Leader>H *<C-O>:AckFromSearch!<CR>