diff --git a/flake.lock b/flake.lock
index 5609b88..ebf809b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -49,42 +49,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -386,47 +350,6 @@
         "type": "github"
       }
     },
-    "mnw": {
-      "locked": {
-        "lastModified": 1735150973,
-        "narHash": "sha256-OJhcCAoaMMXeD6o4qI/hxBCNELJp4dN8D5LJZc8w8XA=",
-        "owner": "Gerg-L",
-        "repo": "mnw",
-        "rev": "40cd0b006cc48dffd0f8698ad7f54cf1d56779a6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "mnw",
-        "type": "github"
-      }
-    },
-    "nil": {
-      "inputs": {
-        "flake-utils": [
-          "nvf",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nvf",
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1732053863,
-        "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=",
-        "owner": "oxalica",
-        "repo": "nil",
-        "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "nil",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1739020877,
@@ -443,18 +366,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1733096140,
-        "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1740367490,
@@ -471,48 +382,6 @@
         "type": "github"
       }
     },
-    "nmd": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1705050560,
-        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
-        "owner": "~rycee",
-        "repo": "nmd",
-        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
-        "type": "sourcehut"
-      },
-      "original": {
-        "owner": "~rycee",
-        "repo": "nmd",
-        "type": "sourcehut"
-      }
-    },
-    "nvf": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "flake-utils": "flake-utils",
-        "mnw": "mnw",
-        "nil": "nil",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nmd": "nmd",
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1740423954,
-        "narHash": "sha256-iMd7ogpbVfYvadf1WjdIObQ1l7w2GhX1G27rBEMn5cc=",
-        "owner": "notashelf",
-        "repo": "nvf",
-        "rev": "ae3fd994472a1b95be5bf1ac9f70e2a1cdb1c1d4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "notashelf",
-        "repo": "nvf",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -540,30 +409,7 @@
       "inputs": {
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_2",
-        "nvf": "nvf"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nvf",
-          "nil",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731983527,
-        "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {
@@ -581,36 +427,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
diff --git a/flake.nix b/flake.nix
index 9ef4d4a..877dc2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,6 @@
     self,
     nixpkgs,
     home-manager,
-    nvf,
     ...
   } @ inputs: let
     args = {inherit self inputs;};
@@ -41,13 +40,6 @@
         value = mkSystem "nemesis";
       }
     ];
-    # Packages
-    packages.x86_64-linux.nvf =
-      (inputs.nvf.lib.neovimConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        modules = [./packages/nvf.nix];
-      })
-      .neovim;
   };
 
   inputs = {
@@ -56,9 +48,6 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-    nvf.url = "github:notashelf/nvf";
-    nvf.inputs.nixpkgs.follows = "nixpkgs";
-
     hyprland.url = "github:hyprwm/Hyprland";
   };
 }
diff --git a/packages/nvf.nix b/packages/nvf.nix
deleted file mode 100644
index 194c82f..0000000
--- a/packages/nvf.nix
+++ /dev/null
@@ -1,158 +0,0 @@
-_: {
-  config.vim = {
-    theme = {
-      enable = true;
-      name = "catppuccin";
-      style = "mocha";
-    };
-
-    viAlias = true;
-    vimAlias = true;
-
-    options = {
-      # Indentation
-      expandtab = true;
-      shiftwidth = 2;
-      tabstop = 2;
-      shiftround = true;
-      smarttab = true;
-      smartindent = true;
-
-      # Visual Settings
-      cursorline = true;
-
-      # signcolumn = "no";
-    };
-
-    syntaxHighlighting = true;
-
-    # Built-Ins
-    autopairs.nvim-autopairs.enable = true;
-    binds.whichKey.enable = true;
-    comments.comment-nvim.enable = true;
-    formatter.conform-nvim.enable = true;
-    dashboard.alpha.enable = true;
-    # session.nvim-session-manager.enable = true;
-
-    # Auto-completion
-    autocomplete.blink-cmp = {
-      enable = true;
-      setupOpts = {
-        # signature = { enabled = true }
-        signature.enabled = true;
-      };
-    };
-    # Filetree
-    filetree.nvimTree = {
-      enable = true;
-      mappings.toggle = "t";
-      openOnSetup = false;
-      setupOpts = {
-        git = {
-          enable = true;
-        };
-        hijack_cursor = true;
-        view.side = "right";
-        disable_netrw = true;
-        hijack_netrw = true;
-      };
-      # TODO:
-      # - allow me to move files around with vim bindings
-    };
-
-    # SyntaxHighlighting
-    treesitter.fold = true;
-
-    # Fuzzy Finding
-    fzf-lua = {
-      enable = true;
-      profile = "default";
-    };
-    telescope = {
-      enable = true;
-    };
-
-    # Git Integration
-    git = {
-      enable = true;
-      git-conflict.enable = true;
-      gitsigns.enable = true;
-      vim-fugitive.enable = true;
-    };
-
-    # Languages
-    languages = {
-      # Global Defaults
-      enableDAP = true;
-      enableExtraDiagnostics = true;
-      enableFormat = true;
-      enableLSP = true;
-      enableTreesitter = true;
-
-      # Specific Languages
-      bash.enable = true;
-      clang.enable = true;
-      csharp.enable = true;
-      css.enable = true;
-      go.enable = true;
-      html.enable = true;
-      java.enable = true;
-      lua.enable = true;
-      markdown.enable = true;
-      nix.enable = true;
-      python.enable = true;
-      rust.enable = true;
-      ts.enable = true;
-      # yaml.enable = true;
-
-      # Markdown
-      markdown.extensions.render-markdown-nvim.enable = true;
-
-      # Nix
-      nix.lsp.options = {
-        settings.nix.flake.autoArchive = true;
-      };
-
-      # Rust
-      rust.crates.enable = true;
-
-      # Typescript
-      ts.extensions.ts-error-translator.enable = true;
-    };
-
-    lsp = {
-      enable = true;
-      formatOnSave = true;
-      lightbulb.enable = true;
-      # lspSignature.enable = true;
-      lspconfig.enable = true;
-      lspkind.enable = true;
-      # lsplines.enable = true;
-      null-ls.enable = true;
-      nvim-docs-view.enable = true;
-      otter-nvim.enable = true;
-      trouble.enable = true;
-    };
-
-    mini = {
-      # animate.enable = true;
-      statusline.enable = true;
-      surround.enable = true;
-    };
-
-    utility = {
-      leetcode-nvim.enable = true;
-      preview.glow.enable = true;
-      yanky-nvim.enable = true;
-      yazi-nvim.enable = true;
-      vim-wakatime.enable = true;
-    };
-
-    visuals = {
-      fidget-nvim.enable = true;
-      indent-blankline.enable = true;
-      nvim-web-devicons.enable = true;
-      rainbow-delimiters.enable = true;
-    };
-  };
-}
diff --git a/users/modules/editor.nix b/users/modules/editor.nix
index f3d01b4..86e7c3f 100644
--- a/users/modules/editor.nix
+++ b/users/modules/editor.nix
@@ -1,10 +1,6 @@
-{
-  self,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home.sessionVariables.EDITOR = "nvim";
-  home.packages = [
-    self.packages.${pkgs.stdenv.system}.nvf
+  home.packages = with pkgs; [
+    neovim
   ];
 }