feat(fish): persist fish_variables

.lazy.lua

@@ -1,9 +1,6 @@
 vim.lsp.config("nixd", {
   settings = {
     nixd = {
-      nixpkgs = {
-        expr = "import <nixpkgs> { }",
-      },
       options = {
         nixos = {
           expr = '(builtins.getFlake ("git+file://" + toString ./.)).nixosConfigurations.'

modules/cli/shell/fish.nix

@@ -17,9 +17,14 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    my.persist.homeDirs = [
+    my.persist = {
+      homeDirs = [
         ".local/share/fish"
       ];
+      homeFiles = [
+        ".config/fish/fish_variables"
+      ];
+    };
     my.hm = {
       xdg.configFile."fish/themes/tokyonight_storm.theme".source = builtins.fetchurl {
         url = "https://raw.githubusercontent.com/folke/tokyonight.nvim/refs/tags/v4.14.1/extras/fish_themes/tokyonight_storm.theme";

modules/cli/vcs/git.nix

@@ -16,9 +16,9 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    my.hm.programs.git.enable = true;
     my.hm = {
       programs.git = {
+        enable = true;
         settings = {
           gpg.ssh.allowedSignersFile =
             (pkgs.writeText "allowed_signers" ''

modules/coding/editor/neovim/nvim/lua/plugins/lsp/lspconfig.lua

@@ -47,7 +47,8 @@ local servers = {
             if builtins.pathExists ./flake.lock then
               let
                 lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-                nodeName = lock.nodes.root.inputs.nixpkgs;
+                node = lock.nodes.root.inputs.nixpkgs;
+                nodeName = if builtins.isList node then builtins.elemAt node 0 else node;
               in
               import (fetchTarball {
                 url = lock.nodes.${nodeName}.locked.url or "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";

modules/i18n/fcitx5.nix

@@ -116,11 +116,14 @@ in
               }:
               {
                 ${pkg} = final.symlinkJoin {
-                  name = prev.${pkg}.name;
+                  pname = prev.${pkg}.pname;
+                  version = prev.${pkg}.version;
                   paths = [ prev.${pkg} ];
                   nativeBuildInputs = [ final.makeWrapper ];
                   postBuild = ''
-                    substituteInPlace $out/share/applications/${desktop}.desktop --replace-quiet "${prev.${pkg}}" $out
+                    rm $out/share/applications/${desktop}.desktop
+                    substitute ${prev.${pkg}}/share/applications/${desktop}.desktop $out/share/applications/${desktop}.desktop \
+                      --replace-quiet "${prev.${pkg}}" $out
                     wrapProgram $out/bin/${exe} --add-flags "--wayland-text-input-version=3"
                   '';
                 };
@@ -158,7 +161,11 @@ in
                   postBuild = lib.concatLines (
                     map (
                       desktop:
-                      "substituteInPlace $out/share/applications/${desktop}.desktop --replace-fail 'Exec=' 'Exec=env QT_IM_MODULE=fcitx XMODIFIERS=@im=fcitx '"
+                      ''
+                        rm $out/share/applications/${desktop}.desktop
+                        substitute ${prev.${pkg}}/share/applications/${desktop}.desktop $out/share/applications/${desktop}.desktop \
+                          --replace-fail 'Exec=' 'Exec=env QT_IM_MODULE=fcitx XMODIFIERS=@im=fcitx '
+                      ''
                     ) desktops
                   );
                 };