group mercury cleanup and firefox config updates

1 files changed, 58 insertions, 92 deletions

diff --git a/modules/desktop/hjem/wm/sway.nix b/modules/desktop/hjem/wm/sway.nix
index 0e5edb2..03450d2 100644
--- a/modules/desktop/hjem/wm/sway.nix
+++ b/modules/desktop/hjem/wm/sway.nix
@@ -6,112 +6,78 @@
 }: let
   cfg = config.collinux.desktop.wm.sway;
 
-  colors = ''
-    set $rosewater #f5e0dc
-    set $flamingo #f2cdcd
-    set $pink #f5c2e7
-    set $mauve #cba6f7
-    set $red #f38ba8
-    set $maroon #eba0ac
-    set $peach #fab387
-    set $yellow #f9e2af
-    set $green #a6e3a1
-    set $teal #94e2d5
-    set $sky #89dceb
-    set $sapphire #74c7ec
-    set $blue #89b4fa
-    set $lavender #b4befe
-    set $text #cdd6f4
-    set $subtext1 #bac2de
-    set $subtext0 #a6adc8
-    set $overlay2 #9399b2
-    set $overlay1 #7f849c
-    set $overlay0 #6c7086
-    set $surface2 #585b70
-    set $surface1 #45475a
-    set $surface0 #313244
-    set $base #1e1e2e
-    set $mantle #181825
-    set $crust #11111b
-  '';
-
-  settings = ''
-    exec ${config.collinux.desktop.wallpaper_cmd}
-    exec ${pkgs.dunst}/bin/dunst
-    exec ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP GTK_USE_PORTAL NIXOS_OZONE_WL MOZ_ENABLE_WAYLAND
-
-    include catppuccin-mocha
-
-    # target                 title     bg    text   indicator  border
-    client.focused           $lavender $base $text  $rosewater $blue
-    client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
-    client.unfocused         $overlay0 $base $text  $rosewater $overlay0
-    client.urgent            $peach    $base $peach $overlay0  $peach
-    client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
-    client.background        $base
-
-    input type:keyboard {
-      xkb_options caps:none
+  settings = with config.collinux.palette; ''
+    exec {
+      ${config.collinux.desktop.wallpaper_cmd}
+      ${pkgs.dunst}/bin/dunst
+      ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP GTK_USE_PORTAL NIXOS_OZONE_WL MOZ_ENABLE_WAYLAND
     }
 
-    input type:touchpad {
-      dwt disabled
-    }
-
-    bindsym Mod4+1 workspace number 1
-    bindsym Mod4+2 workspace number 2
-    bindsym Mod4+3 workspace number 3
-    bindsym Mod4+4 workspace number 4
-    bindsym Mod4+5 workspace number 5
-    bindsym Mod4+6 workspace number 6
-    bindsym Mod4+7 workspace number 7
-    bindsym Mod4+8 workspace number 8
-    bindsym Mod4+9 workspace number 9
+    # target                 title      bg         text       indicator  border
+    client.focused           #${base07} #${base00} #${base05} #${base06} #${base13}
+    client.focused_inactive  #${base03} #${base00} #${base05} #${base06} #${base03}
+    client.unfocused         #${base03} #${base00} #${base05} #${base06} #${base03}
+    client.urgent            #${base09} #${base00} #${base09} #${base03} #${base09}
+    client.placeholder       #${base03} #${base00} #${base05} #${base03} #${base03}
+    client.background        #${base00}
 
-    bindsym Mod4+Shift+1 move container to workspace number 1
-    bindsym Mod4+Shift+2 move container to workspace number 2
-    bindsym Mod4+Shift+3 move container to workspace number 3
-    bindsym Mod4+Shift+4 move container to workspace number 4
-    bindsym Mod4+Shift+5 move container to workspace number 5
-    bindsym Mod4+Shift+6 move container to workspace number 6
-    bindsym Mod4+Shift+7 move container to workspace number 7
-    bindsym Mod4+Shift+8 move container to workspace number 8
-    bindsym Mod4+Shift+9 move container to workspace number 9
+    input {
+      type:keyboard xkb_options caps:none
+      type:touchpad dwt disabled
+    }
 
-    bindsym Mod4+Return       exec ${pkgs.foot}/bin/foot
-    bindsym Mod4+Space        exec tofi-drun
-    bindsym Mod4+b            exec ${pkgs.firefox}/bin/firefox
-    bindsym Mod4+Shift+b      exec ${pkgs.qutebrowser}/bin/qutebrowser
-    bindsym Mod4+q kill
+    default_border pixel 2
+    default_floating_border pixel 2
+    smart_borders on
+    smart_gaps on
 
-    bindsym Mod4+w exec '${pkgs.iwmenu}/bin/iwmenu -l fuzzel -i font -s 2'
+    floating_modifier Mod4 normal
+    default_orientation auto
 
-    bindsym Mod4+Shift+s exec '${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" ~/Pictures/$(date +"%s_grim.png")'
-    bindsym Mod4+Alt+s exec '${pkgs.hyprpicker}/bin/hyprpicker'
+    bindsym {
+      Mod4+1 workspace number 1
+      Mod4+2 workspace number 2
+      Mod4+3 workspace number 3
+      Mod4+4 workspace number 4
+      Mod4+5 workspace number 5
+      Mod4+6 workspace number 6
+      Mod4+7 workspace number 7
+      Mod4+8 workspace number 8
+      Mod4+9 workspace number 9
 
-    bindsym XF86AudioRaiseVolume exec 'util.lua volume up'
-    bindsym XF86AudioLowerVolume exec 'util.lua volume down'
+      Mod4+Shift+1 move container to workspace number 1
+      Mod4+Shift+2 move container to workspace number 2
+      Mod4+Shift+3 move container to workspace number 3
+      Mod4+Shift+4 move container to workspace number 4
+      Mod4+Shift+5 move container to workspace number 5
+      Mod4+Shift+6 move container to workspace number 6
+      Mod4+Shift+7 move container to workspace number 7
+      Mod4+Shift+8 move container to workspace number 8
+      Mod4+Shift+9 move container to workspace number 9
 
-    bindsym XF86MonBrightnessUp exec 'util.lua brightness up'
-    bindsym XF86MonBrightnessDown exec 'util.lua brightness down'
+      Mod4+q kill
 
-    bindsym Home   exec 'util.lua music prev'
-    bindsym End    exec 'util.lua music toggle'
-    bindsym Insert exec 'util.lua music next'
+      Mod4+Return   exec ${pkgs.foot}/bin/foot
+      Mod4+Space    exec tofi-drun
+      Mod4+b        exec ${pkgs.firefox}/bin/firefox
+      Mod4+Shift+b  exec ${pkgs.qutebrowser}/bin/qutebrowser
+      Mod4+w        exec '${pkgs.iwmenu}/bin/iwmenu -l fuzzel -i font -s 2'
 
-    default_border pixel 2
-    default_floating_border pixel 2
-    smart_borders on
-    smart_gaps on
+      Mod4+Shift+s  exec '${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" ~/Pictures/$(date +"%s_grim.png")'
+      Mod4+Alt+s    exec '${pkgs.hyprpicker}/bin/hyprpicker'
 
-    floating_modifier Mod4 normal
+      Home                  exec 'util.lua music prev'
+      End                   exec 'util.lua music toggle'
+      Insert                exec 'util.lua music next'
+      XF86AudioRaiseVolume  exec 'util.lua volume up'
+      XF86AudioLowerVolume  exec 'util.lua volume down'
+      XF86MonBrightnessUp   exec 'util.lua brightness up'
+      XF86MonBrightnessDown exec 'util.lua brightness down'
+    }
   '';
 in
   lib.mkIf cfg.enable {
-    files = {
-      ".config/sway/config".text = settings;
-      ".config/sway/catppuccin-mocha".text = colors;
-    };
+    files.".config/sway/config".text = settings;
 
     packages = with pkgs; [
       sway