dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Use Nix release directly instead of overlaying against nixpkgs

Browse Source
This commit is contained in:
Jack O'Sullivan 2022-02-15 20:55:20 +00:00
parent 948ae3f80f
commit f56e3e8430
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -73,8 +73,6 @@
inputs.devshell.overlay inputs.devshell.overlay
inputs.agenix.overlay inputs.agenix.overlay
inputs.deploy-rs.overlay inputs.deploy-rs.overlay
# TODO: This causes a compile from source which is pretty unnecessary
inputs.nix.overlay
(flakePackageOverlay inputs.home-manager-unstable system) (flakePackageOverlay inputs.home-manager-unstable system)
]; ];
})) }))

2
home-modules/common.nix
View File

@ -87,7 +87,7 @@ in
# Note: If globalPkgs mode is on, then these will be overridden by the NixOS equivalents of these options # Note: If globalPkgs mode is on, then these will be overridden by the NixOS equivalents of these options
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
inputs.nix.overlay (final: prev: { nix = inputs.nix.defaultPackage.${config.nixpkgs.system}; })
# TODO: Wait for https://github.com/NixOS/nixpkgs/pull/159074 to arrive to nixos-unstable # TODO: Wait for https://github.com/NixOS/nixpkgs/pull/159074 to arrive to nixos-unstable
(final: prev: { remarshal = pkgs'.master.remarshal; }) (final: prev: { remarshal = pkgs'.master.remarshal; })
]; ];

2
modules/common.nix
View File

@ -62,7 +62,7 @@ in
}; };
nixpkgs = { nixpkgs = {
overlays = [ overlays = [
inputs.nix.overlay (final: prev: { nix = inputs.nix.defaultPackage.${config.nixpkgs.system}; })
]; ];
config = { config = {
allowUnfree = true; allowUnfree = true;