From 10876be5e6d831ba54fa1d87b37d1ac398476d42 Mon Sep 17 00:00:00 2001
From: m3tam3re <p@m3ta.dev>
Date: Tue, 7 Jul 2026 19:39:43 +0200
Subject: [PATCH] fix: resolve eval warnings and npm prefix

---
 profiles/base/cli-tools/fzf.nix               | 59 +++++++++++--------
 profiles/contexts/desktop/theme/theme.nix     |  2 +-
 profiles/sets/coding/languages/javascript.nix |  3 -
 users/m3tam3re/preferences/default.nix        |  5 +-
 4 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/profiles/base/cli-tools/fzf.nix b/profiles/base/cli-tools/fzf.nix
index 4093298..dd0d351 100644
--- a/profiles/base/cli-tools/fzf.nix
+++ b/profiles/base/cli-tools/fzf.nix
@@ -2,40 +2,47 @@
 {
   config,
   lib,
+  options,
   ...
 }:
 with lib; let
   cfg = config.base.cliTools.fzf;
+  changeDirWidgetCommand = "fd --type d --exclude .git --follow --hidden";
 in {
   # Enabled by default — base modules are always-on.
   options.base.cliTools.fzf.enable = (mkEnableOption "enable fuzzy finder") // {default = true;};
 
   config = mkIf cfg.enable {
-    programs.fzf = {
-      enable = true;
-      enableFishIntegration = true;
-      colors = {
-        "fg" = "#${config.colorScheme.palette.base05}";
-        "bg" = "#${config.colorScheme.palette.base00}";
-        "hl" = "#${config.colorScheme.palette.base0E}";
-        "fg+" = "#${config.colorScheme.palette.base05}";
-        "bg+" = "#${config.colorScheme.palette.base02}";
-        "hl+" = "#${config.colorScheme.palette.base0E}";
-        "info" = "#${config.colorScheme.palette.base09}";
-        "prompt" = "#${config.colorScheme.palette.base0B}";
-        "pointer" = "#${config.colorScheme.palette.base08}";
-        "marker" = "#${config.colorScheme.palette.base08}";
-        "spinner" = "#${config.colorScheme.palette.base09}";
-        "header" = "#${config.colorScheme.palette.base03}";
-      };
-      defaultOptions = [
-        "--preview='bat --color=always -n {}'"
-        "--bind 'ctrl-/:toggle-preview'"
-        "--header 'Press CTRL-Y to copy command into clipboard'"
-        "--bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort'"
-      ];
-      defaultCommand = "fd --type f --exclude .git --follow --hidden";
-      changeDirWidgetCommand = "fd --type d --exclude .git --follow --hidden";
-    };
+    programs.fzf =
+      {
+        enable = true;
+        enableFishIntegration = true;
+        colors = {
+          "fg" = "#${config.colorScheme.palette.base05}";
+          "bg" = "#${config.colorScheme.palette.base00}";
+          "hl" = "#${config.colorScheme.palette.base0E}";
+          "fg+" = "#${config.colorScheme.palette.base05}";
+          "bg+" = "#${config.colorScheme.palette.base02}";
+          "hl+" = "#${config.colorScheme.palette.base0E}";
+          "info" = "#${config.colorScheme.palette.base09}";
+          "prompt" = "#${config.colorScheme.palette.base0B}";
+          "pointer" = "#${config.colorScheme.palette.base08}";
+          "marker" = "#${config.colorScheme.palette.base08}";
+          "spinner" = "#${config.colorScheme.palette.base09}";
+          "header" = "#${config.colorScheme.palette.base03}";
+        };
+        defaultOptions = [
+          "--preview='bat --color=always -n {}'"
+          "--bind 'ctrl-/:toggle-preview'"
+          "--header 'Press CTRL-Y to copy command into clipboard'"
+          "--bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort'"
+        ];
+        defaultCommand = "fd --type f --exclude .git --follow --hidden";
+      }
+      // (
+        if options.programs.fzf ? changeDirWidget
+        then {changeDirWidget.command = changeDirWidgetCommand;}
+        else {inherit changeDirWidgetCommand;}
+      );
   };
 }
diff --git a/profiles/contexts/desktop/theme/theme.nix b/profiles/contexts/desktop/theme/theme.nix
index a5924b0..84dd791 100644
--- a/profiles/contexts/desktop/theme/theme.nix
+++ b/profiles/contexts/desktop/theme/theme.nix
@@ -6,7 +6,7 @@
 }: {
   qt = {
     enable = true;
-    platformTheme.name = "gtk";
+    platformTheme.name = "gtk3";
   };
 
   gtk = {
diff --git a/profiles/sets/coding/languages/javascript.nix b/profiles/sets/coding/languages/javascript.nix
index 86ccf2e..bcc5c01 100644
--- a/profiles/sets/coding/languages/javascript.nix
+++ b/profiles/sets/coding/languages/javascript.nix
@@ -17,9 +17,6 @@ in {
       bun
     ];
 
-    home.file.".npmrc".text = ''
-      prefix=${npmGlobalPrefix}
-    '';
     home.sessionVariables.NPM_CONFIG_PREFIX = npmGlobalPrefix;
   };
 }
diff --git a/users/m3tam3re/preferences/default.nix b/users/m3tam3re/preferences/default.nix
index 098d1bd..8564376 100644
--- a/users/m3tam3re/preferences/default.nix
+++ b/users/m3tam3re/preferences/default.nix
@@ -11,7 +11,9 @@
   pkgs,
   lib,
   ...
-}: {
+}: let
+  npmGlobalPrefix = "${config.home.homeDirectory}/.npm-global";
+in {
   # ── Clipboard ──
   services.cliphist = {
     enable = true;
@@ -27,6 +29,7 @@
   home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
 
   home.file.".npmrc".text = ''
+    prefix=${npmGlobalPrefix}
     @m3ta:registry=https://code.m3ta.dev/api/packages/m3tam3re/npm/
     //code.m3ta.dev/api/packages/m3tam3re/npm/:_authToken=''${GITEA_TOKEN}
   '';