modules/hosts/nixberry/default.nix

@@ -293,7 +293,7 @@ topLevel: {
 
       sops.secrets = {
         "samba/cholli" = {
-          sopsFile = ../../../secrets/secrets.yaml;
+          inherit sopsFile;
         };
       };
 

modules/hosts/nixberry/disko.nix

@@ -59,11 +59,8 @@
       boot.supportedFilesystems = [ "zfs" ];
       networking.hostId = "8425e349";
 
-      services.zfs = {
+      services.zfs.autoScrub.enable = true;
-        autoScrub.enable = true;
+      services.zfs.trim.enable = true;
-        autoSnapshot.enable = true;
-        trim.enable = true;
-      };
 
       disko.devices = {
         disk = {

modules/hosts/yggdrasil/default.nix

@@ -63,22 +63,6 @@ topLevel: {
         root
       ];
 
-      fileSystems."/mnt/pi_share" = {
-        device = "cholli@nixberry:/storage/";
-        fsType = "sshfs";
-
-        options = [
-          # Filesystem options
-          "allow_other" # for non-root access
-          "_netdev" # this is a network fs
-          "x-systemd.automount" # mount on demand
-
-          # SSH options
-          "reconnect" # handle connection drops
-          "ServerAliveInterval=15" # keep connections alive
-        ];
-      };
-
       nix = {
         distributedBuilds = true;
         settings.builders-use-substitutes = true;

secrets/secrets-nixberry.yaml

@@ -1,4 +1,6 @@
 tailscale_key: ENC[AES256_GCM,data:koGEPaAHdrwb7UmxeYQUarWePzFKS2Z7WloSoIUj38vzyYSsd0phFvrAsHs3HAjBIk+PbqFUbQ/uwLUikg==,iv:yQ2hrvQ9Px4cM66mVYvfy2+T/3nZGD/Dm2seuvddtJ8=,tag:5LAdHpw/s+yiDBUSWtCJrQ==,type:str]
+samba:
+    cholli: ENC[AES256_GCM,data:SURrbKsXwj8Bx7zTVvLyKK+Aito=,iv:AEaVTyUIpRbThrMoKZrOsvnTtqWjHCe/2HKAXp7EM04=,tag:4yPCw2y86XVMfk6wR04ymA==,type:str]
 sops:
     age:
         - recipient: age1pc92kl38mfr0j68dxww7tpzvqp3lpw6lwfylj6hn2k3rf4rddgtsjxdx47
@@ -19,7 +21,7 @@ sops:
             eFJGejZqcytEMTEzN054WVZLZWFXeTQKsaT2rdowx8wTHyke1/5mEYQVL3L/A6/d
             weInwZWg30FNBYD0C1qY7yyYprwVe8FjEaN4zi2nQXCOfiCl3Cv4ow==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-12-04T08:41:45Z"
+    lastmodified: "2025-11-23T18:29:30Z"
-    mac: ENC[AES256_GCM,data:BYGcotPHGYNKrqbUqA5fo1JfDEl4vIP16j80Lx3YOoqxWZa1hwOFFra4f4QT15DfN2Vwah9ELeXw77tSGlEBZaOnyQp3vfhxEdG66fHj39QNhdDo1KVfERidSgvSRO5jdAHxA6WEcFrpKmn5cpO7vlFJdDjVsItsLEOY0CA9t+8=,iv:UteMboDnmicROvBTZlX/b5i4cmC36FPXABWcR5jdEac=,tag:93v+CiCtm9QPEzbttshPPw==,type:str]
+    mac: ENC[AES256_GCM,data:JHakDPHXyOhLQgL0LEUb8sW4H9GcCqrLQzu5HPO2uHbt7EKQCB1z86Hlbyu6pOZryXZirA7YQYk0ZD2w7C9ArgJBHb3Y0Xo5wAf3eCzMqasJuVoa5TiZnlycw95JCMyR+IwaE1TPZ6SznUSeHZYAVY89AtvDBXjo9HpNFyryyDo=,iv:LZir+L2OUH8/o49bLf9An/9aTsjXELf8eRP07HZwQPM=,tag:acnN6RMJLI3FAbNaFIq9rw==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.11.0

secrets/secrets.yaml

@@ -1,6 +1,4 @@
 passwordHash: ENC[AES256_GCM,data:T1rPJ5PhicrB54KxuTF2VT9i54uOngZnp1dS1xE/2qiuVUNUmYDrtryCk3nupJx9IVf0XqymQ3ut9A6YD1NjGvCBN+Klk2aevA==,iv:u9tpn9VAwn4yrChxICV6KgHFnvV5rpwKq6WWBjwntEk=,tag:sU9GebazI7gNuLSNO4Sjww==,type:str]
-samba:
-    cholli: ENC[AES256_GCM,data:x2fZ8VcSAcelCj9/Tjp2I1KNeLo=,iv:66Je1+TL6jtnC+LZS3747yq/c6zI4FwlBXH1BjIFeDk=,tag:+vujtFcdKTcsyBisC/UyNA==,type:str]
 remotebuild:
     private-key: ENC[AES256_GCM,data:kLF+Mo5EIS5mu8be0nDVRTAb7mzt6dtEL56aG4mV2BxLRcyUZXs7eCbj7j7sOpjqz0k8m+1lHAouvNjyzxANeH10/R3Fy3GZqeWtgJSOEQE3biZaD3dqz0e3Gv3ib/Y0yNYTafosCmn6CmPIsVfiE/dfS1oM2Ksrf/AQ3ufPKIdV0h+p5SK6LnhpBqxgIf7s3MFbBzR+iEgxn1jnmCLaoVqNXhO2tmQqgmRHyh2kHruFj9ZwUi6mWDBie7zX7qlOt/m9p5QN/v5KWn4CfMDWzMlSTYdjEd6lUlP8UC35MJafVT59ioF+ueqePhr4DyDR7d+Cg6Z/iNHWiSH1z17p4Rxt3D4IAverqcd1i8c92C8S4NJKvtWRyfMgZMB3/iG2ZqrLcJXlxrZZKZ9X5B+y5a0Ljb+Vg00V68ktFISt7vAsK79Qy/QjHCotXY0uugkeaGnxS1qhig5tmXdxD+OKk/cJt0kqYEyUFKVQf9unr6xaD2IuOkFKyp/fYhU5LfS0uiAt99ENrfNrIRdHAsUvgWW6Sq7qSVmjkLfU,iv:mlYWlmFT0Ybmn26Spqri5E9zRkrBweV6bWvvByLnIvs=,tag:tdB7dw+GMnr5/8fXoem10w==,type:str]
 sops:
@@ -32,7 +30,7 @@ sops:
             QUFsdmlYay9lLzF2YWJHVUlBOUhDaHcKKXKuk3ki8WYSrg2YVtaB4PliR/LFy390
             gvCdS/LwqBJlDAwwtOoml7gtgPmn4bACO3z8XnrLfpctDdYgDkqcgQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-12-04T08:42:30Z"
+    lastmodified: "2025-12-01T23:30:01Z"
-    mac: ENC[AES256_GCM,data:xXdrF1yI19G06GMmL9ZpOVIQGTN0uYpru5weMyFnvSc6Igt+GLznht9V4qIRHLW8gRhd+sfSfNvXptn0FbS9HdI5MfIDTvLLC1nVRVtvPPcWiYPKo5lqiFnCh5HV/3UBNVO+7Wz1/m1JtXEptc1cYhpx2JmFPSvH9dQXedGSgec=,iv:iyc2s2CNYNL1XsryV0a5hQN3Woc5bCjrVtfH7bLDVoo=,tag:4B03cEYJstryEJwHxWhrDw==,type:str]
+    mac: ENC[AES256_GCM,data:XSGqMKs3XVupy2wf5E1M8eFVwXlkQndY6Gw2aYV/tJ7WhKX3ToYHqDujUjCKE5S2dPZjT0i9wJD//LcC3lPAEbKlyCExBhHxuQjT44GuRyORNiT+ET5bLL0ilrG3U+DxvYCjFkhIZpTPZHG7E6lC2ch5DHyVCSsl/pjZ+/ZrA4Q=,iv:ZHsE8r4a2XkZS7nvvWF024/Xpv42C04M7D22z2LYgwk=,tag:XOm5TCvivijISw3+ItBvKA==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.11.0