From c5d3d7c7dfe135c56615a5a208f861ffc799313c Mon Sep 17 00:00:00 2001
From: Sam <samual.shop@proton.me>
Date: Fri, 24 Jan 2025 10:58:35 +0000
Subject: [PATCH] sparky autoupgrade and change home persistence

---
 hosts/common/users/media/default.nix | 20 +++-----------------
 hosts/sparky/default.nix             | 11 ++++++-----
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/hosts/common/users/media/default.nix b/hosts/common/users/media/default.nix
index a0320dd..179145f 100644
--- a/hosts/common/users/media/default.nix
+++ b/hosts/common/users/media/default.nix
@@ -21,7 +21,6 @@ in {
     extraGroups = [
       "scanner"
       "lp"
-      "wheel"
     ];
 
     packages = with pkgs; [
@@ -31,22 +30,9 @@ in {
   };
 
   environment.persistence."/persist" = {
-    hideMounts = true;
-    users.${username} = {
-      directories = [
-        "Sync"
-        "Keep"
-        ".ssh"
-        ".config"
-        ".mozilla"
-        ".local"
-        ".zotero"
-        ".var"
-        ".steam"
-      ];
-      files = [
-      ];
-    };
+    directories = [
+      "/home/${username}"
+    ];
   };
 
   sops.secrets = {
diff --git a/hosts/sparky/default.nix b/hosts/sparky/default.nix
index 5c76883..aba4ca6 100644
--- a/hosts/sparky/default.nix
+++ b/hosts/sparky/default.nix
@@ -15,6 +15,7 @@
     then "/dev/mapper/crypted"
     else "/dev/root_vg/root";
   impermanence = true;
+  merlinIp = configVars.networking.addresses.merlin.ip;
   piholeIp = configVars.networking.addresses.pihole.ip;
   gatewayIp = configVars.networking.addresses.gateway.ip;
 in {
@@ -44,9 +45,9 @@ in {
     # Import optional options
     ../common/optional/openssh.nix
     ../common/optional/persistence.nix
-    # ../common/optional/fileserver/media.nix
-    ../common/optional/gaming.nix
-    ../common/optional/printing.nix
+    ../common/optional/fileserver/nfs-client/media.nix
+    # ../common/optional/printing.nix
+    ../common/optional/distributed-builds/local-machine.nix
     outputs.nixosModules.nixosAutoUpgrade
   ];
 
@@ -80,11 +81,11 @@ in {
   system.services.nixosAutoUpgrade = {
     enable = true;
     persistent = true;
+    remote = "remotebuild@${merlinIp}";
     reboot = false;
     pushUpdates = false;
     configDir = "/etc/nixos";
-    onCalendar = "*-*-* 07:00:00";
-    user = "media";
+    onCalendar = "*-*-* 06:00:00";
   };
 
   services.xserver = {