Merge branch 'master' of https://git.joshfabean.com/fabean/Dotfiles

.config/fish/config.fish

@@ -29,7 +29,7 @@ function vpn-status
 end
 
 # my path
-export PATH="/usr/local/bin/php:/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:$PATH"
+export PATH="/home/joshfabean/.n/bin:/usr/local/bin/php:/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:$PATH"
 export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
 
 npm set prfix ~/.npm

.config/sway/golem-sway

@@ -128,7 +128,7 @@ bindsym Print exec scrot -s -e 'mv $f ~/Downloads'
 bindsym $mod+m move scratchpad
 bindsym $mod+n scratchpad show
 bindsym $mod+Shift+s sticky toggle
-bindsym Control+k exec --no-startup-id echo "core.weechat */buffer_dmenu" >> $(find ~/.weechat -type p)
+#bindsym Control+k exec --no-startup-id echo "core.weechat */buffer_dmenu" >> $(find ~/.weechat -type p)
 # Notifications
 bindsym $mod+Control+Shift+space exec --no-startup-id makoctl dismiss -a
 bindsym $mod+Control+space exec --no-startup-id makoctl dismiss

.i3blocks.conf

@@ -9,7 +9,8 @@ command=/usr/lib/i3blocks/$BLOCK_NAME
 #interval=60
 
 [ssid]
-command=echo " $(iw dev wlp4s0 link | grep SSID | cut -d " " -f 2-)"
+#command=echo " $(iw dev wlp4s0 link | grep SSID | cut -d " " -f 2-)"
+command=/usr/lib/i3blocks/iface
 color=#00FF00
 separator=false
 interval=10
@@ -19,10 +20,10 @@ instance=wlp4s0
 color=#00FF00
 interval=10
 
-[battery]
-label=
-command=/usr/lib/i3blocks/battery
-interval=30
+#[battery]
+#label=
+#command=/usr/lib/i3blocks/battery
+#interval=30
 #instance=1
 
 #[battery]
@@ -52,7 +53,7 @@ label=
 interval=30
 
 [cpu_usage]
-label=
+#label=
 interval=30
 
 [volume]