Nebucatnetzer
/
nixos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove custom from everything that isn't home-manager

This commit is contained in:
Andreas Zweili 2023-06-05 10:40:39 +02:00
parent 77b24947e8
commit c38a82cc30
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/mk_computer.nix
View File

@ -1,13 +1,13 @@
{ custom, hostname, inputs, system ? "x86_64-linux", home-module ? "headless", username ? "andreas" }:
let
overlay-unstable = final: prev: {
unstable = import custom.inputs.nixpkgs-unstable {
unstable = import inputs.nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
};
pkgs = import custom.inputs.nixpkgs {
pkgs = import inputs.nixpkgs {
inherit system;
config = {
allowUnfree = true;
@ -28,32 +28,32 @@ let
];
};
in
custom.inputs.nixpkgs.lib.nixosSystem
inputs.nixpkgs.lib.nixosSystem
{
inherit system pkgs;
specialArgs = { inherit custom inputs; };
specialArgs = { inherit inputs; };
modules = (
[
# System configuration for this host
(import "${custom.inputs.self}/systems/${hostname}" {
(import "${inputs.self}/systems/${hostname}" {
inherit hostname;
})
# Common configuration
"${custom.inputs.self}/modules"
"${inputs.self}/modules"
custom.inputs.agenix.nixosModules.age
inputs.agenix.nixosModules.age
{
environment.systemPackages = [ custom.inputs.agenix.packages.${system}.default ];
environment.systemPackages = [ inputs.agenix.packages.${system}.default ];
az-username = username;
}
custom.inputs.home-manager.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.andreas.imports = [
(import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
(import "${inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
];
}
]);

20
lib/mk_raspi.nix
View File

@ -1,13 +1,13 @@
{ custom, hostname, inputs, system ? "aarch64-linux", home-module ? "headless", username ? "andreas" }:
let
overlay-unstable = final: prev: {
unstable = import custom.inputs.nixpkgs-unstable {
unstable = import inputs.nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
};
pkgs = import custom.inputs.nixpkgs {
pkgs = import inputs.nixpkgs {
inherit system;
config = {
allowUnfree = true;
@ -25,30 +25,30 @@ let
};
in
custom.inputs.nixpkgs.lib.nixosSystem {
inputs.nixpkgs.lib.nixosSystem {
inherit pkgs system;
specialArgs = { inherit custom inputs; };
specialArgs = { inherit inputs; };
modules = (
[
# System configuration for this host
(import "${custom.inputs.self}/systems/${hostname}"
(import "${inputs.self}/systems/${hostname}"
{ inherit hostname; })
# Common configuration
"${custom.inputs.self}/modules"
"${inputs.self}/modules"
custom.inputs.agenix.nixosModules.age
inputs.agenix.nixosModules.age
{
environment.systemPackages = [ custom.inputs.agenix.packages.${system}.default ];
environment.systemPackages = [ inputs.agenix.packages.${system}.default ];
az-username = username;
}
custom.inputs.home-manager.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${username}.imports = [
(import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
(import "${inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
];
}
]);