diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix
index 687ad08..7b83766 100644
--- a/modules/home/desktop/niri/default.nix
+++ b/modules/home/desktop/niri/default.nix
@@ -2,12 +2,14 @@
   perSystem,
   osConfig,
   config,
+  inputs,
   pkgs,
   lib,
   ...
 }: let
   # inherit (lib.strings) removeSuffix;
   inherit (lib) mkIf mkEnableOption mkDefault mkForce getExe;
+  inherit (config.lib.stylix) colors;
   # inherit (osConfig.module.stylix) theme;
   inherit (osConfig.networking) hostName;
   cfg = config.desktop.niri;
@@ -15,8 +17,8 @@
   launcher = getExe pkgs.walker;
   lockscreen = getExe pkgs.gtklock;
 in {
-  imports = [
-    ./programs
+  imports = with inputs; [
+    walker.homeManagerModules.default
   ];
   options = {
     desktop.niri.enable =
@@ -62,6 +64,8 @@ in {
       platformTheme.name = "gtk3";
     };
 
+    programs.walker = import ./programs/walker {inherit config inputs pkgs;};
+    programs.waybar = import ./programs/waybar {inherit config colors getExe ifLaptop pkgs;};
     xdg.configFile.niri = import ./niri.nix {inherit config hostName launcher lockscreen;};
     services = import ./services {inherit pkgs lockscreen getExe perSystem;};
 
@@ -162,6 +166,7 @@ in {
           Service =
             mkDefault graphicalService.Service;
         };
+        walker = mkGraphicalService {};
         # gnome-polkit-agent = mkGraphicalService {
         #   Service =
         #     graphicalService.Service
diff --git a/modules/home/desktop/niri/programs/default.nix b/modules/home/desktop/niri/programs/default.nix
index 7056f2e..7ddbcb6 100644
--- a/modules/home/desktop/niri/programs/default.nix
+++ b/modules/home/desktop/niri/programs/default.nix
@@ -14,7 +14,9 @@ in {
   imports = with inputs; [
     walker.homeManagerModules.default
   ];
-  # 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;};
+  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;};
+  };
 }