mirror of
https://github.com/materusPL/nixos-config
synced 2026-07-02 12:46:42 +00:00
configurations: formatting and some cleaning
This commit is contained in:
@@ -3,32 +3,32 @@
|
||||
let
|
||||
profiles = import ../profile;
|
||||
|
||||
makeSystem = {host, arch ? "x86_64-linux", extraModules ? [], stable ? true}:
|
||||
let
|
||||
nixosSystem = if stable then inputs.nixpkgs-stable.lib.nixosSystem else inputs.nixpkgs.lib.nixosSystem;
|
||||
hm = if stable then inputs.configInputs-stable.inputs.home-manager else inputs.configInputs.inputs.home-manager;
|
||||
materusCfg = {
|
||||
inherit stable;
|
||||
inherit materusFlake;
|
||||
inherit host;
|
||||
inherit hm;
|
||||
nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus;
|
||||
configInputs = if stable then inputs.configInputs-stable else inputs.configInputs;
|
||||
path = materusFlake.selfPath;
|
||||
};
|
||||
in
|
||||
(nixosSystem rec {
|
||||
specialArgs = { inherit materusCfg; };
|
||||
system = arch;
|
||||
modules = [
|
||||
./${host}
|
||||
inputs.private.systemModule
|
||||
profiles.osProfile
|
||||
] ++ extraModules;
|
||||
}) // {inherit materusCfg;};
|
||||
makeSystem = { host, arch ? "x86_64-linux", extraModules ? [ ], stable ? true }:
|
||||
let
|
||||
nixosSystem = if stable then inputs.nixpkgs-stable.lib.nixosSystem else inputs.nixpkgs.lib.nixosSystem;
|
||||
hm = if stable then inputs.configInputs-stable.inputs.home-manager else inputs.configInputs.inputs.home-manager;
|
||||
materusCfg = {
|
||||
inherit stable;
|
||||
inherit materusFlake;
|
||||
inherit host;
|
||||
inherit hm;
|
||||
nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus;
|
||||
configInputs = if stable then inputs.configInputs-stable else inputs.configInputs;
|
||||
path = materusFlake.selfPath;
|
||||
};
|
||||
in
|
||||
(nixosSystem rec {
|
||||
specialArgs = { inherit materusCfg; };
|
||||
system = arch;
|
||||
modules = [
|
||||
./${host}
|
||||
inputs.private.systemModule
|
||||
profiles.osProfile
|
||||
] ++ extraModules;
|
||||
}) // { inherit materusCfg; };
|
||||
in
|
||||
{
|
||||
materusPC = makeSystem {host = "materusPC"; stable = false;};
|
||||
flamaster = makeSystem {host = "flamaster"; stable = true;};
|
||||
valkyrie = makeSystem {host = "valkyrie"; stable = true;};
|
||||
materusPC = makeSystem { host = "materusPC"; stable = false; };
|
||||
flamaster = makeSystem { host = "flamaster"; stable = true; };
|
||||
valkyrie = makeSystem { host = "valkyrie"; stable = true; };
|
||||
}
|
||||
|
||||
@@ -217,7 +217,7 @@
|
||||
config.programs.java.package
|
||||
|
||||
nss_latest
|
||||
|
||||
|
||||
pciutils
|
||||
|
||||
aspell
|
||||
|
||||
Reference in New Issue
Block a user