From 7218696832ed3d5d20838e0d28e7d37f5767b5ab Mon Sep 17 00:00:00 2001
From: Josh Fabean <me@joshfabean.com>
Date: Tue, 20 Oct 2020 10:38:55 -0500
Subject: [PATCH] updates

---
 .config/fish/config.fish   |  2 +-
 .config/i3/arch-config     | 34 +++++++++++++++++-----------------
 .config/sway/articuno-sway | 10 ----------
 .config/waybar/config      |  2 +-
 4 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index b6a9193..0005475 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -35,7 +35,7 @@ function notify
 end
 
 # my 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/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:/home/joshfabean/.cargo/bin:$PATH"
 export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
 
 npm set prefix ~/.npm
diff --git a/.config/i3/arch-config b/.config/i3/arch-config
index 8d0c7f8..a2e06c2 100644
--- a/.config/i3/arch-config
+++ b/.config/i3/arch-config
@@ -92,22 +92,22 @@ bindsym $mod+p focus parent
 # focus the child container
 bindsym $mod+c focus child
 
-set $workSpace1 "1: "
-set $workSpace2 "2: CK"
-set $workSpace3 "3: "
-set $workSpace4 "4: "
+set $workSpace1 "1"
+set $workSpace2 "2"
+set $workSpace3 "3"
+set $workSpace4 "4"
 
 # switch to workspace
 bindsym $mod+1 workspace $workSpace1
 bindsym $mod+2 workspace $workSpace2
 bindsym $mod+3 workspace $workSpace3
 bindsym $mod+4 workspace $workSpace4
-bindsym $mod+5 workspace 5: 
-bindsym $mod+6 workspace 6: 
-bindsym $mod+7 workspace 7: 
-bindsym $mod+8 workspace 8: 
-bindsym $mod+9 workspace 9: 
-bindsym $mod+0 workspace 10: 
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace 10
 bindsym Mod1+Control+Right workspace next
 bindsym Mod1+Control+Left workspace prev
 workspace_auto_back_and_forth yes
@@ -119,12 +119,12 @@ bindsym $mod+Shift+1 move container to workspace $workSpace1
 bindsym $mod+Shift+2 move container to workspace $workSpace2
 bindsym $mod+Shift+3 move container to workspace $workSpace3
 bindsym $mod+Shift+4 move container to workspace $workSpace4
-bindsym $mod+Shift+5 move container to workspace number 5: 
-bindsym $mod+Shift+6 move container to workspace number 6: 
-bindsym $mod+Shift+7 move container to workspace number 7: 
-bindsym $mod+Shift+8 move container to workspace number 8: 
-bindsym $mod+Shift+9 move container to workspace number 9: 
-bindsym $mod+Shift+0 move container to workspace number 10: 
+bindsym $mod+Shift+5 move container to workspace number 5
+bindsym $mod+Shift+6 move container to workspace number 6
+bindsym $mod+Shift+7 move container to workspace number 7
+bindsym $mod+Shift+8 move container to workspace number 8
+bindsym $mod+Shift+9 move container to workspace number 9
+bindsym $mod+Shift+0 move container to workspace number 10
 
 #Custom Keybindings
 
@@ -213,7 +213,7 @@ bindsym $mod+Control+Left resize shrink width 5 px or 5 ppt
 
 bar {
         position top
-        status_command i3blocks
+        status_command SCRIPT_DIR=/home/joshfabean/.config/i3blocks i3blocks 
         font pango:Liberation 10, FontAwesome 12
         # strip_workspace_numbers yes
 
diff --git a/.config/sway/articuno-sway b/.config/sway/articuno-sway
index aa1658a..35ba5cf 100644
--- a/.config/sway/articuno-sway
+++ b/.config/sway/articuno-sway
@@ -253,18 +253,8 @@ client.urgent           #dc322f #b71c1c #fdf6e3 #dc322f #dc322f
 ############################
 #HOME
 output HDMI-A-1 pos 440 0 res 2560x1080
-#output DP-1 pos 1920 0 res 1920x1200
 output DP-1 pos 0 1080 res 3440x1440
-#output DP-2 pos 440 0 res 2560x1080
-#FFICE
-#output DVI-D-1 pos 0 0 res 1920x1080
-#output HDMI-A-1 pos 0 0 res 1920x1080
-#output DP-1 pos 1920 0 res 1920x1200
-#output DP-2 pos 3840 0 res 1920x1200
 # background images
-#output eDP-1 bg ~/Wallpapers/xp-sunrise.png stretch
-#output DP-1 bg ~/Wallpapers/xp-sunrise.png stretch
-#output DP-2 bg ~/Wallpapers/xp-sunrise.png stretch
 #output * bg ~/Pictures/Wallpapers/calvin-hobbes-stars.jpg fill
 output * bg ~/Pictures/Wallpapers/scenic-view-of-forest-during-night-time-1252869.jpg fill
 bindsym $mod+Shift+m exec --no-startup-id "sway output output DP-1 pos 2880 0 res 1920x1080 && sway ouput DP-2 res 1920x1080"
diff --git a/.config/waybar/config b/.config/waybar/config
index 1890ba7..d2eff72 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -200,7 +200,7 @@
         //"max-length": 15,
         "interval": 10,
         "exec": "watson-status",
-        "on-click": "watson stop"
+        //"on-click": "/usr/bin/watson stop;exit"
     },
     "custom/calc": {
         "format": "",