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

flake: move overlays to flake outputs

Browse source
This commit is contained in:
Timothy DeHerrera 2019-12-30 17:45:30 -07:00
parent 60f58c5a9c
commit ac5e184666
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
flake.nix
View file

@ -7,16 +7,20 @@
inputs.home.url = "github:nrdxp/home-manager/flakes"; inputs.home.url = "github:nrdxp/home-manager/flakes";
outputs = { self, home, nixpkgs }: { outputs = { self, home, nixpkgs }: {
nixosConfigurations = nixosConfigurations = let
let configs = import ./hosts {
configs = import ./hosts { inherit nixpkgs;
inherit nixpkgs; flake = self;
flake = self; home = home.nixosModules.home-manager;
home = home.nixosModules.home-manager; };
};
in in
configs; configs;
overlays = let
pkgs = import ./pkgs;
in
[ pkgs ];
}; };
} }

2
hosts/default.nix
View file

@ -21,6 +21,8 @@ let
"nixos-config=/etc/nixos/configuration.nix" "nixos-config=/etc/nixos/configuration.nix"
]; ];
system.configurationRevision = flake.rev; system.configurationRevision = flake.rev;
nixpkgs.overlays = flake.overlays;
}; };
local = import "${toString ./.}/${self}.nix"; local = import "${toString ./.}/${self}.nix";

5
profiles/core.nix
View file

@ -142,11 +142,6 @@ in
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = let
overlay = import ../pkgs;
in
[ overlay ];
programs.mtr.enable = true; programs.mtr.enable = true;