fix assets for cgit

5 files changed, 36 insertions, 7 deletions

diff --git a/flake.lock b/flake.lock
index a034f4b..e2f9ba7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -358,6 +358,7 @@
         "nix-index-database": "nix-index-database",
         "nixos-facter-modules": "nixos-facter-modules",
         "nixpkgs": "nixpkgs",
+        "shared-assets": "shared-assets",
         "tmux-tsunami": "tmux-tsunami",
         "uc-css-js": "uc-css-js"
       }
@@ -383,6 +384,22 @@
         "type": "github"
       }
     },
+    "shared-assets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1789870017,
+        "narHash": "sha256-oVMFG9t9eZBMIIz2EV0KdC7T74eC8LZh3PpxDYxkepo=",
+        "ref": "refs/heads/main",
+        "rev": "03f93890672d169de4f77f0149b3a39c30be2ec9",
+        "revCount": 3,
+        "type": "git",
+        "url": "ssh://git@ganymede/~/shared-assets"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git@ganymede/~/shared-assets"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
diff --git a/flake.nix b/flake.nix
index d1d94de..80a56db 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,6 +38,11 @@
       flake = false;
     };
 
+    shared-assets = {
+      url = "git+ssh://git@ganymede/~/shared-assets";
+      flake = false;
+    };
+
     tmux-tsunami = {
       url = "git+https://git.collin.williamsfam.us.com/tmux-tsunami";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
index d98a8fc..b7a4cef 100644
--- a/hosts/ganymede/caddy.nix
+++ b/hosts/ganymede/caddy.nix
@@ -82,7 +82,6 @@
         '';
         extraConfig = ''
           root * /media/public/www/collin
-          try_files {path} {path}.html {path}/index.html
           file_server
         '';
       };
diff --git a/modules/services/nixos/cgit/cgit.css b/modules/services/nixos/cgit/cgit.css
index 8ac6aeb..f2fb6c4 100644
--- a/modules/services/nixos/cgit/cgit.css
+++ b/modules/services/nixos/cgit/cgit.css
@@ -1,5 +1,5 @@
-@import url('https://collin.williamsfam.us.com/static/fonts.css');
-@import url('https://collin.williamsfam.us.com/static/prose.css');
+@import url('/static/fonts.css');
+@import url('/static/prose.css');
 
 :root {
     --bg: #121212;
@@ -617,7 +617,7 @@ header {
         height: 5.5rem;
         flex-shrink: 0;
         background-color: #e6e6e6;
-        mask-image: url("https://collin.williamsfam.us.com/static/Logo.svg");
+        mask-image: url("/static/Logo.svg");
         mask-size: contain;
         mask-repeat: no-repeat;
         mask-position: center;
diff --git a/modules/services/nixos/cgit/default.nix b/modules/services/nixos/cgit/default.nix
index 1da463c..0585515 100644
--- a/modules/services/nixos/cgit/default.nix
+++ b/modules/services/nixos/cgit/default.nix
@@ -2,6 +2,7 @@
   pkgs,
   config,
   lib,
+  inputs,
   ...
 }: let
   cfg = config.collinux.services.cgit;
@@ -97,9 +98,16 @@ in {
           file_server
       }
 
-      reverse_proxy unix//run/cgit/fcgiwrap.sock {
-          transport fastcgi {
-              env SCRIPT_FILENAME ${custom_cgit}/cgit.cgi
+      handle_path /static/* {
+          root * ${inputs.shared-assets}
+          file_server
+      }
+
+      handle {
+          reverse_proxy unix//run/cgit/fcgiwrap.sock {
+              transport fastcgi {
+                  env SCRIPT_FILENAME ${custom_cgit}/cgit.cgi
+              }
           }
       }
     '';