refactor niri config, switch gui to niri for Akun

home/david/configurations/Akun/default.nix

@@ -40,7 +40,10 @@
 
   david = {
     wallpaper.enable = true;
-    programs.openssh.enable = true;
+    programs = {
+      openssh.enable = true;
+      niri.enable = true;
+    };
   };
 
   home.username = "${unixName}";

home/david/configurations/Tytonidae/default.nix

@@ -7,11 +7,6 @@
   ...
 }:
 {
-  imports = [
-    ./niri
-    ./wluma
-  ];
-
   youthlic = {
     xdg-dirs.enable = true;
     programs = {
@@ -50,7 +45,10 @@
 
   david = {
     wallpaper.enable = true;
-    programs.openssh.enable = true;
+    programs = {
+      niri.enable = true;
+      openssh.enable = true;
+    };
   };
 
   home.username = "${unixName}";

home/david/configurations/Tytonidae/niri/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-{
-  youthlic.programs.niri = {
-    enable = true;
-    config = ./config.kdl;
-  };
-}

home/david/configurations/Tytonidae/wluma/default.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  youthlic.programs.wluma.config = ./config.toml;
-}

home/david/modules/programs/default.nix

@@ -2,5 +2,7 @@
 {
   imports = [
     ./openssh.nix
+    ./niri
+    ./wluma
   ];
 }

home/david/modules/programs/niri/default.nix

@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+let
+  cfg = config.david.programs.niri;
+in
+{
+  options = {
+    david.programs.niri = {
+      enable = lib.mkEnableOption "niri";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    youthlic.programs.niri = {
+      enable = true;
+      config = ./config.kdl;
+    };
+    david.programs.wluma.enable = true;
+  };
+}

home/david/modules/programs/wluma/default.nix

@@ -0,0 +1,14 @@
+{ lib, config, ... }:
+let
+  cfg = config.david.programs.wluma;
+in
+{
+  options = {
+    david.programs.wluma = {
+      enable = lib.mkEnableOption "wluma";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    youthlic.programs.wluma.config = ./config.toml;
+  };
+}

nixos/configurations/Akun/default.nix

@@ -22,7 +22,7 @@
       kanata.enable = true;
       tailscale.enable = true;
     };
-    gui.enabled = "cosmic";
+    gui.enabled = "niri";
   };
   programs.gnupg.agent = {
     enable = true;