Merge branch 'master' of github.com:Jab2870/dotfiles

bin/dvdrip

@@ -2,6 +2,9 @@
 # coding=utf-8
 
 """
+
+based on this: https://github.com/xenomachina/dvdrip
+
 Rip DVDs quickly and easily from the commandline.
 
 Features:

bin/zip-recent

@@ -0,0 +1,45 @@
+#!/usr/bin/sh
+
+# A script to create a zip archive of any recentally modified files
+
+
+# Set the defaults
+mtime="7"
+filename=""
+
+while [ $1 ]; do
+	case $1 in
+		-h|--help)
+			echo "Zips recentally modified files"
+			echo ""
+			echo -e "Use this to create a zip archive of recentally modified files"
+			echo -e "Usage: zip-recent [options] filename"
+			echo ""
+			echo -e "Options"
+			echo -e "\t-mtime\t\tThe number of days that should be considered recent [default=$mtime]"
+			exit 0
+			;;
+		-mtime)
+			shift
+			mtime="$1"
+			shift
+			;;
+		*)
+			filename="$1"
+			shift
+			;;
+	esac
+done
+
+if [ "$filename" = "" ]; then
+	echo "You need to enter a filename"
+	exit 1
+fi
+
+# Make sure the filename ends with .zip
+filename="${filename%\.zip}.zip"
+
+
+find . -type f -mtime -$mtime -exec zip $filename {} \;
+
+

i3/configWork

@@ -69,14 +69,15 @@ bindsym $mod+u exec ~/.dotfiles/rofi/scripts/rofi-emoji
 bindsym $mod+Shift+x exec killall i3
 
 
-bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks
+# Send signals to i3 blocks and zsh to tell them that capslock has been pushed
+# The message to zsh is technically a "window change" which causes zsh to re-draw the prompt
+# https://unix.stackexchange.com/questions/440184/update-zsh-ps1-propt-on-keypress
+bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks && pkill -SIGWINCH zsh
+
+#Send a message to i3blocks to say that numlock has been pushed
 bindsym --release Num_Lock  exec pkill -SIGRTMIN+11 i3blocks
 
 
-for_window [class="xfce4-appfinder"] floating enable
-
-
-
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
@@ -263,8 +264,8 @@ bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5%  &
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5%  && pkill -SIGRTMIN+10 i3blocks #decrease sound volume
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle  && pkill -SIGRTMIN+10 i3blocks # mute sound
 
-bindsym --whole-window $alt+button4 exec --no-startup-id pactl set-sink-volume 0 +5% && pkill -SIGRTMIN+10 i3blocks #increase sound volume
+bindsym --whole-window $alt+button4 exec --no-startup-id pactl set-sink-volume 0 -5% && pkill -SIGRTMIN+10 i3blocks #decrease sound volume
-bindsym --whole-window $alt+button5 exec --no-startup-id pactl set-sink-volume 0 -5% && pkill -SIGRTMIN+10 i3blocks #decrease sound volume
+bindsym --whole-window $alt+button5 exec --no-startup-id pactl set-sink-volume 0 +5% && pkill -SIGRTMIN+10 i3blocks #increase sound volume
 
 # Sreen brightness controls
 #bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness

shells/zsh/zshrc

@@ -87,7 +87,10 @@ source $ZSH/oh-my-zsh.sh
 
 source ~/.dotfiles/shells/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 
+TRAPWINCH(){
+	zle && {zle reset-prompt; zle -R}
+}
+
 if [ -f ~/.current-folder ] && [ ! $TMUX ]; then
-	cd "$(cat ~/.current-folder)"
+	\cd "$(cat ~/.current-folder)"
-	clear
 fi

vim

@@ -1 +1 @@
-Subproject commit 3158f31419852bf8c413eef06ba7ebc83e5982f9
+Subproject commit 702903b58931978c03e3a6f078058fa1284ae8fe

x/xbindkeysrc

@@ -0,0 +1,2 @@
+#"pkill -u $USER -SIGWINCH zsh"
+#    Caps_Lock

x/xinitrc

@@ -4,5 +4,6 @@ eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh
 export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
 dbus-update-activation-environment --systemd DISPLAY
 #exec xrdb .Xresources
+xbindkeys
 exec i3 -V >> ~/i3log-$(date + '%F-%k-%M-%S') 2>&1
 exec sh /home/jonathan/.conky/conky-startup.sh