From aa16a0607c6b3f565ca0eb7d083b3289d2b80a81 Mon Sep 17 00:00:00 2001 From: Bad Date: Mon, 4 Oct 2021 21:02:27 +0200 Subject: [PATCH 1/3] Update lockfile --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 92d2d0b..1af34ff 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1627571355, - "narHash": "sha256-iB+s0R/d/bBISo9+JtyytNtS2YMP5oLFqcyfqhXO1qU=", + "lastModified": 1630693543, + "narHash": "sha256-7Sly3ReaJZw60Qo0rpfN4jF6zy94nwQz6ENgUUFzJfg=", "owner": "lovesegfault", "repo": "beautysh", - "rev": "1ad178d756f1f7e77d5215b768bc5c9d4ff8e4fa", + "rev": "5609593961b70428f58d5c1b4b25cdda43b0d0bd", "type": "github" }, "original": { @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1630939671, - "narHash": "sha256-ugNOm7DUHk9kxtD+FNZcRdzyiZKm/wpA0SYeBTg+DO4=", + "lastModified": 1633373878, + "narHash": "sha256-9+ziZ8l6rq3yXyY6B0wYXrVdfxr6cdpEbPEGRHywBKc=", "owner": "divnix", "repo": "bud", - "rev": "26ba27616647dcd08dac2ee818721bc748c4ac61", + "rev": "4e709a2fcf19df500ba87d9c3b1b1481401cd53b", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1633141670, - "narHash": "sha256-+uijaBz8uRHqfzLj2CZlizBMFSNdkAUFLzePjoJ7NZY=", + "lastModified": 1633314837, + "narHash": "sha256-Xnxi9kKj/BqZp0H/MP3J8GBlg4wdNxJI5rnuwKkNuDU=", "owner": "nix-community", "repo": "fenix", - "rev": "24731cb4716d4583e4db427f4320534389640fb5", + "rev": "5dc6c3771797e813c1516f08d50d1b196bd76f58", "type": "github" }, "original": { @@ -271,11 +271,11 @@ ] }, "locked": { - "lastModified": 1631573611, - "narHash": "sha256-u2E/wstadWNcn6vOIoK1xY86QPOzzBZQfT1FbePfdaI=", + "lastModified": 1633291410, + "narHash": "sha256-IxUzCGwj+s2Rn/+u0NtY36ix5I8MopMOO8Ip59PnBlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d9ba15214004c979d2c8733f8be12ce6502cf8a", + "rev": "382505714d10c6791a96712e0554587c75c5bf8b", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "latest_2": { "locked": { - "lastModified": 1633080050, - "narHash": "sha256-T9I2WnlUzAIL70dk9V1jqaYk3nypy/cMkWR19S47ZHc=", + "lastModified": 1633351077, + "narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "82155ff501c7622cb2336646bb62f7624261f6d7", + "rev": "14aef06d9b3ad1d07626bdbb16083b83f92dc6c1", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixos": { "locked": { - "lastModified": 1633176478, - "narHash": "sha256-D6HDiWHo8V6Iq7cUZ4ZoPyVL7hImR+XcOvNVI3CEl3k=", + "lastModified": 1633373706, + "narHash": "sha256-0e6alDQXJM4lxaZ4+GyOl25P46Tnb6k65jZM9c/kTik=", "owner": "nixos", "repo": "nixpkgs", - "rev": "520179f2208a8ed8bb5efa0e8f37d584645aac1f", + "rev": "6d0ceff09d30ab1b72eaaa27bdfe5d423331d989", "type": "github" }, "original": { @@ -546,11 +546,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1633118502, - "narHash": "sha256-dQQFD5Yw5KgsepO0gD6ttBmMQXxWZgWNe7wm+fZbVvg=", + "lastModified": 1633273108, + "narHash": "sha256-wr4Wb6fQdWhB7sDZ9MOdQQoyANgkvKMyBuPY7SX4sME=", "owner": "rust-analyzer", "repo": "rust-analyzer", - "rev": "237ea0d34dced3444486931f68e87cd07f52b6a8", + "rev": "4b7675fcc30d3e2c05eafc68a5724db66b58142c", "type": "github" }, "original": { From aef92606bc3792f60dcef27f018393f7304cba0e Mon Sep 17 00:00:00 2001 From: Bad Date: Thu, 7 Oct 2021 15:57:30 +0200 Subject: [PATCH 2/3] Theme gtk --- flake.lock | 30 +++++++++++++++--------------- users/mae/home-manager-base.nix | 1 + 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 1af34ff..820f226 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ ] }, "locked": { - "lastModified": 1633373878, - "narHash": "sha256-9+ziZ8l6rq3yXyY6B0wYXrVdfxr6cdpEbPEGRHywBKc=", + "lastModified": 1633380447, + "narHash": "sha256-dndGkybpN1AdXL1gaW83yvx243KoGDJPMwfJcAYs++w=", "owner": "divnix", "repo": "bud", - "rev": "4e709a2fcf19df500ba87d9c3b1b1481401cd53b", + "rev": "f2fc51b7e96d803d877262277dfd3cb91a95bca4", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1633314837, - "narHash": "sha256-Xnxi9kKj/BqZp0H/MP3J8GBlg4wdNxJI5rnuwKkNuDU=", + "lastModified": 1633487304, + "narHash": "sha256-duskZbmGX43zs6FLmalgVdoDBl5suV0zAMA4KqgBMRw=", "owner": "nix-community", "repo": "fenix", - "rev": "5dc6c3771797e813c1516f08d50d1b196bd76f58", + "rev": "0af466dbacd32fb4dcf737a4718e2040c253aba6", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixos": { "locked": { - "lastModified": 1633373706, - "narHash": "sha256-0e6alDQXJM4lxaZ4+GyOl25P46Tnb6k65jZM9c/kTik=", + "lastModified": 1633524929, + "narHash": "sha256-5juxXsj+jK4XoYsj61C1FANdCJa9eMR1nQC7a6nQlt4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6d0ceff09d30ab1b72eaaa27bdfe5d423331d989", + "rev": "980a9792cdf62d42ea98f437123a7e64c6d784e2", "type": "github" }, "original": { @@ -434,11 +434,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1633080050, - "narHash": "sha256-T9I2WnlUzAIL70dk9V1jqaYk3nypy/cMkWR19S47ZHc=", + "lastModified": 1633351077, + "narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "82155ff501c7622cb2336646bb62f7624261f6d7", + "rev": "14aef06d9b3ad1d07626bdbb16083b83f92dc6c1", "type": "github" }, "original": { @@ -546,11 +546,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1633273108, - "narHash": "sha256-wr4Wb6fQdWhB7sDZ9MOdQQoyANgkvKMyBuPY7SX4sME=", + "lastModified": 1633471403, + "narHash": "sha256-TFwu/3L4pj6AlGJROnhPIlrMSoqxGGDYe5OjVsdYRPc=", "owner": "rust-analyzer", "repo": "rust-analyzer", - "rev": "4b7675fcc30d3e2c05eafc68a5724db66b58142c", + "rev": "5ff992465e91346f8499ad125675e90f79c70ce0", "type": "github" }, "original": { diff --git a/users/mae/home-manager-base.nix b/users/mae/home-manager-base.nix index c54adc8..c6ea027 100644 --- a/users/mae/home-manager-base.nix +++ b/users/mae/home-manager-base.nix @@ -6,6 +6,7 @@ XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share"; # NIX_BUILD_SHELL = "zsh"; }; + gtk.enable = true; gtk.theme.name = "arc-dark"; gtk.theme.package = pkgs.arc-theme; programs.go = { From c7cb50dd38f87bfb285651da68515b6702237d4d Mon Sep 17 00:00:00 2001 From: Bad Date: Thu, 7 Oct 2021 19:43:43 +0200 Subject: [PATCH 3/3] Add wordlists --- pkgs/_build/generated.nix | 14 +++++++++++-- pkgs/default.nix | 5 +++-- pkgs/sources.nix | 41 ++++++++++++++++++++++++++++++++++++++- pkgs/sources.toml | 7 +++++++ profiles/pwn/default.nix | 1 + 5 files changed, 63 insertions(+), 5 deletions(-) mode change 120000 => 100644 pkgs/sources.nix diff --git a/pkgs/_build/generated.nix b/pkgs/_build/generated.nix index a7b1024..dbe7226 100644 --- a/pkgs/_build/generated.nix +++ b/pkgs/_build/generated.nix @@ -12,7 +12,6 @@ leaveDotGit = false; sha256 = "0rr66y86g6g8ixg69yd6ahyzirl82gfvyv6j2w6b0zv5x0979x9v"; }; - }; manix = { pname = "manix"; @@ -25,6 +24,17 @@ 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/pkgs/default.nix b/pkgs/default.nix index 6fd5c73..48f2405 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,7 @@ -final: prev: { +final: prev: rec { # keep sources this first sources = prev.callPackage (import ./sources.nix) { }; # then, call packages with `final.callPackage` - go-fold-if-err-nil = prev.callPackage ./go-fold-if-err-nil.nix { }; + 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.nix b/pkgs/sources.nix deleted file mode 120000 index 2bf0b7e..0000000 --- a/pkgs/sources.nix +++ /dev/null @@ -1 +0,0 @@ -_build/generated.nix \ No newline at end of file diff --git a/pkgs/sources.nix b/pkgs/sources.nix new file mode 100644 index 0000000..dbe7226 --- /dev/null +++ b/pkgs/sources.nix @@ -0,0 +1,40 @@ +# 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/pkgs/sources.toml b/pkgs/sources.toml index dc05db1..d31190e 100644 --- a/pkgs/sources.toml +++ b/pkgs/sources.toml @@ -1,6 +1,13 @@ [manix] 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/profiles/pwn/default.nix b/profiles/pwn/default.nix index 0081239..d3a24bc 100644 --- a/profiles/pwn/default.nix +++ b/profiles/pwn/default.nix @@ -3,5 +3,6 @@ environment.systemPackages = with pkgs; [ rizin ghidra-bin + (security-wordlists.withLists(ps: with ps; [ dirbuster rockyou ])) ]; }