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