christoph/flake-nixinator
1
Fork 0
Code Activity

update nixos mylib

Browse Source
This commit is contained in:
Christoph Urlacher
2022-08-08 16:29:58 +02:00
parent 9d87ffcc7b
commit 5d69b16661
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/default.nix
View File

@ -1,5 +1,5 @@
{ inputs, pkgs, lib, ... }: { inputs, pkgs, lib, ... }:
rec { rec {
nixos = import ./nixos.nix; nixos = import ./nixos.nix { inherit inputs pkgs lib; };
} }

8
lib/nixos.nix
View File

@ -1,9 +1,7 @@
{ inputs, pkgs, lib, ... }: { inputs, pkgs, lib, ... }:
let let
inherit (inputs) nixpkgs home-manager;
# Allows to just use nixpkgs without qualifiers
inherit (inputs) nixpkgs;
in rec { in rec {
mkNixosConfig = { system, hostname, extraModules, homeManagerConfig }: mkNixosConfig = { system, hostname, extraModules, homeManagerConfig }:
@ -13,7 +11,7 @@ in rec {
# Make our inputs available to the configuration.nix (for importing modules) # Make our inputs available to the configuration.nix (for importing modules)
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = builtins.conatLists [ modules = builtins.concatLists [
[ [
# Replace the pkgs to include overlays/unfree # Replace the pkgs to include overlays/unfree
{ nixpkgs.pkgs = pkgs; } { nixpkgs.pkgs = pkgs; }
@ -25,7 +23,7 @@ in rec {
(import "./nixos/configuration-" + hostname + ".nix") (import "./nixos/configuration-" + hostname + ".nix")
] ]
extraModules extraModules
homeManagerConfig [ homeManagerConfig ]
]; ];
}; };