Moar linux theming

5 files changed, 42 insertions, 211 deletions

diff --git a/dots/sway/.config/sway/bindings.j2 b/dots/sway/.config/sway/bindings.j2
deleted file mode 100644
index 27b7960..0000000
--- a/dots/sway/.config/sway/bindings.j2
+++ /dev/null
@@ -1,80 +0,0 @@
-set $mod {{ window_manager.key.mod }}
-set $mov {{ window_manager.key.mov }}
-
-set $left h
-set $down j
-set $up k
-set $right l
-
-set $browser zen
-set $term alacritty
-set $filemanager pcmanfm
-
-set $launcher wofi
-
-bindsym --to-code  {
-    $mod+Shift+r                   reload
- 
-    $mod+Return        			exec $term
-    $mod+m               exec $filemanager
-    $mod+d               exec $menu
-   
-    $mod+f               fullscreen
-    $mod+v               layout tabbed
-}
-
-bindsym --to-code {
-    $mod+$left focus left
-    $mod+$down focus down
-    $mod+$up focus up
-    $mod+$right focus right
-
-    $mod+$mov+$left move left
-    $mod+$mov+$down move down
-    $mod+$mov+$up move up
-    $mod+$mov+$right move right
-}
-
-bindsym --to-code {
-{% for name, ws in window_manager.workspaces.items() %}
-    $mod+{{ ws.key }} workspace number {{ ws.order }}
-    $mod+$mov+{{ ws.key }} move container to workspace number {{ ws.order }}
-{% endfor %}
-}
-
-bindsym --to-code  $mod+Shift+minus move scratchpad
-bindsym --to-code  $mod+minus scratchpad show
-
-mode "resize" {
-    bindsym --to-code  {
-        $left resize shrink width 10px
-        $down resize grow height 10px
-        $up resize shrink height 10px
-        $right resize grow width 10px
-
-        Return mode "default"
-        Escape mode "default"
-   }
-}
-
-bindsym --to-code  $mod+n mode "resize"
-
-bindsym {
-    XF86AudioRaiseVolume exec volumectl -u up
-    XF86AudioLowerVolume exec volumectl -u down
-    XF86AudioMute exec volumectl toggle-mute
-    XF86AudioMicMute exec volumectl -m toggle-mute
-}
-
-bindsym {
-    XF86MonBrightnessUp exec lightctl up
-    XF86MonBrightnessDown exec lightctl down
-}
-
-bindsym {
-    XF86AudioPlay exec playerctl play
-    XF86AudioPause exec playerctl pause
-    XF86AudioNext exec playerctl next
-    XF86AudioPrev exec playerctl previous
-}
-
diff --git a/dots/sway/.config/sway/config.d/10-autostart-applications b/dots/sway/.config/sway/config.d/10-autostart-applications
index ef4009c..60c5971 100644
--- a/dots/sway/.config/sway/config.d/10-autostart-applications
+++ b/dots/sway/.config/sway/config.d/10-autostart-applications
@@ -1,45 +1,24 @@
-# exec $HOME/.config/sway/scripts/startup_config.sh
-# exec wmname LG3D
+exec /usr/lib/polkit-kde-authentication-agent-1
 
-# TODO: auth with polkit-kde-agent
-# Auth with polkit-gnome:
-# exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-
-# Desktop notifications
 exec mako -c ~/.config/mako/
 
-# GTK3 applications take a long time to start
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
 exec hash dbus-update-activation-environment 2>/dev/null && \
      dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
 
-# Idle settings
 exec swayidle -w \
 		timeout 500 'swaymsg "output * dpms off"' \
 		    resume 'swaymsg "output * dpms on"' \
         timeout 700 'systemctl suspend'
 
-# Gnome Keyring
 exec gnome-keyring-daemon --daemonize --start --components=gpg,pkcs11,secrets,ssh
 
 exec_always {
-    # poweralert 
     '[ -x "$(command -v poweralertd)" ] && pkill poweralertd; poweralertd -s -i "line power" &'
 
-    # playerctl
     '[ -x "$(command -v playerctl)" ] && pkill playerctl; playerctl -a metadata --format \'{{status}} {{title}}\' --follow | while read line; do pkill -RTMIN+5 waybar; done' 
 }
 
