From 775a2a95b59f385c69157593e178bcb028e3a0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Wed, 4 Jun 2025 22:42:26 +0200
Subject: [PATCH] vanadium: make helix the default editor

---
 nix/configurations/vanadium/home/programs.nix | 5 +++--
 nix/homeModules/common/neovim.nix             | 5 +----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix
index 3da1d8a2..9bfe58ff 100644
--- a/nix/configurations/vanadium/home/programs.nix
+++ b/nix/configurations/vanadium/home/programs.nix
@@ -10,8 +10,10 @@
 
   home.sessionVariables = let
     fishCfg = config.programs.fish;
+    helixCfg = config.programs.helix;
   in {
-    "SHELL" = lib.mkIf  fishCfg.enable "${lib.getExe fishCfg.package}";
+    "SHELL" = lib.mkIf fishCfg.enable (lib.getExe fishCfg.package);
+    "EDITOR" = lib.getExe helixCfg.package;
   };
 
   imports = [
@@ -64,7 +66,6 @@
       ];
       programs = {
         neovim.enable = true;
-        neovim.defaultEditor = true;
 
         emacs = {
           enable = true;
diff --git a/nix/homeModules/common/neovim.nix b/nix/homeModules/common/neovim.nix
index b60b8272..1b7e4bf9 100644
--- a/nix/homeModules/common/neovim.nix
+++ b/nix/homeModules/common/neovim.nix
@@ -1,10 +1,7 @@
 {pkgs, lib, config, ...}: let
   cfg = config.programs.neovim;
 in {
-  config = {
-    programs.neovim = lib.mkIf cfg.enable {
-      defaultEditor = true;
-    };
+  config = lib.mkIf cfg.enable {
     home.packages = [
       # might be useful for servers, serves as minimal configuration
       pkgs.nodePackages.bash-language-server