nixos/modules/desktop/default.nix

@@ -4,5 +4,7 @@
     ./hyprland
     ./plasma
     ./sway
+
+    ./waybar
   ];
 }

nixos/modules/desktop/hyprland/default.nix

@@ -20,7 +20,6 @@ in {
         dunst
         libnotify
         swaybg
-        waybar
         waycorner
         playerctl
         wlsunset
@@ -41,13 +40,9 @@ in {
       ];
     };
 
-    programs = {
+    programs.hyprland = {
-      hyprland = {
+      enable = true;
-        enable = true;
+      xwayland.enable = true;
-        xwayland.enable = true;
-      };
-
-      waybar.enable = true;
     };
 
     security.polkit.enable = true;
@@ -58,6 +53,8 @@ in {
       gnome.gnome-keyring.enable = true;
       xserver.videoDrivers = [ "nvidia" ];
     };
+
+    sisyphus.desktop.waybar.enable = true;
   };
 }
 

nixos/modules/desktop/sway/default.nix

@@ -82,7 +82,6 @@ in {
       playerctl
       swaybg
       swaylock-effects
-      waybar
       wlsunset
       waycorner
 
@@ -120,7 +119,7 @@ in {
       xserver.videoDrivers = [ "nouveau" ];
       # xserver.videoDrivers = [ "nvidia" ];
     };
-    
+
     xdg.portal = {
       enable = true;
       wlr.enable = true;
@@ -131,18 +130,18 @@ in {
       xdgOpenUsePortal = true;
     };
   
-    programs = {
+    programs.sway = {
-      sway = {
+      enable = true;
-        enable = true;
+      package = pkgs.swayfx;
-        package = pkgs.swayfx;
+      wrapperFeatures.gtk = true;
-        wrapperFeatures.gtk = true;
-      };
-
-      waybar.enable = true;
     };
 
-    sisyphus.users.wantedGroups = [
+    sisyphus = {
-      config.users.groups.video.name # Brightnessctl
+      desktop.waybar.enable = true;
-    ];
+
+      users.wantedGroups = [
+        config.users.groups.video.name # Brightnessctl
+      ];
+    };
   };
 }

nixos/modules/desktop/waybar/default.nix

@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.sisyphus.desktop.waybar;
+in {
+  options.sisyphus.desktop.waybar.enable = lib.mkEnableOption "Waybar";
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      libnotify
+      playerctl
+      jq
+      j4-dmenu-desktop
+    ];
+
+    programs.waybar.enable = true;
+  };
+}