diff --git a/flake.lock b/flake.lock
index 8ed74cb..6c804cf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -267,21 +267,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "locked": {
-        "lastModified": 1629481132,
-        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "flakeCompat": {
       "flake": false,
       "locked": {
@@ -404,27 +389,6 @@
         "type": "indirect"
       }
     },
-    "modular-nvim": {
-      "inputs": {
-        "neovim-nightly": "neovim-nightly",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1638630126,
-        "narHash": "sha256-zKGvpL4sdO9vku1hxxojgpIV6VPFttMJCOIzTUN8ghU=",
-        "ref": "master",
-        "rev": "3517ef35fd6e5438044fcf028930d59b6f914c09",
-        "revCount": 3,
-        "type": "git",
-        "url": "https://git.privatevoid.net/max/modular-neovim-prototype"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.privatevoid.net/max/modular-neovim-prototype"
-      }
-    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -446,30 +410,6 @@
         "type": "github"
       }
     },
-    "neovim-nightly": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "modular-nvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "dir": "contrib",
-        "lastModified": 1638617502,
-        "narHash": "sha256-+ljeNkTqpLbZlAfRMcOqcB87FAitVKQqHuBblOewRe8=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "76af219e3e481222e6fece34c7c022d6a58998e1",
-        "type": "github"
-      },
-      "original": {
-        "dir": "contrib",
-        "owner": "neovim",
-        "repo": "neovim",
-        "type": "github"
-      }
-    },
     "nix-crx": {
       "inputs": {
         "nixpkgs": [
@@ -672,7 +612,6 @@
         "helix": "helix",
         "home-manager": "home-manager",
         "kernel-clr": "kernel-clr",
-        "modular-nvim": "modular-nvim",
         "naersk": "naersk",
         "nix-crx": "nix-crx",
         "nix-super": "nix-super",
diff --git a/flake.nix b/flake.nix
index 7637e94..e9d3a41 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,6 @@
     nix-super.url = "git+https://git.privatevoid.net/max/nix-super-fork";
     nix-super.inputs.nixpkgs.follows = "nixpkgs";
 
-    modular-nvim.url = "git+https://git.privatevoid.net/max/modular-neovim-prototype";
-    modular-nvim.inputs.nixpkgs.follows = "nixpkgs";
-
     home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 524036d..620a95e 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -29,7 +29,7 @@ in {
   ];
 
   environment.variables = {
-    EDITOR = "nvim";
+    EDITOR = "hx";
     SSH_ASKPASS = lib.mkForce "";
   };
 
diff --git a/modules/desktop/package-sets.nix b/modules/desktop/package-sets.nix
index 33c6654..6bf18f0 100644
--- a/modules/desktop/package-sets.nix
+++ b/modules/desktop/package-sets.nix
@@ -1,8 +1,5 @@
 { pkgs, config, inputs, lib, ... }: let
   sets = with pkgs; rec {
-    editor = [
-      inputs.modular-nvim.defaultPackage.x86_64-linux
-    ];
     writing = [
       apostrophe
       libreoffice
@@ -50,7 +47,6 @@
     dev-tools = [
       bustle
       gnome-builder
-      inputs.self.packages.x86_64-linux.neovim-gtk
     ];
     system = with pkgs.gnomeExtensions; [
       appindicator
diff --git a/modules/nix-register-flakes/default.nix b/modules/nix-register-flakes/default.nix
index 0a6b25f..05c506a 100644
--- a/modules/nix-register-flakes/default.nix
+++ b/modules/nix-register-flakes/default.nix
@@ -18,17 +18,6 @@ with inputs;
     };
     default.flake = nixpkgs;
     home-manager.flake = home-manager;
-    vim.flake = let
-      nixpkgsSelfLock = lib.importJSON "${self}/flake.lock";
-      vimLock = lib.importJSON "${modular-nvim}/flake.lock";
-      patchedLock = lib.recursiveUpdate vimLock { nodes.nixpkgs.locked = (nixpkgsSelfLock.nodes.nixpkgs.locked); };
-      patchedLockFile = pkgs.writeText "patched-flake.lock" (builtins.toJSON patchedLock);
-    in pkgs.runCommand "vim-flake" {} ''
-      cp -vr ${modular-nvim} $out
-      chmod +w $out
-      rm $out/flake.lock
-      cp -v ${patchedLockFile} $out/flake.lock
-    '';
     templates.to = {
       owner = "max";
       repo = "flake-templates";
diff --git a/modules/shell-config/default.nix b/modules/shell-config/default.nix
index b97bbe7..d510ff3 100644
--- a/modules/shell-config/default.nix
+++ b/modules/shell-config/default.nix
@@ -22,8 +22,7 @@ in {
     sudo = "sudo ";
     tree = "lsd --tree";
     uctl = "systemctl --user";
-    vim = "nvim";
-    nvr = "nvr --servername /tmp/nvim-remote-$USER --remote-tab";
+    vim = "hx";
     nix-repl = "nix repl '<repl>'";
     # thanks gytis
     manix-view = ''manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --ansi --preview="manix '{}' | sed 's/type: /> type: /g' | bat -l Markdown --color=always --plain"'';
diff --git a/users/max/home.nix b/users/max/home.nix
index a6894ca..5d1cbba 100644
--- a/users/max/home.nix
+++ b/users/max/home.nix
@@ -77,7 +77,4 @@ in
     global.warn_timeout = "24h";
   };
   programs.zsh.enable = true;
-
-  home.packages = with pkgs; [ neovim-remote ];
-
 }