From 6dfd9860181fe0e437f2a3764f7d82d9a8cd8ca9 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 2 Jun 2021 16:46:32 -0400
Subject: [PATCH] rename stable to nixpkgs

---
 flake.lock              | 30 ++++++++++++++----------------
 flake.nix               |  8 ++++----
 hosts/default.nix       |  4 ++--
 hosts/hp/default.nix    |  2 +-
 hosts/lenny/default.nix |  2 +-
 hosts/neo/default.nix   |  2 +-
 hosts/tosh/default.nix  |  2 +-
 7 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2353a98..e11080e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,25 +1,24 @@
 {
   "nodes": {
-    "root": {
-      "inputs": {
-        "stable2105": "stable2105",
-        "unstable": "unstable"
-      }
-    },
-    "stable2105": {
+    "nixpkgs": {
       "locked": {
-        "lastModified": 1622449420,
-        "narHash": "sha256-aKDhIaJqNUy7p3urHEBC/mdIAJWckhW3Fgzmv284UHg=",
+        "lastModified": 1622622179,
+        "narHash": "sha256-XCw/9QDuj9J6prVR8YrteTcFKj2sRWYIjwgs8qOOrYQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d25ea6a0d2a847fb52131da546f2a866656fbafa",
+        "rev": "eaba7870ffc3400eca4407baa24184b7fe337ec1",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
         "ref": "nixos-21.05",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "unstable": "unstable"
       }
     },
     "unstable": {
@@ -32,10 +31,9 @@
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
         "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "type": "indirect"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 506fc5b..97677c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,11 @@
 {
-  inputs.unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-  inputs.stable2105.url = "github:NixOS/nixpkgs/nixos-21.05";
+  inputs.nixpkgs.url = "nixpkgs/nixos-21.05";
+  inputs.unstable.url = "nixpkgs/nixos-unstable";
 
-  outputs = { self, unstable, stable2105 }: {
+  outputs = { self, unstable, nixpkgs }: {
     nixosModule = { ... }: {
       imports = [ ./. ];
     };
-    nixosConfigurations = import ./hosts { modules = [ ./. ]; inherit unstable stable2105; };
+    nixosConfigurations = import ./hosts { modules = [ ./. ]; inherit unstable nixpkgs; };
   };
 }
diff --git a/hosts/default.nix b/hosts/default.nix
index b285e3d..be7770d 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,4 +1,4 @@
-{ modules, unstable, stable2105 }:
+{ modules, nixpkgs, unstable }:
 let
 
   hostMetadata =
@@ -21,7 +21,7 @@ let
 in
 builtins.mapAttrs
   (n: v:
-    let pkgs = { inherit unstable stable2105; }.${v.pkgs};
+    let pkgs = { inherit nixpkgs unstable; }.${v.pkgs};
     in
     pkgs.lib.nixosSystem {
       inherit (v) system;
diff --git a/hosts/hp/default.nix b/hosts/hp/default.nix
index 7d82025..a955fc1 100644
--- a/hosts/hp/default.nix
+++ b/hosts/hp/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs = "stable2105";
+  pkgs = "nixpkgs";
   system = "x86_64-linux";
   hardware = "physical";
 }
diff --git a/hosts/lenny/default.nix b/hosts/lenny/default.nix
index 7d82025..a955fc1 100644
--- a/hosts/lenny/default.nix
+++ b/hosts/lenny/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs = "stable2105";
+  pkgs = "nixpkgs";
   system = "x86_64-linux";
   hardware = "physical";
 }
diff --git a/hosts/neo/default.nix b/hosts/neo/default.nix
index 7d82025..a955fc1 100644
--- a/hosts/neo/default.nix
+++ b/hosts/neo/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs = "stable2105";
+  pkgs = "nixpkgs";
   system = "x86_64-linux";
   hardware = "physical";
 }
diff --git a/hosts/tosh/default.nix b/hosts/tosh/default.nix
index 7d82025..a955fc1 100644
--- a/hosts/tosh/default.nix
+++ b/hosts/tosh/default.nix
@@ -1,5 +1,5 @@
 {
-  pkgs = "stable2105";
+  pkgs = "nixpkgs";
   system = "x86_64-linux";
   hardware = "physical";
 }