diff --git a/modules/home/desktop/niri/programs/default.nix b/modules/home/desktop/niri/programs/default.nix
deleted file mode 100644
index 7ddbcb6..0000000
--- a/modules/home/desktop/niri/programs/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  osConfig,
-  config,
-  inputs,
-  pkgs,
-  lib,
-  ...
-}: let
-  inherit (lib) mkIf mkDefault getExe;
-  inherit (config.lib.stylix) colors;
-  inherit (osConfig.networking) hostName;
-  ifLaptop = mkIf (hostName != "dunamis");
-in {
-  imports = with inputs; [
-    walker.homeManagerModules.default
-  ];
-  options = config.desktop.niri.enable {
-    # programs.fuzzel = import ./fuzzel {inherit config mkDefault;};
-    programs.walker = import ./walker {inherit config inputs pkgs;};
-    programs.waybar = import ./waybar {inherit colors config getExe ifLaptop pkgs;};
-  };
-}
diff --git a/modules/nixos/desktop/niri/default.nix b/modules/nixos/desktop/niri/default.nix
index f408248..7df4c1e 100644
--- a/modules/nixos/desktop/niri/default.nix
+++ b/modules/nixos/desktop/niri/default.nix
@@ -31,7 +31,8 @@ in {
         config.niri.default = ["gnome" "gtk"];
       };
     })
-    (mkIf config.services.displayManager.autoLogin.enable {
+    (mkIf (cfg.enable
+      && config.services.displayManager.autoLogin.enable) {
       services.greetd.settings.initial_session = {
         command = "niri-session";
         user = config.services.displayManager.autoLogin.user;