Merge branch 'master' of zzq.org:repos/dotfiles

5 files changed, 15 insertions, 10 deletions

diff --git a/emacs/.local/share/applications/mimeapps.list b/emacs/.local/share/applications/mimeapps.list
index a5853b0..5604a2e 100644
--- a/emacs/.local/share/applications/mimeapps.list
+++ b/emacs/.local/share/applications/mimeapps.list
@@ -1,7 +1,2 @@
 [Default Applications]
-text/html=vivaldi-stable.desktop
-x-scheme-handler/http=vivaldi-stable.desktop
-x-scheme-handler/https=vivaldi-stable.desktop
-x-scheme-handler/about=vivaldi-stable.desktop
-x-scheme-handler/unknown=vivaldi-stable.desktop
 x-scheme-handler/org-protocol=emacsclient.desktop
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index c0a81d6..a047be8 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -160,21 +160,22 @@ bar {
         tray_output primary
 }
 
+# Fix JB IntelliJ windows to float
 for_window [class="^jetbrains-.+"][window_type=dialog] focus
 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
 
 exec run-once nm-applet
-# exec run-once wicd-client -t
 exec run-once clipit
-exec run-once xbindkeys
+#exec run-once xbindkeys
 exec run-once synclient PalmDetect=1
 exec run-once synclient HorizTwoFingerScroll=1
 #exec run-once fetchmail -d 60
 #exec run-once qasmixer -t
-exec run-once xfce4-power-manager
 exec run-once blueman-applet
-exec run-once feh --bg-scale "/home/jason/Sync/wallpaper/wallhaven-3601.jpg"
+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 run-once run_vmtoolsd
diff --git a/scripts/bin/run-once b/scripts/bin/run-once
index 56f3709..214665b 100755
--- a/scripts/bin/run-once
+++ b/scripts/bin/run-once
@@ -1,7 +1,10 @@
 #! /bin/bash
 
+# run_keybase -a doesn't work
+export KEYBASE_AUTOSTART=1
+
 # Run program unless it's already running.
 
 if [ -z "`ps -Af | grep -o -w ".*$1" | grep -v grep | grep -v run-once`" ]; then
   $@
-fi
\ No newline at end of file
+fi
diff --git a/xorg/.Xmodmap b/xorg/.Xmodmap
index 2575551..43f5d90 100644
--- a/xorg/.Xmodmap
+++ b/xorg/.Xmodmap
@@ -1,3 +1,6 @@
 clear Lock
 keycode 66 = Control_L
 add Control = Control_L
+
+! Disable mosue back (6) and mouse forward (7)
+pointer = 1 2 3 4 5 0 0 8 9 10 11 12
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 401b837..28b8855 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -108,6 +108,9 @@ elif [ -f /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh ]; then
     source /usr/share/virtualenvwrapper/virtualenvwrapper_lazy.sh
 fi
 
+# Enable firefox touchscreen scrolling
+export MOZ_USE_XINPUT2=1
+
 # GPG ssh key
 export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"