From ac5e184666435c3a81f0dd48a785dc35aedfd43b Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Mon, 30 Dec 2019 17:45:30 -0700 Subject: [PATCH] flake: move overlays to flake outputs --- flake.nix | 22 +++++++++++++--------- hosts/default.nix | 2 ++ profiles/core.nix | 5 ----- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index c40b384..2c13346 100644 --- a/flake.nix +++ b/flake.nix @@ -7,16 +7,20 @@ inputs.home.url = "github:nrdxp/home-manager/flakes"; outputs = { self, home, nixpkgs }: { - nixosConfigurations = - let - configs = import ./hosts { - inherit nixpkgs; - flake = self; - home = home.nixosModules.home-manager; - }; + nixosConfigurations = let + configs = import ./hosts { + inherit nixpkgs; + flake = self; + home = home.nixosModules.home-manager; + }; - in - configs; + in + configs; + + overlays = let + pkgs = import ./pkgs; + in + [ pkgs ]; }; } diff --git a/hosts/default.nix b/hosts/default.nix index 7f7aa29..461611a 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -21,6 +21,8 @@ let "nixos-config=/etc/nixos/configuration.nix" ]; system.configurationRevision = flake.rev; + + nixpkgs.overlays = flake.overlays; }; local = import "${toString ./.}/${self}.nix"; diff --git a/profiles/core.nix b/profiles/core.nix index 5d41048..960e9d1 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -142,11 +142,6 @@ in nixpkgs.config.allowUnfree = true; - nixpkgs.overlays = let - overlay = import ../pkgs; - in - [ overlay ]; - programs.mtr.enable = true;