From 35645f6183257035a7f595a1e63ce90c69a39c6f Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob@jhink.org>
Date: Wed, 2 Nov 2022 09:23:00 -0400
Subject: [PATCH] Stop hardcoding nixos-22.05 in flake.nix. Instead pin in
 flake.lock

---
 flake.lock | 66 ++++++++++++++++++++++++++++++++++++++++--------------
 flake.nix  | 13 +++--------
 2 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3ddb260..d64465f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,46 +4,65 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "utils": "utils"
       },
       "locked": {
-        "narHash": "sha256-T4at7d+KsQNWh5rfjvOtQCaIMWjSDlSgQZKvxb+LcEY=",
-        "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz"
+        "lastModified": 1666649150,
+        "narHash": "sha256-kINnLxC0KFalUk4tVO/H5hUU7FVAOYYcUSWrsBpnl+I=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "7dc4e4ebd71280842b4d30975439980baaac9db8",
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz"
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1665649208,
-        "narHash": "sha256-MDkPVG4W8gigJ8OxWDp9L6aKaEwLRV3As1RvKkMq0rc=",
+        "lastModified": 1665987993,
+        "narHash": "sha256-MvlaIYTRiqefG4dzI5p6vVCfl+9V8A1cPniUjcn6Ngc=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "d92ed98c099ae731664fc526c348d609c4cffe04",
+        "rev": "0e6593630071440eb89cd97a52921497482b22c6",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "master",
         "repo": "nixos-hardware",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653936696,
-        "narHash": "sha256-M6bJShji9AIDZ7Kh7CPwPBPb/T7RiVev2PAcOi4fxDQ=",
+        "lastModified": 1666709108,
+        "narHash": "sha256-fBCVW1SpaAav6V8V99tHLeZefCAEAaOvD70Gb2H/D4U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ce6aa13369b667ac2542593170993504932eb836",
+        "rev": "9237fad40957a5ec3d6d6fb17675c1eae6743497",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-22.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-22_05": {
+      "locked": {
+        "lastModified": 1666610816,
+        "narHash": "sha256-q4F2VNe5bpxXOvp16DyLwE1SgNZMbNO29ZQJPIomedg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6107f97012a0c134c5848125b5aa1b149b76d2c9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -61,9 +80,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-22_05": [
-          "nixpkgs"
-        ]
+        "nixpkgs-22_05": "nixpkgs-22_05"
       },
       "locked": {
         "lastModified": 1665289655,
@@ -78,6 +95,21 @@
         "repo": "sops-nix",
         "type": "github"
       }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index c5bd9a4..cc5f9cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,25 +2,18 @@
   description = "NixOS configurations for my machines";
 
   inputs = {
-    nixpkgs.url = github:nixos/nixpkgs/nixos-22.05;
+    nixpkgs.url = github:nixos/nixpkgs;
     nixos-hardware = {
-      url = github:nixos/nixos-hardware/master;
+      url = github:nixos/nixos-hardware;
       inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
-      url = "https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz";
+      url = github:nix-community/home-manager;
       inputs.nixpkgs.follows = "nixpkgs";
     };
     sops-nix = {
       url = github:Mic92/sops-nix;
-      # sops-nix uses both -22.05 and -unstable in their flake.
-      # As far as I can tell, 22.05 is only used for testing, whereas unstable
-      # is used for the tooling. So here, I let both of these follow our
-      # nixpkgs input. Note that after NixOS releases, this might break since
-      # they may do away with 22.05 at that point.
-      # https://github.com/Mic92/sops-nix/blob/master/flake.nix
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-22_05.follows = "nixpkgs";
     };
   };