From ee00a86744061cbdd056be6f02d298981f183b4d Mon Sep 17 00:00:00 2001
From: maralorn <maralorn@maralorn.de>
Date: Sun, 19 Feb 2023 12:25:22 +0100
Subject: [PATCH] Fix registry

---
 flake.lock              | 14 ++++++++------
 flake.nix               |  5 +++--
 nixos/roles/default.nix | 16 +++++++---------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 94025667..37224dec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -269,30 +269,32 @@
       "locked": {
         "lastModified": 1676718858,
         "narHash": "sha256-giQecvcifVLNHCC9lMfTGP09tNxXhOMw+d/aql7MhRw=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "e6d5772f3515b8518d50122471381feae7cbae36",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "nixos",
         "ref": "nixos-22.11",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixos-unstable": {
       "locked": {
         "lastModified": 1676721149,
         "narHash": "sha256-mN2EpTGxxVNnFZLoLWRwh6f7UWhXy4qE+wO2CZyrXps=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "5f4e07deb7c44f27d498f8df9c5f34750acf52d2",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "nixos",
         "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-140774-workaround": {
diff --git a/flake.nix b/flake.nix
index af4e72b4..9fbfa07b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,8 @@
       };
       url = "git+ssh://git@hera.m-0.eu/nix-output-monitor?ref=main";
     };
-    nixos-unstable.url = "nixpkgs/nixos-unstable";
+    # Don’t use registry so that we can override it locally.
+    nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-mailserver = {
       inputs = {
         flake-compat.follows = "";
@@ -35,7 +36,7 @@
       };
       url = "git+https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git";
     };
-    nixos-stable.url = "nixpkgs/nixos-22.11";
+    nixos-stable.url = "github:nixos/nixpkgs/nixos-22.11";
     flake-parts.inputs.nixpkgs-lib.follows = "nixos-unstable";
     home-manager = {
       url = "home-manager/release-22.11";
diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix
index bab539b5..6e2f3c8e 100644
--- a/nixos/roles/default.nix
+++ b/nixos/roles/default.nix
@@ -115,15 +115,13 @@
   };
 
   nix = {
-    registry = [
-      {
-        from = {
-          type = "indirect";
-          id = "nixpkgs";
-        };
-        flake = pkgs.flake-inputs.nixos-stable;
-      }
-    ];
+    registry.nixpkgs = {
+      from = {
+        type = "indirect";
+        id = "nixpkgs";
+      };
+      flake = pkgs.flake-inputs.nixos-stable;
+    };
     settings.trusted-users = ["maralorn" "laminar"];
     # Extra Option which is on by default: allow-import-from-derivation = true
     extraOptions = ''