axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #45 from nrdxp/external-modules

Browse source 
flake: add `externModules` list
This commit is contained in:
Timothy DeHerrera 2020-12-28 15:09:52 -07:00 committed by GitHub
parent 167c692f9b bdfdc4da54
commit db653d6a8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -23,6 +23,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
externOverlays = [ nur.overlay ]; externOverlays = [ nur.overlay ];
externModules = [ home.nixosModules.home-manager ];
pkgset = pkgset =
let overlays = (attrValues self.overlays) ++ externOverlays; in let overlays = (attrValues self.overlays) ++ externOverlays; in
@ -33,7 +34,7 @@
outputs = { outputs = {
nixosConfigurations = nixosConfigurations =
import ./hosts (recursiveUpdate inputs { import ./hosts (recursiveUpdate inputs {
inherit lib pkgset system utils; inherit lib pkgset system utils externModules;
}); });
overlay = import ./pkgs; overlay = import ./pkgs;

5
hosts/default.nix
View file

@ -6,6 +6,7 @@
, self , self
, system , system
, utils , utils
, externModules
, ... , ...
}: }:
let let
@ -19,8 +20,6 @@ let
modules = modules =
let let
inherit (home.nixosModules) home-manager;
core = self.nixosModules.profiles.core; core = self.nixosModules.profiles.core;
global = { global = {
@ -68,7 +67,7 @@ let
attrValues (removeAttrs self.nixosModules [ "profiles" ]); attrValues (removeAttrs self.nixosModules [ "profiles" ]);
in in
flakeModules ++ [ core global local home-manager overrides ]; flakeModules ++ [ core global local overrides ] ++ externModules;
extraArgs = { extraArgs = {
inherit system; inherit system;