Spring Cleaning

- create new module, `system`, that consumes the `boot` module and takes
in the more system-interested services from the `services` module
- touch up left over services (which are more self-hosting interested)
- touch up yo and yoshi configs

4 files changed, 22 insertions, 13 deletions

diff --git a/modules/desktop/hjem/wm/dunst.nix b/modules/desktop/hjem/wm/dunst.nix
index 9366975..7528dd0 100644
--- a/modules/desktop/hjem/wm/dunst.nix
+++ b/modules/desktop/hjem/wm/dunst.nix
@@ -18,17 +18,16 @@
       origin = "top-right"
 
     [urgency_low]
-      background = "#${base00}99"
       foreground = "#${base05}ff"
+      background = "#ffffff00"
 
     [urgency_normal]
-      background = "#${base00}99"
       foreground = "#${base05}ff"
+      background = "#ffffff00"
 
     [urgency_critical]
-      background = "#${base00}99"
-      foreground = "#${base05}ff"
-      frame_color = "#${base08}"
+      foreground = "#${base08}ff"
+      background = "#ffffff00"
   '';
 in
   lib.mkIf cfg.enable {
diff --git a/modules/desktop/hjem/wm/sway.nix b/modules/desktop/hjem/wm/sway.nix
index 4cecdea..7051402 100644
--- a/modules/desktop/hjem/wm/sway.nix
+++ b/modules/desktop/hjem/wm/sway.nix
@@ -38,11 +38,12 @@
   settings = ''
     exec ${config.collinux.desktop.wallpaper_cmd}
     exec ${pkgs.dunst}/bin/dunst
+    exec ${pkgs.soteria}/bin/soteria
 
     include catppuccin-mocha
 
     # target                 title     bg    text   indicator  border
-    client.focused           $lavender $base $text  $rosewater $lavender
+    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
@@ -93,8 +94,11 @@
     bindsym Insert exec 'util.lua music next'
 
     default_border pixel 2
+    default_floating_border pixel 2
     smart_borders on
     smart_gaps on
+
+    floating_modifier Mod4 normal
   '';
 in
   lib.mkIf cfg.enable {
diff --git a/modules/desktop/nixos/greeters/greetd.nix b/modules/desktop/nixos/greeters/greetd.nix
index 02af31f..8e0a3ba 100644
--- a/modules/desktop/nixos/greeters/greetd.nix
+++ b/modules/desktop/nixos/greeters/greetd.nix
@@ -14,13 +14,8 @@
     }
     else if cfg.autologin.enable
     then {
+      command = cfg.autologin.command;
       user = config.collinux.user.name;
-      command = with config.collinux.desktop;
-        if (wm.sway.enable && !gnome.enable && !wm.niri.enable)
-        then lib.getExe pkgs.sway
-        else if (wm.niri.enable && !gnome.enable && !wm.sway.enable)
-        then "${pkgs.niri}/bin/niri-session"
-        else null;
     }
     else {};
 in
diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix
index 5ba4423..1bd03fe 100644
--- a/modules/desktop/options.nix
+++ b/modules/desktop/options.nix
@@ -22,7 +22,18 @@ in {
 
       greetd = {
         enable = mkEnableOption "greetd greeter";
-        autologin.enable = mkEnableOption "autologin";
+        autologin = {
+          enable = mkEnableOption "autologin";
+          command = mkOption {
+            type = lib.types.str;
+            default = with config.collinux.desktop;
+              if (wm.sway.enable && !gnome.enable && !wm.niri.enable)
+              then "${pkgs.sway}/bin/sway"
+              else if (wm.niri.enable && !gnome.enable && !wm.sway.enable)
+              then "${pkgs.niri}/bin/niri-session"
+              else null;
+          };
+        };
         cosmic-greeter.enable = mkEnableOption "cosmic-greeter";
       };
       gdm.enable = mkEnableOption "gdm display manager";