4 files changed, 10 insertions, 5 deletions
diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix
index dc5adfe..b94e14b 100644
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -62,8 +62,6 @@ let cfg = config.roles.desktop; in {
       xwayland.enable = true;
     };
 
-    programs.waybar.enable = true;
-
     fonts = {
       packages = with pkgs; [
         noto-fonts
diff --git a/roles/home/desktop/default.nix b/roles/home/desktop/default.nix
index 6fdbb9a..dd52671 100644
--- a/roles/home/desktop/default.nix
+++ b/roles/home/desktop/default.nix
@@ -6,8 +6,7 @@ let cfg = config.home.roles.desktop; in {
     ./theme.nix
 
     ./sway.nix
-    ./picom.nix
-    ./polybar.nix
+    ./waybar.nix
     ./rofi.nix
     ./kitty.nix
 
@@ -62,6 +61,7 @@ let cfg = config.home.roles.desktop; in {
     gtk.enable = true;
 
     programs = {
+      waybar.enable = true;
       rofi.enable = true;
       kitty.enable = true;
 
diff --git a/roles/home/desktop/sway.nix b/roles/home/desktop/sway.nix
index 7be1439..52a42f8 100644
--- a/roles/home/desktop/sway.nix
+++ b/roles/home/desktop/sway.nix
@@ -93,7 +93,7 @@
       };
 
       startup = [
-        { command = "waybar"; always = true; }
+        { command = "${pkgs.waybar}/bin/waybar"; always = true; }
 
         #TODO: make sure swww-daemon is *re*starting
         { command = "${pkgs.swww}/bin/swww-daemon"; always = true; }
diff --git a/roles/home/desktop/waybar.nix b/roles/home/desktop/waybar.nix
new file mode 100644
index 0000000..68fad79
--- /dev/null
+++ b/roles/home/desktop/waybar.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, ... }:
+
+{
+  programs.waybar = {
+    
+  };
+}
+\ No newline at end of file