Merge remote-tracking branch 'refs/remotes/origin/config' into config

This commit is contained in:
bad 2021-10-08 17:37:14 +02:00
commit 4e3a496acf
7 changed files with 88 additions and 29 deletions

View file

@ -30,11 +30,11 @@
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
"lastModified": 1627571355, "lastModified": 1630693543,
"narHash": "sha256-iB+s0R/d/bBISo9+JtyytNtS2YMP5oLFqcyfqhXO1qU=", "narHash": "sha256-7Sly3ReaJZw60Qo0rpfN4jF6zy94nwQz6ENgUUFzJfg=",
"owner": "lovesegfault", "owner": "lovesegfault",
"repo": "beautysh", "repo": "beautysh",
"rev": "1ad178d756f1f7e77d5215b768bc5c9d4ff8e4fa", "rev": "5609593961b70428f58d5c1b4b25cdda43b0d0bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,11 +70,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1630939671, "lastModified": 1633380447,
"narHash": "sha256-ugNOm7DUHk9kxtD+FNZcRdzyiZKm/wpA0SYeBTg+DO4=", "narHash": "sha256-dndGkybpN1AdXL1gaW83yvx243KoGDJPMwfJcAYs++w=",
"owner": "divnix", "owner": "divnix",
"repo": "bud", "repo": "bud",
"rev": "26ba27616647dcd08dac2ee818721bc748c4ac61", "rev": "f2fc51b7e96d803d877262277dfd3cb91a95bca4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1633141670, "lastModified": 1633487304,
"narHash": "sha256-+uijaBz8uRHqfzLj2CZlizBMFSNdkAUFLzePjoJ7NZY=", "narHash": "sha256-duskZbmGX43zs6FLmalgVdoDBl5suV0zAMA4KqgBMRw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "24731cb4716d4583e4db427f4320534389640fb5", "rev": "0af466dbacd32fb4dcf737a4718e2040c253aba6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,11 +271,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1631573611, "lastModified": 1633291410,
"narHash": "sha256-u2E/wstadWNcn6vOIoK1xY86QPOzzBZQfT1FbePfdaI=", "narHash": "sha256-IxUzCGwj+s2Rn/+u0NtY36ix5I8MopMOO8Ip59PnBlw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7d9ba15214004c979d2c8733f8be12ce6502cf8a", "rev": "382505714d10c6791a96712e0554587c75c5bf8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,11 +303,11 @@
}, },
"latest_2": { "latest_2": {
"locked": { "locked": {
"lastModified": 1633080050, "lastModified": 1633351077,
"narHash": "sha256-T9I2WnlUzAIL70dk9V1jqaYk3nypy/cMkWR19S47ZHc=", "narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "82155ff501c7622cb2336646bb62f7624261f6d7", "rev": "14aef06d9b3ad1d07626bdbb16083b83f92dc6c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1633176478, "lastModified": 1633524929,
"narHash": "sha256-D6HDiWHo8V6Iq7cUZ4ZoPyVL7hImR+XcOvNVI3CEl3k=", "narHash": "sha256-5juxXsj+jK4XoYsj61C1FANdCJa9eMR1nQC7a6nQlt4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "520179f2208a8ed8bb5efa0e8f37d584645aac1f", "rev": "980a9792cdf62d42ea98f437123a7e64c6d784e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -434,11 +434,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1633080050, "lastModified": 1633351077,
"narHash": "sha256-T9I2WnlUzAIL70dk9V1jqaYk3nypy/cMkWR19S47ZHc=", "narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "82155ff501c7622cb2336646bb62f7624261f6d7", "rev": "14aef06d9b3ad1d07626bdbb16083b83f92dc6c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -546,11 +546,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1633118502, "lastModified": 1633471403,
"narHash": "sha256-dQQFD5Yw5KgsepO0gD6ttBmMQXxWZgWNe7wm+fZbVvg=", "narHash": "sha256-TFwu/3L4pj6AlGJROnhPIlrMSoqxGGDYe5OjVsdYRPc=",
"owner": "rust-analyzer", "owner": "rust-analyzer",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "237ea0d34dced3444486931f68e87cd07f52b6a8", "rev": "5ff992465e91346f8499ad125675e90f79c70ce0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -12,7 +12,6 @@
leaveDotGit = false; leaveDotGit = false;
sha256 = "0rr66y86g6g8ixg69yd6ahyzirl82gfvyv6j2w6b0zv5x0979x9v"; sha256 = "0rr66y86g6g8ixg69yd6ahyzirl82gfvyv6j2w6b0zv5x0979x9v";
}; };
}; };
manix = { manix = {
pname = "manix"; pname = "manix";
@ -25,6 +24,17 @@
leaveDotGit = false; leaveDotGit = false;
sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs"; 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";
};
}; };
} }

View file

@ -1,6 +1,7 @@
final: prev: { final: prev: rec {
# keep sources this first # keep sources this first
sources = prev.callPackage (import ./sources.nix) { }; sources = prev.callPackage (import ./sources.nix) { };
# then, call packages with `final.callPackage` # 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") { };
} }

View file

@ -1 +0,0 @@
_build/generated.nix

40
pkgs/sources.nix Normal file
View file

@ -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";
};
};
}

View file

@ -1,6 +1,13 @@
[manix] [manix]
src.git = "https://github.com/mlvzk/manix" src.git = "https://github.com/mlvzk/manix"
fetch.github = "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] [go-fold-if-err-nil]
src.git = "https://im.badat.dev/bad/nvimgofoldiferrnil" src.git = "https://im.badat.dev/bad/nvimgofoldiferrnil"
fetch.git = "https://im.badat.dev/bad/nvimgofoldiferrnil" fetch.git = "https://im.badat.dev/bad/nvimgofoldiferrnil"

View file

@ -3,5 +3,6 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
rizin rizin
ghidra-bin ghidra-bin
(security-wordlists.withLists(ps: with ps; [ dirbuster rockyou ]))
]; ];
} }

View file

@ -6,6 +6,7 @@
XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share"; XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
# NIX_BUILD_SHELL = "zsh"; # NIX_BUILD_SHELL = "zsh";
}; };
gtk.enable = true;
gtk.theme.name = "arc-dark"; gtk.theme.name = "arc-dark";
gtk.theme.package = pkgs.arc-theme; gtk.theme.package = pkgs.arc-theme;
programs.go = { programs.go = {