From 2f02f474b95fcc2b97c8893f75fc0184f46676df Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 30 Apr 2021 18:39:07 +0200
Subject: [PATCH] flake.nix: switch zentralwerk-network-key input from nix to
 master branch

---
 flake.lock                          | 11 +++++------
 flake.nix                           |  2 +-
 nix/nixos-module/server/server2.nix |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9b39a16..e1f1818 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,17 +24,16 @@
     "zentralwerk-network-key": {
       "locked": {
         "dir": "nix/key",
-        "lastModified": 1618099335,
-        "narHash": "sha256-EteGJyT4VkaLUKxnXhiesfqp4rqyQ+fEsFgTr/9Nygw=",
-        "ref": "nix",
-        "rev": "4b8b1a9382baacc60bb30d69994c1321494a1143",
-        "revCount": 968,
+        "lastModified": 1619731618,
+        "narHash": "sha256-GPrb+GgJ+IOfee1QQK1O6aB56Nfc8ABmBf8Qgku76Bg=",
+        "ref": "master",
+        "rev": "67acfb140b23f77662478989b9c35d860b80362f",
+        "revCount": 1003,
         "type": "git",
         "url": "https://gitea.c3d2.de/zentralwerk/network.git?dir=nix%2fkey"
       },
       "original": {
         "dir": "nix/key",
-        "ref": "nix",
         "type": "git",
         "url": "https://gitea.c3d2.de/zentralwerk/network.git?dir=nix%2fkey"
       }
diff --git a/flake.nix b/flake.nix
index 6904c15..83f8d2c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     # TODO: nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05";
     # `nix flake update --override-flake zentralwerk-network-key git+file:///...`
     # to provide the GPG secret key
-    zentralwerk-network-key.url = "git+https://gitea.c3d2.de/zentralwerk/network.git?dir=nix/key&ref=nix";
+    zentralwerk-network-key.url = "git+https://gitea.c3d2.de/zentralwerk/network.git?dir=nix/key";
   };
 
   outputs = inputs@{ self, nixpkgs, zentralwerk-network-key }:
diff --git a/nix/nixos-module/server/server2.nix b/nix/nixos-module/server/server2.nix
index f77da83..213b815 100644
--- a/nix/nixos-module/server/server2.nix
+++ b/nix/nixos-module/server/server2.nix
@@ -50,7 +50,6 @@
   environment.systemPackages = with pkgs; [
     wget vim git screen
   ];
-  #nix.registry.zentralwerk-network.flake = "git+https://gitea.c3d2.de/zentralwerk/network.git?ref=nix";
   services.openssh.enable = true;
   services.openssh.permitRootLogin = "yes";
 }