refactoring

This commit is contained in:
Matt Nish-Lapidus 2025-03-21 22:51:04 -04:00
parent 69400c1aa3
commit 88fe4f636b
3 changed files with 31 additions and 48 deletions

View file

@ -111,6 +111,8 @@
inherit (nixpkgs.lib) genAttrs replaceStrings;
inherit (nixpkgs.lib.filesystem) packagesFromDirectoryRecursive listFilesRecursive;
sys = "x86_64-linux";
forAllSystems =
function:
genAttrs [
@ -122,9 +124,20 @@
configArgs = {
inherit inputs;
nix-config = self;
pkgs-stable = inputs.nixpkgs-stable {
config.allowUnfree = true;
};
pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${sys};
};
baseHomeModules = [
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.sops-nix.homeManagerModules.sops
];
baseHomeManager = {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "bak";
sharedModules = baseHomeModules;
extraSpecialArgs = configArgs;
};
in
@ -154,7 +167,7 @@
nixosConfigurations = {
eddie = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
system = sys;
specialArgs = configArgs;
modules = [
inputs.musnix.nixosModules.musnix
@ -165,22 +178,7 @@
./hosts/eddie/configuration.nix
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "bak";
sharedModules = [
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.sops-nix.homeManagerModules.sops
];
extraSpecialArgs = {
inherit inputs;
nix-config = self;
pkgs-stable = inputs.nixpkgs-stable {
config.allowUnfree = true;
};
};
home-manager = baseHomeManager // {
users.emenel = import ./homes/emenel/default.nix;
};
}
@ -188,7 +186,7 @@
};
media-server = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
system = sys;
specialArgs = configArgs;
modules = [
home-manager.nixosModules.home-manager
@ -198,22 +196,7 @@
./hosts/media-server/configuration.nix
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "bak";
sharedModules = [
inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.sops-nix.homeManagerModules.sops
];
extraSpecialArgs = {
inherit inputs;
nix-config = self;
pkgs-stable = inputs.nixpkgs-stable {
config.allowUnfree = true;
};
};
home-manager = baseHomeManager // {
users.media = import ./homes/media/default.nix;
};
}