From 36bd5c64605b28b053eb07cd82cc74c721bfb0e6 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Wed, 13 Sep 2023 23:20:31 +0200 Subject: [PATCH] Update worf, ctf-shell and flake.lock --- .gitignore | 1 + flake.lock | 36 ++++++++++++++++++------------------ hosts/worf/configuration.nix | 26 +++++++++++++++++++++++++- hosts/worf/home.nix | 6 ++++++ shells/ctf.nix | 7 ++++--- 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 9885c2c..a0b7eeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ result /secrets_tmp/ +*.drv diff --git a/flake.lock b/flake.lock index f3e63e6..9dfaea6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1692099905, - "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", + "lastModified": 1693208669, + "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", + "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1691963303, - "narHash": "sha256-zqvt4N4Ic06BrGo02itCIPTEKzVnGT0BtGbIr+aUGqE=", + "lastModified": 1692248770, + "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "3fcd83783a1e2ddad0f14821da4186a95bc76c50", + "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692134936, - "narHash": "sha256-Z68O969cioC6I3k/AFBxsuEwpJwt4l9fzwuAMUhCCs0=", + "lastModified": 1693953029, + "narHash": "sha256-1+28KQl4YC4IBzKo/epvEyK5KH4MlgoYueJ8YwLGbOc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfd953b2c6de4f550f75461bcc5768b6f966be10", + "rev": "4077a0e4ac3356222bc1f0a070af7939c3098535", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1691874659, - "narHash": "sha256-qgmixg0c/CRNT2p9Ad35kaC7NzYVZ6GRooErYI7OGJM=", + "lastModified": 1693675694, + "narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "efeed708ece1a9f4ae0506ae4a4d7da264a74102", + "rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1692127428, - "narHash": "sha256-+e9dD67mpGLBhhqdv7A7i1g/r2AT/PmqthWaYHyVZR4=", + "lastModified": 1693898833, + "narHash": "sha256-OIrMAGNYNeLs6IvBynxcXub7aSW3GEUvWNsb7zx6zuU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f81e73cf9a4ef4b949b9225be3daa1e586c096da", + "rev": "faf21ac162173c2deb54e5fdeed002a9bd6e8623", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "unstable": { "locked": { - "lastModified": 1692174805, - "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", + "lastModified": 1693844670, + "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", + "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "type": "github" }, "original": { diff --git a/hosts/worf/configuration.nix b/hosts/worf/configuration.nix index a8bdd82..8b4333d 100644 --- a/hosts/worf/configuration.nix +++ b/hosts/worf/configuration.nix @@ -10,7 +10,30 @@ # options = "--delete-older-than 2d"; # }; - settings.experimental-features = ["nix-command" "flakes"]; + settings = { + allow-dirty = true; + experimental-features = [ "nix-command" "flakes" "repl-flake" ]; + auto-optimise-store = true; + builders-use-substitutes = true; + log-lines = 50; + }; + + buildMachines = [ + { + hostName = "voyager.home.feal.no"; + system = "x86_64-linux"; + + maxJobs = 4; + supportedFeatures = [ "kvm" "big-parallel" "benchmark" "nixos-test" ]; + mandatoryFeatures = [ ]; + + sshUser = "felixalb"; + sshKey = "/var/root/.ssh/nix-builder-voyager"; + } + ]; + + distributedBuilds = true; + extraOptions = "builders-use-substitutes = true"; }; # System packages for all users @@ -41,6 +64,7 @@ fonts = { fontDir.enable = true; fonts = with pkgs; [ + noto-fonts font-awesome fira-code hack-font diff --git a/hosts/worf/home.nix b/hosts/worf/home.nix index c24f202..81a2c38 100644 --- a/hosts/worf/home.nix +++ b/hosts/worf/home.nix @@ -21,6 +21,7 @@ neofetch nix-index nodejs + # unstable.ripes spotify tldr vscode @@ -49,6 +50,11 @@ ]; }; + programs.nix-index = { + enable = true; + enableZshIntegration = true; + }; + # Copy Applications to ~/Applications to allow them to be launched from Spotlight disabledModules = [ "targets/darwin/linkapps.nix" ]; home.activation = lib.mkIf pkgs.stdenv.isDarwin { diff --git a/shells/ctf.nix b/shells/ctf.nix index d2c3a7a..716f4b2 100644 --- a/shells/ctf.nix +++ b/shells/ctf.nix @@ -21,11 +21,14 @@ gnutar ripgrep curl + #sxiv + feh ghidra - pwntools + pwninit metasploit + sqlmap exiftool steghide @@ -42,13 +45,11 @@ john ] ++ lib.optionals (pkgs.stdenv.isLinux) [ sage - gdb pwndbg ropgadget ropper hashcat - sxiv wireshark tcpdump ];