From 21ce843a8f3696ea85f41d9713e58291a842207e Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Thu, 17 Feb 2022 15:59:00 +0000
Subject: [PATCH] Use nixos-unstable nixVersions.stable as nix package

---
 flake.lock                      | 67 ---------------------------------
 flake.nix                       |  3 +-
 home-manager/modules/common.nix |  3 +-
 nixos/modules/common.nix        |  2 +-
 4 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/flake.lock b/flake.lock
index b5ed9c8..d05c308 100644
--- a/flake.lock
+++ b/flake.lock
@@ -164,57 +164,6 @@
         "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": 1643066034,
-        "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=",
-        "owner": "NixOS",
-        "repo": "nix",
-        "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62",
-        "type": "github"
-      },
-      "original": {
-        "id": "nix",
-        "ref": "latest-release",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1632864508,
-        "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-21.05-small",
-        "type": "indirect"
-      }
-    },
     "nixpkgs-master": {
       "locked": {
         "lastModified": 1644486793,
@@ -244,21 +193,6 @@
         "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"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1644472683,
@@ -298,7 +232,6 @@
         "home-manager-stable": "home-manager-stable",
         "home-manager-unstable": "home-manager-unstable",
         "impermanence": "impermanence",
-        "nix": "nix",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-mine": "nixpkgs-mine",
         "nixpkgs-stable": "nixpkgs-stable",
diff --git a/flake.nix b/flake.nix
index c5b5442..001b24e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,6 @@
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs-unstable";
 
     # Stuff used by systems
-    nix.url = "nix/latest-release";
     #impermanence.url = "github:nix-community/impermanence";
     impermanence.url = "github:devplayer0/impermanence/qemu-vm-dirs";
   };
@@ -150,7 +149,7 @@
 
         packages = with pkgs; [
           coreutils
-          nix
+          nixVersions.stable
           agenix
           deploy-rs.deploy-rs
           home-manager
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index 2341ebb..fd16be7 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -108,7 +108,6 @@ in
       # Note: If globalPkgs mode is on, then these will be overridden by the NixOS equivalents of these options
       nixpkgs = {
         overlays = [
-          (final: prev: { nix = inputs.nix.defaultPackage.${config.nixpkgs.system}; })
           # TODO: Wait for https://github.com/NixOS/nixpkgs/pull/159074 to arrive to nixos-unstable
           (final: prev: { remarshal = pkgs'.master.remarshal; })
         ];
@@ -122,7 +121,7 @@ in
 
       home = {
         packages = with pkgs; [
-          nix
+          pkgs'.unstable.nixVersions.stable
         ];
       };
     })
diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix
index 65b3628..a8dcbb4 100644
--- a/nixos/modules/common.nix
+++ b/nixos/modules/common.nix
@@ -54,6 +54,7 @@ in
       };
 
       nix = {
+        package = pkgs'.unstable.nixVersions.stable;
         extraOptions =
           ''
             experimental-features = nix-command flakes ca-derivations
@@ -61,7 +62,6 @@ in
       };
       nixpkgs = {
         overlays = [
-          (final: prev: { nix = inputs.nix.defaultPackage.${config.nixpkgs.system}; })
           # TODO: Wait for https://github.com/NixOS/nixpkgs/pull/159074 to arrive to nixos-unstable
           (final: prev: { remarshal = pkgs'.master.remarshal; })
         ];