updates

4 files changed, 37 insertions, 24 deletions

diff --git a/emacs/.authinfo.gpg b/emacs/.authinfo.gpg
index 8ec7167..4d85884 100644
--- a/emacs/.authinfo.gpg
+++ b/emacs/.authinfo.gpg
diff --git a/git/.gitconfig b/git/.gitconfig
index 6aab6de..522f7c7 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,16 +1,24 @@
 [github]
-        user = com4
-        oauth-token =
+user = com4
+oauth-token =
+
 [user]
-        name = jason
-        email = jason@zzq.org
+name = jason
+email = jason@zzq.org
+
 [alias]
-        permission-reset = "!git diff -p | grep -E \"^(diff|old mode|new mode)\" | sed -e \"s/^old/NEW/;s/^new/old/;s/^NEW/new/\" | git apply"
+# ! indicates use the shell instead of alias a git sub-command
+permission-reset = "!git diff -p | grep -E \"^(diff|old mode|new mode)\" | sed -e \"s/^old/NEW/;s/^new/old/;s/^NEW/new/\" | git apply"
+clean-tree = "!git clean -fd -e'!__pycache__' -e'!*.py[cod]'"
+clean-tree-dry = "clean-tree -n"
+
 [rerere]
 enabled = 1
 autoupdate = 1
+
 [magit]
-        hideCampaign = true
+hideCampaign = true
+
 [pager]
-        branch = false
-        blame = false
+branch = false
+blame = false
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index a047be8..e4e7ea6 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -30,7 +30,7 @@ font pango:monospace 8
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec urxvt
+bindsym $mod+Return exec alacritty
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -125,7 +125,7 @@ bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Do you really want to exit i3?' -b 'Yes, exit i3' 'i3-msg exit'"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -153,16 +153,25 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
+    bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -2%
+    bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +2%
+    bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle #&& pactl list sinks | grep '^[[:space:]]Volume:' | head -n $(( $( pactl list short sinks | sed -e 's,^\([0-9][0-9]*\)[^0-9].*,\1,' | head -n 1 ) + 1 )) | tail -n 1 | sed -e 's,.* \([0-9][0-9]*\)%.*,\1,' > $SWAYSOCK.wob
+
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
         status_command i3status
         tray_output primary
+#        status_command i3status-rs ~/.i3status-rs.toml
 }
+#exec_always --no-startup-id $HOME/bin/polybar-launch.sh
 
-# Fix JB IntelliJ windows to float
+# Intellij splash screen float
+for_window [class="jetbrains-idea" title="win0"] floating enable;
+# Fix dialog windows so they don't get left behind
 for_window [class="^jetbrains-.+"][window_type=dialog] focus
-for_window [instance="sun-awt-X11-XWindowPeer"] border pixel 0
+# for_window [instance="sun-awt-X11-XWindowPeer"] border pixel 0
+
 # Fix JRiver menus to act like real dropdown menus
 for_window [class="^Media_Center_.+" instance="JRiver Menu Class"] floating enable
 for_window [class="^Media_Center_.+" instance="JRiver Popup Class"] floating enable
@@ -170,12 +179,12 @@ for_window [class="^Media_Center_.+" instance="JRiver Popup Class"] floating ena
 exec run-once nm-applet
 exec run-once clipit
 #exec run-once xbindkeys
-exec run-once synclient PalmDetect=1
-exec run-once synclient HorizTwoFingerScroll=1
+exec synclient PalmDetect=1
+exec synclient HorizTwoFingerScroll=1
 #exec run-once fetchmail -d 60
 #exec run-once qasmixer -t
 exec run-once blueman-applet
 exec run-once run_keybase -a
-exec run-once feh --bg-scale "/home/jason/Resilio Sync/Sync/wallpaper/wallhaven-3601.jpg"
-exec run-once xset dpms 300 600 900
+exec feh --bg-scale "/home/jason/Resilio Sync/Sync/wallpaper/wallhaven-3601.jpg"
+exec xset dpms 300 600 900
 # exec run-once run_vmtoolsd
diff --git a/zsh/.zshrc b/zsh/.zshrc
index b7b7c3c..5e0b3bd 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -7,10 +7,6 @@
 ##ZSH_THEME="kolo"
 ZSH_THEME="gianu"
 
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
 # Uncomment the following line to use case-sensitive completion.
 CASE_SENSITIVE="true"
 
@@ -93,13 +89,13 @@ export EDITOR=$_TERM_EMACS
 
 # Aliases
 #alias fixfileperm='find /music -type f -exec chmod 0644 {} \;'
-alias cleanbranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin'
+#alias cleanremotebranches='git branch --merged | grep -v "\*" | xargs -n 1 git branch -d; git branch -r --merged master | grep -iv "master" | sed "s/origin\///" | xargs -n 1 git push --delete origin'
 alias ducks='du -cks * |sort -rn |head -11'
-alias dc='docker-compose'
+#alias dc='docker-compose'
 alias define='sdcv'
 alias emacs=$_TERM_EMACS
-alias java18='/usr/local/java/jdk1.8.0_191/bin/java'
-alias javac18='/usr/local/java/jdk1.8.0_191/bin/javac'
+#alias cleanstale="git clean -fd -e'!__pycache__' -e'!*.py[cod]'"
+#alias dry-cleanstale="git clean -fdn -e'!__pycache__' -e'!*.py[cod]'"
 
 # Python
 if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then