summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/i3/config1
-rw-r--r--.config/nvim/init.vim25
-rw-r--r--.config/zsh/.zshenv7
3 files changed, 21 insertions, 12 deletions
diff --git a/.config/i3/config b/.config/i3/config
index f206ea1..f884d03 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -66,6 +66,7 @@ font pango:monospace 10
# WS3
# WS4
# WS5
+ assign [class="vlc"] $ws5
# WS6
assign [class="Google-chrome"] $ws6
# WS7
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 0b52768..5650fee 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -3,7 +3,7 @@
"
""---Auto installs vim-plug---""
-" let autoload_plug_path = '~/.config/nvim/autoload/plug.vim'
+" let autoload_plug_path='~/.config/nvim/autoload/plug.vim'
" if !filereadable(autoload_plug_path)
" echo "Downloading junegunn/vim-plug to manage plugins..."
" silent execute '!curl -fLo ' . autoload_plug_path . ' --create-dirs
@@ -130,6 +130,18 @@
" SympylFold
let g:SympylFold_docstring_preview=1
+ " YouCompleteMe
+ let g:ycm_autoclose_preview_window_after_completion=1
+
+ " syntastic
+ " set statusline+=%#warningmsg#
+ " set statusline+=%{SyntasticStatuslineFlag()}
+ " set statusline+=%*
+ let g:syntastic_always_populate_loc_list=1
+ let g:syntastic_auto_loc_list=1
+ let g:syntastic_check_on_open=1
+ let g:syntastic_check_on_wq=0
+
""---Keybindings---""
" Reload vim
nmap <F5> :source ~/.config/nvim/init.vim<CR>
@@ -159,15 +171,4 @@
nnoremap <Space> za
" YouCompleteMe
- let g:ycm_autoclose_preview_window_after_completion=1
map <leader>g :YcmCompleter GoToDefinitionElseDeclaration<CR>
-
- " syntastic
- set statusline+=%#warningmsg#
- set statusline+=%{SyntasticStatuslineFlag()}
- set statusline+=%*
-
- let g:syntastic_always_populate_loc_list = 1
- let g:syntastic_auto_loc_list = 1
- let g:syntastic_check_on_open = 1
- let g:syntastic_check_on_wq = 0
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
new file mode 100644
index 0000000..bd8c365
--- /dev/null
+++ b/.config/zsh/.zshenv
@@ -0,0 +1,7 @@
+#!/bin/zsh
+# ~/.config/zsh/.zshenv
+# As suggested by https://vi.stackexchange.com/questions/7644/use-vim-with-virtualenv/7654#7654
+
+if [[ -n $VIRTUAL_ENV && -e "${VIRTUAL_ENV}/bin/activate" ]]; then
+ source "${VIRTUAL_ENV}/bin/activate"
+fi