diff options
| author | 2020-03-04 10:30:51 +0100 | |
|---|---|---|
| committer | 2020-03-04 10:30:51 +0100 | |
| commit | b9f41964c6bb7107d2c71674e6d90a4f97e210e5 (patch) | |
| tree | 59aeba6d74dcd22da533c7cba7540b6afdf35b32 | |
| parent | 209dee3af598eb057d6416df9adfbd30dd1f5b5d (diff) | |
| download | dotfiles-b9f41964c6bb7107d2c71674e6d90a4f97e210e5.tar.gz dotfiles-b9f41964c6bb7107d2c71674e6d90a4f97e210e5.tar.bz2 dotfiles-b9f41964c6bb7107d2c71674e6d90a4f97e210e5.zip | |
Fixed ycm compilation
| -rwxr-xr-x | bash/.bashrc | 12 | ||||
| -rwxr-xr-x | vim/.vim/vimrc | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/bash/.bashrc b/bash/.bashrc index b910453..cd6c966 100755 --- a/bash/.bashrc +++ b/bash/.bashrc | |||
| @@ -217,6 +217,11 @@ if exists lpass; then | |||
| 217 | 217 | ||
| 218 | cmp=${COMP_WORDS[COMP_CWORD]} | 218 | cmp=${COMP_WORDS[COMP_CWORD]} |
| 219 | search="$(sed 's/\\\ /___/g' <<< $cmp)" | 219 | search="$(sed 's/\\\ /___/g' <<< $cmp)" |
| 220 | |||
| 221 | if [ -z "$search" ]; then | ||
| 222 | return | ||
| 223 | fi | ||
| 224 | |||
| 220 | items=$(lpass ls --format "%an$newline%aN" | sed "s/\ /___/g") | 225 | items=$(lpass ls --format "%an$newline%aN" | sed "s/\ /___/g") |
| 221 | 226 | ||
| 222 | for item in $items; do | 227 | for item in $items; do |
| @@ -256,13 +261,6 @@ if exists pyenv; then | |||
| 256 | export PATH="$PATH:$(pyenv root)/shims" | 261 | export PATH="$PATH:$(pyenv root)/shims" |
| 257 | fi | 262 | fi |
| 258 | 263 | ||
| 259 | if exists xcrun; then | ||
| 260 | SDK_PATH="$(xcrun --show-sdk-path)" | ||
| 261 | PATH="$PATH:$(xcrun --show-sdk-path)/usr/bin" | ||
| 262 | export C_INCLUDE_PATH="$C_INCLUDE_PATH:$SDK_PATH/usr/include" | ||
| 263 | export CPLUS_INCLUDE_PATH="$CPLUS_INCLUDE_PATH:$SDK_PATH/usr/include" | ||
| 264 | fi | ||
| 265 | |||
| 266 | if exists python3; then | 264 | if exists python3; then |
| 267 | alias pyhttpd="python3 -m http.server" | 265 | alias pyhttpd="python3 -m http.server" |
| 268 | fi | 266 | fi |
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index 8785a22..3e4076f 100755 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc | |||
| @@ -14,7 +14,7 @@ Plug 'unblevable/quick-scope' | |||
| 14 | Plug 'vim-airline/vim-airline-themes' | 14 | Plug 'vim-airline/vim-airline-themes' |
| 15 | 15 | ||
| 16 | if executable('ansible') | 16 | if executable('ansible') |
| 17 | Plug 'chase/vim-ansible-yaml' | 17 | Plug 'chase/vim-ansible-yaml' |
| 18 | endif | 18 | endif |
| 19 | 19 | ||
| 20 | if has('python') || has('python3') | 20 | if has('python') || has('python3') |
| @@ -28,6 +28,10 @@ if has('python') || has('python3') | |||
| 28 | let g:ycm_install_command .= ' --gocode-completer' | 28 | let g:ycm_install_command .= ' --gocode-completer' |
| 29 | endif | 29 | endif |
| 30 | 30 | ||
| 31 | if executable('rustc') | ||
| 32 | let g:ycm_install_command .= ' --rust-completer' | ||
| 33 | endif | ||
| 34 | |||
| 31 | Plug 'Valloric/YouCompleteMe', {'do': g:ycm_install_command} | 35 | Plug 'Valloric/YouCompleteMe', {'do': g:ycm_install_command} |
| 32 | endif | 36 | endif |
| 33 | 37 | ||
| @@ -77,7 +81,7 @@ set ignorecase | |||
| 77 | set smartcase " capital letters = case sensitive | 81 | set smartcase " capital letters = case sensitive |
| 78 | 82 | ||
| 79 | " Disable ex mode | 83 | " Disable ex mode |
| 80 | " nnoremap Q <Nop> | 84 | nnoremap Q <Nop> |
| 81 | 85 | ||
| 82 | " Save as sudo | 86 | " Save as sudo |
| 83 | cnoremap w!! w !sudo tee > /dev/null % | 87 | cnoremap w!! w !sudo tee > /dev/null % |
