summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-01-02 19:16:56 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-01-03 20:18:01 +0100
commita3eccb33fc973012255af4590af008ce68fa12f1 (patch)
tree9c4d7cb681c52f7459664931fe05477ed233f021
parent7f7d02a3f03435d455c3373d4f655d0d5aa8369e (diff)
downloadnixos-a3eccb33fc973012255af4590af008ce68fa12f1.tar
nixos-a3eccb33fc973012255af4590af008ce68fa12f1.tar.gz
nixos-a3eccb33fc973012255af4590af008ce68fa12f1.tar.bz2
nixos-a3eccb33fc973012255af4590af008ce68fa12f1.tar.xz
nixos-a3eccb33fc973012255af4590af008ce68fa12f1.zip
construct nixpkgs with overridable config
-rw-r--r--system-profiles/core.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/system-profiles/core.nix b/system-profiles/core.nix
index 5f2433bb..0ff3a9f4 100644
--- a/system-profiles/core.nix
+++ b/system-profiles/core.nix
@@ -36,7 +36,10 @@ in {
36 networking.hostName = hostName; 36 networking.hostName = hostName;
37 system.configurationRevision = lib.mkIf (flake ? rev) flake.rev; 37 system.configurationRevision = lib.mkIf (flake ? rev) flake.rev;
38 38
39 nixpkgs.pkgs = flake.legacyPackages.${config.nixpkgs.system}; 39 nixpkgs.pkgs = import flake.legacyPackages.${config.nixpkgs.system}.path {
40 inherit (config.nixpkgs) system config;
41 overlays = lib.attrValues flake.overlays;
42 };
40 43
41 nix = { 44 nix = {
42 package = pkgs.nixUnstable; 45 package = pkgs.nixUnstable;
@@ -68,5 +71,7 @@ in {
68 }; 71 };
69 72
70 sops.gnupgHome = lib.mkIf hasSops "/root/.gnupg"; 73 sops.gnupgHome = lib.mkIf hasSops "/root/.gnupg";
74
75 environment.systemPackages = [ pkgs.git ] ++ lib.optional hasSops pkgs.gnupg;
71 }; 76 };
72} 77}