diff --git a/flake.nix b/flake.nix
index ff84b36..79619c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,7 @@
         ./modules/nix.nix
         ./modules/shell.nix
 
+        ./modules/linux/tuigreet.nix
         ./modules/linux/desktop.nix
         ./modules/linux/ssh.nix
         ./modules/linux/opensnitch.nix
diff --git a/modules/linux/desktop.nix b/modules/linux/desktop.nix
index f31ac68..79a86b6 100644
--- a/modules/linux/desktop.nix
+++ b/modules/linux/desktop.nix
@@ -11,20 +11,6 @@
     jack.enable = true;
   };
 
-  # Enable display manager w/autologin
-  services.greetd = {
-    enable = true;
-    settings = {
-      initial_session = {
-        command = "${pkgs.uwsm}/bin/uwsm start default";
-        user = "nico";
-      };
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --asterisks --time --greeting 'nyaaa~~'";
-      };
-    };
-  };
-
   # Applications
   programs.steam = {
     # doesn't do anything if steam isn't enabled so safe here
diff --git a/modules/linux/tuigreet.nix b/modules/linux/tuigreet.nix
new file mode 100644
index 0000000..0c1fa4d
--- /dev/null
+++ b/modules/linux/tuigreet.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+{
+  # Enable display manager w/autologin
+  services.greetd = {
+    enable = true;
+    settings = {
+      initial_session = {
+        command = if (config.programs.niri.enable == true) then "${pkgs.niri}/bin/niri-session" else if (config.programs.hyprland.enable == true) then "${pkgs.hyprland}/bin/Hyprland" else "${pkgs.zsh}/bin/zsh";
+        user = "nico";
+      };
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --asterisks --time --greeting 'nyaaa~~'";
+      };
+    };
+  };
+}