From 240259f623c95745efe6a299fdf93f50a4e567ab Mon Sep 17 00:00:00 2001 From: Henri Dohmen Date: Tue, 15 Jul 2025 11:15:07 +0200 Subject: [PATCH] some cleanup --- flake.nix | 2 +- lib.nix | 16 +++------------- secrets.nix | 8 +++----- secrets/hd-password.age | 17 ++++++++--------- secrets/roam/rclone-conf.age | Bin 2868 -> 2868 bytes var/default.nix | 11 +++++++++++ var/ssh-keys.nix | 21 +++++++++++---------- 7 files changed, 37 insertions(+), 38 deletions(-) create mode 100644 var/default.nix diff --git a/flake.nix b/flake.nix index 625c49e..ce925d0 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ specialArgs = rec { inherit inputs lib'; - var = (lib'.walk-dir ./var)._map (f: import f { inherit lib var; }); + var = import ./var { inherit lib; }; secrets = lib'.walk-dir ./secrets; }; overlays = _: { diff --git a/lib.nix b/lib.nix index 213614f..8ed2303 100644 --- a/lib.nix +++ b/lib.nix @@ -1,7 +1,7 @@ { lib, ... }: with builtins; -let - walk-dir-inner = +rec { + walk-dir = path: let dir = readDir path; @@ -12,18 +12,8 @@ let if value == "regular" then path + "/${filename}" else if value == "directory" then - walk-dir-inner (path + "/${filename}") + walk-dir (path + "/${filename}") else throw "Items of type ${value} are unsupported."; }) dir; - - helper-attrs = subpaths: { - _map = f: lib.mapAttrsRecursive (_: f) subpaths; - }; - - with-helper-attrs = - x: if isAttrs x then lib.mapAttrs (_: with-helper-attrs) x // helper-attrs x else x; -in -{ - walk-dir = p: with-helper-attrs (walk-dir-inner p); } diff --git a/secrets.nix b/secrets.nix index 1fa71b9..7e061e0 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,9 +1,7 @@ let - keys = - let - k = import ./var/ssh-keys.nix { }; - in - k.root; # ++ k.hd; + pkgs = import { }; + inherit (pkgs) lib; + keys = (import ./var { inherit lib; }).ssh-keys.root; secrets = [ "roam/rclone-conf" "hd-password" diff --git a/secrets/hd-password.age b/secrets/hd-password.age index a6d79af..c9a29c4 100644 --- a/secrets/hd-password.age +++ b/secrets/hd-password.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 ydxpSQ M0sDsl0um+whNdnXrl5RMp8BAXdVe1n8K41L6HXizG4 -hIV5u4+ZPujJsNwet9UC2wnAFgpFe+b4BGtsNhah/34 --> ssh-ed25519 gbs8eg lNj3bYYZXf28MzvjOJ052zOg7xOROf3MjUWR35ZJfWw -Pxqa+IqRVAhoJdV/Muzt74rfoYBxE4YLh7y8KWwHaG0 --> ssh-ed25519 FTMbvw 7deJR8NLmOWT/RKUa+JbdZ7KYcLNqYxuYS9y/eOYoE8 -haM8XoJVYTUVEEEuMbCdQxuOeZZT8ILtaGWG/uRDo+0 ---- MKr7VcEMTYpu+gNelWf7vIZvU/TpyH/N61shLABcitA -Ϻa̓UJm!yaُΌnxE8Kw * Z%MV:ò A֚K;& -~G;jyJ[6zK/4Ҳ? \ No newline at end of file +-> ssh-ed25519 ydxpSQ NpAWr39/EtAvLrm1ZAA7r4Cx2G4axqVCmBXDupKWyHI +jtH6IB4w4oQiSyQ22YYQvHXn2BIpCxVKw+dj5VQ+RIg +-> ssh-ed25519 gbs8eg iXE23gxJJlJhoV5/vc3P/xM8l5poODWZt9cmu027SSM +OqRXi1L4yRG6b5MU8L12m7GHpKK7L6QXallzYBe971M +-> ssh-ed25519 FTMbvw NE+q2JXrQjuqt4Q5KRh5/s53xoz/gcx9k/QzYk1NUmU +un55OQzaIA5XDsU8AukomS3gyJvEtuspxRvumqZd74w +--- tXcyFIzu77Mm0VIygP1slKtqsJQk3arctl2LimSkNbA +5"mnU6TY{"29 |^0lFT'̌&D0LiGL#':NNA/}'2,7(tHA aRK \ No newline at end of file diff --git a/secrets/roam/rclone-conf.age b/secrets/roam/rclone-conf.age index 2c67c317942c7fcceb417616231a75a3214d5d05..1f4704133c38a1c3047fc856f4ffea3438963371 100644 GIT binary patch delta 2833 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 Ia9nOB012ftk^lez delta 2833 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