Regenerated

Droidnix/README.org

@@ -648,24 +648,37 @@ Finally, it creates a systemd user service (wpaperd.service) that automatically
 ** =generated/modules/desktop/hyprland.nix=
 Setting up Hyprland
 #+BEGIN_SRC nix :tangle generated/modules/desktop/hyprland.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, inputs, ... }:
 
 let
   username = config.defaultUser or "henrov";
   assetPath = ../../../assets/hyprland/conf/hypr;
   mainConfig = "${assetPath}/hyprland.conf";
+
+  # Determine the package: prefer Nixpkgs, fallback to -git, fallback to flake input
+  hyprlandPkg =
+    pkgs.hyprland or
+    pkgs.hyprland-git or
+    inputs.hyprland.packages.${pkgs.system}.default;
 in
 {
+  # Install Hyprland system-wide
+  environment.systemPackages = [ hyprlandPkg ];
+
   # Home Manager user settings
   _module.args.hmUsers = {
     ${username} = {
-      home.packages = [ pkgs.hyprland ];
+      # Ensure Hyprland is also available in the user's environment
+      home.packages = [ hyprlandPkg ];
 
       # Copy main config into ~/.config/hypr
       home.file.".config/hypr/hyprland.conf".source = mainConfig;
 
-      # Optional: extend settings for this module
+      # Optional module-specific settings
       settings.general."col.active_border" = "0xff97cbcd 0xff89b4fa";
+
+      # Optional: add extra configs dynamically from the module's asset folder
+      # e.g., all files in assetPath could be mapped automatically if needed
     };
   };
 }