From f895b700150036a5b50ec2735e22460df26957e6 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 12 Apr 2023 13:56:09 +0100
Subject: [PATCH] Compile waybar with experimental features to enable wlr
 workspaces

---
 nixos/common.nix                    |  4 ++--
 nixos/home-manager/env/hyprland.nix |  7 +------
 nixos/home-manager/env/waybar.nix   | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 nixos/home-manager/env/waybar.nix

diff --git a/nixos/common.nix b/nixos/common.nix
index 7a15a9eb..1f001a4d 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -13,8 +13,8 @@ in
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  home-manager.useUserPackages = true;
-  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = false;
+  home-manager.useGlobalPkgs = false;
 
   # Enable networking
   networking.networkmanager.enable = true;
diff --git a/nixos/home-manager/env/hyprland.nix b/nixos/home-manager/env/hyprland.nix
index 4370fa84..61e4358c 100644
--- a/nixos/home-manager/env/hyprland.nix
+++ b/nixos/home-manager/env/hyprland.nix
@@ -9,8 +9,8 @@ in
 {
   imports = [
     hyprland.homeManagerModules.default
-    ./gtk.nix
     ./dunst.nix
+    ./waybar.nix
   ];
 
   home.packages = with pkgs; [
@@ -48,11 +48,6 @@ in
     grace = 2;
     fade-in = 0.2;
   };
-  programs.waybar = {
-    enable = true;
-    #settings = ./config/waybar/config;
-    style = ./config/waybar/style.css;
-  };
   programs.eww = {
     enable = true;
     package = pkgs.eww-wayland;
diff --git a/nixos/home-manager/env/waybar.nix b/nixos/home-manager/env/waybar.nix
new file mode 100644
index 00000000..f6a42e92
--- /dev/null
+++ b/nixos/home-manager/env/waybar.nix
@@ -0,0 +1,15 @@
+{ ... }:
+{
+  nixpkgs.overlays = [
+    (self: super: {
+      waybar = super.waybar.overrideAttrs (oldAttrs: {
+        mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+      });
+    })
+  ];
+  programs.waybar = {
+    enable = true;
+    #settings = ./config/waybar/config;
+    style = ./config/waybar/style.css;
+  };
+}