From 4fc7d8dd2a7c0d4ef0775840f97422960edd10da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sat, 24 Oct 2020 13:28:45 +0200
Subject: [PATCH] chore: nixos-unstable -> nixpkgs-unstable

---
 .versions/nixpkgs-unstable.json | 8 ++++----
 configs/nixpkgs-unstable.nix    | 2 +-
 deploy.nix                      | 2 +-
 shell.nix                       | 6 +++---
 systems/toum/hass/default.nix   | 2 +-
 systems/toum/hass/frontend.nix  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.versions/nixpkgs-unstable.json b/.versions/nixpkgs-unstable.json
index 99ebab7..6a24b8e 100644
--- a/.versions/nixpkgs-unstable.json
+++ b/.versions/nixpkgs-unstable.json
@@ -1,7 +1,7 @@
 {
-  "url": "https://github.com/NixOS/nixpkgs-channels.git",
-  "rev": "84d74ae9c9cbed73274b8e4e00be14688ffc93fe",
-  "date": "2020-09-26T18:54:09-07:00",
-  "sha256": "0ww70kl08rpcsxb9xdx8m48vz41dpss4hh3vvsmswll35l158x0v",
+  "url": "https://github.com/NixOS/nixpkgs.git",
+  "rev": "3d4e133e7724e1376ff9310b9949c4c372410c65",
+  "date": "2020-10-24T09:55:06+02:00",
+  "sha256": "15p45fa0w9rqv6wf3zih162liwj5xwzy1s942zvinb97fimrni24",
   "fetchSubmodules": false
 }
diff --git a/configs/nixpkgs-unstable.nix b/configs/nixpkgs-unstable.nix
index 506a911..0ffc620 100644
--- a/configs/nixpkgs-unstable.nix
+++ b/configs/nixpkgs-unstable.nix
@@ -1,5 +1,5 @@
 { config, ... }: {
   nixpkgs.config.packageOverrides = pkgs: {
-    unstable = import <nixos-unstable> { config = config.nixpkgs.config; };
+    unstable = import <nixpkgs-unstable> { config = config.nixpkgs.config; };
   };
 }
diff --git a/deploy.nix b/deploy.nix
index eacfccf..1fcfa02 100644
--- a/deploy.nix
+++ b/deploy.nix
@@ -17,7 +17,7 @@ let
       nixos-config.symlink = "system/configuration.nix";
 
       nixpkgs.git = gitFromJson .versions/nixpkgs.json;
-      nixos-unstable.git = gitFromJson .versions/nixpkgs-unstable.json;
+      nixpkgs-unstable.git = gitFromJson .versions/nixpkgs-unstable.json;
       home-manager.git = gitFromJson .versions/home-manager.json;
       stockholm.git = gitFromJson .versions/stockholm.json;
       retiolum.git = gitFromJson .versions/retiolum.json;
diff --git a/shell.nix b/shell.nix
index f477aef..4ea4484 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,12 +7,12 @@ let
   dependencies = {
     nixpkgs = {
       ref = "refs/heads/nixos-${release}";
-      url = "https://github.com/NixOS/nixpkgs-channels.git";
+      url = "https://github.com/NixOS/nixpkgs.git";
       path = toString .versions/nixpkgs.json;
     };
     nixpkgs-unstable = {
-      ref = "refs/heads/nixos-unstable";
-      url = "https://github.com/NixOS/nixpkgs-channels.git";
+      ref = "refs/heads/master";
+      url = "https://github.com/NixOS/nixpkgs.git";
       path = toString .versions/nixpkgs-unstable.json;
     };
     home-manager = {
diff --git a/systems/toum/hass/default.nix b/systems/toum/hass/default.nix
index 49db344..13a61ec 100644
--- a/systems/toum/hass/default.nix
+++ b/systems/toum/hass/default.nix
@@ -11,7 +11,7 @@ in
   imports = [
     ./zigbee.nix
     ./frontend.nix
-    <nixos-unstable/nixos/modules/services/misc/home-assistant.nix>
+    <nixpkgs-unstable/nixos/modules/services/misc/home-assistant.nix>
   ];
 
   services.home-assistant = {
diff --git a/systems/toum/hass/frontend.nix b/systems/toum/hass/frontend.nix
index 76160e0..5790795 100644
--- a/systems/toum/hass/frontend.nix
+++ b/systems/toum/hass/frontend.nix
@@ -7,7 +7,7 @@ in
   ];
 
   imports = [
-    <nixos-unstable/nixos/modules/services/misc/home-assistant.nix>
+    <nixpkgs-unstable/nixos/modules/services/misc/home-assistant.nix>
   ];