small changes to cgit

5 files changed, 29 insertions, 80 deletions

diff --git a/hosts/ganymede/caddy.nix b/hosts/ganymede/caddy.nix
index fe1e90f..cf85042 100644
--- a/hosts/ganymede/caddy.nix
+++ b/hosts/ganymede/caddy.nix
@@ -76,19 +76,6 @@
         '';
       };
       # collin's stuff
-      "static.williamsfam.us.com" = {
-        logFormat = lib.mkForce ''
-          output file /var/log/caddy/access-williamsfam.us.com.log
-        '';
-        extraConfig = ''
-          root * /media/public/www/static
-          file_server
-
-          @allowed_origins header_regexp Origin ^https?://([a-z0-9-]+)\.(williamsfam\.us\.com|ganymede)(:[0-9]+)?$
-          header @allowed_origins Access-Control-Allow-Origin "{header.Origin}"
-          header @allowed_origins Vary "Origin"
-        '';
-      };
       "collin.williamsfam.us.com" = {
         logFormat = lib.mkForce ''
           output file /var/log/caddy/access-williamsfam.us.com.log
@@ -97,6 +84,10 @@
           root * /media/public/www/collin
           try_files {path} {path}.html {path}/index.html
           file_server
+
+          @allowed_origins header_regexp Origin ^https?://([a-z0-9-]+\.)+(williamsfam\.us\.com|ganymede)(:[0-9]+)?$
+          header @allowed_origins Access-Control-Allow-Origin "{header.Origin}"
+          header @allowed_origins Vary "Origin"
         '';
       };
       # "git.collin.williamsfam.us.com" = {
diff --git a/modules/services/nixos/cgit/Logo.svg b/modules/services/nixos/cgit/Logo.svg
deleted file mode 100644
index 77eb306..0000000
--- a/modules/services/nixos/cgit/Logo.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg version="1.1"
-     viewBox="0 0 960 960"
-     fill="none"
-     xmlns="http://www.w3.org/2000/svg">
-
-  <rect
-    x="1"
-    y="1"
-    width="958"
-    height="958"
-    fill="none"
-    stroke="#e6e6e6"
-    stroke-width="40"/>
-
-  <path
-    fill="#e6e6e6"
-    d="m311.93704 145.0l0 52.28067l120.27191 0l0 5.2159424c-26.282684 7.439789 -46.328003 19.367706 -60.135956 35.783752c-13.7127075 16.33519 -20.569061 36.18811 -20.569061 59.558716c0 29.839996 8.332367 53.69586 24.997131 71.567505c16.664764 17.871643 42.56656 30.527374 77.70538 37.967163l0 3.0325317c-42.18564 4.447693 -75.13425 18.235565 -98.845825 41.363586c-23.616333 23.04715 -35.4245 50.986816 -35.4245 83.81888c0 29.273987 5.856476 53.736267 17.569397 73.387024c11.712952 19.650757 30.710785 36.066833 56.99347 49.24817c26.282715 13.100464 61.659607 24.38147 106.13071 33.842896l66.706604 14.192261l-29.853699 94.614624l66.706665 14.1922l26.425537 -83.454956c1.1427002 -4.5286255 2.1425781 -8.895447 2.9996338 -13.100525c0.85705566 -4.205078 1.2855835 -8.046265 1.2855835 -11.52356c0 -12.938721 -4.6661377 -24.219727 -13.998413 -33.842957c-9.332275 -9.704041 -24.23529 -16.820374 -44.709167 -21.348938l-66.706635 -14.919983c-26.94928 -5.9033203 -48.756317 -13.1813965 -65.42105 -21.834167c-16.664764 -8.733704 -28.949066 -19.165527 -36.852936 -31.295654c-7.903839 -12.2109375 -11.855774 -26.524414 -11.855774 -42.94049l0 -10.431885c0 -19.89331 4.23761 -36.794586 12.71283 -50.703735c8.47522 -13.90918 22.235535 -24.583649 41.280975 -32.023438c19.04544 -7.4397583 43.756897 -11.159668 74.13434 -11.159668l76.41986 0l0 -52.159363l-76.41986 0c-30.948822 0 -54.803223 -7.075897 -71.5632 -21.227661c-16.664764 -14.2326355 -24.997131 -34.247253 -24.997131 -60.043915l0 -10.431885c0 -20.37854 4.380432 -37.643692 13.141357 -51.795456c8.85611 -14.151764 20.99759 -24.94754 36.424377 -32.38733c15.522034 -7.439789 33.805664 -11.159683 54.85086 -11.159683l116.84375 0l0 -52.28067z"/>
-</svg>
\ No newline at end of file
diff --git a/modules/services/nixos/cgit/cgit-head.html b/modules/services/nixos/cgit/cgit-head.html
index da6140d..b0c74dd 100644
--- a/modules/services/nixos/cgit/cgit-head.html
+++ b/modules/services/nixos/cgit/cgit-head.html
@@ -19,21 +19,24 @@
 		
 		const headerInfo = document.createElement("div");
 		headerInfo.className = "header-info";
