summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2024-04-10 18:50:02 +0200
committerAlan Pearce2024-04-10 18:50:02 +0200
commit2b09b74ba617346a0c9c932543e658837ef9e5d2 (patch)
tree980c05a0e50d8026a0884c6015b440c31ebb2c6f
parenta2534b9daab7d39d2eeb005f7648b74bc72a8520 (diff)
downloadnixfiles-2b09b74ba617346a0c9c932543e658837ef9e5d2.tar.lz
nixfiles-2b09b74ba617346a0c9c932543e658837ef9e5d2.tar.zst
nixfiles-2b09b74ba617346a0c9c932543e658837ef9e5d2.zip
nix: pin nixpkgs to flake input globally and per-user
-rw-r--r--flake.nix3
-rw-r--r--pin.nix (renamed from user/settings/pin.nix)0
-rw-r--r--system/settings/configuration/nix.nix3
-rw-r--r--system/settings/darwin.nix3
-rw-r--r--user/settings/nix.nix2
5 files changed, 10 insertions, 1 deletions
diff --git a/flake.nix b/flake.nix
index b89941a7..9115ef97 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,6 +42,7 @@
     {
       nixosConfigurations.prefect = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
         modules = [
           ./system/prefect.nix
         ] ++ (with nixos-hardware.nixosModules; [
@@ -54,10 +55,12 @@
       };
       nixosConfigurations.nanopi = nixpkgs.lib.nixosSystem {
         system = utils.lib.system.aarch64-linux;
+        specialArgs = { inherit inputs; };
         modules = [ ./nanopi.nix ];
       };
       darwinConfigurations.mba = darwin.lib.darwinSystem {
         system = utils.lib.system.aarch64-darwin;
+        specialArgs = { inherit inputs; };
         modules = [ ./system/mba.nix ];
       };
       homeConfigurations."alan@mba" = mkHomeConfiguration {
diff --git a/user/settings/pin.nix b/pin.nix
index ab7c8b3e..ab7c8b3e 100644
--- a/user/settings/pin.nix
+++ b/pin.nix
diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix
index 6328f32e..4142fa34 100644
--- a/system/settings/configuration/nix.nix
+++ b/system/settings/configuration/nix.nix
@@ -2,6 +2,9 @@
 , pkgs
 , ...
 }: {
+  imports = [
+    ../../../pin.nix
+  ];
   nix = {
     settings = {
       cores = 0;
diff --git a/system/settings/darwin.nix b/system/settings/darwin.nix
index 806fdeb9..460d47bd 100644
--- a/system/settings/darwin.nix
+++ b/system/settings/darwin.nix
@@ -3,6 +3,9 @@
 , lib
 , ...
 }: {
+  imports = [
+    ../../pin.nix
+  ];
   services.nix-daemon = {
     enable = true;
     enableSocketListener = true;
diff --git a/user/settings/nix.nix b/user/settings/nix.nix
index b15f5c5d..ec69d51f 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -3,7 +3,7 @@
 , ...
 }: {
   imports = [
-    ./pin.nix
+    ../../pin.nix
   ];
   nixpkgs.config = import ../config.nix;
   home.packages = with pkgs; [