Merge remote-tracking branch 'origin/main'

hosts/jude/default.nix

@@ -8,6 +8,7 @@
 		./printing.nix
 		./virt.nix
 	];
+	programs.steam.enable = true;
 	networking.hostName = "jude";
 	greg.tailscale.enable = true;
 	greg.gnome.enable= true;

hosts/lappy/default.nix

@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+	imports = [
+		./hardware-configuration.nix
+	];
+	# Bootloader.
+	boot.loader.systemd-boot.enable = true;
+	boot.loader.efi.canTouchEfiVariables = true;
+	boot.loader.efi.efiSysMountPoint = "/boot/efi";
+	# Graphics, please
+	greg.gnome.enable = true;
+	# Set host name
+	networking.hostName = "lappy";
+}

hosts/lappy/hardware-configuration.nix

@@ -0,0 +1,39 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/63bcc80e-0501-4aef-bb58-30bb83881055";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot/efi" =
+    { device = "/dev/disk/by-uuid/C617-B2B1";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/bc4f24a3-5969-4bcb-95f4-f80109e36ebb"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
+
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/linode/default.nix

@@ -11,6 +11,7 @@
 	greg.home = false;
 	greg.linode.enable = true;
 	greg.tailscale.enable = true;
+	greg.backup.key = ./ssh/id_ed25519;
 	networking.hostName = "linode";
 	networking.domain = "thehellings.com";
 }

hosts/linode/nextcloud.nix

@@ -25,9 +25,9 @@
 		enableACME = true;
 	};
 
-	services.syncthing.folders."nextcloud-backup" = {
-		path = "${config.services.nextcloud.datadir}";
-		enable = true;
-		devices = [ "nas" ];
+	greg.backup.jobs.nextcloud = {
+		src = "/var/lib/nextcloud";
+		dest = "nextcloud-backup";
+		user = "nextcloud";
 	};
 }

hosts/linode/postgres.nix

@@ -31,23 +31,27 @@ root root postgres
 		enable = true;
 		databases = [
 			"nextcloud"
-			"matrix-synapse"
+			"synapse"
 		];
 	};
 
 	services.logrotate = {
 		enable = true;
 		settings = {
-			postgres = {
+			postgresBackup = {
 				enable = true;
 				files = "${config.services.postgresqlBackup.location}/*.gz";
 			};
+			postgresLog = {
+				enable = true;
+				files = "/var/lib/postgresql/*/log/*.log";
+			};
 		};
 	};
 
-	services.syncthing.folders."postgres-backups" = {
-		path = "${config.services.postgresqlBackup.location}";
-		enable = true;
-		devices = [ "nas" ];
+	greg.backup.jobs.postgresql = {
+		src = "/var/backup/postgresql";
+		dest = "linode-postgres";
+		user = "postgres";
 	};
 }

hosts/linode/ssh/id_ed25519

@@ -0,0 +1,9 @@
+U2FsdGVkX1+5xhF/T+xJUHDp5c4sT1d0SHp/bwqJ0WXOsiCv7pGNuDBVV1rhItct
+tRnfR7OKwrfK7DXFCTNJkcYhnNwma8ZBurmFCwMpAC6sXGhEIoxHNkWezjlGnZja
+k1cVx8R17Eg4/3jzKPyaCGv1kZ9Nhxg8aHtXP5ow2e6C0dzkQaq3j9QEVjRUm+tf
+JY4Aetg+ySXvKVfdj0JnSkAu4k8IznxzEqzkdF7gcTdiYJo54VQXzupAjwe6BBrh
++ncgfBWaFOfq9Jiawh8HFFm48cOwsKh3+18itI9t8snhyANFj3pFiTsoCZBdYIxR
+UwbfcRjDsyplCpwQNZaioe3bh/UMOZsFrUm4Ch8kR6nbJjfonl4nmnrSLHCY9lrn
+QWscukwrLcwsAh4B0q0bhUPa3qCj9KQyml/iSKbOboIigbPu9IhFCP23POnFl0Rc
+ehf+WQ+xtu49YPbvGjn6lhklHMDlJAM3HGp+/7c0b0VQ98ZzRBjqmIsrDmVKR9ba
+1lVm6C+ootFhXrTrejFh4zmMSynL3P179d9O0936uY4=

hosts/linode/ssh/id_ed25519.pub

@@ -0,0 +1,3 @@
+U2FsdGVkX1/RfYko8CbloOVbd2J9+eCw/UuUw8YJ0Rm/G/yUZNeLU2yngUky/vsk
+XxXZBVO+ScNGwgzvb4iDqx01szQtrT8cIpkhaetyUY11CLEgPr8fbcHX/XOfGctV
+bUnljF9ubnNcmRzAzXjsfQ==