-		
-		const title = document.createElement("h1");
+
 		const repo = main.querySelector("a:last-of-type");
-		title.textContent = repo?.textContent.trim() ?? "";
+		const title = document.createElement("h1");
+		if (repo && repo !== main.querySelector("a:first-of-type")) {
+		    title.textContent = repo.textContent.trim();
+		} else {
+		    title.textContent = document.title; // we must be on the title page
+				title.className = "main-page";
+		}
 		
 		const desc = document.createElement("p");
-		desc.className = "description";
+		desc.className = "description"
 		desc.textContent = description?.textContent.trim() ?? "";
 		
 		headerInfo.append(title, desc);
 		headerTop.append(logoLink, headerInfo);
+		header.append(headerTop);
 		
-		const hr = document.createElement("hr");
-		
-		header.append(headerTop, hr);
 		oldHeader.replaceWith(header);
-		});
+	});
 </script>
diff --git a/modules/services/nixos/cgit/cgit.css b/modules/services/nixos/cgit/cgit.css
index 25cff6e..8ac6aeb 100644
--- a/modules/services/nixos/cgit/cgit.css
+++ b/modules/services/nixos/cgit/cgit.css
@@ -1,5 +1,5 @@
-@import url('https://static.williamsfam.us.com/fonts.css');
-@import url('https://static.williamsfam.us.com/prose.css');
+@import url('https://collin.williamsfam.us.com/static/fonts.css');
+@import url('https://collin.williamsfam.us.com/static/prose.css');
 
 :root {
     --bg: #121212;
@@ -46,39 +46,10 @@ table {
 
 div#cgit {
     max-width: fit-content;
+    min-width: 904.9px;
     margin: 0 auto;
 }
 
-table#header {
-    width: 100%;
-    margin-bottom: 1.5rem;
-
-    td.logo {
-        width: 96px;
-        vertical-align: top;
-    }
-
-    td.main {
-        font-family: var(--fontSerif);
-        font-size: 2rem;
-        font-weight: 600;
-        padding: 0 0 0 0.75rem;
-        white-space: nowrap;
-
-        a {
-            color: var(--fg);
-            &:hover { color: var(--accent); }
-        }
-    }
-
-    td.sub {
-        color: var(--muted);
-        padding-left: 0.75rem;
-        padding-top: 0.25rem;
-        font-family: var(--fontSerif);
-    }
-}
-
 td.form {
     text-align: right;
 }
@@ -87,8 +58,8 @@ td.form {
 table.tabs {
     border-bottom: 2px solid var(--border);
     border-collapse: collapse;
-    margin-top: 2rem;
-    margin-bottom: 0;
+    margin: 0;
+    margin-top: 1rem;
     width: 100%;
 
     td {
@@ -646,7 +617,7 @@ header {
         height: 5.5rem;
         flex-shrink: 0;
         background-color: #e6e6e6;
-        mask-image: url("https://static.williamsfam.us.com/Logo.svg");
+        mask-image: url("https://collin.williamsfam.us.com/static/Logo.svg");
         mask-size: contain;
         mask-repeat: no-repeat;
         mask-position: center;
@@ -663,6 +634,10 @@ header {
             font-family: var(--fontMono); /* makes more sense for a git repo title */
             line-height: 1;
             margin: 0;
+
+            &.main-page {
+                font-family: var(--fontSerif); /* makes more sense for the "Repositories" title of the main page*/
+            }
         }
     }
 
diff --git a/modules/services/nixos/cgit/default.nix b/modules/services/nixos/cgit/default.nix
index 477e678..0ae3256 100644
--- a/modules/services/nixos/cgit/default.nix
+++ b/modules/services/nixos/cgit/default.nix
@@ -36,7 +36,7 @@ in {
     users.users."git" = {
       isSystemUser = true;
       group = "git";
-      shell = lib.getExe pkgs.git;
+      shell = "${pkgs.git}/bin/git-shell";
 
       home = "/var/lib/cgit";
       createHome = true;
@@ -59,8 +59,8 @@ in {
       enable-http-clone=1
       enable-commit-graph=1
 
-      root-title=git@ganymede
-      root-desc=Git repos associated with Ganymede
+      root-title=Repositories
+      root-desc=Git repos for my various personal projects
 
       readme=:README.md
       about-filter=${md2html}/bin/md2html.sh
@@ -86,9 +86,7 @@ in {
       };
     };
 
-    services.caddy.virtualHosts."git.ganymede".extraConfig = ''
-      tls internal
-
+    services.caddy.virtualHosts."git.collin.williamsfam.us.com".extraConfig = ''
       @assets path /cgit.css /cgit.js /favicon.svg /robots.txt
       handle @assets {
       	root * ${custom_cgit}