From 5cbf904b15cb25981473c27a489bd492b0af75b6 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Wed, 23 Feb 2022 10:21:55 +0100
Subject: [PATCH] Fix editor being set to nano in a different way

---
 modules/base/default.nix     | 5 +----
 modules/base/zsh/default.nix | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/base/default.nix b/modules/base/default.nix
index fd8554af..542cd83d 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -52,10 +52,7 @@
       };
     };
 
-    environment = {
-      systemPackages = with pkgs; [ git htop moreutils ncdu ripgrep unzip zip ];
-      variables.EDITOR = "emacs";
-    };
+    environment.systemPackages = with pkgs; [ git htop moreutils ncdu ripgrep unzip zip ];
 
     console = {
       colors = [
diff --git a/modules/base/zsh/default.nix b/modules/base/zsh/default.nix
index d57e15e9..ed199a4e 100644
--- a/modules/base/zsh/default.nix
+++ b/modules/base/zsh/default.nix
@@ -42,6 +42,7 @@ let
   });
 in
 {
+  programs.zsh.enable = true;
   chvp.base.zfs.systemLinks = [{ path = "/root/.local/share/autojump"; type = "cache"; }];
   chvp.base.zfs.homeLinks = [{ path = ".local/share/autojump"; type = "cache"; }];
   home-manager.users.charlotte = { ... }: (base "/home/charlotte");