diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix
index ab5af6d..2458d8b 100644
--- a/home/david/configurations/Akun/default.nix
+++ b/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}";
diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix
index 3b9fae7..ed6e5f4 100644
--- a/home/david/configurations/Tytonidae/default.nix
+++ b/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}";
diff --git a/home/david/configurations/Tytonidae/niri/default.nix b/home/david/configurations/Tytonidae/niri/default.nix
deleted file mode 100644
index f019883..0000000
--- a/home/david/configurations/Tytonidae/niri/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  youthlic.programs.niri = {
-    enable = true;
-    config = ./config.kdl;
-  };
-}
diff --git a/home/david/configurations/Tytonidae/wluma/default.nix b/home/david/configurations/Tytonidae/wluma/default.nix
deleted file mode 100644
index 50a5098..0000000
--- a/home/david/configurations/Tytonidae/wluma/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  youthlic.programs.wluma.config = ./config.toml;
-}
diff --git a/home/david/modules/programs/default.nix b/home/david/modules/programs/default.nix
index 29f07f6..4d84c73 100644
--- a/home/david/modules/programs/default.nix
+++ b/home/david/modules/programs/default.nix
@@ -2,5 +2,7 @@
 {
   imports = [
     ./openssh.nix
+    ./niri
+    ./wluma
   ];
 }
diff --git a/home/david/configurations/Tytonidae/niri/config.kdl b/home/david/modules/programs/niri/config.kdl
similarity index 100%
rename from home/david/configurations/Tytonidae/niri/config.kdl
rename to home/david/modules/programs/niri/config.kdl
diff --git a/home/david/modules/programs/niri/default.nix b/home/david/modules/programs/niri/default.nix
new file mode 100644
index 0000000..b9bde1c
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/home/david/configurations/Tytonidae/wluma/config.toml b/home/david/modules/programs/wluma/config.toml
similarity index 100%
rename from home/david/configurations/Tytonidae/wluma/config.toml
rename to home/david/modules/programs/wluma/config.toml
diff --git a/home/david/modules/programs/wluma/default.nix b/home/david/modules/programs/wluma/default.nix
new file mode 100644
index 0000000..648ebb5
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix
index d847e1a..3d7a8cc 100644
--- a/nixos/configurations/Akun/default.nix
+++ b/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;