diff --git a/home/felschr-server.nix b/home/felschr-server.nix
index 9221d92..faf84f5 100644
--- a/home/felschr-server.nix
+++ b/home/felschr-server.nix
@@ -1,11 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./shell
-    # ./editors
-    ./git.nix
-  ];
+  imports = [ ./shell ./editors/lsp.nix ./editors/helix.nix ./git.nix ];
 
   home.packages = with pkgs; [ fh ncurses ];
 
@@ -27,11 +23,6 @@
 
   programs.git.defaultProfile = "private";
 
-  home.sessionVariables.EDITOR = "nvim";
-  programs.neovim.enable = true;
-  programs.neovim.viAlias = true;
-  programs.neovim.vimAlias = true;
-
   xdg.configFile."nixpkgs/config.nix".text = ''
     {
       allowUnfree = true;