From 652420556cd9c2fd4a351526b4ba1a0866bd8e28 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 22 Aug 2025 14:34:33 +0200
Subject: [PATCH] home/breakerbox: add rest of wayland stuff

---
 home/breakerbox.nix                 | 8 ++++----
 home/programs/hyprland/hyprland.nix | 3 ---
 home/programs/waybar.nix            | 5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/home/breakerbox.nix b/home/breakerbox.nix
index d61385e..7f0c065 100644
--- a/home/breakerbox.nix
+++ b/home/breakerbox.nix
@@ -30,6 +30,7 @@ in
     ./programs/git
     ./programs/gpg.nix
     ./programs/home-manager.nix
+    ./programs/hyprland
     ./programs/jq.nix
     ./programs/less.nix
     ./programs/man.nix
@@ -56,6 +57,7 @@ in
     ./programs/tmux
     ./programs/uv.nix
     ./programs/vscode
+    ./programs/waybar.nix
     ./programs/yazi.nix
     ./programs/yt-dlp.nix
     ./programs/zathura.nix
@@ -79,9 +81,6 @@ in
 
     ./services/fcitx5.nix
     ./services/keybase.nix
-  ]) ++ (optionals machineVars.wayland [
-    ./programs/hyprland
-    ./programs/waybar.nix
   ]) ++ (optionals (!machineVars.wayland) [
     ./programs/xmonad
     # ./programs/xmobar
@@ -161,6 +160,7 @@ in
   services.psd.enable = graphics;
   services.tumblerd.enable = graphics;
 
-
   programs.anyrun.enable = machineVars.wayland;
+  programs.waybar.enable = machineVars.wayland;
+  wayland.windowManager.hyprland.enable = machineVars.wayland;
 }
diff --git a/home/programs/hyprland/hyprland.nix b/home/programs/hyprland/hyprland.nix
index 0803df5..6122716 100644
--- a/home/programs/hyprland/hyprland.nix
+++ b/home/programs/hyprland/hyprland.nix
@@ -1,8 +1,5 @@
-{ config, lib, ... }:
 {
   wayland.windowManager.hyprland = {
-    enable = true;
-
     systemd.enable = false;
     systemd.enableXdgAutostart = false;
 
diff --git a/home/programs/waybar.nix b/home/programs/waybar.nix
index 2894472..a2e73d3 100644
--- a/home/programs/waybar.nix
+++ b/home/programs/waybar.nix
@@ -1,11 +1,10 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 let
   cfg = config.programs.waybar;
   cfgs = cfg.settings.mainBar;
 in
 {
   programs.waybar = {
-    enable = true;
     systemd.enable = true;
 
     settings = {
@@ -237,7 +236,7 @@ in
     #'';
   };
 
-  systemd.user.services.waybar = {
+  systemd.user.services.waybar = lib.mkIf (cfg.enable && cfg.systemd.enable){
     Service.Environment = [
       "DISPLAY=:0"
     ];