From 2912359f1a7788d44981826c3b77f60f7082d7ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 14 May 2025 19:33:55 +0200 Subject: [PATCH 1/7] feat: add new mail address --- modules/moritz/profiles/personal_mail.nix | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/modules/moritz/profiles/personal_mail.nix b/modules/moritz/profiles/personal_mail.nix index 37cc07d..a12686e 100644 --- a/modules/moritz/profiles/personal_mail.nix +++ b/modules/moritz/profiles/personal_mail.nix @@ -43,6 +43,24 @@ in { services.mbsync.enable = true; services.imapnotify.enable = true; programs.mbsync.enable = true; + accounts.email.accounts.personal2 = { + imapnotify.enable = true; + imapnotify.boxes = ["Inbox"]; + imapnotify.onNotify = "${lib.getExe' pkgs.systemd "systemctl"} start --user mbsync.service"; + address = "main@moritz.foo"; + userName = "main@moritz.foo"; + aerc.enable = true; + # gpg.signByDefault = true; + # gpg.key = "0xE4F362A3F5C338A0"; + imap.host = "mail.moritz.foo"; + smtp.host = "mail.moritz.foo"; + realName = "Moritz Böhme"; + mbsync.enable = true; + mbsync.create = "both"; + mbsync.remove = "both"; + mbsync.expunge = "both"; + passwordCommand = "${lib.getExe' pkgs.coreutils "cat"} ${config.clan.core.vars.generators.moritz-email-new.files.password.path}"; + }; accounts.email.accounts.personal = { imapnotify.enable = true; imapnotify.boxes = ["Inbox"]; @@ -71,5 +89,12 @@ in { share = true; files.password.owner = lib.mkForce "moritz"; }; + clan.core.vars.generators.moritz-email-new = { + prompts.password.description = "the email password"; + prompts.password.type = "hidden"; + prompts.password.persist = true; + share = true; + files.password.owner = lib.mkForce "moritz"; + }; }; } From dda126bdc505d070b909c23e09039b8b6b1a136f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 14 May 2025 19:34:10 +0200 Subject: [PATCH 2/7] feat: add spell dicts --- machines/moritz-server/mail-server.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/moritz-server/mail-server.nix b/machines/moritz-server/mail-server.nix index 14d87cf..debce59 100644 --- a/machines/moritz-server/mail-server.nix +++ b/machines/moritz-server/mail-server.nix @@ -60,6 +60,7 @@ services.roundcube = { enable = true; hostName = "webmail.moritz.foo"; + dicts = with pkgs.aspellDicts; [en de]; extraConfig = '' # starttls needed for authentication, so the fqdn required to match # the certificate From b3a07d31f00ecaef128d75b65e1149ba425b2ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 14 May 2025 19:51:19 +0200 Subject: [PATCH 3/7] migrated facts to vars for generator zerotier for machine moritz-server --- .../machines/moritz-server | 1 + .../zerotier/zerotier-identity-secret/secret | 19 +++++++++++++++++++ .../zerotier-identity-secret/users/moritz | 1 + .../moritz-server/zerotier/zerotier-ip/value | 1 + .../zerotier/zerotier-network-id/value | 1 + 5 files changed, 23 insertions(+) create mode 120000 vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/machines/moritz-server create mode 100644 vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/secret create mode 120000 vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/users/moritz create mode 100644 vars/per-machine/moritz-server/zerotier/zerotier-ip/value create mode 100644 vars/per-machine/moritz-server/zerotier/zerotier-network-id/value diff --git a/vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/machines/moritz-server b/vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/machines/moritz-server new file mode 120000 index 0000000..f18ca49 --- /dev/null +++ b/vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/machines/moritz-server @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-server \ No newline at end of file diff --git a/vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/secret b/vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/secret new file mode 100644 index 0000000..e3b94af --- /dev/null +++ b/vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:LXdxn2d88JKhUM/Tg5cRjeZz9eWVzbIvVde17mCEk+xmZjmpUfne6f1xGLGFkMlVYympvV01UVlns2Lpvgz1HQc3ty0xFUeauzACuzabLPGY2GsO0Kf5WAUhFKhfsoj5/v1PagrBtT26sPkHbPmbHDoOX76lO/2uaxr+nSBJTNiTERAY7jLi9YE0wXiMUbh+le7QSWZBisP9qgJXCo2V0R3jdH8rQjrcDe2RC6xezeXvp2F/ugnqPgJ/EsSfetHxIYBpitJDxkLzKrMZD9P6YAYa9jPmUvpDx55pLfEz+STLP1RRwLfequDErvhQiBNBm4c4wP67ssR0Mnh9lHxyab6rWjZ7hDpZQ7YXdQna,iv:uYLOdMTbhmfcWQaal0pPliLJhgv85aZw129T36R6P8o=,tag:OCs2Hp0aEVF5Wb8xas+4Ig==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzSU5sMnZjOFhxTERRc3Ru\nZWhUMkhHUS9ES1hseXlLVzJ6NTFXVmRFWmp3Ck9iMjJ2ME5IVitqeUNORVFxNFFF\nZUJhcnF3bEVQQS9WeDZETGdTTHU2MG8KLS0tIEg2a2IwaEYySEh4ak5pVHZWd0hp\nd2gvK0lxL3FqWFVBTy9nc3pCeFRSNzQKOuyllpi8f3DN0ZOtMIjf2X2gDVE+1cc+\nR+UvSqojtzc3QjNiZgtIedKp2NcE4oA8ixVodtVowjjjZpmUAlcZQg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1wwlwwv9gscl9z6k59z6pp8hcay7vehvqp6y5f85pjyd9seqe8s0q5dkmr4", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvamVyWDBzSjRWZEFXcklk\nMEx1NnBMRjF1UUgyOFNSQ09pYmMxUE5yaEFjClQ5VVp4dmtTL0o4aFE0WmlWZk5G\nQndsVkZ3QmhjUkprRDU0dVQ1T0RNSDQKLS0tIGVoYlM5K0VWMnlYVXpZUnRHS1Na\ndHo0TUJLdjdqQ29RNEh4aElmYlJIalUKTkFcKthkuPOwv3bq2vyUmeYkY07OGTHx\ncISq1akc3lpYAIJpkSc6FHgObHWniAwbn55T+PHW1VuNZqWTAScOQA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-05-14T17:51:19Z", + "mac": "ENC[AES256_GCM,data:Xfde2INvh8DXbJBTc6J6JdRFcehh/AMdQFXqdFxiUPxcwaVPvXvRvwaJFKHLRHMNbb3ebyCCuCWO5wobxwQdoUzxPc3McmsEgDQsLKIWO55Bg3AOpVIMUntbktfYSKMm0+dsgREEiNLa/A6srdCUxK58xTIhjftzuvwTvcRM7uA=,iv:mfze7eYnL0uwMzNkXECgO6Q8prDU6ZdNR3bwpuxD2jo=,tag:pNjJXYZE2QbP0STNYi1F3w==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/users/moritz b/vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-server/zerotier/zerotier-identity-secret/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file diff --git a/vars/per-machine/moritz-server/zerotier/zerotier-ip/value b/vars/per-machine/moritz-server/zerotier/zerotier-ip/value new file mode 100644 index 0000000..0c68f5b --- /dev/null +++ b/vars/per-machine/moritz-server/zerotier/zerotier-ip/value @@ -0,0 +1 @@ +fd77:acc0:1d56:2265:499:9377:acc0:1d56 \ No newline at end of file diff --git a/vars/per-machine/moritz-server/zerotier/zerotier-network-id/value b/vars/per-machine/moritz-server/zerotier/zerotier-network-id/value new file mode 100644 index 0000000..cce47eb --- /dev/null +++ b/vars/per-machine/moritz-server/zerotier/zerotier-network-id/value @@ -0,0 +1 @@ +77acc01d56226504 \ No newline at end of file From 0b1fbf54ac5d422521b4975adf72e6589682d992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 14 May 2025 19:51:31 +0200 Subject: [PATCH 4/7] migrated facts to vars for generator zerotier for machine moritz-laptop --- .../machines/moritz-laptop | 1 + .../zerotier/zerotier-identity-secret/secret | 19 +++++++++++++++++++ .../zerotier-identity-secret/users/moritz | 1 + .../moritz-laptop/zerotier/zerotier-ip/value | 1 + 4 files changed, 22 insertions(+) create mode 120000 vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/machines/moritz-laptop create mode 100644 vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/secret create mode 120000 vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/users/moritz create mode 100644 vars/per-machine/moritz-laptop/zerotier/zerotier-ip/value diff --git a/vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/machines/moritz-laptop b/vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/machines/moritz-laptop new file mode 120000 index 0000000..60d1226 --- /dev/null +++ b/vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/machines/moritz-laptop @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-laptop \ No newline at end of file diff --git a/vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/secret b/vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/secret new file mode 100644 index 0000000..f1f7661 --- /dev/null +++ b/vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:J8eGWkxIoIs0xR0ZmoBeaJt1hpeg7jkXjJkM6ABijqsyUhB3HK/xc/+tZZuwpX0NCKU/RHmxeejKDWqcYNvcC0OET9VHxsQW5bqOmxx20QvpP6QrN7DyTA4Ju4WoDfw4brJz7GJOXcgVRfyaM07sz632EajNc3uP5LZb/ylN3yEiaUW81bhQwYGgb5ZGnK3w8yqeKAGe8D6+naN4TqTwuQmLWlFSD41QhSqSN45y7fcWM7YPa7IhhrbvLcxdscGgYTYP+Z0uvV1xxAObA/JMggKo0miAg00SUQXAnwh6Pggnchf4GVM/b52kUHAEx17QLldZnfSVrQXD1Ub+1Q73ohnM9mmwDzCEtHODEPUc,iv:21oHHGNifTzAGVYU1mvqPih8Bcf2JKLH2hWr5SHybQE=,tag:mF7/9Kdf5nT9SorDL/aegg==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtUlkxdjNhTFN4VlVmZ29F\nQmJZQkZqb1NUK2VIVlpTakttODE4VDN1ZUdnClYreUc4MDRGejdrMDdheWdRZWdH\nNGJnVi9adjBQWTEwbWVpdVZsUTMxZmcKLS0tIGJvU21JbTVtbGZJWTFsQ0ZZS3NH\nVTBGT1R0VzJIUmlLYXl5SlNkcm14MVkKPzwX+YjN8h0Woh+p9iXDcpA7N3rSzhbX\ntzk8c0wzt2aj9NCng+b+xbqZNAa02jGUe7yiZAGa4fydwyW7oZJq8A==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1rgyueg2rnfw2er0rzkc6dc97p38fekjujdusfje6xn7g40plpfrshrlsyu", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxS3JueUVqMkZFbkNIckJh\ndlBSU3kwdTNTWlpXaEdGQmNUWThERVdEV1VnCkhVRkd6Z3UwMVV3RE9FK2ljKzNx\naFA2anJtdDZ6UlhFMS9QOFgvL2JSKzQKLS0tIGt3dG1lVUJ2OVJyZXZnaGk5aUJZ\nTGZ1QXV5V01hYlJIVnJhNDk5SjYxTmMKYn9lzMZ9RCZ/UXivFGhtUh6J9JDUmuZr\nyVsPCP4+jpP+XxRqd9VcMG5cuaYyJlTz9gt+Q+P1PB4U91XcFozbEg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-05-14T17:51:31Z", + "mac": "ENC[AES256_GCM,data:siRLgvArGug/JkLtuiaVbLb+COvhHhp4IqX9DNrAtRDuNBpsU6Kt+HeGxSWVld6ogHtO8QJDgZ64uZ1Ms0yhxozyZRjmNIJ2I/DWcl/QGvvivKaWMs1SkzjUBFGGx0mRZf5DKjXQsaUnqayH0cjZPF4bFgpx5wpQ5hIZQQ5ZEto=,iv:ibd5kk7J5ZvE69VJSZckr0dFDWe1xJJ5+YTRcMy/kjU=,tag:ojIl1Jdl5M8St7qNnI1AUQ==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/users/moritz b/vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-laptop/zerotier/zerotier-identity-secret/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file diff --git a/vars/per-machine/moritz-laptop/zerotier/zerotier-ip/value b/vars/per-machine/moritz-laptop/zerotier/zerotier-ip/value new file mode 100644 index 0000000..4b88a6f --- /dev/null +++ b/vars/per-machine/moritz-laptop/zerotier/zerotier-ip/value @@ -0,0 +1 @@ +fd77:acc0:1d56:2265:499:9393:d739:1525 \ No newline at end of file From 356ee0e2749e30a52c2e0e72c7c25f757fd5ad15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 14 May 2025 19:51:40 +0200 Subject: [PATCH 5/7] migrated facts to vars for generator zerotier for machine moritz-desktop --- .../machines/moritz-desktop | 1 + .../zerotier/zerotier-identity-secret/secret | 19 +++++++++++++++++++ .../zerotier-identity-secret/users/moritz | 1 + .../moritz-desktop/zerotier/zerotier-ip/value | 1 + 4 files changed, 22 insertions(+) create mode 120000 vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/machines/moritz-desktop create mode 100644 vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/secret create mode 120000 vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/users/moritz create mode 100644 vars/per-machine/moritz-desktop/zerotier/zerotier-ip/value diff --git a/vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/machines/moritz-desktop b/vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/machines/moritz-desktop new file mode 120000 index 0000000..32315cc --- /dev/null +++ b/vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/machines/moritz-desktop @@ -0,0 +1 @@ +../../../../../../sops/machines/moritz-desktop \ No newline at end of file diff --git a/vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/secret b/vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/secret new file mode 100644 index 0000000..5dbdc4f --- /dev/null +++ b/vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/secret @@ -0,0 +1,19 @@ +{ + "data": "ENC[AES256_GCM,data:S/xJSQH4/fGUS7M3scpUVWBbV9TkhXMmqgZK5+n6djRFXlfRMAZlhS2A001s0PHT66E+fxo7vR3OCDz+Rsg35epPnQp+hMRc9wIsU7FC09W5nkDJ0JvdTtnbVp10jsQTPUXEbVEGW+HLf5aKWdkvmeo7wxAQt+kxFJ9ch3FZNB2vf3sy7iOMc5Jl75+TmPv+aqzWPGKML5TmQ+bI1jFhIc+snojaL/TFjvP6HyYBvTeP9a6Nb7JN5d/XvuaXcFBMny2hkTrWSkoId7BRxZqL9fTSQzuySo+SogFaahOOTmoNwaLsAX+vnUzy3MJjknC3L+BAQvkt9hUbQFASVZHBIU+xT9mWCcoykiG5SdjJ,iv:oahsFcjC5nIJqh0uvIdsbez4jF89sLoHyeBtILlQDtI=,tag:YRSeajnVrliYrcUFWYtMww==,type:str]", + "sops": { + "age": [ + { + "recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4aGd1SStOdzVxaGo0c2Ix\nR3ZVR2NPTTk3UVNwc3g4RVZsK3hMSUZZWVVNClcwUjY4VHdmNmw3M1hxcEVLOE0y\nNERpaHdIbkhXNk5NMVZKdnowR00zcUUKLS0tIDE1Sjl3OTNzd1E1ek1ScTJ4Q3lp\nL2VRaDhxNHFuWUY0WmpvR3J6Q3d4RTgKFK/JK5SHeZ3cKAm9teBQpn2e3GoIbCTS\n4rKHCxeEHn7Hw9xJ28CuksKxk5G0R32+rp9L8uI1s/JbfJYxVZwvFA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPK0MyWUJ0Z05UYmljR3pS\ncHR5RnMrRGxvS3JRQmlWYlhZbHdkWTYrZlIwCmwzYzNCQ2NpQ1BETzRzcWZMQzZz\ndkEzakJScmpJVFRwa1g4cFYzU3V1eWsKLS0tIHR2QTNDVnBLZkJ3TkNDQVNNM0Yw\nbXQyT3R3Mk5ERDd0ZkZpblFpN0tzdkEKIKNUnGwa9uCQUIVLXIo8gPIzF1kP1V4j\ncgVHz3J4++O36vbwJIJU0nskC5+JjEXU5g1Nv2M/glKgAz7SgsGSDg==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2025-05-14T17:51:39Z", + "mac": "ENC[AES256_GCM,data:2RbCeWibu/hflljXFYFS5lgve29OltGFqUz9dHf9hi38mFCuWRM2TibQ1CZaCbJ6dxV1vGrpjSgFAa5uWAAgqbx0B9qS6eqL5dW1zljPW7J04NfnRg6cW64VedRELw1PPiGokmnWlzMc2qdUh5XsdbxYT9+as8C+BHonQI9Dlzs=,iv:vOicQvozkQQfqjZJwiIUI09Z+WN26hMWBmsWfp9dOc4=,tag:zoHA6RwPo0EGd/qKcCNMvg==,type:str]", + "unencrypted_suffix": "_unencrypted", + "version": "3.10.2" + } +} diff --git a/vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/users/moritz b/vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/users/moritz new file mode 120000 index 0000000..1b45802 --- /dev/null +++ b/vars/per-machine/moritz-desktop/zerotier/zerotier-identity-secret/users/moritz @@ -0,0 +1 @@ +../../../../../../sops/users/moritz \ No newline at end of file diff --git a/vars/per-machine/moritz-desktop/zerotier/zerotier-ip/value b/vars/per-machine/moritz-desktop/zerotier/zerotier-ip/value new file mode 100644 index 0000000..c06c228 --- /dev/null +++ b/vars/per-machine/moritz-desktop/zerotier/zerotier-ip/value @@ -0,0 +1 @@ +fd77:acc0:1d56:2265:499:93df:ba7c:3573 \ No newline at end of file From cbd5295bd5a1df91262c4034eecb569554d30cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 14 May 2025 20:15:33 +0200 Subject: [PATCH 6/7] chore: update inputs --- flake.lock | 252 +++++++++++++++++++++++++++++------------------------ 1 file changed, 140 insertions(+), 112 deletions(-) diff --git a/flake.lock b/flake.lock index 702ded0..3a2a7ec 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1741229528, - "narHash": "sha256-21DoV4SMueMFRHMsvfsPfQIOtsvRWNY06rE4gB7xFnc=", + "lastModified": 1745247844, + "narHash": "sha256-YfgmhyqLH067pjqRSeCpfqFkeaac1nBvsKcrRNkKw7o=", "owner": "arkenfox", "repo": "user.js", - "rev": "3d76c74c80485931425464fec0e59d6cb461677a", + "rev": "7f852e94fc80fd0aa19f1c948319974e3301187f", "type": "github" }, "original": { @@ -57,6 +57,7 @@ "flake-parts" ], "nix-darwin": "nix-darwin", + "nix-select": "nix-select", "nixos-facter-modules": "nixos-facter-modules", "nixpkgs": [ "nixpkgs" @@ -66,11 +67,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745001614, - "narHash": "sha256-NAADglNN3lh/3hgTbkynbYC2JuQCCGvv3Yizm9I64ns=", + "lastModified": 1747235631, + "narHash": "sha256-v3tBUKPCIsOUjuznZZqGOHKGPITECWiRE+gzb3mTOxI=", "ref": "refs/heads/main", - "rev": "779d28577de180c60ed4774c002cc5814162a0f9", - "revCount": 6386, + "rev": "974c3f9b095ada5be29491a5c83da35a16642429", + "revCount": 6923, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -114,17 +115,15 @@ ] }, "locked": { - "lastModified": 1744961442, - "narHash": "sha256-ymbmZjOaIoVwEuTpFDjlXPGufqmdlzdDEVpQAjNi8Ls=", - "ref": "refs/heads/main", - "rev": "0328b8c5912db9562e1ab115f760ca7ba0044aff", - "revCount": 409, - "type": "git", - "url": "https://git.clan.lol/clan/data-mesher" + "lastModified": 1747008053, + "narHash": "sha256-rob/qftmEuk+/JVGCIrOpv+LWjdmayFtebEKqRZXVAI=", + "rev": "2666bb11f4287cfbdf3b7c5f55231c6b5772a436", + "type": "tarball", + "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/2666bb11f4287cfbdf3b7c5f55231c6b5772a436.tar.gz" }, "original": { - "type": "git", - "url": "https://git.clan.lol/clan/data-mesher" + "type": "tarball", + "url": "https://git.clan.lol/clan/data-mesher/archive/main.tar.gz" } }, "disko": { @@ -135,11 +134,11 @@ ] }, "locked": { - "lastModified": 1744940522, - "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=", + "lastModified": 1746729224, + "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", "owner": "nix-community", "repo": "disko", - "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081", + "rev": "85555d27ded84604ad6657ecca255a03fd878607", "type": "github" }, "original": { @@ -210,11 +209,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -321,11 +320,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -400,11 +399,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -420,11 +419,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -506,11 +505,11 @@ ] }, "locked": { - "lastModified": 1742014779, - "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", + "lastModified": 1744693102, + "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "524637ef84c177661690b924bf64a1ce18072a2c", + "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e", "type": "github" }, "original": { @@ -526,11 +525,11 @@ ] }, "locked": { - "lastModified": 1744400600, - "narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=", + "lastModified": 1747225851, + "narHash": "sha256-4IbmZrNOdXP143kZEUzxBS5SqyxUlaSHLgdpeJfP2ZU=", "owner": "nix-community", "repo": "home-manager", - "rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3", + "rev": "6bf057fc8326e83bda05a669fc08d106547679fb", "type": "github" }, "original": { @@ -568,16 +567,16 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } @@ -588,11 +587,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1744436521, - "narHash": "sha256-3Q3+H8YeuRRGXZqL0FgWAcPg2bX416M6NX/VpLGRw+c=", + "lastModified": 1747221863, + "narHash": "sha256-2sHoet8Dj16i6fiwlZh9r5Hs9mRIInKvewk8JjU91KQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1dd888cc60079910fba27eb43b959b633e3b466c", + "rev": "e6189e1e6e019dea8c0ee4f7eba2a435b232e294", "type": "github" }, "original": { @@ -603,11 +602,11 @@ }, "master": { "locked": { - "lastModified": 1744479069, - "narHash": "sha256-B3mImWFdHmpCFMm5o2h0Gtl01JWDpzDwVGvckcihdZo=", + "lastModified": 1747244259, + "narHash": "sha256-MDcETIJDcln8Xk0wLBev/dRNltOV6Vr7BrVJeBQ5hIg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca82b3ec2b85899573cf03075021bc2eb0b585a8", + "rev": "6d0d3850ff291b04c1394cc388cd5740f843fabc", "type": "github" }, "original": { @@ -649,11 +648,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1744447706, - "narHash": "sha256-8bkAMTy5A6IEEBrr8fGyBrpRNvHMBttsjmTS3IHO/3w=", + "lastModified": 1747188452, + "narHash": "sha256-n/XRdH8zSaEispBMMV+lVXTndAKrZ++ebCuKRbOJfhY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "8479d0e1c0b9274c25001432169c0056633bf63a", + "rev": "a2f0b8e4d30ea28a8021fa3314eb2244cc133199", "type": "github" }, "original": { @@ -665,11 +664,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1744372015, - "narHash": "sha256-Aith8tgE4jRYDpFa9JqPsA4beTimLmqgwl6PLNlJHyU=", + "lastModified": 1747147482, + "narHash": "sha256-9Vvl0BVjZNrPrgXiNZT1xfR/Fnatyl3oba5GnI+rKfQ=", "owner": "neovim", "repo": "neovim", - "rev": "4a706a70928231643e1a3f3fcf785de7aa930f8b", + "rev": "40b64e91007e364fd7c7eaab64ce7c8cf0150aec", "type": "github" }, "original": { @@ -690,11 +689,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744381460, - "narHash": "sha256-ay8Vijc8IuQiA+bMmKaKFy/2iTtvB9K7xqrirhnwivU=", + "lastModified": 1747152040, + "narHash": "sha256-C6xbCOgSAi+a/1Bk1GPdWd5l791neY5YRWxVM/0cYNg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4e592d48fb54ed742fb1ab14972a11432b2cbc31", + "rev": "fa50b6e56aaf6c9b32aadc44f7a2e47187e9b6ac", "type": "github" }, "original": { @@ -723,11 +722,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1744271375, - "narHash": "sha256-W4h6ZX2WHJ6k0ApUTpuxkDPZ5JAI3MLWFP4lpfu3iv8=", + "lastModified": 1747145615, + "narHash": "sha256-U6MhqL4QXLojCOKH5yc8GbfOF7Fas36e1nqcPQx6/zQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "df9466243504a00240f7048a1f9644cb002776a8", + "rev": "0d6843ea67da91aea37b655be5de92dfeea081b5", "type": "github" }, "original": { @@ -744,11 +743,11 @@ ] }, "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "lastModified": 1746708654, + "narHash": "sha256-GeC99gu5H6+AjBXsn5dOhP4/ApuioGCBkufdmEIWPRs=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "rev": "6cb36e8327421c61e5a3bbd08ed63491b616364a", "type": "github" }, "original": { @@ -786,11 +785,11 @@ ] }, "locked": { - "lastModified": 1743911143, - "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=", + "lastModified": 1746934494, + "narHash": "sha256-3n6i+F0sDASjkhbvgFDpPDZGp7z19IrRtjfF9TwJpCA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb", + "rev": "e9b21b01e4307176b9718a29ac514838e7f6f4ff", "type": "github" }, "original": { @@ -806,11 +805,11 @@ ] }, "locked": { - "lastModified": 1737219791, - "narHash": "sha256-OU0NPjJ3woNDFNx7HtWuUXBb4eI6Ggre/Uj2qhiSjrg=", + "lastModified": 1745680380, + "narHash": "sha256-Z8PknjkmIr/8ZCH+dmc2Pc+UltiOr7/oKg37PXuVvuU=", "owner": "ners", "repo": "nix-monitored", - "rev": "6ed8ed4832ff26c616e5856ba19f5b8141d61bd3", + "rev": "60f3baa4701d58eab86c2d1d9c3d7e820074d461", "type": "github" }, "original": { @@ -819,6 +818,19 @@ "type": "github" } }, + "nix-select": { + "locked": { + "lastModified": 1745005516, + "narHash": "sha256-IVaoOGDIvAa/8I0sdiiZuKptDldrkDWUNf/+ezIRhyc=", + "rev": "69d8bf596194c5c35a4e90dd02c52aa530caddf8", + "type": "tarball", + "url": "https://git.clan.lol/api/v1/repos/clan/nix-select/archive/69d8bf596194c5c35a4e90dd02c52aa530caddf8.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.clan.lol/clan/nix-select/archive/main.tar.gz" + } + }, "nixos-facter-modules": { "locked": { "lastModified": 1743671943, @@ -889,11 +901,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { @@ -921,11 +933,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -937,11 +949,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1744316434, - "narHash": "sha256-lzFCg/1C39pyY2hMB2gcuHV79ozpOz/Vu15hdjiFOfI=", + "lastModified": 1747060738, + "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d19cf9dfc633816a437204555afeb9e722386b76", + "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", "type": "github" }, "original": { @@ -953,11 +965,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1744442362, - "narHash": "sha256-i47t4DRIZgwBZw2Osbrp1OJhhO1k/n+QzRx+TrmfE9Y=", + "lastModified": 1747060738, + "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2349f9de17183971db12ae9e0123dab132023bd7", + "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", "type": "github" }, "original": { @@ -969,11 +981,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -1023,14 +1035,15 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_4" }, "locked": { - "lastModified": 1744429493, - "narHash": "sha256-T3nhF5uBFaLSoR4EM7/Yf5TuD2kghyqRlNCmcN4tQx0=", + "lastModified": 1747224967, + "narHash": "sha256-we27kbNAAEeT0+PxJ2aUNVFXlJ7uvh4pxTc3R8RUqxA=", "owner": "nix-community", "repo": "nixvim", - "rev": "1095b7f89192c1e2bc9b52d0d9660c02752afe5a", + "rev": "95ca65c8d1adee5594bd14f527c68d564fb68879", "type": "github" }, "original": { @@ -1046,11 +1059,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1744474042, - "narHash": "sha256-CDLAzJ5lqgPbp6gc/+x3m5ojmBust/wxLGM5XD9W818=", + "lastModified": 1747240942, + "narHash": "sha256-4vzxLACNjlCHGnJo4I+hg1CuelDicd711OXGryfvNW0=", "owner": "nix-community", "repo": "NUR", - "rev": "96bc1373445beb864dd3564e09f0ca0b9d623a5a", + "rev": "aace8e6f0db97112d40089b96686101bd0d72c54", "type": "github" }, "original": { @@ -1069,11 +1082,11 @@ ] }, "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { @@ -1089,11 +1102,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -1152,11 +1165,11 @@ ] }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "type": "github" }, "original": { @@ -1167,11 +1180,11 @@ }, "stable": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { @@ -1241,6 +1254,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "timers": { "inputs": { "naersk": "naersk", @@ -1269,11 +1297,11 @@ ] }, "locked": { - "lastModified": 1744961264, - "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", + "lastModified": 1746989248, + "narHash": "sha256-uoQ21EWsAhyskNo8QxrTVZGjG/dV4x5NM1oSgrmNDJY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8d404a69efe76146368885110f29a2ca3700bee6", + "rev": "708ec80ca82e2bbafa93402ccb66a35ff87900c5", "type": "github" }, "original": { @@ -1290,11 +1318,11 @@ ] }, "locked": { - "lastModified": 1743748085, - "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", + "lastModified": 1746989248, + "narHash": "sha256-uoQ21EWsAhyskNo8QxrTVZGjG/dV4x5NM1oSgrmNDJY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", + "rev": "708ec80ca82e2bbafa93402ccb66a35ff87900c5", "type": "github" }, "original": { @@ -1326,7 +1354,7 @@ }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1692799911, @@ -1362,11 +1390,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1743346993, - "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", + "lastModified": 1747111562, + "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", + "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72", "type": "github" }, "original": { From 5fda53d31d35476c13bbce9ff4520c19d2b92898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 14 May 2025 20:27:45 +0200 Subject: [PATCH 7/7] fix: clan services --- clanServices/flake-module.nix | 2 +- clanServices/remote-builders/default.nix | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/clanServices/flake-module.nix b/clanServices/flake-module.nix index cf88ae7..d61c171 100644 --- a/clanServices/flake-module.nix +++ b/clanServices/flake-module.nix @@ -3,7 +3,7 @@ lib, ... }: { - clan.inventory.modules = { + clan.modules = { remote-builders = lib.modules.importApply ./remote-builders/default.nix {inherit self;}; }; } diff --git a/clanServices/remote-builders/default.nix b/clanServices/remote-builders/default.nix index 0250a72..5067649 100644 --- a/clanServices/remote-builders/default.nix +++ b/clanServices/remote-builders/default.nix @@ -8,14 +8,12 @@ # These options can be set via 'roles.client.settings' options.supportedFeatures = lib.mkOption { type = with lib.types; - listOf ( - oneOf [ - "nixos-test" - "benchmark" - "big-parallel" - "kvm" - ] - ); + listOf (enum [ + "nixos-test" + "benchmark" + "big-parallel" + "kvm" + ]); default = []; description = '' kvm | Everything which builds inside a vm, like NixOS tests