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

bin/.bin/zoom_screen

@@ -1,9 +0,0 @@
-current_resolution=$(xrandr | awk '/DSI1/ {print $4}')
-
-if [[ $current_resolution == 1920x1200* ]];
-then
-	xrandr --size 600x960
-else
-	xrandr --size 1200x1920
-fi
-chwp

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

@@ -1,8 +1,8 @@
 # bspwm hotkeys
 #
 # Cleanly quit bspwm
-super + shift + q
-	bspc quit 1 
+super + shift + a
+	bspc quit 1 && pkill lemonpanel && pkill lemonbar
 
 # Show keybindings
 super + F1
@@ -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 + }{1,2,3,4,5,6,7,8,9,0}
+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)
@@ -125,7 +125,7 @@ super + Tab
 	WindowSelector
 	
 #Focus windows by direction, works with multihead
-super + {a,s,w,d}
+super + {q,s,z,d}
     focusmover {west,south,north,east}
 
 super + {h,j,k,l}
@@ -137,7 +137,7 @@ super + {Left,Down,Up,Right}
 # Move tiled windows. Moving a tiled window to 
 # preselected one moves into preselection instead. 
 # Moving out of the screen should move the window to next monitor if possible
-super + shift + {q,s,w,d}
+super + shift + {q,s,z,d}
 	windowgrabber {west,south,north,east}
 
 super + shift + {h,j,k,l}
@@ -148,7 +148,7 @@ super + shift + {Left,Down,Up,Right}
 	euclid_mover {west,south,north,east}
 
 #resize windows
-super + ctrl + {a,s,w,d}
+super + ctrl + {q,s,z,d}
 	bspwm_resize.sh {west,south,north,east}
 
 super + ctrl + {h,j,k,l}
@@ -334,9 +334,6 @@ super + ctrl + space
 	{pkill picom ,\
 	picom -b }
 
-ctrl + alt +t 
-	pkill rotateScreen_au || rotateScreen_auto
-
 # Remove receptacles
 super + BackSpace
   for i in $(bspc query -N -n .leaf.!window.local); do bspc node $i -k; done

vim/.vim/ftplugin/markdown.vim

@@ -1 +0,0 @@
-set tw=120

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',
-              '-Xmx1G',
-              '-XX:+UseG1GC',
-              '-XX:+UseStringDeduplication']
+# jdtls_args = ['-noverify',
+#               '-Xmx1G',
+#               '-XX:+UseG1GC',
+#               '-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>
 
@@ -132,4 +134,4 @@ hi Normal ctermfg=None ctermbg=None
 hi NonText ctermfg=None ctermbg=None
 
 packadd termdebug
-let termdebug_wide=1
+let g:termdebug_wide=1

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
@@ -187,8 +189,7 @@ bindkey '^[[B' history-substring-search-down
 # Apply different settigns for different terminals
 case $(basename "$(cat "/proc/$PPID/comm")") in
   login)
-		RPROMPT="%(?.%{$fg[green]%}✓ %{$reset_color%}.%{$fg[red]%}✗ %{$reset_color%})"
-    	# RPROMPT="%{$fg[red]%} %(?..[%?])" 
+    	RPROMPT="%{$fg[red]%} %(?..[%?])" 
     	alias x='startx ~/.xinitrc'      # Type name of desired desktop after x, xinitrc is configured for it
     ;;
 #  'tmux: server')