gitea service themeing, athame ygg fix, sources update

depot/hosts/athame/nixos.nix

@@ -86,14 +86,17 @@ with lib;
       enable = true;
       pubkey = "55e3f29c252d16e73ac849a6039824f94df1dee670c030b9e29f90584f935575";
       listen.enable = true;
-      listen.endpoints = [ "tcp://${config.network.addresses.public.ipv4.address}:52969" "tcp://${config.network.addresses.public.ipv6.address}:52969" ];
+      listen.endpoints = [ "tcp://${config.network.addresses.public.ipv4.address}:52969" "tcp://[${config.network.addresses.public.ipv6.address}]:52969" ];
     };
   };
 
   # Firewall
 
   network.firewall = {
-    public.interfaces = singleton "enp1s0";
+    public = {
+      interfaces = singleton "enp1s0";
+      tcp.ports = singleton 52969;
+    };
     private.interfaces = singleton "yggdrasil";
   };
 

depot/services/gitea/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, tf, ... }:
+{ config, lib, pkgs, tf, ... }:
 
 {
   kw.secrets = [
@@ -54,17 +54,27 @@
         ENABLE_NOTIFY_MAIL = true;
       };
       ui = {
-        THEMES = "gitea,arc-green";
-        DEFAULT_THEME = "gitea";
+        THEMES = "pitchblack,gitea,arc-green";
+        DEFAULT_THEME = "pitchblack";
         THEME_COLOR_META_TAG = "#222222";
       };
     };
   };
 
-  systemd.services.gitea.preStart = ''
-    ${pkgs.coreutils}/bin/ln -sfT ${./public} /var/lib/gitea/custom/public
-    ${pkgs.coreutils}/bin/ln -sfT ${./templates} /var/lib/gitea/custom/templates
-  '';
+  systemd.services.gitea.serviceConfig.ExecStartPre = [
+    "${pkgs.coreutils}/bin/ln -sfT ${pkgs.runCommand "gitea-public" {
+    } ''
+      ${pkgs.coreutils}/bin/mkdir -p $out/{css,img}
+      ${pkgs.coreutils}/bin/cp ${pkgs.fetchFromGitHub {
+        owner = "iamdoubz";
+        repo = "Gitea-Pitch-Black";
+        rev = "38a10947254e46a0a3c1fb90c617d913d6fe63b9";
+        sha256 = "1zpmjv0h4k9nf52yaj22zyfabhv83n79f6cj6kfm5s685b2s1348";
+      }}/theme-pitchblack.css $out/css
+      ${pkgs.coreutils}/bin/cp -r ${./public}/* $out/
+    ''} /var/lib/gitea/custom/public"
+    "${pkgs.coreutils}/bin/ln -sfT ${./templates} /var/lib/gitea/custom/templates"
+  ];
 
   services.nginx.virtualHosts."git.${config.network.dns.domain}" = {
     enableACME = true;

depot/services/gitea/public/img/logo.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 280 171.19"><defs><style>.cls-1,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-2{fill:#ccc;}.cls-3,.cls-4{fill:#f2f2f2;}</style></defs><path class="cls-1" d="M403.84,463.72s13.51-20.52,9.51-44.75c0,0-22.62-2.63-38,12.5C361.41,402.18,345.28,369,369.47,345c0,0,8,5.45,8.47,12.71,2,31.08-1.18,31.53-1.18,31.53,25.3-3.77,32.51-45.12,9.89-59.77-55.53-26.12-63.59-4.21-71.3,42.35-3.2,27.07-3.83,41.66-8.19,62.74-13.46-15.72-38.59-14.19-38-14-3.4,25,7.88,45.73,9.45,46.09-15,4.55-37.67,6.71-73,11.28,75.87,17.66,199,11.15,274.58-4.94C468.23,470.85,414.31,471.71,403.84,463.72Z" transform="translate(-202.9 -317.79)"/><polygon class="cls-2" points="98.68 121.45 90.04 110.5 90.44 120.65 75.53 115.4 83.03 130.62 71.94 130.38 81.58 144.37 98.68 121.45"/><path class="cls-3" d="M305.65,436.85" transform="translate(-202.9 -317.79)"/><path class="cls-4" d="M301.65,439.44l-.07-.2a85.43,85.43,0,0,0-6.65-5.65l0,6.41s-6,1.47-10.83-1.78c0,0,7.18,11.33,1.07,11.54a40.37,40.37,0,0,0-5.48.5l4.78,11.9C299.42,459.81,301.81,444.69,301.65,439.44Z" transform="translate(-202.9 -317.79)"/><polygon class="cls-2" points="179.03 119.28 187.68 108.33 187.28 118.47 202.19 113.22 194.69 128.44 205.78 128.21 196.13 142.19 179.03 119.28"/><path class="cls-4" d="M381.87,437.27l.07-.2a83.13,83.13,0,0,1,6.65-5.66l0,6.41s6,1.47,10.83-1.78c0,0-7.18,11.33-1.07,11.55a38.39,38.39,0,0,1,5.48.5L399,460C384.1,457.63,381.71,442.51,381.87,437.27Z" transform="translate(-202.9 -317.79)"/></svg>

nix/sources.json

@@ -53,10 +53,10 @@
         "homepage": null,
         "owner": "kittywitch",
         "repo": "nixexprs",
-        "rev": "27778b42a7736d5208d9f68f7394492e8769a9c5",
-        "sha256": "069dw03p1bgqh445w5zan9dpx5l338spb2dhwx2x1dpx3dv06g8s",
+        "rev": "4d874bf15445951693db8e99e89d191a68cf966d",
+        "sha256": "1613fdzl3fani82kjvficlgj1y8980i9dsmb21idr8112y3lf5cl",
         "type": "tarball",
-        "url": "https://github.com/kittywitch/nixexprs/archive/27778b42a7736d5208d9f68f7394492e8769a9c5.tar.gz",
+        "url": "https://github.com/kittywitch/nixexprs/archive/4d874bf15445951693db8e99e89d191a68cf966d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {