From 10d68c577e0ebb73725dc1aa9d9baafde378ba3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.dev>
Date: Sat, 1 Jul 2023 08:49:46 +0100
Subject: [PATCH] make sure helix is the default editor

---
 nixos/home-manager/programs/helix.nix | 5 +++++
 nixos/vim/home.nix                    | 6 +++---
 nixos/zsh/home.nix                    | 2 --
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/home-manager/programs/helix.nix b/nixos/home-manager/programs/helix.nix
index fe2c368e..83e98485 100644
--- a/nixos/home-manager/programs/helix.nix
+++ b/nixos/home-manager/programs/helix.nix
@@ -9,6 +9,11 @@
   alejandra = lib.getExe inputs.alejandra.packages.${system}.default;
   nil = lib.getExe inputs.nil.packages.${system}.default;
 in {
+
+  home.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
+  programs.zsh.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
+  systemd.user.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
+
   programs.helix = {
     enable = true;
     languages = {
diff --git a/nixos/vim/home.nix b/nixos/vim/home.nix
index d432afdc..40587871 100644
--- a/nixos/vim/home.nix
+++ b/nixos/vim/home.nix
@@ -7,9 +7,9 @@ let
 in {
   home.file.".vimrc".source = ../../.vimrc;
   home.packages = with pkgs; [ ripgrep ];
-  home.sessionVariables = { EDITOR = "vim"; };
-  programs.zsh.sessionVariables = { EDITOR = "vim"; };
-  systemd.user.sessionVariables = { EDITOR = "vim"; };
+  home.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
+  programs.zsh.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
+  systemd.user.sessionVariables = { EDITOR = "vim"; VISUAL="vim"; };
 
   programs.neovim = {
     enable = true;
diff --git a/nixos/zsh/home.nix b/nixos/zsh/home.nix
index 0182ae47..dcaacfc3 100644
--- a/nixos/zsh/home.nix
+++ b/nixos/zsh/home.nix
@@ -49,8 +49,6 @@
 
     sessionVariables = {
       TERM = "xterm-256color";
-      EDITOR = "vim";
-      VISUAL = "vim";
       PAGER = "less";
       ZSH_TMUX_AUTOSTART = true;
       GOPATH = "$HOME/go";