Merge branch 'master' of github into master

.gitignore

@@ -0,0 +1 @@
+nvim/.netrwhist

bspwm/bspwmrc

@@ -22,6 +22,7 @@ numlockx on &
 ###
 if [ "`hostname`" = "beef-book" ]; then
 	bspc monitor "DP-1" -d 1 2 3 4 5 6
+	bspc monitor "DP-4" -d 1 2 3 4 5 6 7 8 9
 	bspc monitor "LVDS1" -d 1 2 3 4 5 6 7 8 9
 	bspc monitor "LVDS-1-1" -d 1 2 3 4 5 6 7 8 9
 	bspc monitor "VGA-0" 7 8 9

nvim/.netrwhist

@@ -1,11 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhistcnt =9
-let g:netrw_dirhist_9='/home/vibikim/repos/st'
-let g:netrw_dirhist_8='/home/vibikim/repos'
-let g:netrw_dirhist_7='/home/vibikim/repos/st'
-let g:netrw_dirhist_6='/home/vibikim/repos'
-let g:netrw_dirhist_5='/home/vibikim/repos/dotfiles/polybar'
-let g:netrw_dirhist_4='/home/vibikim'
-let g:netrw_dirhist_3='/home/vibikim/.config/awesome'
-let g:netrw_dirhist_2='/home/vibikim/.config'
-let g:netrw_dirhist_1='/home/vibikim'

nvim/init.vim

@@ -9,16 +9,18 @@ syntax on
 set encoding=utf-8
 set number
 set termguicolors
+set splitbelow splitright
+
+" restore cursor to the last position after reopening a file
+    autocmd BufReadPost *
+      \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
+      \ |   exe "normal! g`\""
+      \ | endif
 
 " Enable spell checking, s for spell check
 map <leader>se :setlocal spell! spelllang=en<CR>
 map <leader>sr :setlocal spell! spelllang=ro<CR>
 
-" Easier Write and Quit aliases
-nnoremap <leader>q :q<CR>
-nnoremap <leader>Q :wq<CR>
-nnoremap <leader>w :w<CR>
-
 " ###
 " # Plugins
 " ###
@@ -40,3 +42,28 @@ autocmd VimEnter * HexokinaseTurnOn
 " ###
 
 map <C-s> :source ~/.config/nvim/init.vim<CR>
+nnoremap <leader>e :Ex<CR>
+
+" Easier Write and Quit aliases
+nnoremap <leader>q :q<CR>
+nnoremap <leader>Q :wq<CR>
+nnoremap <leader>w :w<CR>
+
+" Split navigation with leader key
+nnoremap <leader>h <C-w>h
+nnoremap <leader>j <C-w>j
+nnoremap <leader>k <C-w>k
+nnoremap <leader>l <C-w>l
+
+" Make adjusing split sizes a bit more friendly
+noremap <silent> <C-Left> :vertical resize +3<CR>
+noremap <silent> <C-Right> :vertical resize -3<CR>
+noremap <silent> <C-Up> :resize +3<CR>
+noremap <silent> <C-Down> :resize -3<CR>
+
+" New splits
+nnoremap <leader>sv :Vex<CR>
+nnoremap <leader>sh :Sex<CR>
+nnoremap <leader>t :24sp<CR>:term<CR>:startinsert<CR>
+" exit insert mode in terminal easier
+tnoremap <C-\> <C-\><C-N>

sxhkd/sxhkdrc

@@ -28,8 +28,8 @@ super + shift + o
 	$TERMINAL -e htop
 super + shift + Escape
 	xfce4-taskmanager
-super + shift + v
-	$TERMINAL -e vim -c Ex
+super + shift + e
+	$TERMINAL -e nvim -c Ex
 
 
 ###