Update to run on Isaiah and containers

This commit is contained in:
Greg Hellings
2024-08-15 09:43:35 -05:00
parent 6987c485fb
commit 89789e6af8
6 changed files with 15 additions and 9 deletions
+10 -7
View File
@@ -22,13 +22,16 @@ let
modules = [ modules = [
{ {
nixpkgs.overlays = overlays; nixpkgs.overlays = overlays;
home-manager.useGlobalPkgs = true; home-manager = {
home-manager.useUserPackages = true; useGlobalPkgs = true;
home-manager.users.greg = import ../home/home.nix; useUserPackages = true;
home-manager.extraSpecialArgs = { users.greg = import ../home/home.nix;
inherit inputs overlays; extraSpecialArgs = {
home = "/home/greg"; inherit inputs overlays;
host = name; home = "/home/greg";
host = name;
};
backupFileExtension = "bkp";
}; };
} }
inputs.agenix.nixosModules.default inputs.agenix.nixosModules.default
+1
View File
@@ -57,6 +57,7 @@ in {
greg.backup.jobs.nas-backup = { greg.backup.jobs.nas-backup = {
src = "/var/gitlab/state/backup/"; src = "/var/gitlab/state/backup/";
dest = "gitlab"; dest = "gitlab";
id = "yha^-s45h";
}; };
services = { services = {
+1
View File
@@ -40,6 +40,7 @@ in {
systemd.services = { systemd.services = {
"gitlab-runner" = { "gitlab-runner" = {
after = [ "container@github.service" ];
preStart = builtins.concatStringsSep "\n" [ preStart = builtins.concatStringsSep "\n" [
"${pkgs.kmod}/bin/modprobe kvm" "${pkgs.kmod}/bin/modprobe kvm"
"${pkgs.kmod}/bin/modprobe kvm_amd" "${pkgs.kmod}/bin/modprobe kvm_amd"
-1
View File
@@ -33,7 +33,6 @@ in
allowUnfree = true; allowUnfree = true;
}; };
home-manager.backupFileExtension = "bkp";
# Base packages that need to be in all my hosts # Base packages that need to be in all my hosts
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
+1 -1
View File
@@ -57,7 +57,7 @@ in {
greg.backup.jobs.greg-postgresql-backup = { greg.backup.jobs.greg-postgresql-backup = {
src = config.services.postgresqlBackup.location; src = config.services.postgresqlBackup.location;
dest = "database-${config.networking.hostName}"; dest = "database-${config.networking.hostName}";
user = "postgres"; id = "${config.networking.hostName}-postgres-backup";
}; };
}; };
} }
+2
View File
@@ -16,7 +16,9 @@ in with lib; {
devices = { devices = {
chronicles.id = "7FI6Y3M-C7YQEDI-IB345L6-RKLXMB6-AEIV57Y-3J2RCXQ-MK6QRNK-EINPXAE"; chronicles.id = "7FI6Y3M-C7YQEDI-IB345L6-RKLXMB6-AEIV57Y-3J2RCXQ-MK6QRNK-EINPXAE";
genesis.id = "YDTH4SD-GUAC5AA-SSYWYPZ-YMJW5LK-LE7PZKJ-GV2UJFZ-CU7LZAD-GTYWCQK"; 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"; linode.id = "IJMMXPR-WNALZBD-FMJH5W5-WV7XGJY-HLJTKGT-5TKHJIH-75LT56D-UUZCYQE";
matrix.id = "K5IHM3I-TJFFEW5-GAYJMPS-CYSHW5C-XHMC462-MFRMOHJ-EJLKIKC-CZHGJQ2";
}; };
options = { options = {
urAccepted = -1; urAccepted = -1;