refactor: Move $EDITOR definition to shared/default.nix

Remove `$EDITOR` definition from `shells/zsh.nix`, set as `environment.variables` in `shared/default.nix`. This sets the var globally.
AVGVSTVS96 · Nov 17, 2024 · b48c0da · b48c0da
1 parent 13eb9d8
commit b48c0da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/modules/shared/default.nix b/modules/shared/default.nix
@@ -20,4 +20,9 @@
       description = "Currently active shell";
     };
   };
+
+  config = {
+    # TODO: Find a better place to put this
+    environment.variables.EDITOR = "nvim";
+  };
 }
diff --git a/modules/shared/shells/fish.nix b/modules/shared/shells/fish.nix
@@ -30,8 +30,6 @@ in
       shellAbbrs = {
         # General aliases
         g   = "git";
-        zrc = "nvim ~/.zshrc";
-        szrc = "source ~/.zshrc";
         exz = "exec zsh";
         cl  = "clear";
         yz  = "yazi";

diff --git a/modules/shared/shells/zsh.nix b/modules/shared/shells/zsh.nix
@@ -34,8 +34,6 @@ in
       shellAliases = {
         # General aliases
         g   = "git";
-        zrc = "nvim ~/.zshrc";
-        szrc = "source ~/.zshrc";
         exz = "exec zsh";
         cl  = "clear";
         yz  = "yazi";
@@ -93,8 +91,6 @@ in
 
         # Remove history data we don't want to see
         export HISTIGNORE="pwd:ls:cd"
-
-        export EDITOR=nvim
       '';
     };