From b9123f5666b75ff84f42b3a2aeb71e9955ad06eb Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Sun, 7 Apr 2024 17:38:36 +0200
Subject: [PATCH] add nixvim as default EDITOR

---
 .../nixos/apps/cli-apps/nixvim/default.nix    | 21 +++++++++++++++----
 modules/nixos/user/default.nix                |  2 +-
 systems/x86_64-linux/yggdrasil/default.nix    |  6 +++---
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/modules/nixos/apps/cli-apps/nixvim/default.nix b/modules/nixos/apps/cli-apps/nixvim/default.nix
index ccf0a91..f9e5ec7 100644
--- a/modules/nixos/apps/cli-apps/nixvim/default.nix
+++ b/modules/nixos/apps/cli-apps/nixvim/default.nix
@@ -16,9 +16,22 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      less
-      wyrdgard.neovim
-    ];
+    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";
+      };
+    };
   };
 }
diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index 206a1e9..0e0c740 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -28,7 +28,7 @@ let
     pkgs.runCommandNoCC "propagated-icon"
       {
         passthru = {
-          fileName = cfg.icon.fileName;
+          inherit (fileName);
         };
       }
       ''
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index 29bddb0..c639176 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -30,11 +30,11 @@ with lib.wyrdgard;
         time = "10:00";
       };
       hardware = {
-      bluetooth = enabled;
-      gpu.nvidia = enabled;
+        bluetooth = enabled;
+        gpu.nvidia = enabled;
+      };
     };
   };
-  };
 
   system.stateVersion = "23.11";
 }