From a457a2fcef4b683a2e8edce0ee340565eabf67fd Mon Sep 17 00:00:00 2001 From: bad Date: Sat, 26 Feb 2022 14:03:39 +0100 Subject: [PATCH] Remove wordlists --- pkgs/_build/.shake.database | Bin 3510 -> 0 bytes pkgs/_build/.shake.lock | 0 pkgs/{_build => _sources}/generated.nix | 12 ------- pkgs/default.nix | 3 +- pkgs/{sources.toml => nvfetcher.toml} | 5 --- pkgs/sources.nix | 40 ------------------------ profiles/core/default.nix | 3 ++ profiles/pwn/default.nix | 1 - users/profiles/neovim/default.nix | 1 + 9 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 pkgs/_build/.shake.database delete mode 100644 pkgs/_build/.shake.lock rename pkgs/{_build => _sources}/generated.nix (69%) rename pkgs/{sources.toml => nvfetcher.toml} (60%) delete mode 100644 pkgs/sources.nix diff --git a/pkgs/_build/.shake.database b/pkgs/_build/.shake.database deleted file mode 100644 index a4f3389d07310b65d6481dd4c405eeccb1e61a69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3510 zcmcIn&2Jk;6yJ~rXdt4cAR&aRRS=M*+O^kSuXj_56Jn=96@l25_&5;l$LxBW^{zX+ z-s~FXiVy+;m#WI47lg!t8wbPz^~8bx2OzEpaYW+4fvCJU_ByUpT077u{dUGP?`z(h zH#45+IIgj=dZ{KN`(t^cl!d0X#<(M30^ zl6D9xNA11kM$I>Mb4Pc`C6XRl*IGcy#6p`f1kKzbbZhY*F-O(?z}ABR{QKAJ3~@Fh z(gr{8!Q4w_)uqIY0-B1|fP{lzwZsjhtqG;qU5`vGc#%W{t7`%5Gd~I^F+3~}ijFOd z&QB^_^W*!wii$=2jK>->-Z4C>6WZ~`Rc}{ML)PD#hvI#hn}RRW2>|vp;26?bz!Myt z6$8pRUifHR!NIoybKIlweG!n0TJ0RcY7=Z&g;30^#gZ!JwSrPA2}MPNo{)bEI5Vn$ zN^XYmBh!m*?#z#6obTyA3BCL2Rx;hvsP1<_dRVtDea&=#5922w0vuNdJOn^G*Nmce zxSY$mEz!^|JrXSv=b)GKW4Gl5cHmjAO(^wUuP4F2Pdb5sQ-W&?Fe$)n{&0FhwpCR! zWm}Og&D3>MvP&8|K(CoZc zwpGJ6q=H=3Rbm&3lqYiLX6=J?;3g&s-P}8wF5kYM9=cgYZf+LfV5d*Vi1XM{1QQsW zj2^J5z8N`BsiLH+;wX;lCXS+|mZCS)u1h_&;Mj2*D_07;ijnWer3B)tC0d*X@|TbQ z#JiSz25|j1t@8ZS`xQu*(5A%3yHbE;&OwH!xf$Si7Fm0AmwopGi#JYBeR6bH@)!8` zXL-Ku>n#HP`J){3=V3l3G;{+WImX?)OfIA*$S|M5WoC-!JJdr(*~T2BvY0NOrzD=( z1HNay(J@+qh3^maNB2U4%i?*9koKAv__+9?VUOrBsRnqX-#HOB^+HKOFOHL6wvIit zJiCVvE2Ocvake?m9Q>u?OAQYLJg%_Ca#~`Eehhl=0x}w}{ujnAbx?aPQw{C^uf4Ba zmW*=Zs%F8W#%|Z{mh)!UvP}6(u^5&eN%veDO9gA!)1;} z^ZS=+CH`Y$Wwd;L0_JHJyE$a-QSS)6!2*dRQ#LyjA>DTr2^(a&9IA_PBgo{&sf)WG z*i3v-3KJQ9V5M-JT(NbGmcqEp$rAnDsc#0QfEOQ@0v5nJV2*nnzIgj@8y(lPat`qc z)gxkwuos431xvSX?0*hVnoKLU>-%4^S3!ko!pjs-TBZov0qc9of%Y8y#!DF)&;bNK ekg!D;@E_6)xN}IEAsorBbu@wf`rjKXh<^YVccv8p 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