From 5d69b166613fff7276db1febcd6cacdf34fb707d Mon Sep 17 00:00:00 2001 From: ChUrl Date: Mon, 8 Aug 2022 16:29:58 +0200 Subject: [PATCH] update nixos mylib --- lib/default.nix | 2 +- lib/nixos.nix | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 42d93a46..f725ef21 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,5 +1,5 @@ { inputs, pkgs, lib, ... }: rec { - nixos = import ./nixos.nix; + nixos = import ./nixos.nix { inherit inputs pkgs lib; }; } \ No newline at end of file diff --git a/lib/nixos.nix b/lib/nixos.nix index 01524c72..767f2708 100644 --- a/lib/nixos.nix +++ b/lib/nixos.nix @@ -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 ] ]; };