diff --git a/shells/liquidpromptrc b/shells/liquidpromptrc index f99560f..be6a22c 100644 --- a/shells/liquidpromptrc +++ b/shells/liquidpromptrc @@ -5,4 +5,5 @@ LP_ENABLE_SSH_COLORS=1 LP_USER_ALWAYS=0 LP_ENABLE_OHMYGIT=1 LP_ENABLE_BATT=1 +LP_ENABLE_JOBS=0 # vim: ft=sh: diff --git a/vim/vimrc b/vim/vimrc index 103aeb6..d8746c9 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -226,7 +226,11 @@ inoremap pumvisible() ? "\" : "\u\" let loaded_matchit=1 let g:UltiSnipsEditSplit="vertical" filetype off -call plug#begin('~/.vim/plugged') +if has("win32") + call plug#begin('~/vimfiles/plugged') +else + call plug#begin('~/.vim/plugged') +endif "Plug 'Floobits/floobits-vim' "Plug 'tsaleh/vim-matchit' "Plug 'Shougo/neosnippet' @@ -353,15 +357,33 @@ endif silent! colorscheme fruity nnoremap W :%s/\s\+$//:let @/='' function! Initialize() - silent !mkdir -p ~/.vim/autoload - silent !mkdir -p ~/.vim/plugin - silent !mkdir -p ~/.vim/backup - silent !mkdir -p ~/.vim/undo - silent !mkdir -p ~/.vim/tmp - if empty(glob("~/.vim/autoload/plug.vim")) - !curl -fLo ~/.vim/autoload/plug.vim https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + if has("win32") + if empty(glob("~/_vim/autoload/plug.vim")) + cd ~ + silent !mkdir vimfiles + cd vimfiles + silent !mkdir autoload + silent !mkdir plugin + silent !mkdir backup + silent !mkdir undo + silent !mkdir tmp + cd autoload + silent !powershell -command "& { iwr https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -OutFile plug.vim }" + silent! so ~/_vimrc + silent! PlugInstall + q + endif + else + if empty(glob("~/.vim/autoload/plug.vim")) + silent !mkdir -p ~/.vim/autoload + silent !mkdir -p ~/.vim/plugin + silent !mkdir -p ~/.vim/backup + silent !mkdir -p ~/.vim/undo + silent !mkdir -p ~/.vim/tmp + silent !curl -fLo ~/.vim/autoload/plug.vim https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + silent! so ~/.vimrc + silent! PlugInstall + q + endif endif - silent! so ~/.vimrc - silent! PlugInstall - q endfunction diff --git a/xinerama.sh b/xinerama.sh index 90a85b3..3c66447 100644 --- a/xinerama.sh +++ b/xinerama.sh @@ -28,8 +28,10 @@ xrandr --output VIRTUAL3 --off #2 monitors -x11vnc -clip 1280x800+640+0 -xrandr -forever -x11vnc -clip 1280x800+1920+0 -xrandr -forever +x11vnc -clip 1280x800+640+0 -xrandr -forever nifyd +x11vnc -clip 1280x800+1920+0 -xrandr -forever nifyd + +smon ./s xrandr --newmode "1280x800_60.00" 83.50 1280 1352 1480 1680 800 803 809 831 -hsync +vsync