From b23704c2e7f1fc87bfbafc3bcb95c641d0780860 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Sat, 14 Oct 2023 00:09:22 +0200 Subject: [PATCH] worf: minor updates --- flake.lock | 42 +++++++++++++++++++++--------------------- hosts/worf/home.nix | 3 ++- shells/ctf.nix | 8 ++++++-- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index f83338e..843f513 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1693208669, - "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=", + "lastModified": 1695108154, + "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c", + "rev": "07682fff75d41f18327a871088d20af2710d4744", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1690488646, - "narHash": "sha256-yuceqT8Ev1sdwYvGYHegdTo0yrdRxVYJ2qXSbPtBgTw=", + "lastModified": 1695523160, + "narHash": "sha256-ExYu6mpSZ3F0PDKnW1rmOKRxYzXOWH61CYWGOx6MJko=", "owner": "dali99", "repo": "nixos-matrix-modules", - "rev": "bf997073d98670528c6230144e208a37d27fc388", + "rev": "161d1ed3607b73eb4f873c54ec6e00d07aa7cea2", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1692248770, - "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=", + "lastModified": 1696360011, + "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b", + "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694499547, - "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=", + "lastModified": 1696697597, + "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24", + "rev": "5a237aecb57296f67276ac9ab296a41c23981f56", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1693675694, - "narHash": "sha256-2pIOyQwGyy2FtFAUIb8YeKVmOCcPOTVphbAvmshudLE=", + "lastModified": 1696717752, + "narHash": "sha256-qEq1styCyQHSrw7AOhskH2qwCFx93bOwsGEzUIrZC0g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5601118d39ca9105f8e7b39d4c221d3388c0419d", + "rev": "2f3b6b3fcd9fa0a4e6b544180c058a70890a7cc1", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1693898833, - "narHash": "sha256-OIrMAGNYNeLs6IvBynxcXub7aSW3GEUvWNsb7zx6zuU=", + "lastModified": 1696734395, + "narHash": "sha256-O/g/wwBqqSS7RQ53bE6Ssf0pXVTCYfN7NnJDhKfggQY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "faf21ac162173c2deb54e5fdeed002a9bd6e8623", + "rev": "d7380c38d407eaf06d111832f4368ba3486b800e", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "unstable": { "locked": { - "lastModified": 1694669921, - "narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=", + "lastModified": 1696604326, + "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c", + "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64", "type": "github" }, "original": { diff --git a/hosts/worf/home.nix b/hosts/worf/home.nix index 459011a..038dac0 100644 --- a/hosts/worf/home.nix +++ b/hosts/worf/home.nix @@ -21,9 +21,10 @@ neofetch nix-index nodejs - # unstable.ripes + unstable.ripes spotify tldr + zellij ]; programs.zsh = { diff --git a/shells/ctf.nix b/shells/ctf.nix index 716f4b2..5f2da9c 100644 --- a/shells/ctf.nix +++ b/shells/ctf.nix @@ -1,4 +1,6 @@ -{ pkgs ? import {} }: +let + unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) { }; +in { pkgs ? import {} }: pkgs.mkShell { nativeBuildInputs = with pkgs; [ python3 @@ -37,19 +39,21 @@ dig nmap rustscan + unstable.thc-hydra # davtest # cadaver httpie john + unstable.hashcat + ] ++ lib.optionals (pkgs.stdenv.isLinux) [ sage gdb pwndbg ropgadget ropper - hashcat wireshark tcpdump ];