genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 01:17:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass around less stuff

Browse source
This commit is contained in:
Gene Liverman 2024-12-04 21:39:16 -05:00
parent eead479245
commit 6318b773df
2 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/default.nix
View file

@ -1,10 +1,5 @@
{ inputs, nixpkgs, nixpkgs-unstable, compose2nix, disko, flox, genebean-omp-themes, { inputs, ... }: let
home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixos-cosmic, nixosHostConfig = import ./nixosHostConfig.nix { inherit inputs; };
nixos-hardware, nixpkgs-terraform, simple-nixos-mailserver, sops-nix, ...
}: let
nixosHostConfig = import ./nixosHostConfig.nix { inherit inputs nixpkgs nixpkgs-unstable compose2nix disko flox genebean-omp-themes
home-manager nix-darwin nix-flatpak nix-homebrew nixos-cosmic
nixos-hardware nixpkgs-terraform simple-nixos-mailserver sops-nix; };
in { in {
inherit (nixosHostConfig) inherit (nixosHostConfig)
nixosHostConfig nixosHostConfig

27
lib/nixosHostConfig.nix
View file

@ -1,10 +1,13 @@
{ inputs, nixpkgs, nixpkgs-unstable, compose2nix, disko, flox, genebean-omp-themes, { inputs, ... }: {
home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixos-cosmic, nixosHostConfig = {
nixos-hardware, nixpkgs-terraform, simple-nixos-mailserver, sops-nix, ... system ? "x86_64-linux",
}: { hostname,
nixosHostConfig = { system ? "x86_64-linux", hostname, username ? "gene", additionalModules ? [], additionalSpecialArgs ? {} }: nixpkgs.lib.nixosSystem { username ? "gene",
additionalModules ? [],
additionalSpecialArgs ? {}
}: inputs.nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { inherit inputs compose2nix hostname username; } // additionalSpecialArgs; specialArgs = { inherit inputs hostname username; } // additionalSpecialArgs;
modules = [ modules = [
# move this to a common file later # move this to a common file later
({ ({
@ -13,15 +16,15 @@
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [ "olm-3.2.16" "electron-27.3.11" ]; permittedInsecurePackages = [ "olm-3.2.16" "electron-27.3.11" ];
}; };
overlays = [ nixpkgs-terraform.overlays.default ]; overlays = [ inputs.nixpkgs-terraform.overlays.default ];
}; };
}) })
disko.nixosModules.disko inputs.disko.nixosModules.disko
home-manager.nixosModules.home-manager { inputs.home-manager.nixosModules.home-manager {
home-manager = { home-manager = {
extraSpecialArgs = { inherit genebean-omp-themes hostname username; }; extraSpecialArgs = { inherit inputs hostname username; };
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.${username}.imports = [ users.${username}.imports = [
@ -30,9 +33,9 @@
}; };
} }
nix-flatpak.nixosModules.nix-flatpak inputs.nix-flatpak.nixosModules.nix-flatpak
sops-nix.nixosModules.sops # system wide secrets management inputs.sops-nix.nixosModules.sops # system wide secrets management
../modules/system/common/all-nixos.nix # system-wide stuff ../modules/system/common/all-nixos.nix # system-wide stuff
../modules/hosts/nixos/${hostname} # host specific stuff ../modules/hosts/nixos/${hostname} # host specific stuff
] ++ additionalModules; ] ++ additionalModules;