summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-04-08 15:39:59 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2022-04-08 15:39:59 +0200
commit2c6d2f275f5536a1c865d45640f3ef5a06452929 (patch)
treef3af0de1be8fa5910464894e58eb0afa195becd6
parent8fb207dbb8c944847cc523f844fd05b6e7fe6fae (diff)
downloadnixos-2c6d2f275f5536a1c865d45640f3ef5a06452929.tar
nixos-2c6d2f275f5536a1c865d45640f3ef5a06452929.tar.gz
nixos-2c6d2f275f5536a1c865d45640f3ef5a06452929.tar.bz2
nixos-2c6d2f275f5536a1c865d45640f3ef5a06452929.tar.xz
nixos-2c6d2f275f5536a1c865d45640f3ef5a06452929.zip
...
-rw-r--r--system-profiles/core.nix35
1 files changed, 20 insertions, 15 deletions
diff --git a/system-profiles/core.nix b/system-profiles/core.nix
index 6a38d9ce..87dc0e92 100644
--- a/system-profiles/core.nix
+++ b/system-profiles/core.nix
@@ -52,21 +52,8 @@ in {
52 experimental-features = nix-command flakes 52 experimental-features = nix-command flakes
53 ''; 53 '';
54 nixPath = [ 54 nixPath = [
55 "nixpkgs=${flakeInputs.nixpkgs.outPath}" 55 "nixpkgs=/run/nixpkgs"
56 "nixpkgs-overlays=${pkgs.writeText "overlays.nix" '' 56 "nixpkgs-overlays=/run/nixpkgs-overlays.nix"
57 with builtins;
58
59 attrValues (import
60 (
61 let lock = fromJSON (readFile ${toString ../flake.lock}); in
62 fetchTarball {
63 url = "https://github.com/edolstra/flake-compat/archive/''${lock.nodes.flake-compat.locked.rev}.tar.gz";
64 sha256 = lock.nodes.flake-compat.locked.narHash;
65 }
66 )
67 { src = ${toString ../.}; }
68 ).defaultNix.overlays
69 ''}"
70 ]; 57 ];
71 registry = 58 registry =
72 let override = { self = "nixos"; }; 59 let override = { self = "nixos"; };
@@ -75,6 +62,24 @@ in {
75 { flake = inpFlake; } ) flakeInputs; 62 { flake = inpFlake; } ) flakeInputs;
76 }; 63 };
77 64
65 systemd.tmpfiles.rules = [
66 "L+ /run/nixpkgs - - - - ${flakeInputs.nixpkgs.outPath}"
67 "L+ /run/nixpkgs-overlays.nix - - - - ${pkgs.writeText "overlays.nix" ''
68 with builtins;
69
70 attrValues (import
71 (
72 let lock = fromJSON (readFile ${toString ../flake.lock}); in
73 fetchTarball {
74 url = "https://github.com/edolstra/flake-compat/archive/''${lock.nodes.flake-compat.locked.rev}.tar.gz";
75 sha256 = lock.nodes.flake-compat.locked.narHash;
76 }
77 )
78 { src = ${toString ../.}; }
79 ).defaultNix.overlays
80 ''}"
81 ];
82
78 users.mutableUsers = false; 83 users.mutableUsers = false;
79 84
80 # documentation.nixos.includeAllModules = true; # incompatible with home-manager (build fails) 85 # documentation.nixos.includeAllModules = true; # incompatible with home-manager (build fails)