nix update required to compile

This commit is contained in:
2026-04-04 15:20:53 -05:00
parent 6ac626aa9f
commit 11d3569bab
3 changed files with 79 additions and 62 deletions
+77 -57
View File
@@ -25,8 +25,8 @@
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# This is a path to the services I've declared. # This is a path to the services I've declared.
# It just happens to be stored in the same repository (relative), # It just happens to be stored in the same repository (relative),
# but could well be a separate repository # but could well be a separate repository
tests-service.url = "github:RoyDumblauskas/tests-service?shallow=1"; tests-service.url = "github:RoyDumblauskas/tests-service?shallow=1";
minio-service.url = "path:../homelab-services/minio-service"; minio-service.url = "path:../homelab-services/minio-service";
@@ -34,60 +34,80 @@
postgresql-db.url = "path:../homelab-services/postgresql-db"; postgresql-db.url = "path:../homelab-services/postgresql-db";
}; };
outputs = { self, nixpkgs, nixvim, home-manager, disko, sops-nix, quasiSecrets, impermanence, firefox-addons, tests-service, minio-service, mc-service, postgresql-db }@inputs: outputs =
let {
nodes = [ self,
{ nixpkgs,
name = "nixos-homelab-00"; nixvim,
hostId = "3884D2F1"; home-manager,
} disko,
]; sops-nix,
in { quasiSecrets,
nixosConfigurations = builtins.listToAttrs (map (node: { impermanence,
name = node.name; firefox-addons,
value = nixpkgs.lib.nixosSystem { tests-service,
specialArgs = { minio-service,
meta = { mc-service,
hostname = node.name; postgresql-db,
hostId = node.hostId; }@inputs:
let
nodes = [
{
name = "nixos-homelab-00";
hostId = "3884D2F1";
}
];
in
{
nixosConfigurations = builtins.listToAttrs (
map (node: {
name = node.name;
value = nixpkgs.lib.nixosSystem {
specialArgs = {
meta = {
hostname = node.name;
hostId = node.hostId;
};
};
system = "x86_64-linux";
modules = [
./configuration.nix
./hardware-configuration.nix
./disk-config.nix
disko.nixosModules.disko
sops-nix.nixosModules.sops
quasiSecrets.nixosModules.ipAddrs
quasiSecrets.nixosModules.serviceList
impermanence.nixosModules.impermanence
tests-service.nixosModules.default
minio-service.nixosModules.minio-service
mc-service.nixosModules.mc-service
postgresql-db.nixosModules.postgresql-db
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.sysAdmin =
{ ... }:
{
imports = [
./home.nix
sops-nix.homeManagerModules.sops
];
};
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.roy =
{ ... }:
{
imports = [
./home-roy.nix
sops-nix.homeManagerModules.sops
];
};
}
];
}; };
}; }) nodes
system = "x86_64-linux"; );
modules = [ };
./configuration.nix
./hardware-configuration.nix
./disk-config.nix
disko.nixosModules.disko
sops-nix.nixosModules.sops
quasiSecrets.nixosModules.ipAddrs
quasiSecrets.nixosModules.serviceList
impermanence.nixosModules.impermanence
tests-service.nixosModules.default
minio-service.nixosModules.minio-service
mc-service.nixosModules.mc-service
postgresql-db.nixosModules.postgresql-db
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.sysAdmin = { ... }: {
imports = [
./home.nix
impermanence.homeManagerModules.impermanence
sops-nix.homeManagerModules.sops
];
};
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.roy = { ... }: {
imports = [
./home-roy.nix
nixvim.homeManagerModules.nixvim
impermanence.homeManagerModules.impermanence
sops-nix.homeManagerModules.sops
];
};
}
];
};
}) nodes);
};
} }
+1 -2
View File
@@ -47,7 +47,7 @@
}; };
# user persisted dirs # user persisted dirs
home.persistence."/persist/home/roy" = { home.persistence."/persist" = {
directories = [ directories = [
".ssh" ".ssh"
"rp" "rp"
@@ -62,7 +62,6 @@
".config/sops/age/keys.txt" ".config/sops/age/keys.txt"
]; ];
allowOther = true;
}; };
# User services must come after sops secrets # User services must come after sops secrets
+1 -3
View File
@@ -14,7 +14,7 @@
]; ];
# user persisted dirs # user persisted dirs
home.persistence."/persist/home/sysAdmin" = { home.persistence."/persist" = {
directories = [ directories = [
".ssh" ".ssh"
"rp" "rp"
@@ -24,10 +24,8 @@
".config/sops/age/keys.txt" ".config/sops/age/keys.txt"
]; ];
allowOther = true;
}; };
home.stateVersion = "24.11"; home.stateVersion = "24.11";
programs.home-manager.enable = true; programs.home-manager.enable = true;