From 95d70d52256151df7c16dd2dec28a98391f23468 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Mon, 1 Nov 2021 19:29:39 +0100
Subject: [PATCH] use cluster-modules use flakes now

---
 nixos/flake.lock | 20 +++++++++-----------
 nixos/flake.nix  |  5 ++---
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/nixos/flake.lock b/nixos/flake.lock
index 8f38f2c..c01dde6 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -1,20 +1,18 @@
 {
   "nodes": {
     "cluster-module": {
-      "flake": false,
       "locked": {
-        "lastModified": 1537379100,
-        "narHash": "sha256-TcZfK3thYq65S7mHC0jyc2ELVq8Ue8Enuj4iU4L9fTI=",
-        "ref": "master",
-        "rev": "ef621797a30f8a57de16bf33672abdd411cbcece",
-        "revCount": 8,
-        "type": "git",
-        "url": "https://git.ingolf-wagner.de/nix-modules/cluster.git"
+        "lastModified": 1635790675,
+        "narHash": "sha256-hWwS/sX46dEIw+swRfB8KZq0T/gDpryswTkZy5n0BAc=",
+        "owner": "mrvandalo",
+        "repo": "module.cluster",
+        "rev": "299f5e9f4d9faa2abce40ae853601e11eecd7383",
+        "type": "github"
       },
       "original": {
-        "rev": "ef621797a30f8a57de16bf33672abdd411cbcece",
-        "type": "git",
-        "url": "https://git.ingolf-wagner.de/nix-modules/cluster.git"
+        "owner": "mrvandalo",
+        "repo": "module.cluster",
+        "type": "github"
       }
     },
     "doom-emacs": {
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 8833809..8d14db2 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -21,8 +21,7 @@
       inputs.home-manager.follows = "home-manager";
     };
     cluster-module = {
-      url = "git+https://git.ingolf-wagner.de/nix-modules/cluster.git?rev=ef621797a30f8a57de16bf33672abdd411cbcece";
-      flake = false;
+      url = "github:mrvandalo/module.cluster";
     };
     nixpkgs-fmt = {
       url = "github:nix-community/nixpkgs-fmt";
@@ -48,7 +47,7 @@
       nixosSystem = nixpkgs.lib.nixosSystem;
       defaultModules = [
         sops-nix.nixosModules.sops
-        { imports = [ "${cluster-module}" ]; }
+        cluster-module.nixosModules.tinc
         ({ pkgs, ... }: {
           nix = {
             # no channesl needed this way