-exec {
-    # mounting daemon
-    '[ -x "$(command -v pcmanfm)" ] && pcmanfm -d'
-
-    # xdg user dirs
-    '[ -x "$(command -v xdg-user-dirs-update)" ] && exec xdg-user-dirs-update'
-}
-
-
-# Status Bars:
 
 exec nm-applet --indicator
 bar {
diff --git a/dots/sway/.config/sway/config.d/bindings.j2 b/dots/sway/.config/sway/config.d/bindings.j2
index 246b80f..abcdfa4 100644
--- a/dots/sway/.config/sway/config.d/bindings.j2
+++ b/dots/sway/.config/sway/config.d/bindings.j2
@@ -1,32 +1,30 @@
-set $mod Mod1
+set $mod {{ window_manager.key.mod }}
+set $mov {{ window_manager.key.mov }}
+set $sup {{ window_manager.key.sup }}
 
-# Home row direction keys, like vim
 set $left h
 set $down j
 set $up k
 set $right l
 
-set $browser zen
+set $browser zen-browser
 set $term alacritty
-set $filemanager pcmanfm
 
 set $launcher wofi
 
-bindsym --to-code  {
-   $mod+Shift+r                   reload
-
-   $mod+Return        			exec $term
+bindsym --to-code {
+    $sup+q kill
+}
 
-   $mod+d               exec $menu
-  
-   # f
-   $mod+f               fullscreen
+bindsym --to-code {
+    $sup+Shift+r reload
+    $sup+f fullscreen
 
-   # n
-   $mod+n               exec $filemanager
+    $sup+Space exec $launcher
+    $mod+Return exec $term
+    $mod+b exec $browser
 
-   # v
-   $mod+v               layout tabbed
+    $mod+v layout tabbed
 }
 
 bindsym --to-code {
@@ -35,117 +33,52 @@ bindsym --to-code {
     $mod+$up focus up
     $mod+$right focus right
 
-    $mod+Shift+$left move left
-    $mod+Shift+$down move down
-    $mod+Shift+$up move up
-    $mod+Shift+$right move right
+    $mod+$mov+$left move left
+    $mod+$mov+$down move down
+    $mod+$mov+$up move up
+    $mod+$mov+$right move right
 }
 
-# Workspaces:
 bindsym --to-code {
-
-    # Switch to workspace
-    $mod+1 workspace number 1
-    $mod+2 workspace number 2
-    $mod+3 workspace number 3
-    $mod+4 workspace number 4
-    $mod+5 workspace number 5
-    $mod+6 workspace number 6
-    $mod+7 workspace number 7
-    $mod+8 workspace number 8
-    $mod+9 workspace number 9
-    $mod+0 workspace number 10
-
-    # Move focused container to workspace
-    $mod+Shift+1 move container to workspace number 1
-    $mod+Shift+2 move container to workspace number 2
-    $mod+Shift+3 move container to workspace number 3
-    $mod+Shift+4 move container to workspace number 4
-    $mod+Shift+5 move container to workspace number 5
-    $mod+Shift+6 move container to workspace number 6
-    $mod+Shift+7 move container to workspace number 7
-    $mod+Shift+8 move container to workspace number 8
-    $mod+Shift+9 move container to workspace number 9
-    $mod+Shift+0 move container to workspace number 10
+{% for name, ws in window_manager.workspaces.items() %}
+    $mod+{{ ws.key }} workspace {{ name }}
+    $mod+$mov+{{ ws.key }} move container to workspace {{ name }}
+{% endfor %}
 }
 
-# Scratchpad:
-# Move the currently focused window to the scratchpad
 bindsym --to-code  $mod+Shift+minus move scratchpad
-
-# Show the next scratchpad window or hide the focused scratchpad window.
-# If there are multiple scratchpad windows, this command cycles through them.
 bindsym --to-code  $mod+minus scratchpad show
 
-# Resizing containers:
 mode "resize" {
-    # left will shrink the containers width
-    # right will grow the containers width
-    # up will shrink the containers height
-    # down will grow the containers height
     bindsym --to-code  {
-         $left resize shrink width 10px
-         $down resize grow height 10px
-         $up resize shrink height 10px
-         $right resize grow width 10px
-
-         # Ditto, with arrow keys
-         Left resize shrink width 10px
-         Down resize grow height 10px
-         Up resize shrink height 10px
-         Right resize grow width 10px
-
-         # Return to default mode
-         Return mode "default"
-         Escape mode "default"
-   }
-}
+        $left resize shrink width 10px
+        $down resize grow height 10px
+        $up resize shrink height 10px
+        $right resize grow width 10px
 
-bindsym --to-code  $mod+r mode "resize"
-
-# Resize floating windows with mouse scroll:
-bindsym --to-code  --whole-window --border {
-   $mod+button4 resize shrink height 5 px or 5 ppt
-   $mod+button5 resize grow height 5 px or 5 ppt
-   $mod+shift+button4 resize shrink width 5 px or 5 ppt
-   $mod+shift+button5 resize grow width 5 px or 5 ppt
+        Return mode "default"
+        Escape mode "default"
+   }
 }
 
-# Volume
-   # bindsym --to-code  XF86AudioRaiseVolume  exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10%
-   # bindsym --to-code  XF86AudioLowerVolume  exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10%
-   # bindsym --to-code  XF86AudioMute         exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle # mute sound
-
-   #wob
-# bindsym {
-#    XF86AudioRaiseVolume exec pamixer -ui 10 && pamixer --get-volume > $SWAYSOCK.wob
-#    XF86AudioLowerVolume exec pamixer -ud 10  && pamixer --get-volume > $SWAYSOCK.wob
-#    XF86AudioMute exec pamixer --toggle-mute && ( pamixer --get-mute && echo 0 > $SWAYSOCK.wob ) || pamixer --get-volume > $SWAYSOCK.wob
-# }
-# 
-# # Backlight
-#    #wob
-# bindsym {
-#    XF86MonBrightnessUp exec light -A 10 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob
-#    XF86MonBrightnessDown exec light -U 10 && light -G | cut -d'.' -f1 > $SWAYSOCK.wob
-# }
+bindsym --to-code  $mod+n mode "resize"
 
 bindsym {
-  XF86AudioRaiseVolume exec volumectl -u up
-  XF86AudioLowerVolume exec volumectl -u down
-  XF86AudioMute exec volumectl toggle-mute
-  XF86AudioMicMute exec volumectl -m toggle-mute
+    XF86AudioRaiseVolume exec volumectl -u up
+    XF86AudioLowerVolume exec volumectl -u down
+    XF86AudioMute exec volumectl toggle-mute
+    XF86AudioMicMute exec volumectl -m toggle-mute
 }
 
 bindsym {
-  XF86MonBrightnessUp exec lightctl up
-  XF86MonBrightnessDown exec lightctl down
+    XF86MonBrightnessUp exec lightctl up
+    XF86MonBrightnessDown exec lightctl down
 }
 
 bindsym {
-  XF86AudioPlay exec playerctl play
-  XF86AudioPause exec playerctl pause
-  XF86AudioNext exec playerctl next
-  XF86AudioPrev exec playerctl previous
+    XF86AudioPlay exec playerctl play
+    XF86AudioPause exec playerctl pause
+    XF86AudioNext exec playerctl next
+    XF86AudioPrev exec playerctl previous
 }
 
diff --git a/dots/sway/.config/sway/config.d/swayfx b/dots/sway/.config/sway/config.d/swayfx
index 204c3b5..ed88db2 100644
--- a/dots/sway/.config/sway/config.d/swayfx
+++ b/dots/sway/.config/sway/config.d/swayfx
@@ -1,4 +1,3 @@
-layer_effects "waybar" blur enable; shadows disable;
 layer_effects "gtk-layer-shell" blur enable; shadows enable; corner_radius 13
 layer_effects "wofi" blur enable; shadows enable; corner_radius 13
 
diff --git a/dots/sway/.config/sway/config.d/theme b/dots/sway/.config/sway/config.d/theme
index 83b5ffa..1de8db5 100644
--- a/dots/sway/.config/sway/config.d/theme
+++ b/dots/sway/.config/sway/config.d/theme
@@ -1,4 +1,4 @@
-gaps inner 25
+gaps inner 12
 gaps outer 0
 
 # hide titlebar on windows