From a0a8280934dc527f9206912744425bf9f9d43c12 Mon Sep 17 00:00:00 2001
From: Michael Huebner <michael.huebner@ptspaper.de>
Date: Mon, 19 May 2025 10:35:25 +0200
Subject: [PATCH] Try colmena system 1

---
 flake.nix      | 53 ++++++++++++++++++++++++++------------------------
 git_system.nix | 20 -------------------
 2 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4c419a8..796fc21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,35 +31,38 @@
         }:
         {
           deployment = {
-            targetHost = "somehost.tld";
-            targetPort = 1234;
-            targetUser = "luser";
+            targetHost = "188.40.66.217";
+            targetPort = 22;
+            targetUser = "root";
           };
-          imports = [ ./git_system.nix ];
-        };
-      runner-system =
-        {
-          name,
-          nodes,
-          pkgs,
-          ...
-        }:
-        {
-          imports = [ ./runner_system.nix ];
-        };
-      dev-system =
-        {
-          name,
-          nodes,
-          pkgs,
-          ...
-        }:
-        {
           imports = [
-            ./dev_system.nix
-            inputs.sops-nix.nixosModules.sops
+            # ./git_system.nix
+            (import ./setup { inherit inputs; })
           ];
         };
+      # runner-system =
+      #   {
+      #     name,
+      #     nodes,
+      #     pkgs,
+      #     ...
+      #   }:
+      #   {
+      #     imports = [ ./runner_system.nix ];
+      #   };
+      # dev-system =
+      #   {
+      #     name,
+      #     nodes,
+      #     pkgs,
+      #     ...
+      #   }:
+      #   {
+      #     imports = [
+      #       ./dev_system.nix
+      #       inputs.sops-nix.nixosModules.sops
+      #     ];
+      #   };
     };
   };
 }
diff --git a/git_system.nix b/git_system.nix
index 3c3d9b9..dc905d5 100644
--- a/git_system.nix
+++ b/git_system.nix
@@ -23,26 +23,6 @@ in
     ./shared/ssh.nix
   ];
 
-  programs = {
-    msmtp = {
-      enable = true;
-      defaults = {
-        tls = true;
-      };
-      accounts = {
-        default = {
-          auth = true;
-          host = "TODO: e.g. smtp.strato.de";
-          port = 587;
-          tls_starttls = true;
-          from = "TODO: email";
-          user = "TODO: email";
-          password = "TODO";
-        };
-      };
-    };
-  };
-
   security.acme = {
     defaults.email = "michael.huebner@ptspaper.de";
     acceptTerms = true;