summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
authorLinnnus <[email protected]>2024-10-12 17:47:42 +0200
committerLinnnus <[email protected]>2024-10-12 17:47:42 +0200
commit0a18dc38b0f9412f493041c4dc8f0b88a25617b9 (patch)
tree5c35e23613dfad1849c39418e0f0f476add43693 /hosts
parent642ebf61e89b545999ecd50ca1c173b2237d6b59 (diff)
Make <nixpkgs> resolve to nixpkgs flake input
Diffstat (limited to 'hosts')
-rw-r--r--hosts/common.nix19
1 files changed, 14 insertions, 5 deletions
diff --git a/hosts/common.nix b/hosts/common.nix
index 6a2bb4b..551fa47 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -21,11 +21,20 @@
# I'm not *that* vegan.
nixpkgs.config.allowUnfree = true;
- # Use overlays from this repo for building system configuration as well as
- # system-wide.
- #
- # See: https://nixos.wiki/wiki/Overlays#Using_nixpkgs.overlays_from_configuration.nix_as_.3Cnixpkgs-overlays.3E_in_your_NIX_PATH
- nix.nixPath = options.nix.nixPath.default ++ ["nixpkgs-overlays=${flakeInputs.self}/overlays/compat.nix"];
+ nix.nixPath = [
+ # Use overlays from this repo for building system configuration as well as
+ # system-wide.
+ #
+ # See: https://nixos.wiki/wiki/Overlays#Using_nixpkgs.overlays_from_configuration.nix_as_.3Cnixpkgs-overlays.3E_in_your_NIX_PATH
+ "nixpkgs-overlays=${flakeInputs.self}/overlays/compat.nix"
+
+ # For consistency, use the same version of nixpkgs everywhere. This DOES
+ # however make the system closure depend on the nixpkgs sources which would
+ # be undesirable if I didn't already use all my systems interactively for
+ # Nix stuff.
+ "nixpkgs=${flakeInputs.nixpkgs}"
+ "nixpkgs-unstable=${flakeInputs.nixpkgs-unstable}"
+ ];
# Set ZSH as the shell.
# https://nixos.wiki/wiki/Command_Shell#Changing_default_shelltrue