Minor improvements
This commit is contained in:
parent
12a8475435
commit
8db7dfc6ef
@ -190,7 +190,7 @@ exec --no-startup-id /home/stonewareslord/xmodmap.sh
|
|||||||
exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/urxvt'
|
exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/urxvt'
|
||||||
exec --no-startup-id /usr/bin/shutter --min_at_startup
|
exec --no-startup-id /usr/bin/shutter --min_at_startup
|
||||||
#exec --no-startup-id "sleep 25;/usr/bin/owncloud"
|
#exec --no-startup-id "sleep 25;/usr/bin/owncloud"
|
||||||
exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 4000:2000
|
exec --no-startup-id /usr/bin/redshift -l 36.3:-80.3 -t 4000:2000
|
||||||
exec --no-startup-id /usr/bin/parcellite
|
exec --no-startup-id /usr/bin/parcellite
|
||||||
exec --no-startup-id /usr/bin/numlockx
|
exec --no-startup-id /usr/bin/numlockx
|
||||||
exec --no-startup-id /usr/bin/zeal
|
exec --no-startup-id /usr/bin/zeal
|
||||||
|
@ -72,9 +72,12 @@ alias search='apt-cache search'
|
|||||||
if [ "$(uname)" != "Darwin" ]; then
|
if [ "$(uname)" != "Darwin" ]; then
|
||||||
# Not Mac
|
# Not Mac
|
||||||
alias ls='ls --color=always -F'
|
alias ls='ls --color=always -F'
|
||||||
alias steam='sudo kill -9 `pidof steam`;sudo unshare -n -- sh -c "ifconfig lo up;sudo -u stonewareslord steam" > /dev/null 2>&1 & disown'
|
alias steamo='sudo kill -9 `pidof steam`;sudo unshare -n -- sh -c "ifconfig lo up;sudo -u stonewareslord steam" > /dev/null 2>&1 & disown'
|
||||||
alias matlab='matlab -glnx86'
|
alias matlab='matlab -glnx86'
|
||||||
alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"'
|
alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"'
|
||||||
|
if command -v greadlink 2>&1 >/dev/null; then
|
||||||
|
alias readlink='greadlink'
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
if test -f /etc/gentoo-release; then
|
if test -f /etc/gentoo-release; then
|
||||||
# Gentoo
|
# Gentoo
|
||||||
@ -92,7 +95,7 @@ if test -f /etc/gentoo-release; then
|
|||||||
sudo zsh -c "git up&&echo Done pulling&&eix-update&&echo Done with eix"
|
sudo zsh -c "git up&&echo Done pulling&&eix-update&&echo Done with eix"
|
||||||
cd ->/dev/null
|
cd ->/dev/null
|
||||||
}
|
}
|
||||||
alias upgrade='sudo emerge --update --newuse --with-bdeps=y --deep --verbose -t -a --keep-going=y @world'
|
alias upgrade='sudo emerge --update --newuse --with-bdeps=y --deep --verbose -t -a --keep-going=y --verbose-conflicts @world'
|
||||||
elif test -f /etc/lsb-release; then
|
elif test -f /etc/lsb-release; then
|
||||||
# Ubuntu
|
# Ubuntu
|
||||||
alias install='sudo apt-get --show-progress install'
|
alias install='sudo apt-get --show-progress install'
|
||||||
|
40
vim/vimrc
40
vim/vimrc
@ -217,26 +217,26 @@ let g:neocomplete#sources#syntax#min_keyword_length = 2
|
|||||||
let g:php_refactor_command='php /usr/local/bin/refactor.phar'
|
let g:php_refactor_command='php /usr/local/bin/refactor.phar'
|
||||||
let g:ctrlp_extensions=['funky']
|
let g:ctrlp_extensions=['funky']
|
||||||
"inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
|
"inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
|
||||||
function! g:UltiSnips_Complete()
|
"function! g:UltiSnips_Complete()
|
||||||
call UltiSnips#ExpandSnippet()
|
" call UltiSnips#ExpandSnippet()
|
||||||
if g:ulti_expand_res == 0
|
" if g:ulti_expand_res == 0
|
||||||
if pumvisible()
|
" if pumvisible()
|
||||||
return "\<C-n>"
|
" return "\<C-n>"
|
||||||
else
|
" else
|
||||||
call UltiSnips#JumpForwards()
|
" call UltiSnips#JumpForwards()
|
||||||
if g:ulti_jump_forwards_res == 0
|
" if g:ulti_jump_forwards_res == 0
|
||||||
return "\<TAB>"
|
" return "\<TAB>"
|
||||||
endif
|
" endif
|
||||||
endif
|
" endif
|
||||||
endif
|
" endif
|
||||||
return ""
|
" return ""
|
||||||
endfunction
|
"endfunction
|
||||||
au BufEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
|
"au BufEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
|
||||||
let g:UltiSnipsJumpForwardTrigger="<tab>"
|
"let g:UltiSnipsJumpForwardTrigger="<tab>"
|
||||||
let g:UltiSnipsListSnippets="<c-e>"
|
"let g:UltiSnipsListSnippets="<c-e>"
|
||||||
|
"let g:UltiSnipsEditSplit="vertical"
|
||||||
inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
|
inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
|
||||||
let loaded_matchit=1
|
let loaded_matchit=1
|
||||||
let g:UltiSnipsEditSplit="vertical"
|
|
||||||
filetype off
|
filetype off
|
||||||
if has("win32")
|
if has("win32")
|
||||||
call plug#begin('~/vimfiles/plugged')
|
call plug#begin('~/vimfiles/plugged')
|
||||||
@ -296,8 +296,8 @@ Plug 'godlygeek/tabular'
|
|||||||
" "Better abbrivation | https://github.com/tpope/vim-abolish
|
" "Better abbrivation | https://github.com/tpope/vim-abolish
|
||||||
Plug 'godlygeek/csapprox'
|
Plug 'godlygeek/csapprox'
|
||||||
"256 color vim in terminal | https://github.com/godlygeek/csapprox
|
"256 color vim in terminal | https://github.com/godlygeek/csapprox
|
||||||
Plug 'sirver/UltiSnips'
|
"Plug 'sirver/UltiSnips'
|
||||||
"Adds snippets | https://github.com/sirver/UltiSnips
|
" "Adds snippets | https://github.com/sirver/UltiSnips
|
||||||
Plug 'honza/vim-snippets'
|
Plug 'honza/vim-snippets'
|
||||||
"More snippets | https://github.com/honza/vim-snippets
|
"More snippets | https://github.com/honza/vim-snippets
|
||||||
Plug 'othree/eregex.vim'
|
Plug 'othree/eregex.vim'
|
||||||
|
Loading…
Reference in New Issue
Block a user