diff --git a/terminal-environment/config.nix b/terminal-environment/config.nix
index b16a2be..e69b582 100644
--- a/terminal-environment/config.nix
+++ b/terminal-environment/config.nix
@@ -4,23 +4,16 @@ let
 in
 {
 
+   imports = [
+      ./editor.nix
+   ];
+
     environment.systemPackages = with pkgs; [
-        vim
-        neovim
         astyle
-        python313Packages.pynvim
         hyfetch
-        fzf
         fzf-zsh
-        ripgrep
-        ripgrep-all
     ];
 
-    environment.variables = {
-        EDITOR = "nvim";
-    };
-
-
     programs.tmux = {
         enable = true;
         clock24 = true;
diff --git a/terminal-environment/editor.nix b/terminal-environment/editor.nix
new file mode 100644
index 0000000..834876c
--- /dev/null
+++ b/terminal-environment/editor.nix
@@ -0,0 +1,35 @@
+{ config, pkgs, ... }:
+let
+    dotfiles_nvim = pkgs.fetchgit {
+        url = "https://git.nichkara.eu/nichkara/nvim";
+        rev = "4b1aa4c6342a5c1df864247aca3e553d81cc82a9";
+        sha256 = "sha256-0ODOTolosRHVm0Uc2NRGBpUFM5W3C53ScaL9OQQviW0=";
+    };
+
+    profile = import ../profile.nix;
+in
+{
+
+   environment.systemPackages = with pkgs; [
+      vim
+      fzf
+      ripgrep
+      ripgrep-all
+   ];
+
+   programs.neovim = {
+      enable = true;
+      defaultEditor = true;
+      withPython3 = true;
+      withRuby = true;
+      withNodeJs = true;
+   };
+
+   home-manager.users.${profile.username} = { ... }: {
+      home.file.".config/nvim" = {
+         source = dotfiles_nvim;
+         recursive = true;
+      };
+   };
+}
+