From 977eb1dee3370ffb3234fa88d1e30a38c8061a15 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Thu, 20 Apr 2023 07:56:53 +0200 Subject: [PATCH] Update flakes, add some quality of life improvements (#1346) --- .gitignore | 2 ++ flake.lock | 30 ++++++++++++++++++++++++------ flake.nix | 8 ++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3698e60d..0242df2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +ignored/ + # Binaries for programs and plugins *.exe *.exe~ diff --git a/flake.lock b/flake.lock index 0c2d485f..33c7ddba 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1680776469, - "narHash": "sha256-3CXUDK/3q/kieWtdsYpDOBJw3Gw4Af6x+2EiSnIkNQw=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "411e8764155aa9354dbcd6d5faaeb97e9e3dce24", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -17,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680789907, - "narHash": "sha256-0AOMkabjbOauxspnqfzqgLKhB2gSh3sLkz1p/jIckcs=", + "lastModified": 1681753173, + "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9de84cd029054adc54fdc6442e121fbc5ac33baf", + "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125", "type": "github" }, "original": { @@ -36,6 +39,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 93330f0b..eeee440c 100644 --- a/flake.nix +++ b/flake.nix @@ -129,6 +129,14 @@ shellHook = '' export GOFLAGS=-tags="ts2019" + export PATH="$PWD/result/bin:$PATH" + + mkdir -p ./ignored + export HEADSCALE_PRIVATE_KEY_PATH="./ignored/private.key" + export HEADSCALE_NOISE_PRIVATE_KEY_PATH="./ignored/noise_private.key" + export HEADSCALE_DB_PATH="./ignored/db.sqlite" + export HEADSCALE_TLS_LETSENCRYPT_CACHE_DIR="./ignored/cache" + export HEADSCALE_UNIX_SOCKET="./ignored/headscale.sock" ''; };