Merge remote-tracking branch 'origin/master' into marynux

bspwm/.config/bspwm/bspwmrc

@@ -123,3 +123,5 @@ sxhkd &
 #. $HOME/.config/bspwm/autostart
 #limepanel &
 $HOME/.config/polybar/launch.sh &
+
+$HOME/.fehbg

polybar/.config/polybar/config

@@ -48,7 +48,7 @@ secondary = #e60053
 alert = #FF5555
 
 [bar/bspbar1]
-monitor = ${env:MONITOR:DVI-D-0}
+monitor = ${env:MONITOR:DVI-I-1}
 width = 100%:-10
 height = 25
 offset-x = 5

sxhkd/.config/sxhkd/sxhkdrc

@@ -96,7 +96,7 @@ super + Return
 # 	bspc node -n @/
 	
 # go (Shift=move) to desktop (and focus the monitor that the desktop is located on. Bspwm style)
-super + {_,shift + }{ampersand,eacute,quotedbl,apostrophe,parenleft,minus,egrave,underscore,ccedilla,agrave}
+super + {_,shift + }{ampersand,eacute,quotedbl,apostrophe,parenleft,section,egrave,exclam,ccedilla,agrave}
     bspc {desktop -f,node -d} ^{1-9,10}
 
 ## Alternative: i3 style behavior (focus nth, desktop of the focused monitor)

vim/.vim/ycm_extra_conf.py

@@ -1,10 +1,10 @@
 import os
 
 PATH_TO_LOMBOK = os.path.expanduser("/usr/lib/lombok-common/lombok.jar")
-jdtls_args = ['-noverify',
+# jdtls_args = ['-noverify',
-              '-Xmx1G',
+#               '-Xmx1G',
-              '-XX:+UseG1GC',
+#               '-XX:+UseG1GC',
-              '-XX:+UseStringDeduplication']
+#               '-XX:+UseStringDeduplication']
 
 def Settings( **kwargs ):
     if not os.path.exists(PATH_TO_LOMBOK):
@@ -15,6 +15,6 @@ def Settings( **kwargs ):
                 'jvm_args': [
                     '-javaagent:' + PATH_TO_LOMBOK,
                     '-Xbootclasspath/a:' + PATH_TO_LOMBOK
-                    ] + jdtls_args
+                    ]
             }
         }

vim/.vimrc

@@ -37,6 +37,8 @@ nnoremap K :YcmCompleter GetDoc<CR>
 nnoremap \<CR> :YcmCompleter FixIt<CR>
 noremap gN :Lex<CR>
 
+nnoremap yp :let @+=expand('%') .. '#' .. line('.')<CR>
+
 nnoremap <F12> :Make<CR>
 nnoremap <leader><F12> :Make run<CR>
 

zsh/.zshrc

@@ -176,8 +176,10 @@ zmodload zsh/terminfo
 # Enabling fzf capabilities
 source /usr/share/fzf/*.zsh
 
+source /opt/enhancd/init.sh
 source /usr/share/enhancd/init.sh
 export ENHANCD_ENABLE_DOUBLE_DOT=false
+>>>>>>> origin/master
 
 bindkey "$terminfo[kcuu1]" history-substring-search-up
 bindkey "$terminfo[kcud1]" history-substring-search-down