From 91bd5252699ca471fa33defda502558864cdaff0 Mon Sep 17 00:00:00 2001
From: Jasper Ras <jras@hostnet.nl>
Date: Mon, 3 Feb 2025 21:31:48 +0100
Subject: stuff

---
 configuration/gitea.nix | 27 +++++++++++++++++++++++++++
 files/id_tarrel.pub     |  1 +
 files/id_work.pub       |  1 +
 flake.nix               |  5 ++---
 roles/base.nix          |  6 +++---
 roles/git-server.nix    | 20 --------------------
 6 files changed, 34 insertions(+), 26 deletions(-)
 create mode 100644 configuration/gitea.nix
 create mode 100644 files/id_tarrel.pub
 create mode 100644 files/id_work.pub
 delete mode 100644 roles/git-server.nix

diff --git a/configuration/gitea.nix b/configuration/gitea.nix
new file mode 100644
index 0000000..f9e48f4
--- /dev/null
+++ b/configuration/gitea.nix
@@ -0,0 +1,27 @@
+{ ... }:
+{
+  users.groups.git = {};
+  users.users.git = {
+    isSystemUser = true;
+    group = "git";
+    hashedPassword = "$6$Rc//lmBr5orYHn.0$M9y3Zj4zCe723r8hYGIhPC5kPv5SVGHjF1FsjrT9IIx7trxuNTLtLDQVL9lhmR5/7bFMUFEf0CMx9w7.vgXgY0";
+    openssh.authorizedKeys.keyFiles = [
+      ../files/id_tarrel.pub
+      ../files/id_work.pub
+    ];
+  };
+
+  services.gitea = {
+    enable = true;
+    appName = "JAP56 Git Server";
+    group = "git";
+    user = "git";
+    settings.server = {
+      HTTP_PORT = 80;
+      DOMAIN = "snorlax";
+    };
+    useWizard = true;
+  };
+
+  services.openssh.settings.AllowUsers = [ "git" ];
+}
diff --git a/files/id_tarrel.pub b/files/id_tarrel.pub
new file mode 100644
index 0000000..d52bb07
--- /dev/null
+++ b/files/id_tarrel.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpAWpymOovrrdaNh43UHNIifi7hyRjtQZl24gqprUT/ jras@tarrel
diff --git a/files/id_work.pub b/files/id_work.pub
new file mode 100644
index 0000000..bc9457e
--- /dev/null
+++ b/files/id_work.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCiljUOLUIywzNfQpAGtIXwleFeLvb7Vk+Gsvzlr9Oq jras@work
diff --git a/flake.nix b/flake.nix
index 950e749..6966ffb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -102,10 +102,9 @@
         }
 
         ./hardware/snorlax-disks.nix
-        ./configuration/snorlax.nix
-
         ./roles/server.nix
-        ./roles/git-server.nix
+        ./configuration/snorlax.nix
+        ./configuration/gitea.nix
       ];
     };
   };
diff --git a/roles/base.nix b/roles/base.nix
index 4fe0692..da82c25 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -12,9 +12,9 @@
     extraGroups = [ "wheel" ];
     shell = pkgs.zsh;
     packages = with pkgs; [ git helix curl ];
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpAWpymOovrrdaNh43UHNIifi7hyRjtQZl24gqprUT/ jras@tarrel"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCiljUOLUIywzNfQpAGtIXwleFeLvb7Vk+Gsvzlr9Oq jras@work"
+    openssh.authorizedKeys.keyFiles = [
+      ../files/id_tarrel.pub
+      ../files/id_work.pub
     ];
   };
 
diff --git a/roles/git-server.nix b/roles/git-server.nix
deleted file mode 100644
index 935f75f..0000000
--- a/roles/git-server.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ ... }:
-{
-  services.openssh.settings.AllowUsers = [ "git" ];
-  users.groups.git = {};
-  users.users.git = {
-    isSystemUser = true;
-    group = "git";
-    hashedPassword = "$6$Rc//lmBr5orYHn.0$M9y3Zj4zCe723r8hYGIhPC5kPv5SVGHjF1FsjrT9IIx7trxuNTLtLDQVL9lhmR5/7bFMUFEf0CMx9w7.vgXgY0";
-  };
-  services.gitea = {
-    enable = true;
-    appName = "JAP56 Git Server";
-    group = "git";
-    user = "git";
-    settings.server = {
-      HTTP_PORT = 80;
-      DOMAIN = "snorlax";
-    };
-  };
-}
-- 
cgit v1.2.3