diff --git a/terminal-environment/config.nix b/terminal-environment/config.nix
index 438448b..ae43ea4 100644
--- a/terminal-environment/config.nix
+++ b/terminal-environment/config.nix
@@ -10,7 +10,6 @@ in
   ];
 
   home.packages = with pkgs; [
-    git
     astyle
     hyfetch
     distrobox
@@ -40,6 +39,7 @@ in
       push = {
         autoSetupRemote = true;
       };
+      init.defaultBranch = "main";
     };
   };
 
diff --git a/terminal-environment/editor.nix b/terminal-environment/editor.nix
index fe7282b..5e5c1a1 100644
--- a/terminal-environment/editor.nix
+++ b/terminal-environment/editor.nix
@@ -1,12 +1,16 @@
 { config, pkgs, ... }:
 let
+  neovim_configuration = pkgs.fetchgit {
+    url = "https://git.nichkara.eu/nichkara/nvim";
+    rev = "ba38abd4c782efc592a97b6da453492eae37f8d0";
+    sha256 = "sha256-E00IKMwpS6WjkWnpxpg0NxWYZEhbNlS+0vs0Nv5N4eY=";
+  };
+
   profile = import ../profile.nix;
 in
 {
 
   home.packages = with pkgs; [
-    vim
-    neovim
     neovim-qt
 
     fzf
@@ -18,10 +22,21 @@ in
     haskellPackages.lsp
 
     python3
-    python3Packages.pynvim
-
     nodejs
-
     ruby
   ];
+
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    withNodeJs = true;
+    withPerl = true;
+    withPython3 = true;
+    withRuby = true;
+    waylandSupport = true;
+  };
+
+  xdg.configFile."nvim/nvim" = {
+    source = neovim_configuration;
+  };
 }