snorlax git stuff

3 files changed, 30 insertions, 4 deletions

diff --git a/configuration/snorlax/default.nix b/configuration/snorlax/default.nix
index 8ed9169..fa60d0e 100644
--- a/configuration/snorlax/default.nix
+++ b/configuration/snorlax/default.nix
@@ -1,9 +1,11 @@
 { ... }:
 {
   imports = [
-    ./disk-config.nix
-    ./gitea.nix
+    ../nix-settings.nix
     ../users
+
+    ./disk-config.nix
+    ./git.nix
   ];
 
   networking.hostName = "snorlax";
diff --git a/configuration/snorlax/git.nix b/configuration/snorlax/git.nix
new file mode 100644
index 0000000..e4cee27
--- /dev/null
+++ b/configuration/snorlax/git.nix
@@ -0,0 +1,26 @@
+{ pkgs, ... }:
+{
+  networking.firewall.allowedTCPPorts = [ 80 ];
+  services.cgit.jap56 = {
+    enable = true;
+    group = "git";
+    repos = {
+      nixos.desc = "Contains my NixOS configuration";
+      nixos.path = "/var/lib/git/nixos.git";
+    };
+  };
+  users.groups.git = {};
+  users.users.git = {
+    isNormalUser = true;
+    home = "/var/lib/git";
+    shell = pkgs.zsh;
+    group = "git";
+    hashedPassword = "$6$Rc//lmBr5orYHn.0$M9y3Zj4zCe723r8hYGIhPC5kPv5SVGHjF1FsjrT9IIx7trxuNTLtLDQVL9lhmR5/7bFMUFEf0CMx9w7.vgXgY0";
+    openssh.authorizedKeys.keyFiles = [
+      ../../keys/id_tarrel.pub
+      ../../keys/id_work.pub
+    ];
+    packages = with pkgs; [ git ];
+  };
+  services.openssh.settings.AllowUsers = [ "git" ];
+}
diff --git a/configuration/snorlax/gitea.nix b/configuration/snorlax/gitea.nix
index 8b814d9..6ad46e0 100644
--- a/configuration/snorlax/gitea.nix
+++ b/configuration/snorlax/gitea.nix
@@ -17,10 +17,8 @@
     group = "git";
     user = "git";
     settings.server = {
-      HTTP_PORT = 80;
       DOMAIN = "snorlax";
     };
-    useWizard = true;
   };
 
   services.openssh.settings.AllowUsers = [ "git" ];