From a3eccb33fc973012255af4590af008ce68fa12f1 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 2 Jan 2021 19:16:56 +0100
Subject: construct nixpkgs with overridable config

---
 system-profiles/core.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'system-profiles/core.nix')

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 {
     networking.hostName = hostName;
     system.configurationRevision = lib.mkIf (flake ? rev) flake.rev;
 
-    nixpkgs.pkgs = flake.legacyPackages.${config.nixpkgs.system};
+    nixpkgs.pkgs = import flake.legacyPackages.${config.nixpkgs.system}.path {
+      inherit (config.nixpkgs) system config;
+      overlays = lib.attrValues flake.overlays;
+    };
 
     nix = {
       package = pkgs.nixUnstable;
@@ -68,5 +71,7 @@ in {
     };
 
     sops.gnupgHome = lib.mkIf hasSops "/root/.gnupg";
+
+    environment.systemPackages = [ pkgs.git ] ++ lib.optional hasSops pkgs.gnupg;
   };
 }
-- 
cgit v1.2.3