diff --git a/flake.lock b/flake.lock index 401b301..b803fec 100644 --- a/flake.lock +++ b/flake.lock @@ -231,11 +231,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729455275, - "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", + "lastModified": 1730368399, + "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", + "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", "type": "github" }, "original": { @@ -247,11 +247,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -277,13 +277,28 @@ "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": { "locked": { - "lastModified": 1729471037, - "narHash": "sha256-aWGGu8XhKVR1FZ8nH8LVdvFwHX65byd8ZOJLi1gVCQA=", + "lastModified": 1730450711, + "narHash": "sha256-quBA0X4kODNac/4ZF/urYD99PFC789rDC4Vi8ASKn6s=", "owner": "nix-community", "repo": "NUR", - "rev": "b1f97f5db3a6309affd80e412aee8cce747a1489", + "rev": "1c95a10940bc0ce0d6b28dd092a3d6a1c45555cb", "type": "github" }, "original": { @@ -317,6 +332,7 @@ "nixpkgs": "nixpkgs", "nur": "nur", "unstable": "unstable", + "wack-ctf": "wack-ctf", "wack-server-conf": "wack-server-conf" } }, @@ -344,11 +360,11 @@ }, "unstable": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1730272153, + "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53", "type": "github" }, "original": { @@ -390,6 +406,27 @@ "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": { "inputs": { "dandellion": "dandellion", diff --git a/flake.nix b/flake.nix index f3b611a..94fef03 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,9 @@ wack-server-conf.url = "github:WackAttackCTF/wack-server-conf"; 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.inputs.nixpkgs.follows = "unstable"; @@ -45,6 +48,7 @@ grzegorz-clients = inputs.greg-clients.packages.${prev.system}.grzegorz-clients; gregctl = inputs.greg-clients.packages.${prev.system}.grzegorzctl; # helix = inputs.helix.packages.${prev.system}.helix; + wack = inputs.wack-ctf.packages.${prev.system}.wack; }) nur.overlay nixgl.overlay @@ -57,7 +61,7 @@ , username ? "daniel" , homeDirectory ? "/home/${username}" , stateVersion ? "22.05" - , extraSpecialArgs ? { inherit (self) defaultOverlays; } + , extraSpecialArgs ? { overlays = defaultOverlays; } }: home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index fb4d427..f76068f 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -81,6 +81,7 @@ in ripgrep gregctl + wack ] ++ lib.optionals cfg.plus [ ffmpeg-full ] ++ lib.optionals config.profiles.gui.enable [ diff --git a/hosts/ayanami/2024-10-21-033702_838x698_scrot.png b/hosts/ayanami/2024-10-21-033702_838x698_scrot.png deleted file mode 100644 index 4bc6ca5..0000000 Binary files a/hosts/ayanami/2024-10-21-033702_838x698_scrot.png and /dev/null differ diff --git a/hosts/ayanami/hardware-configuration.nix b/hosts/ayanami/hardware-configuration.nix index 7b2d580..d10b681 100644 --- a/hosts/ayanami/hardware-configuration.nix +++ b/hosts/ayanami/hardware-configuration.nix @@ -19,8 +19,10 @@ 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" = { device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51"; fsType = "btrfs";