update makefile and configs

3 files changed, 35 insertions, 25 deletions

diff --git a/i3wm/.config/i3/config b/i3wm/.config/i3/config
index c918ff2..29e90c2 100644
--- a/i3wm/.config/i3/config
+++ b/i3wm/.config/i3/config
@@ -60,31 +60,33 @@ bindsym $mod+l focus up
 bindsym $mod+semicolon focus right
 
 # alternatively, you can use the cursor keys:
-#bindsym $mod+Left focus left
 bindsym $mod+Left workspace prev_on_output
-bindsym $mod+Control+Left workspace prev
+bindsym $mod+Shift+Left workspace prev
+bindsym $mod+Shift+j workspace prev
 bindsym $mod+Shift+Control+Left move workspace to output left
+
 bindsym $mod+Down focus down
 bindsym $mod+Up focus up
-#bindsym $mod+Right focus right
 bindsym $mod+Right workspace next_on_output
-bindsym $mod+Control+Right workspace next
+bindsym $mod+Shift+Right workspace next
+bindsym $mod+Shift+semicolon workspace next
 bindsym $mod+Shift+Control+Right move workspace to output right
+
 bindsym $mod+b workspace back_and_forth
 bindsym $mod+Shift+b move container to workspace back_and_forth
 bindsym $mod+n exec --no-startup-id rofiworkspace
 
 # move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move right
+bindsym $mod+Control+j move left
+bindsym $mod+Control+k move down
+bindsym $mod+Control+l move up
+bindsym $mod+Control+semicolon move right
 
 # alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
+bindsym $mod+Control+Left move left
+bindsym $mod+Control+Down move down
+bindsym $mod+Control+Up move up
+bindsym $mod+Control+Right move right
 
 # split in horizontal orientation
 bindsym $mod+h split h
@@ -231,7 +233,7 @@ bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
 
-bindsym $mod+Control+l exec "xautolock -locknow"
+bindsym $mod+Shift+l exec "xautolock -locknow"
 
 
 
@@ -248,3 +250,10 @@ gaps outer 0
 #        status_command i3status
 #        position top
 #}
+
+
+# window assignments
+for_window [class="Spotify"] move to workspace Spotify
+assign [class="Firefox"] → Browser
+assign [class="Zeal"] → Zeal
+assign [class="kitty"] → Term
diff --git a/i3wm/.config/polybar/config b/i3wm/.config/polybar/config
index 07b9d8e..419ff49 100644
--- a/i3wm/.config/polybar/config
+++ b/i3wm/.config/polybar/config
@@ -30,7 +30,8 @@ alert = #bd2c40
 [bar/topbar]
 monitor = ${env:MONITOR:eDP-1}
 width = 100%
-height = 30
+height = 40
+dpi = 156
 ;offset-x = 1%
 ;offset-y = 1%
 radius = 6.0
@@ -80,7 +81,8 @@ modules-right = filesystem backlight pulseaudio xkeyboard memory cpu wlan eth et
 [bar/topbar-second]
 monitor = ${env:MONITOR:eDP-1}
 width = 100%
-height = 30
+height = 40
+dpi = 156
 ;offset-x = 1%
 ;offset-y = 0
 radius = 6.0
@@ -138,11 +140,11 @@ tail = true
 format = <label>
 format-foreground = ${colors.foreground-alt}
 format-underline = ${colors.primary}
-click-right = xte 'key XF86AudioPlay'
-click-left = xte 'key XF86AudioPlay'
-click-middle = xte 'key XF86AudioNext'
-scroll-up = xte 'key XF86AudioNext'
-scroll-down = xte 'key XF86AudioPrev'
+click-right = playerctl play-pause
+click-left = playerctl play-pause
+click-middle = playerctl next
+scroll-up = playerctl next
+scroll-down = playerctl previous
 label-maxlen = 120
 label-ellipsis = true
 
@@ -333,7 +335,7 @@ label = %percentage_used%%
 
 [module/wlan]
 type = internal/network
-interface = wlp3s0
+interface = wlp13s0
 interval = 3.0
 accumulate-stats = true
 
@@ -353,7 +355,7 @@ ramp-signal-foreground = ${colors.foreground-alt}
 
 [module/eth]
 type = internal/network
-interface = enp0s31f6
+interface = eno1
 interval = 3.0
 accumulate-stats = true
 
diff --git a/i3wm/.config/polybar/launch.sh b/i3wm/.config/polybar/launch.sh
index e099ebb..c45e085 100755
--- a/i3wm/.config/polybar/launch.sh
+++ b/i3wm/.config/polybar/launch.sh
@@ -9,12 +9,11 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
 
 # Launch bar1 and bar2
 MONITOR=$(polybar -m|tail -n1|sed -e 's/:.*$//g') polybar topbar &
-
+sleep 1
 MONITORS=$(polybar -m|sed -e 's/:.*$//g')
 while read -r monitor; do
 	MONITOR=$monitor polybar topbar-second &
+	sleep 1
 done <<< $MONITORS
 
-PRIMARY_MONITOR=$(xrandr -q|awk '/ connected primary /'|cut -d ' ' -f1)
-
 echo "Bars launched..."