diff --git a/modules/gitea.nix b/modules/gitea.nix
index 87a30ec..9837089 100644
--- a/modules/gitea.nix
+++ b/modules/gitea.nix
@@ -1,29 +1,43 @@
-{
-  enable = true;
+{ ... }:
+let
   domain = "dev.mc-fucker.cool";
-  rootUrl = "https://dev.mc-fucker.cool";
-  log.level = "Warn";
-  database = {
-    createDatabase = false;
-    host = "192.168.2.5";
-    type = "postgres";
-    port = 5432;
-    name = "giteadb";
-    passwordFile = /etc/nixos/keys/gitea-dbpassword;
+in
+
+{
+  services.gitea = {
+    enable = true;
+    domain = "${domain}";
+    rootUrl = "https://${domain}";
+    log.level = "Warn";
+
+    database = {
+      createDatabase = false;
+      host = "192.168.2.5";
+      type = "postgres";
+      port = 5432;
+      name = "giteadb";
+      passwordFile = /etc/nixos/keys/gitea-dbpassword;
+    };
+
+    settings = {
+      service = {
+        REGISTER_MANUAL_CONFIRM = true;
+      };
+      server = {
+        START_SSH_SERVER = true;
+        SSH_SERVER_HOST_KEYS = "ssh/gitea.ed25519";
+      };
+      ui = {
+        DEFAULT_THEME = "arc-green";
+        #THEMES = "gitea-modern";
+      };
+    };
+
+    ssh.clonePort = 2222;
+
   };
-  settings = {
-    service = {
-      REGISTER_MANUAL_CONFIRM = true;
-    };
-    server = {
-      START_SSH_SERVER = true;
-      SSH_SERVER_HOST_KEYS = "ssh/gitea.ed25519";
-    };
-    ui = {
-      DEFAULT_THEME = "arc-green";
-      #THEMES = "gitea-modern";
-    };
-  };
-  ssh.clonePort = 2222;
+
+  networking.firewall.allowedTCPPorts = [ 3000 2222 ];
+
 }
 # vim: set et ts=2 sw=2 ai:
diff --git a/systems/mc3/configuration.nix b/systems/mc3/configuration.nix
index bf21344..d7cfdb8 100644
--- a/systems/mc3/configuration.nix
+++ b/systems/mc3/configuration.nix
@@ -3,10 +3,6 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 { config, pkgs, lib, ... }:
-  let
-    #unstable = import <nixos-unstable> {};
-    mc1 = "192.168.0.167";
-  in
 {
     imports =
       [
@@ -15,21 +11,9 @@
         ./modules/invidious.nix
         ./modules/nitter.nix
         ./modules/borg.nix
+        ./modules/gitea.nix
       ];
 
-  #nixpkgs.overlays = [
-  #  (self: super: {
-  #    gitea = unstable.gitea;
-  #    htop = unstable.htop;
-  #  })
-  #];
-
-  networking.firewall.allowedTCPPorts = [ 3000 2222 ];
-  services = {
-    gitea = import ./modules/gitea.nix;
-  };
-
-
   system.stateVersion = "21.05";
 }