nix unstableee

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1652452043,
-        "narHash": "sha256-nh3mdVB/Kk5ag1uRMAlKo8r+ssN3HNxwbLsqRG4xZkw=",
+        "lastModified": 1653518057,
+        "narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "273598f53e04f0111dca5724b37640e3907edaaf",
+        "rev": "64831f938bd413cefde0b0cf871febc494afaa4f",
         "type": "github"
       },
       "original": {
@@ -21,13 +21,51 @@
         "type": "github"
       }
     },
+    "lowdown-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1633514407,
+        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "type": "github"
+      }
+    },
+    "nix": {
+      "inputs": {
+        "lowdown-src": "lowdown-src",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-regression": "nixpkgs-regression"
+      },
+      "locked": {
+        "lastModified": 1653643505,
+        "narHash": "sha256-VReVQKEfedov22lbZYQjOcIoxjOcLCSVWF8A2szoZ/k=",
+        "owner": "nixos",
+        "repo": "nix",
+        "rev": "ec07a70979a86cc436de7e46e03789b4606d25ab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1650522846,
-        "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=",
+        "lastModified": 1653463224,
+        "narHash": "sha256-bUxKhqZhki2vPzFTl8HOo1m7pagF7WzY1MZiso8U5ws=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "6b4ebea9093c997c5f275c820e679108de4871ab",
+        "rev": "39a7bfc496d2ddfce73fe9542af1f2029ba4fe39",
         "type": "github"
       },
       "original": {
@@ -53,11 +91,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1652231724,
-        "narHash": "sha256-MjalcXFZgcgchp4QqnF05JTkFBBGad5hbksA1EKoP98=",
+        "lastModified": 1653581809,
+        "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "41ff747f882914c1f8c233207ce280ac9d0c867f",
+        "rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
         "type": "github"
       },
       "original": {
@@ -67,9 +105,25 @@
         "type": "github"
       }
     },
+    "nixpkgs-regression": {
+      "locked": {
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "indirect"
+      }
+    },
     "root": {
       "inputs": {
         "home": "home",
+        "nix": "nix",
         "nixos-hardware": "nixos-hardware",
         "nixos-persistence": "nixos-persistence",
         "nixpkgs": "nixpkgs"

flake.nix

@@ -9,6 +9,9 @@
 
     nixos-hardware.url = "github:nixos/nixos-hardware";
     nixos-persistence.url = "github:nix-community/impermanence";
+
+    nix.url = "github:nixos/nix";
+    nix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = inputs: let
@@ -16,9 +19,8 @@
     tlib = (import ./lib lib).extend (_: prev: rec {
       makePkgs = system:
         import ./pkgs-set {
-          inherit system lib;
+          inherit system lib inputs;
           tlib = prev;
-          channel = inputs.nixpkgs;
         };
       genPkgs = f: prev.genSystems (system: f (makePkgs system));
     });

modules/base/nix.nix

@@ -5,8 +5,11 @@
   ...
 }: {
   nix = {
-    registry = builtins.mapAttrs (_: v: {flake = v;}) (lib.filterAttrs (_: v: v ? outputs) inputs);
-    package = pkgs.nixUnstable;
+    registry =
+      builtins.mapAttrs
+      (_: v: {flake = v;})
+      (lib.filterAttrs (_: v: v ? outputs) inputs);
+    package = pkgs.nix;
     gc.automatic = true;
     optimise.automatic = true;
     extraOptions = ''

pkgs-set/default.nix

@@ -1,20 +1,28 @@
 {
-  channel,
+  inputs,
   system,
   lib,
   ...
 }: let
-  pkgs = import channel {
+  l = lib;
+  pkgs = import inputs.nixpkgs {
     inherit system;
     config.allowUnfree = true;
     overlays =
-      lib.mapAttrsToList
-      (name: _: import "${./overlays}/${name}")
-      (lib.readDir ./overlays);
+      l.mapAttrsToList
+      (
+        name: _: let
+          o = import "${./overlays}/${name}";
+        in
+          if (l.functionArgs o) ? inputs
+          then o {inherit inputs;}
+          else o
+      )
+      (l.readDir ./overlays);
   };
   pkgsToExport = import ./pkgs-to-export.nix;
 in
   pkgs
   // {
-    _exported = lib.getAttrs pkgsToExport pkgs;
+    _exported = l.getAttrs pkgsToExport pkgs;
   }

pkgs-set/overlays/nix-unstable.nix

@@ -0,0 +1,6 @@
+{inputs}: _: prev: {
+  nix = inputs.nix.packages.${prev.system}.nix.overrideAttrs (old: {
+    doCheck = false;
+    doInstallCheck = false;
+  });
+}