From cb788261448f0cc1aff6bf6505f5b6bcd7a17531 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Thu, 10 Feb 2022 18:13:41 -0800 Subject: nix: fix a bunch of stuff --- lib/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/default.nix b/lib/default.nix index 7f0f8ed..532a33b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,24 +1,21 @@ -{ inputs, overlays }: +{ inputs }: + { mkSystem = { hostname , system - , desktop ? false }: inputs.nixpkgs.lib.nixosSystem { inherit system; specialArgs = { - inherit inputs system hostname desktop; + inherit inputs system hostname; }; modules = [ - ../modules/deskop ../modules/system ../hosts/${hostname} { networking.hostName = hostname; - # Apply overlay and allow unfree packages nixpkgs = { - inherit overlays; config.allowUnfree = true; }; # Add each input as a registry @@ -27,7 +24,7 @@ inputs.nixpkgs.lib.nameValuePair (n) ({ flake = v; })) inputs; } - ] + ]; }; mkHome = @@ -39,7 +36,7 @@ inputs.home-manager.lib.homeManagerConfiguration { inherit username system; extraSpecialArgs = { - inherit system hostname graphical; + inherit system hostname desktop; }; homeDirectory = "/home/${username}"; configuration = ../users/${username}; @@ -48,7 +45,6 @@ # Base configuration { nixpkgs = { - inherit overlays; config.allowUnfree = true; }; programs = { -- cgit 1.4.1