christoph/flake-nixinator
1
Fork 0
Code Activity

update nixos lib

Browse Source
This commit is contained in:
Christoph Urlacher
2022-08-08 17:42:31 +02:00
parent c9135fa3d9
commit f074af5845
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/nixos.nix
View File

@ -4,7 +4,7 @@ let
inherit (inputs) nixpkgs home-manager; inherit (inputs) nixpkgs home-manager;
in rec { in rec {
mkNixosConfig = { system, hostname, extraModules, homeManagerConfig }: mkNixosConfig = { system, hostname, extraModules, homeConfigs }:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
@ -17,19 +17,26 @@ in rec {
{ nixpkgs.pkgs = pkgs; } { nixpkgs.pkgs = pkgs; }
# Main config file for all configs/hosts # Main config file for all configs/hosts
./nixos/configuration.nix ../nixos/configuration.nix
# Host specifig config file # Host specifig config file
(import "./nixos/configuration-" + hostname + ".nix") ../nixos/${hostname}
] ]
extraModules extraModules
[ homeManagerConfig ]
# Make a user home for every config supplied
(builtins.map home-manager.nixosModules.home-manager homeConfigs)
]; ];
}; };
mkHomeManagerConfig = { username }: # Only returns the set that has to be passed to home-manager.nixosModules.home-manager
home-manager.nixosModules.home-manager # because then nix is able to automatically inject the dependencies
mkHomeConfig = { username }:
{ {
# Include the inputs just in case they might be needed somewhere
home-manager.extraSpecialArgs = { inherit inputs; };
# Use systems pkgs, disables nixpkgs.* options in home.nix # Use systems pkgs, disables nixpkgs.* options in home.nix
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -37,9 +44,7 @@ in rec {
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# User specific config file # User specific config file
home-manager.users.username = import "./home/home-" + username + ".nix"; # TODO: Do this for a list of users
home-manager.users.${username}.imports = [ ../home/${username} ]; # Is marked as error but correct (I think)
# Include the inputs just in case they might be needed somewhere
home-manager.extraSpecialArgs = { inherit inputs; };
}; };
} }