From 90bbdfaf680b74f82b786520e44499295fe4e5c0 Mon Sep 17 00:00:00 2001 From: Austen Adler Date: Tue, 29 Mar 2016 17:12:47 -0400 Subject: [PATCH] Minor fixes --- i3/G2-status.conf | 6 ++++++ scripts/youcompleteme.sh | 8 ++++---- vim/vimrc | 21 +++++++-------------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/i3/G2-status.conf b/i3/G2-status.conf index a8779ed..84b8445 100644 --- a/i3/G2-status.conf +++ b/i3/G2-status.conf @@ -11,11 +11,17 @@ general { interval = 1 } order += "disk /" +order += "ethernet tun0" order += "wireless wlp2s0" order += "ethernet enp1s0" order += "volume master" order += "battery 1" order += "tztime local" +ethernet tun0 { + # if you use %speed, i3status requires root privileges + format_up = "%ip" + format_down = "!T" +} wireless wlp2s0 { format_up = "%essid : %ip @ %quality" format_down = "!W" diff --git a/scripts/youcompleteme.sh b/scripts/youcompleteme.sh index b5fc99d..5ad3130 100755 --- a/scripts/youcompleteme.sh +++ b/scripts/youcompleteme.sh @@ -9,10 +9,10 @@ cd ~/ycm_build touch .nobackup cmake -G "Unix Makefiles" . ~/.vim/plugged/YouCompleteMe/third_party/ycmd/cpp cmake --build . --target ycm_core -cd ~/.vim/plugged/YouCompleteMe/third_party/ycmd/third_party/gocode -go build -cd ~/.vim/plugged/YouCompleteMe/third_party/ycmd/third_party/tern_runtime -npm install --production +#cd ~/.vim/plugged/YouCompleteMe/third_party/ycmd/third_party/gocode +#go build +#cd ~/.vim/plugged/YouCompleteMe/third_party/ycmd/third_party/tern_runtime +#npm install --production cd - echo "It should be done." echo -n "Running vim to test for errors. Press enter to continue..." diff --git a/vim/vimrc b/vim/vimrc index 1d5c264..7a98662 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -195,6 +195,7 @@ let g:airline_left_sep='▶' let g:airline_right_sep='◀' let g:airline#extensions#syntastic#enabled=0 let g:ycm_show_diagnostics_ui=0 +let g:ycm_path_to_python_interpreter='/usr/bin/python2.7' let g:syntastic_cpp_compiler = 'clang++' let g:syntastic_cpp_compiler_options = ' -std=c++11 -stdlib=libc++' let g:airline#extensions#whitespace#enabled=0 @@ -269,23 +270,17 @@ endif Plug 'godlygeek/tabular' "Quickly make tables in vim | https://github.com/godlygeek/tabular Plug 'sirver/UltiSnips' - " "Adds snippets | https://github.com/sirver/UltiSnips + "Adds snippets | https://github.com/sirver/UltiSnips Plug 'honza/vim-snippets' "More snippets | https://github.com/honza/vim-snippets Plug 'othree/eregex.vim' "Real regexes in vim | https://github.com/othree/eregex.vim - Plug 'vim-scripts/DoxygenToolkit.vim' - "Doxygen | https://github.com/vim-scripts/DoxygenToolkit.vim Plug 'mhinz/vim-signify' "Git information inline | https://github.com/mhinz/vim-signify Plug 'https://github.com/jiangmiao/auto-pairs' "Automatic pairs | https://github.com/jiangmiao/auto-pairs Plug 'https://github.com/Valloric/YouCompleteMe' - " "Autocompletion | https://github.com/Valloric/YouCompleteMe - Plug 'https://github.com/xolox/vim-easytags' - "Vim tags | https://github.com/xolox/vim-easytags - Plug 'https://github.com/xolox/vim-misc' - "Misc (required for easytags) | https://github.com/xolox/vim-misc + "Autocompletion | https://github.com/Valloric/YouCompleteMe Plug 'https://austenwares.com/gogs/vim/vim-java-getset.git' "Java getters and setters| gogs@austenwares.com:stonewareslord/vim-java-getset.git " } @@ -322,18 +317,16 @@ endif "GPG support | https://github.com/jamessan/vim-gnupg " } " Unused { - "Plug 'vim-scripts/DirDiff.vim' - "Directory diff | https://github.com/vim-scripts/DirDiff.vim + "Plug 'https://github.com/xolox/vim-easytags' + " "Vim tags | https://github.com/xolox/vim-easytags + "Plug 'https://github.com/xolox/vim-misc' + " "Misc (required for easytags) | https://github.com/xolox/vim-misc "Plug 'https://github.com/kien/rainbow_parentheses.vim' " "Colored parenthesis | https://github.com/kien/rainbow_parentheses.vim "Plug 'vim-scripts/SyntaxRange' "Range of syntaxes | https://github.com/vim-scripts/SyntaxRange - "Plug 'https://github.com/majutsushi/tagbar' - " " | https://github.com/majutsushi/tagbar "Plug 'Rykka/colorv.vim' " "Color selection in vim | https://github.com/Rykka/colorv.vim - "Plug 'https://github.com/joonty/vdebug' - " "Php debugging | https://github.com/joonty/vdebug "Plug 'https://github.com/zenbro/mirror.vim' " "Edit files remotely | https://github.com/zenbro/mirror.vim " }