From 89789e6af85f9bfcb7b005f0c455b814f3db3cef Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Thu, 15 Aug 2024 09:41:36 -0500
Subject: [PATCH] Update to run on Isaiah and containers

---
 hosts/default.nix              | 17 ++++++++++-------
 hosts/myself/container-git.nix |  1 +
 hosts/myself/git.nix           |  1 +
 modules/baseline.nix           |  1 -
 modules/nixos/db.nix           |  2 +-
 modules/nixos/syncthing.nix    |  2 ++
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/hosts/default.nix b/hosts/default.nix
index 77d9903..afc29eb 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -22,13 +22,16 @@ let
 		modules = [
 			{
 				nixpkgs.overlays = overlays;
-				home-manager.useGlobalPkgs = true;
-				home-manager.useUserPackages = true;
-				home-manager.users.greg = import ../home/home.nix;
-				home-manager.extraSpecialArgs = {
-					inherit inputs overlays;
-					home = "/home/greg";
-					host = name;
+				home-manager = {
+					useGlobalPkgs = true;
+					useUserPackages = true;
+					users.greg = import ../home/home.nix;
+					extraSpecialArgs = {
+						inherit inputs overlays;
+						home = "/home/greg";
+						host = name;
+					};
+					backupFileExtension = "bkp";
 				};
 			}
 			inputs.agenix.nixosModules.default
diff --git a/hosts/myself/container-git.nix b/hosts/myself/container-git.nix
index b1644c3..22f5204 100644
--- a/hosts/myself/container-git.nix
+++ b/hosts/myself/container-git.nix
@@ -57,6 +57,7 @@ in {
 	greg.backup.jobs.nas-backup = {
 		src = "/var/gitlab/state/backup/";
 		dest = "gitlab";
+		id = "yha^-s45h";
 	};
 
 	services = {
diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix
index 1207e1e..548f261 100644
--- a/hosts/myself/git.nix
+++ b/hosts/myself/git.nix
@@ -40,6 +40,7 @@ in  {
 
 	systemd.services = {
 		"gitlab-runner" = {
+			after = [ "container@github.service" ];
 			preStart = builtins.concatStringsSep "\n" [
 				"${pkgs.kmod}/bin/modprobe kvm"
 				"${pkgs.kmod}/bin/modprobe kvm_amd"
diff --git a/modules/baseline.nix b/modules/baseline.nix
index 04157c8..ec6947d 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -33,7 +33,6 @@ in
         allowUnfree = true;
     };
     
-    home-manager.backupFileExtension = "bkp";
 
     # Base packages that need to be in all my hosts
     environment.systemPackages = with pkgs; [
diff --git a/modules/nixos/db.nix b/modules/nixos/db.nix
index ec551d1..8bf1097 100644
--- a/modules/nixos/db.nix
+++ b/modules/nixos/db.nix
@@ -57,7 +57,7 @@ in {
 		greg.backup.jobs.greg-postgresql-backup = {
 			src = config.services.postgresqlBackup.location;
 			dest = "database-${config.networking.hostName}";
-			user = "postgres";
+			id = "${config.networking.hostName}-postgres-backup";
 		};
 	};
 }
diff --git a/modules/nixos/syncthing.nix b/modules/nixos/syncthing.nix
index 23bc7c6..d259516 100644
--- a/modules/nixos/syncthing.nix
+++ b/modules/nixos/syncthing.nix
@@ -16,7 +16,9 @@ in with lib; {
 				devices = {
 					chronicles.id = "7FI6Y3M-C7YQEDI-IB345L6-RKLXMB6-AEIV57Y-3J2RCXQ-MK6QRNK-EINPXAE";
 					genesis.id = "YDTH4SD-GUAC5AA-SSYWYPZ-YMJW5LK-LE7PZKJ-GV2UJFZ-CU7LZAD-GTYWCQK";
+					gitlab.id = "VAG5GHP-L7TNY7O-CHR3CKU-GXXVCIL-OT3WHHU-E4VAIZC-JI4BKOM-PYZQOQS";
 					linode.id = "IJMMXPR-WNALZBD-FMJH5W5-WV7XGJY-HLJTKGT-5TKHJIH-75LT56D-UUZCYQE";
+					matrix.id = "K5IHM3I-TJFFEW5-GAYJMPS-CYSHW5C-XHMC462-MFRMOHJ-EJLKIKC-CZHGJQ2";
 				};
 				options = {
 					urAccepted = -1;