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

config.fish

@@ -30,18 +30,18 @@ if command --search p4 >/dev/null
 end
 
 # PATH
-set -x PATH $HOME/dotfiles/bin $PATH
-# set -x PATH $HOME/.local/bin $PATH
-set -x PATH $HOME/.npm-packages/bin $PATH
-# set -x PATH /usr/local/opt/python/libexec/bin $PATH
-set -x PATH $HOME/.cargo/bin $PATH
+test -e $HOME/dotfiles/bin ; and set -x PATH $HOME/dotfiles/bin $PATH
+test -e $HOME/.local/bin ; and set -x PATH $HOME/.local/bin $PATH
+test -e $HOME/.npm-packeges/bin ; and set -x PATH $HOME/.npm-packages/bin $PATH
+test -e /usr/local/opt/python/libexec/bin ; and set -x PATH /usr/local/opt/python/libexec/bin $PATH
+test -e $HOME/.cargo/bin ; and set -x PATH $HOME/.cargo/bin $PATH
 
 # Keychain
-if status --is-interactive
+# if status --is-interactive
     # TODO Take this out when keychain fixes this bug
-    set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1"
-    keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
-end
+    # set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1"
+    # keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
+    # end
 
 # iTerm2
 test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
@@ -57,3 +57,5 @@ end
 if test -n "$EMACS"
   set -x TERM eterm-color
 end
+
+set fish_greeting ""

logitech_linux_mouse.sh

@@ -3,5 +3,6 @@
 for id in `xinput --list|grep 'MX Master 2S'|perl -ne 'while (m/id=(\d+)/g){print "$1\n";}'`; do
     xinput set-prop $id "Device Accel Velocity Scaling" 1
     xinput set-prop $id "Device Accel Constant Deceleration" 0.8
+    # xinput set-prop $id "Evdev Scrolling Distance" -1 -1 -1
     xinput set-button-map $id 1 2 3 5 4 # "natural" scrolling
 done

polybar

@@ -66,7 +66,7 @@ format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
 format-prefix-underline = ${colors.secondary}
 
-label-layout = %layout%
+label-layout = %name%
 label-layout-underline = ${colors.secondary}
 
 label-indicator-padding = 2

symlinks.sh

@@ -3,7 +3,7 @@
 # ln -sf ~/dotfiles/zshrc ~/.zshrc
 mkdir -p ~/.config/fish; ln -sf ~/dotfiles/config.fish ~/.config/fish/config.fish
 curl -Lo ~/.config/fish/functions/fisher.fish --create-dirs https://git.io/fisher
-ln -s ~/dotfiles/fishfile ~/.config/fish/fishfile
+ln -sf ~/dotfiles/fishfile ~/.config/fish/fishfile
 mkdir ~/.ghc; ln -sf ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
 ln -sf ~/dotfiles/gitconfig ~/.gitconfig
 ln -sf ~/dotfiles/tmux.conf ~/.tmux.conf

xmonad.hs

@@ -10,7 +10,7 @@ import XMonad.Util.EZConfig
 lightBlue = "#66aaff"
 
 main = xmonad $ docks $ ewmh $ defaultConfig
-    { terminal = "urxvtc"
+    { terminal = "alacritty"
     , modMask = mod4Mask
     , workspaces = [ "α", "β", "γ" ]
     , borderWidth = 2