diff --git a/common/home.nix b/common/home/default.nix
similarity index 89%
rename from common/home.nix
rename to common/home/default.nix
index 6d75efb..a45d9fc 100644
--- a/common/home.nix
+++ b/common/home/default.nix
@@ -29,13 +29,13 @@ in
 {
   imports =
     [
-      ../modules
-      ./nvim/nvim.nix
+      ../../modules
+      ../nvim/nvim.nix
       extraConfig
     ]
     ++ lib.optionals enableGraphical [
-      ./discord/discord.nix
-      ./spotify.nix
+      ../discord/discord.nix
+      ../spotify.nix
     ];
 
   home = {
@@ -107,7 +107,7 @@ in
   };
 
   xdg.configFile = lib.mkIf enableGraphical {
-    "niri/config.kdl".source = import ../packages/niri-config/default.nix {
+    "niri/config.kdl".source = import ../../packages/niri-config/default.nix {
       inherit pkgs inputs displays;
       self-pkgs = inputs.self.packages.${pkgs.system};
     };
@@ -116,28 +116,6 @@ 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;
@@ -159,7 +137,6 @@ in
     startServices = "sd-switch";
 
     services = lib.mkMerge [
-
       (builtins.listToAttrs (
         builtins.map (
           {
@@ -172,19 +149,19 @@ in
             display_config =
               let
                 display-shader = pkgs.substituteAll {
-                  src = ../modules/automapaper/display-with_vars.glsl;
+                  src = ../../modules/automapaper/display-with_vars.glsl;
                   background = inputs.nix-colors.lib.conversions.hexToGLSLVec "0a000a";
                   foreground = inputs.nix-colors.lib.conversions.hexToGLSLVec "192291";
                 };
-                state-shader = ../modules/automapaper/state-game_of_life.glsl;
-                init-shader = ../modules/automapaper/init.glsl;
+                state-shader = ../../modules/automapaper/state-game_of_life.glsl;
+                init-shader = ../../modules/automapaper/init.glsl;
                 # General configurations
                 cycles = 2000;
                 tps = 30;
                 horizontal-dot-size = 10;
                 vertical-dot-size = 10;
               in
-              (import ../modules/automapaper/config.nix {
+              (import ../../modules/automapaper/config.nix {
                 inherit (pkgs) writeTextFile;
                 inherit
                   init-shader
diff --git a/hosts/lambdaos/configuration.nix b/hosts/lambdaos/configuration.nix
index 0dc665a..fcc122c 100644
--- a/hosts/lambdaos/configuration.nix
+++ b/hosts/lambdaos/configuration.nix
@@ -119,7 +119,7 @@
       inherit nix-colors;
     };
     users = {
-      "noa" = (import ../../common/home.nix) {
+      "noa" = (import ../../common/home) {
         enableGraphical = true;
         enableFlut = true;
         enableGames = true;
diff --git a/hosts/muos/configuration.nix b/hosts/muos/configuration.nix
index 1010b86..0fe97d1 100644
--- a/hosts/muos/configuration.nix
+++ b/hosts/muos/configuration.nix
@@ -76,7 +76,7 @@
       inherit nix-colors;
     };
     users = {
-      "noa" = (import ../../common/home.nix) {
+      "noa" = (import ../../common/home) {
         enableGraphical = true;
         enableFlut = false;
         enableGames = true;
diff --git a/hosts/nuos/configuration.nix b/hosts/nuos/configuration.nix
index f1f2174..646fcab 100644
--- a/hosts/nuos/configuration.nix
+++ b/hosts/nuos/configuration.nix
@@ -88,7 +88,7 @@
       inherit nix-colors;
     };
     users = {
-      "noa" = (import ../../common/home.nix) {
+      "noa" = (import ../../common/home) {
         enableFlut = true;
       };
       "root" = import ./root.nix;
diff --git a/modules/waybar/default.nix b/modules/waybar/default.nix
index 96fa6ee..be09e48 100644
--- a/modules/waybar/default.nix
+++ b/modules/waybar/default.nix
@@ -68,6 +68,10 @@ in
     programs.waybar = {
       enable = true;
       package = cfg.package;
+      systemd = {
+        enable = true;
+        target = "niri.service";
+      };
       settings = {
         mainBar = {
           layer = "top";
diff --git a/packages/niri-config/default.nix b/packages/niri-config/default.nix
index 755438d..2f00190 100644
--- a/packages/niri-config/default.nix
+++ b/packages/niri-config/default.nix
@@ -16,7 +16,6 @@ let
       "spotify\""
       "keepassxc\""
       "thunderbird\""
-      "${pkgs.waybar}/bin/waybar\""
     ];
 
   displays-string = pkgs.lib.strings.concatMapStringsSep "\n" (