From 633bec1b71bd9fa3491e5cab5e2ae6a7ba5008cf Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Wed, 28 Jun 2023 22:10:01 +0200
Subject: [PATCH] fix: fix symlinks and waybar package

---
 nixos/home/dotfiles.nix | 4 ++--
 nixos/home/hyprland.nix | 8 ++++----
 nixos/home/packages.nix | 5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nixos/home/dotfiles.nix b/nixos/home/dotfiles.nix
index 250ca0f..8efeb0a 100644
--- a/nixos/home/dotfiles.nix
+++ b/nixos/home/dotfiles.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:
 
 let
   configDir = "/home/matt/.nix/configs";
@@ -16,7 +16,7 @@ in
 
     eww = {
       enable = true;
-      configDir = "${configDir}/eww"; # see hyprland.nix for scripts path
+      configDir = config.lib.file.mkOutOfStoreSymlink "${configDir}/eww"; # see hyprland.nix for scripts path
       package = (builtins.getFlake "github:matt1432/eww-exclusiver").packages.x86_64-linux.default;
     };
 
diff --git a/nixos/home/hyprland.nix b/nixos/home/hyprland.nix
index 9b5a970..4e72420 100644
--- a/nixos/home/hyprland.nix
+++ b/nixos/home/hyprland.nix
@@ -5,7 +5,6 @@
   flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
 
   hyprland = (import flake-compat {
-                                           # I use release version for plugin support
     src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/master.tar.gz";
   }).defaultNix;
 
@@ -43,8 +42,9 @@ in
     '';
   };
 
-  home.file = {
-    ".config/hypr/main.conf".source       = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/main.conf";
-    ".config/hypr/hyprpaper.conf".source  = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/hyprpaper.conf";
+  # https://www.reddit.com/r/NixOS/comments/vc3srj/comment/iccqxw1/?utm_source=share&utm_medium=web2x&context=3
+  xdg.configFile = {
+    "hypr/main.conf".source       = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/main.conf";
+    "hypr/hyprpaper.conf".source  = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/hyprpaper.conf";
   };
 }
diff --git a/nixos/home/packages.nix b/nixos/home/packages.nix
index bc6ca29..14ece66 100644
--- a/nixos/home/packages.nix
+++ b/nixos/home/packages.nix
@@ -8,9 +8,8 @@
 
     waybar = {
       enable = true;
-      package = pkgs.waybar.overrideAttrs (oldAttrs: {
-        mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-      });
+      # https://discourse.nixos.org/t/how-to-use-waybar-hyprland/27638/6
+      package = (builtins.getFlake "github:hyprwm/Hyprland").packages.x86_64-linux.waybar-hyprland;
     };
   };