diff --git a/configuration.nix b/configuration.nix
index caeeeac..93e9c61 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -101,7 +101,6 @@ clipcatd &
       neofetch
       ncpamixer
       tree
-      neovim
       xclip
       grpc
       clipcat
@@ -120,7 +119,6 @@ clipcatd &
         };
       };
     };
-    
 
     programs.bash = {
       enable = true;
@@ -140,18 +138,19 @@ clipcatd &
       };
     };
 
-    programs.neovim.plugins = [
-      pkgs.vimPlugins.nvim-lspconfig 
-      {
-        plugin = pkgs.vimPlugins.nvim-lspconfig;
-      }
+    programs.neovim = {
+      enable = true;
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      plugins = with pkgs.vimPlugins; [
+        nvim-lspconfig
+        nvim-treesitter.withAllGrammars
+      ];
+    };
 
-      pkgs.vimPlugins.nvim-tree-lua
-      {
-        plugin = pkgs.vimPlugins.vim-startify;
-        config = "let g:startify_change_to_vcs_root = 0";
-      } 
-    ];
+    
     home.stateVersion = "23.11";
   };
   # List packages installed in system profile. To search, run:
@@ -176,10 +175,6 @@ clipcatd &
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   programs.mtr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
 
   # List services that you want to enable: