diff --git a/common/home.nix b/common/home.nix
index dece969..581d17a 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -71,6 +71,11 @@ in
         yubico-piv-tool
 
         libreoffice-qt6
+
+        # for niri
+        wl-clipboard
+        libnotify
+        playerctl
       ];
     pointerCursor = lib.mkIf enableGraphical {
       gtk.enable = true;
@@ -104,6 +109,28 @@ in
   nixpkgs.config.allowUnfree = true;
 
   modules = {
+    waybar = {
+      modules = {
+        left = [
+          "niri/workspaces"
+          "tray"
+          "niri/window"
+        ];
+        center = [
+          "clock"
+          "custom/spotify"
+        ];
+        right = [
+          "custom/vpn"
+          "wireplumber"
+          "network"
+          "cpu"
+          "memory"
+          "custom/poweroff"
+        ];
+      };
+      enable = lib.mkDefault enableGraphical;
+    };
     games.enable = enableGraphical && enableGames;
     apps = {
       zsh.enable = true;
diff --git a/hosts/muos/configuration.nix b/hosts/muos/configuration.nix
index 3a48cf4..7b9d71b 100644
--- a/hosts/muos/configuration.nix
+++ b/hosts/muos/configuration.nix
@@ -93,38 +93,10 @@
           }
         ];
         extraConfig = {
-          modules.waybar = {
-            modules = {
-              left = [
-                "niri/workspaces"
-                "tray"
-                "niri/window"
-              ];
-              center = [
-                "clock"
-                "custom/spotify"
-              ];
-              right = [
-                "custom/vpn"
-                "wireplumber"
-                "network"
-                "cpu"
-                "memory"
-                "custom/poweroff"
-              ];
-            };
-            enable = lib.mkDefault true;
-          };
-          home.packages = with pkgs; [
-            wl-clipboard
-            libnotify
-            playerctl
-          ];
           xdg.configFile = {
             "niri/config.kdl".source = import ../../packages/niri-config/default.nix {
-              pkgs = pkgs;
+              inherit pkgs inputs;
               self-pkgs = inputs.self.packages.${pkgs.system};
-              inputs = inputs;
               displays = [
                 {
                   name = "eDP-1";