diff --git a/modules/base.nix b/modules/base.nix
index 407bf27..29d1b86 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ config, pkgs, inputs, lib, ... }:
 {
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -21,9 +21,15 @@
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   environment = {
-    systemPackages = with pkgs; [ vim ripgrep xdg-utils webcord ];
+    systemPackages = with pkgs; [
+      vim
+      ripgrep
+      xdg-utils
+      webcord
       element-desktop
+    ];
     shells = with pkgs; [ bash ];
+    sessionVariables.EDITOR = lib.mkDefault "vim";
   };
 
   hardware.bluetooth.enable = true;
diff --git a/modules/dev/default.nix b/modules/dev/default.nix
index 9e67c96..814997e 100644
--- a/modules/dev/default.nix
+++ b/modules/dev/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   imports = [
     ./direnv.nix
@@ -34,7 +34,7 @@
     monocraft
   ];
 
-  environment.sessionVariables.EDITOR = "hx";
+  environment.sessionVariables.EDITOR = lib.mkForce "hx";
   environment.shells = with pkgs; [ nushell bash ];
 
   users.users.fredrikr.shell = pkgs.nushell;