add nixvim as default EDITOR

modules/nixos/apps/cli-apps/nixvim/default.nix

@@ -16,9 +16,22 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
+    environment = {
+      systemPackages = with pkgs; [
         less
         wyrdgard.neovim
       ];
+      variables = {
+        EDITOR = "nvim";
+        SUDOEDITOR = "nvim";
+      };
+    };
+
+    wyrdgard.home = {
+      extraOptions = {
+        # Use Neovim for Git diffs.
+        programs.fish.shellAliases.vimdiff = "nvim -d";
+      };
+    };
   };
 }

modules/nixos/user/default.nix

@@ -28,7 +28,7 @@ let
     pkgs.runCommandNoCC "propagated-icon"
       {
         passthru = {
-          fileName = cfg.icon.fileName;
+          inherit (fileName);
         };
       }
       ''