From 5c6bb2745d2c9210e3395683ee91008655a2c1f2 Mon Sep 17 00:00:00 2001
From: Lukas Wurzinger <lukas@wrz.one>
Date: Sun, 18 Aug 2024 20:11:43 +0200
Subject: [PATCH] fix

---
 README.md                    |   2 +-
 flake.nix                    |  12 +++++++-----
 hosts/abacus/miniflux.nix    |   6 +-----
 hosts/abacus/vaultwarden.nix |   6 +-----
 secrets/vaultwarden.age      | Bin 565 -> 757 bytes
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index eb96722..cdd4fc7 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # ❄️ puter
 
-This is my NixOS configuration. There are many like it, but this one is mine. Copy at your own risk.
+This is my cobbled together NixOS configuration. There are many like it, but this one is mine. Copy at your own risk.
diff --git a/flake.nix b/flake.nix
index 9da3b1a..69040b6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,12 +34,14 @@
                 ({lib, ...}: {networking.hostName = lib.mkDefault name;})
               ];
             };
+
+          genHosts = (nixpkgs.lib.pipe (builtins.readDir ./hosts) [
+            (nixpkgs.lib.filterAttrs (name: type: type == "directory" && name != "default.nix"))
+            builtins.attrNames
+            nixpkgs.lib.genAttrs
+          ]);
         in
-          nixpkgs.lib.genAttrs [
-            "abacus"
-            "vessel"
-          ]
-          commonNixosSystem;
+          genHosts commonNixosSystem;
       };
 
       perSystem = {
diff --git a/hosts/abacus/miniflux.nix b/hosts/abacus/miniflux.nix
index 163e201..e85eb21 100644
--- a/hosts/abacus/miniflux.nix
+++ b/hosts/abacus/miniflux.nix
@@ -2,11 +2,7 @@
   inherit (config.networking) domain;
   virtualHostName = "flux.${domain}";
 in {
-  age.secrets.miniflux = {
-    file = ../../secrets/miniflux.age;
-    # owner = config.systemd.services.miniflux.serviceConfig.User;
-    # group = "root";
-  };
+  age.secrets.miniflux.file = ../../secrets/miniflux.age;
 
   services.miniflux = {
     enable = true;
diff --git a/hosts/abacus/vaultwarden.nix b/hosts/abacus/vaultwarden.nix
index bcaa49e..7c7c96c 100644
--- a/hosts/abacus/vaultwarden.nix
+++ b/hosts/abacus/vaultwarden.nix
@@ -3,11 +3,7 @@
   virtualHostName = "vault.${domain}";
   backupDir = "/srv/backup/vaultwarden";
 in {
-  age.secrets.vaultwarden = {
-    file = ../../secrets/vaultwarden.age;
-    owner = config.systemd.services.vaultwarden.serviceConfig.User;
-    group = config.systemd.services.vaultwarden.serviceConfig.Group;
-  };
+  age.secrets.vaultwarden.file = ../../secrets/vaultwarden.age;
 
   services.vaultwarden = {
     enable = true;
diff --git a/secrets/vaultwarden.age b/secrets/vaultwarden.age
index a061439e380278021a19b51e367772a699d91158..7934c304abe1f90472d7fdda5221bb936941f9d1 100644
GIT binary patch
delta 705
zcmV;y0zUn<1oZ`wEPrfyHgRD}cQ|W8R%L5rdPQk<bZKl?Z7X9oX?H_za%)0$SaEnx
zT0}=|cM4}sR&q#fS9echM0Yb-F?2#&IYebqby_)Yc~DYzMn`gFPce6GWJORyK?*HC
zAaiqQEoEdfH8n9gAX6)3cTrIwK`Tj2Q%`U~Z%<4{PB}4gYeq;&K{+c#F;7inT5wBk
zM^koqW>qk8c{DIE3Pw*fFjaCgVO45vVoO13L`HKqPh@9RayT<;Zb@QHQ!+7CLMu#K
zY;H4Ek?|LQYeQpgMnW}7G*VG)G)8A?RV!CEO-y80HDqo@dQ@&|NN-hnQC3t?R#j07
zLsE8jY&2?ZL~BfXZg)0yFJo<Dab`zNdT3fyc`{dVS9UmOM0HL#W?@kZEiEk|cULnw
zbxv(`a5Q6NX;5%ZGjwxRS8{GzOmuWtLs2n8XmMwMT1##+Pgglb3i`3g?q@NI*Isou
zn+oo-R?UlWb#QuEA}@-(%~I-X$lm~bmPedi=Y@<21sH-tr4z9ya@Pe$5aW(FKw59%
zRw`i{*d+${o|ejpF7<4hBGk|G=lr!yDfH<V@g$kvIQ*%>epIc*jmoz;E(hPmH`k}?
z%+BY3!%^5Z)gcY5<yDp2ew!9kHnlpo=-KY*C}-%4W!a>DJ|+X9SCC9~jld2~2nGh}
z8u$u^*OnuKP?=uTXWj636kGsfgrfwA4^@D}E5b1Hu}QF!iWDa%V=SD1W@iARDr4!G
ztn;M<sIqt`3-jS=V?uywI;~Qxke<)Q5`OM*!x~3p<bpUlfpp{-!{o}VMMdi+w*Q#>
z#0$9T;9?+m-a<TM5D!uIr>EfFlQ-a{)|Nd)E2<cyp7=9Zax_j^Kps>ec<)6diIRXh
nqTthHyQN%<{x+H>>KEbndxy3;C`rslm#ZeNi!|a%O<{!Yy<aDi

delta 512
zcmV+b0{{K>1+@f_EPqdHMp$A*F-B}zRW>wdR82@)XH0oxFK=g2NJnE~XIg1tQdKr>
zPI_@yQ3_aiWOZ|KV?s1xWHfJhHep3FXJ}JKcv4X_O+{==FjG`RbWS!kL2OH8I0`L3
zAaiqQEoEdfH8n9gAX6)3cTrIwGj>yTOjCMfS8q{FR&h!&GDc%UF>*>!P%%SxF=AnN
zL^fedaBXyGW=?lm3RqK3VOU2nWN~9wbW>MaS~fIsOJZ$TLPJn$V{b-LL}7PwG-Y*1
zSwUoHk?|LQMM*+tPBLzEFe^$}N@6imXHR%GZFXo!aYkiOa8!9qSWt0JG;U^MGG{aj
zT2ymzO?7uTO>%N|Giz{2Xj4Q<Ph~+xFlISfbVW5)d2B*5Y;0(1SaeAWEiEk|H8(kQ
zb5vPbRdz5>G)77}Y+`g$M>$7UG-hE|G;u~lFGX^HdPHesLTF}13I?E>|D5U{nU1BQ
z8z^50*qCw=mgvN4;q%BxdQdY#=bxd(M#DJClzPS&P!AIP%_36ll1$NO>pZ(M<KooY
z^(sUg*JX8aSauj6rhK@1wZqgbyM6Kr>dR6hls86mbQElS_J$dtVM>0=wn1b8%t<iz
zOFBU>4$<l9j@WCukD$J16wj@dG|#70^u;eAK<&^Yt%i>ltt5N~PzN`r`$t}y9KAY&
CH^kfk