diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index 28d10c4..0181792 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -10,7 +10,7 @@ let
 in
 {
   imports = [
-    ../../modules/dconf.nix # TODO: Only enable when on Gnome?
+    # ../../modules/dconf.nix # TODO: Only enable when on Gnome?
     ../../modules/git.nix
     ../../modules/k9s.nix
     (import ../../modules/taskwarrior.nix {
diff --git a/hosts/andromache/default.nix b/hosts/andromache/default.nix
index 2af8b85..4c4527d 100644
--- a/hosts/andromache/default.nix
+++ b/hosts/andromache/default.nix
@@ -22,7 +22,7 @@ in
       inherit lib;
       inherit config;
     })
-    ../../modules/gnome.nix
+    ../../modules/desktops/niri.nix
     ../../modules/bluetooth.nix
     ../../modules/keyboard
     (import ../../modules/networking.nix { hostName = "andromache"; })
diff --git a/hosts/astyanax/default.nix b/hosts/astyanax/default.nix
index 6dd7c81..ecbdd17 100644
--- a/hosts/astyanax/default.nix
+++ b/hosts/astyanax/default.nix
@@ -24,7 +24,7 @@ in
       inherit config;
       device = "/dev/nvme0n1";
     })
-    ../../modules/gnome.nix
+    ../../modules/desktops/niri.nix
     ../../modules/bluetooth.nix
     ../../modules/keyboard
     (import ../../modules/networking.nix { hostName = hostName; })
diff --git a/modules/gnome.nix b/modules/desktops/gnome.nix
similarity index 100%
rename from modules/gnome.nix
rename to modules/desktops/gnome.nix
diff --git a/modules/desktops/niri.nix b/modules/desktops/niri.nix
new file mode 100644
index 0000000..28044be
--- /dev/null
+++ b/modules/desktops/niri.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  programs.niri.enable = true;
+
+  environment.systemPackages = with pkgs; [ wlsunset ];
+}