Compare commits

...

2 Commits

Author SHA1 Message Date
1243f93092 expose the set of overlays I use again 2024-11-01 12:20:53 +01:00
7b85076c99 install wack tool 2024-11-01 10:20:53 +01:00
5 changed files with 61 additions and 15 deletions

61
flake.lock generated
View File

@ -231,11 +231,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1729455275, "lastModified": 1730368399,
"narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -247,11 +247,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729181673, "lastModified": 1730327045,
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "rev": "080166c15633801df010977d9d7474b4a6c549d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -277,13 +277,28 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1699099776,
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1729471037, "lastModified": 1730450711,
"narHash": "sha256-aWGGu8XhKVR1FZ8nH8LVdvFwHX65byd8ZOJLi1gVCQA=", "narHash": "sha256-quBA0X4kODNac/4ZF/urYD99PFC789rDC4Vi8ASKn6s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "b1f97f5db3a6309affd80e412aee8cce747a1489", "rev": "1c95a10940bc0ce0d6b28dd092a3d6a1c45555cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -317,6 +332,7 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nur": "nur", "nur": "nur",
"unstable": "unstable", "unstable": "unstable",
"wack-ctf": "wack-ctf",
"wack-server-conf": "wack-server-conf" "wack-server-conf": "wack-server-conf"
} }
}, },
@ -344,11 +360,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1729265718, "lastModified": 1730272153,
"narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -390,6 +406,27 @@
"type": "github" "type": "github"
} }
}, },
"wack-ctf": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-unstable": "nixpkgs-unstable"
},
"locked": {
"lastModified": 1730344946,
"narHash": "sha256-oc/0nVxNfOp+tIOj0F1SVvYVzFGFO3geKpDsD2cAGbE=",
"owner": "WackAttackCTF",
"repo": "wack-ctf-flake",
"rev": "7128fa8b1f7ae284ae093b5fc80df0da788efa6f",
"type": "github"
},
"original": {
"owner": "WackAttackCTF",
"repo": "wack-ctf-flake",
"type": "github"
}
},
"wack-server-conf": { "wack-server-conf": {
"inputs": { "inputs": {
"dandellion": "dandellion", "dandellion": "dandellion",

View File

@ -22,6 +22,9 @@
wack-server-conf.url = "github:WackAttackCTF/wack-server-conf"; wack-server-conf.url = "github:WackAttackCTF/wack-server-conf";
wack-server-conf.inputs.nixpkgs.follows = "nixpkgs"; wack-server-conf.inputs.nixpkgs.follows = "nixpkgs";
wack-ctf.url = "github:WackAttackCTF/wack-ctf-flake";
wack-ctf.inputs.nixpkgs.follows = "nixpkgs";
greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients"; greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients";
greg-clients.inputs.nixpkgs.follows = "unstable"; greg-clients.inputs.nixpkgs.follows = "unstable";
@ -45,6 +48,7 @@
grzegorz-clients = inputs.greg-clients.packages.${prev.system}.grzegorz-clients; grzegorz-clients = inputs.greg-clients.packages.${prev.system}.grzegorz-clients;
gregctl = inputs.greg-clients.packages.${prev.system}.grzegorzctl; gregctl = inputs.greg-clients.packages.${prev.system}.grzegorzctl;
# helix = inputs.helix.packages.${prev.system}.helix; # helix = inputs.helix.packages.${prev.system}.helix;
wack = inputs.wack-ctf.packages.${prev.system}.wack;
}) })
nur.overlay nur.overlay
nixgl.overlay nixgl.overlay
@ -57,7 +61,7 @@
, username ? "daniel" , username ? "daniel"
, homeDirectory ? "/home/${username}" , homeDirectory ? "/home/${username}"
, stateVersion ? "22.05" , stateVersion ? "22.05"
, extraSpecialArgs ? { inherit (self) defaultOverlays; } , extraSpecialArgs ? { overlays = defaultOverlays; }
}: }:
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@ -115,6 +119,8 @@
type = "app"; type = "app";
program = "${self.homeActivations.${machine}}/activate"; program = "${self.homeActivations.${machine}}/activate";
}); });
inherit defaultOverlays;
# hydraJobs = { # hydraJobs = {
# laptop.x86_64-linux = self.homeActivations.laptop; # laptop.x86_64-linux = self.homeActivations.laptop;

View File

@ -81,6 +81,7 @@ in
ripgrep ripgrep
gregctl gregctl
wack
] ++ lib.optionals cfg.plus [ ] ++ lib.optionals cfg.plus [
ffmpeg-full ffmpeg-full
] ++ lib.optionals config.profiles.gui.enable [ ] ++ lib.optionals config.profiles.gui.enable [

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 KiB

View File

@ -19,8 +19,10 @@
options = [ "subvol=root" ]; options = [ "subvol=root" ];
}; };
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/27c2e6ae-d9ec-4bbd-9ebe-6ec2e63dd139"; boot.initrd.luks.devices."enc" = {
allowDiscards = true;
device = "/dev/disk/by-uuid/27c2e6ae-d9ec-4bbd-9ebe-6ec2e63dd139";
};
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51"; { device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51";
fsType = "btrfs"; fsType = "btrfs";