From 5535d43146b362fe7b7fbe991f9f828a83034d26 Mon Sep 17 00:00:00 2001 From: kenji Date: Fri, 12 Dec 2025 11:29:10 -0600 Subject: [PATCH] test --- modules/desktop/desktop.nix | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix index 5ed820e29..ed4407ed0 100644 --- a/modules/desktop/desktop.nix +++ b/modules/desktop/desktop.nix @@ -31,9 +31,11 @@ in { }; home.file = lib.mkMerge [ - (lib.mkIf cfg.settings.hyprland.useNixForConf { - home.file = let + # The home.file configuration is now split into two mutually exclusive blocks. + (lib.mkIf cfg.settings.hyprland.useNixForConf ( + let scriptDir = ../../.config/hypr/hyprland/scripts; + # List only the files that need to be executable scripts = [ "fuzzel-emoji.sh" "launch_first_available.sh" @@ -43,13 +45,21 @@ in { "zoom.sh" ]; in - lib.genAttrs - (map (name: ".config/hypr/scripts/${name}") scripts) - (path: { - source = "${scriptDir}/${builtins.baseNameOf path}"; - executable = true; - }); - }) + # 1. Map the individual scripts with executable = true + ( + lib.genAttrs + (map (name: ".config/hypr/scripts/${name}") scripts) + (path: { + source = "${scriptDir}/${builtins.baseNameOf path}"; + executable = true; + }) + ) + # 2. Add the 'ai' directory separately (cannot use executable=true on dirs) + // { + ".config/hypr/scripts/ai".source = "${scriptDir}/ai"; + } + )) + (lib.mkIf (!cfg.settings.hyprland.useNixForConf) { ".config/hypr" = { source = builtins.path {