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

bin/.bin/zoom_screen

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

sxhkd/.config/sxhkd/sxhkdrc

@@ -1,8 +1,8 @@
 # bspwm hotkeys
 #
 # Cleanly quit bspwm
-super + shift + a
-	bspc quit 1 && pkill lemonpanel && pkill lemonbar
+super + shift + q
+	bspc quit 1 
 
 # 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 + }{ampersand,eacute,quotedbl,apostrophe,parenleft,minus,egrave,underscore,ccedilla,agrave}
+super + {_,shift + }{1,2,3,4,5,6,7,8,9,0}
     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 + {q,s,z,d}
+super + {a,s,w,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,z,d}
+super + shift + {q,s,w,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 + {q,s,z,d}
+super + ctrl + {a,s,w,d}
 	bspwm_resize.sh {west,south,north,east}
 
 super + ctrl + {h,j,k,l}
@@ -334,6 +334,9 @@ 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

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

vim/.vimrc

@@ -132,4 +132,4 @@ hi Normal ctermfg=None ctermbg=None
 hi NonText ctermfg=None ctermbg=None
 
 packadd termdebug
-let g:termdebug_wide=1
+let termdebug_wide=1

zsh/.zshrc

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