diff --git a/NixOS/home.nix b/NixOS/home.nix
index 22eae6b..2f88e6f 100644
--- a/NixOS/home.nix
+++ b/NixOS/home.nix
@@ -1,13 +1,26 @@
 { config, pkgs, ... }:
 
 {
+    imports = [
+        (import ./modules/zsh.nix {inherit config pkgs;})
+    ];
+
     home.stateVersion = "24.11";
     targets.genericLinux.enable = true;
     nixpkgs.config.allowUnfree = true;
 
+    home.packages = with pkgs; [
+        htop
+    ];
+
     programs.bash.enable = true;
-    programs.neovim.enable = true;
     programs.home-manager.enable = true;
+    programs.neovim = {
+        enable = true;
+        viAlias = true;
+        vimAlias = true;
+        defaultEditor = true;
+    };
 
     programs.git = {
         enable = true;
@@ -15,19 +28,8 @@
         userEmail = "email@thomasave.be";
     };
 
-    home.packages = with pkgs; [
-        htop
-    ];
-
-    programs.zsh = {
-        enable = true;
-        enableCompletion = true;
-        syntaxHighlighting.enable = true;
-
-        shellAliases = {
-            ll = "ls -lhat";
-        };
-        history.size = 10000;
-        history.path = "${config.xdg.dataHome}/zsh/history";
+    home.sessionVariables = {
+        EDITOR = "nvim";
+        LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib";
     };
 }
diff --git a/NixOS/modules/zsh.nix b/NixOS/modules/zsh.nix
new file mode 100644
index 0000000..6a264f1
--- /dev/null
+++ b/NixOS/modules/zsh.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+    home.packages = with pkgs; [
+        htop
+    ];
+
+    programs.zsh = {
+        enable = true;
+        enableCompletion = true;
+        syntaxHighlighting.enable = true;
+
+        shellAliases = {
+            ll = "ls -lhat";
+        };
+        history.size = 10000;
+        history.path = "${config.xdg.dataHome}/zsh/history";
+    };
+}