materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configurations: formatting and some cleaning

This commit is contained in:
Mateusz Słodkowicz 2023-10-27 17:00:26 +02:00
parent 0ac720823c
commit f2c82ea93f
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
6 changed files with 48 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configurations/home/default.nix
View File

@ -2,5 +2,4 @@
let let
genHomes = import ./genHomes.nix { inherit inputs; inherit materusFlake; }; genHomes = import ./genHomes.nix { inherit inputs; inherit materusFlake; };
in in
{ } genHomes "materus"
// genHomes "materus"

3
configurations/home/genHomes.nix
View File

@ -39,7 +39,7 @@ let
path = materusFlake.selfPath; path = materusFlake.selfPath;
}; in }; in
inputs.configInputs.inputs.home-manager.lib.homeManagerConfiguration { inputs.configInputs.inputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = {allowUnfree = true;}; }; pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; };
extraSpecialArgs = { inherit materusCfg; }; extraSpecialArgs = { inherit materusCfg; };
modules = [ modules = [
./${username} ./${username}
@ -48,6 +48,5 @@ let
]; ];
}; };
}; };
in in
genHomes genHomes

24
configurations/host/default.nix
View File

@ -3,11 +3,11 @@
let let
profiles = import ../profile; profiles = import ../profile;
makeSystem = {host, arch ? "x86_64-linux", extraModules ? [], stable ? true}: makeSystem = { host, arch ? "x86_64-linux", extraModules ? [ ], stable ? true }:
let let
nixosSystem = if stable then inputs.nixpkgs-stable.lib.nixosSystem else inputs.nixpkgs.lib.nixosSystem; 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; hm = if stable then inputs.configInputs-stable.inputs.home-manager else inputs.configInputs.inputs.home-manager;
materusCfg = { materusCfg = {
inherit stable; inherit stable;
inherit materusFlake; inherit materusFlake;
inherit host; inherit host;
@ -15,9 +15,9 @@ materusCfg = {
nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus; nixerus = if stable then inputs.configInputs-stable.inputs.nixerus else inputs.configInputs.inputs.nixerus;
configInputs = if stable then inputs.configInputs-stable else inputs.configInputs; configInputs = if stable then inputs.configInputs-stable else inputs.configInputs;
path = materusFlake.selfPath; path = materusFlake.selfPath;
}; };
in in
(nixosSystem rec { (nixosSystem rec {
specialArgs = { inherit materusCfg; }; specialArgs = { inherit materusCfg; };
system = arch; system = arch;
modules = [ modules = [
@ -25,10 +25,10 @@ in
inputs.private.systemModule inputs.private.systemModule
profiles.osProfile profiles.osProfile
] ++ extraModules; ] ++ extraModules;
}) // {inherit materusCfg;}; }) // { inherit materusCfg; };
in in
{ {
materusPC = makeSystem {host = "materusPC"; stable = false;}; materusPC = makeSystem { host = "materusPC"; stable = false; };
flamaster = makeSystem {host = "flamaster"; stable = true;}; flamaster = makeSystem { host = "flamaster"; stable = true; };
valkyrie = makeSystem {host = "valkyrie"; stable = true;}; valkyrie = makeSystem { host = "valkyrie"; stable = true; };
} }

9
flake.nix
View File

@ -46,18 +46,9 @@
outputs = inputs @ { self, nixpkgs, home-manager, nur, ... }: outputs = inputs @ { self, nixpkgs, home-manager, nur, ... }:
let
systems = [
"x86_64-linux"
"i686-linux"
"aarch64-linux"
];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
in
rec { rec {
nixosConfigurations = import ./configurations/host { inherit inputs; materusFlake = self; }; nixosConfigurations = import ./configurations/host { inherit inputs; materusFlake = self; };
homeConfigurations = import ./configurations/home { inherit inputs; materusFlake = self; }; homeConfigurations = import ./configurations/home { inherit inputs; materusFlake = self; };
selfPath = ./.; selfPath = ./.;
}; };
} }