diff --git a/Justfile b/Justfile
index 5ee187f..1b42a9d 100644
--- a/Justfile
+++ b/Justfile
@@ -61,4 +61,4 @@ sops-add machine_name target:
 
 sops-generate-keys:
   sudo cat /etc/ssh/ssh_host_ed25519_key | ssh-to-age --private-key > .sops.keys
-  cat ~/.ssh/id_ed25519 | ssh-to-age --private-key >> .sops.keys
\ No newline at end of file
+  cat ~/.ssh/id_ed25519 | ssh-to-age --private-key >> .sops.keys
diff --git a/home-manager/features/vim.nix b/home-manager/features/vim.nix
new file mode 100644
index 0000000..3dbc11e
--- /dev/null
+++ b/home-manager/features/vim.nix
@@ -0,0 +1,33 @@
+{ inputs, pkgs, ... }: {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+  ];
+
+  programs.nixvim = {
+    enable = true;
+
+    colorschemes.tokyonight.enable = true;
+
+    autoCmd = [
+      { event = "VimEnter"; command = "Neotree"; }
+    ];
+
+    keymaps = [
+      # Toggleterm Ctrl + `
+      { action = "<cmd>ToggleTerm<CR>"; key = "<C-`>"; options.silent = true; }
+    ];
+
+    plugins = {
+      neo-tree = {
+        enable = true;
+        closeIfLastWindow = true;
+        buffers.followCurrentFile.leaveDirsOpen = true;
+      };
+      lightline.enable = true;
+      toggleterm.enable = true;
+      rainbow-delimiters.enable = true;
+      treesitter.enable = true;
+      barbar.enable = true;
+    };
+  };
+}
diff --git a/home-manager/noe/common/default.nix b/home-manager/noe/common/default.nix
index 56d65c2..437aba7 100644
--- a/home-manager/noe/common/default.nix
+++ b/home-manager/noe/common/default.nix
@@ -4,6 +4,7 @@
     inputs.sops-nix.homeManagerModules.sops
     ../../features/direnv.nix
     ../../features/git.nix
+    ../../features/vim.nix
   ] ++ (builtins.attrValues outputs.homeManagerModules);
   
   sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];