diff --git a/pkgs/_build/.shake.database b/pkgs/_build/.shake.database
deleted file mode 100644
index a4f3389..0000000
Binary files a/pkgs/_build/.shake.database and /dev/null differ
diff --git a/pkgs/_build/.shake.lock b/pkgs/_build/.shake.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/pkgs/_build/generated.nix b/pkgs/_sources/generated.nix
similarity index 69%
rename from pkgs/_build/generated.nix
rename to pkgs/_sources/generated.nix
index dbe7226..343dd22 100644
--- a/pkgs/_build/generated.nix
+++ b/pkgs/_sources/generated.nix
@@ -25,16 +25,4 @@
       sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs";
     };
   };
-  wordlists = {
-    pname = "wordlists";
-    version = "0c0b84b48a64c3b24f53410ac4e76326008a63c2";
-    src = fetchgit {
-      url = "https://github.com/Pamplemousse/nixpkgs";
-      rev = "0c0b84b48a64c3b24f53410ac4e76326008a63c2";
-      fetchSubmodules = false;
-      deepClone = false;
-      leaveDotGit = false;
-      sha256 = "0a4lajmpaxh5myc6jqhhpm13hqn7cc3bckwg6s41mglspm3vyn0i";
-    };
-  };
 }
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 48f2405..5090c16 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,7 +1,6 @@
 final: prev: rec {
   # keep sources this first
-  sources = prev.callPackage (import ./sources.nix) { };
+  sources = prev.callPackage (import ./_sources/generated.nix) { };
   # then, call packages with `final.callPackage`
   go-fold-if-err-nil = final.callPackage ./go-fold-if-err-nil.nix { };
-  security-wordlists = final.callPackage (import "${sources.wordlists.src}/pkgs/tools/security/wordlists/default.nix") { };
 }
diff --git a/pkgs/sources.toml b/pkgs/nvfetcher.toml
similarity index 60%
rename from pkgs/sources.toml
rename to pkgs/nvfetcher.toml
index d31190e..2379dc9 100644
--- a/pkgs/sources.toml
+++ b/pkgs/nvfetcher.toml
@@ -2,11 +2,6 @@
 src.git = "https://github.com/mlvzk/manix"
 fetch.github = "mlvzk/manix"
 
-[wordlists]
-src.git = "https://github.com/Pamplemousse/nixpkgs"
-fetch.git = "https://github.com/Pamplemousse/nixpkgs"
-src.branch = "wordlists"
-
 [go-fold-if-err-nil]
 src.git = "https://im.badat.dev/bad/nvimgofoldiferrnil"
 fetch.git = "https://im.badat.dev/bad/nvimgofoldiferrnil"
diff --git a/pkgs/sources.nix b/pkgs/sources.nix
deleted file mode 100644
index dbe7226..0000000
--- a/pkgs/sources.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file was generated by nvfetcher, please do not modify it manually.
-{ fetchgit, fetchurl }:
-{
-  go-fold-if-err-nil = {
-    pname = "go-fold-if-err-nil";
-    version = "4f881c4f64d9caac1f59ebd5d14963f99db3d71a";
-    src = fetchgit {
-      url = "https://im.badat.dev/bad/nvimgofoldiferrnil";
-      rev = "4f881c4f64d9caac1f59ebd5d14963f99db3d71a";
-      fetchSubmodules = false;
-      deepClone = false;
-      leaveDotGit = false;
-      sha256 = "0rr66y86g6g8ixg69yd6ahyzirl82gfvyv6j2w6b0zv5x0979x9v";
-    };
-  };
-  manix = {
-    pname = "manix";
-    version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
-    src = fetchgit {
-      url = "https://github.com/mlvzk/manix";
-      rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
-      fetchSubmodules = false;
-      deepClone = false;
-      leaveDotGit = false;
-      sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs";
-    };
-  };
-  wordlists = {
-    pname = "wordlists";
-    version = "0c0b84b48a64c3b24f53410ac4e76326008a63c2";
-    src = fetchgit {
-      url = "https://github.com/Pamplemousse/nixpkgs";
-      rev = "0c0b84b48a64c3b24f53410ac4e76326008a63c2";
-      fetchSubmodules = false;
-      deepClone = false;
-      leaveDotGit = false;
-      sha256 = "0a4lajmpaxh5myc6jqhhpm13hqn7cc3bckwg6s41mglspm3vyn0i";
-    };
-  };
-}
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index 2f281e2..dc0f5f6 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -16,6 +16,9 @@ in
   # Fix zsh autocompletion with home-manager
   environment.pathsToLink = [ "/share/zsh" ];
 
+  # We set this via home-manager
+  environment.variables.EDITOR = "$EDITOR";
+
   services.logind.lidSwitch = "ignore";
    services.logind.extraConfig = ''
     # don’t shutdown when power button is short-pressed
diff --git a/profiles/pwn/default.nix b/profiles/pwn/default.nix
index d3a24bc..0081239 100644
--- a/profiles/pwn/default.nix
+++ b/profiles/pwn/default.nix
@@ -3,6 +3,5 @@
   environment.systemPackages = with pkgs; [
     rizin
     ghidra-bin
-    (security-wordlists.withLists(ps: with ps; [ dirbuster rockyou ]))
   ];
 }
diff --git a/users/profiles/neovim/default.nix b/users/profiles/neovim/default.nix
index af7670d..8ec1f06 100644
--- a/users/profiles/neovim/default.nix
+++ b/users/profiles/neovim/default.nix
@@ -120,6 +120,7 @@
       vim-nix
       pkgs.go-fold-if-err-nil
       coc-json
+      coc-emmet
       coc-go
       coc-html
       coc-rust-analyzer