diff --git a/nix-system-configs/modules/styling/forgejo/header.tmpl b/nix-system-configs/modules/styling/forgejo/header.tmpl index 241df9e..3f563b3 100644 --- a/nix-system-configs/modules/styling/forgejo/header.tmpl +++ b/nix-system-configs/modules/styling/forgejo/header.tmpl @@ -1,2 +1,14 @@ -{{/* This will be injected into via $FORGEJO_CUSTOM/templates/custom/header.tmpl */}} - +{{/* Custom header content - inject custom fonts that apply to all themes */}} + diff --git a/nix-system-configs/modules/styling/forgejo/home.tmpl b/nix-system-configs/modules/styling/forgejo/home.tmpl index 8516f3a..1f5db13 100644 --- a/nix-system-configs/modules/styling/forgejo/home.tmpl +++ b/nix-system-configs/modules/styling/forgejo/home.tmpl @@ -1,5 +1,5 @@ -[[:Template:Template "base/head" .]] -
+{{template "base/head" .}} +
@@ -10,4 +10,4 @@
-[[:Template:Template "base/footer" .]] \ No newline at end of file +{{template "base/footer" .}} diff --git a/nix-system-configs/modules/styling/forgejo/theme-custom.css b/nix-system-configs/modules/styling/forgejo/theme-custom.css index 7c12ccd..f3fa8d3 100644 --- a/nix-system-configs/modules/styling/forgejo/theme-custom.css +++ b/nix-system-configs/modules/styling/forgejo/theme-custom.css @@ -1,4 +1,3 @@ -@import "./theme-forgejo-auto.css"; @font-face { font-family: 'Maple Mono NF'; diff --git a/nix-system-configs/modules/system/forgejo.nix b/nix-system-configs/modules/system/forgejo.nix index b02e2b0..692c962 100644 --- a/nix-system-configs/modules/system/forgejo.nix +++ b/nix-system-configs/modules/system/forgejo.nix @@ -122,8 +122,8 @@ in { }; settings.ui = { - DEFAULT_THEME = "custom"; - THEMES = "forgejo-auto,forgejo-light,forgejo-dark,custom"; + DEFAULT_THEME = "forgejo-auto"; + THEMES = "forgejo-auto,forgejo-light,forgejo-dark"; }; }; @@ -133,18 +133,14 @@ in { "d '${config.services.forgejo.customDir}/templates/custom' - forgejo forgejo - -" "d '${config.services.forgejo.customDir}/public' - forgejo forgejo - -" "d '${config.services.forgejo.customDir}/public/assets' - forgejo forgejo - -" - "d '${config.services.forgejo.customDir}/public/assets/css' - forgejo forgejo - -" # ensure fonts directory exists "d '${config.services.forgejo.customDir}/public/assets/fonts' - forgejo forgejo - -" # install the TTF from the Nix store into the Forgejo customDir "C+ '${config.services.forgejo.customDir}/public/assets/fonts/MapleMonoNerd.ttf' - forgejo forgejo - ${mapleFonts}/fonts/MapleMonoNerd.ttf" - "C+ '${config.services.forgejo.customDir}/public/assets/css/theme-custom.css' - forgejo forgejo - ${ - ../styling/forgejo/theme-custom.css - }" "C+ '${config.services.forgejo.customDir}/templates/home.tmpl' - forgejo forgejo - ${ ../styling/forgejo/home.tmpl }" - # copy a small header.tmpl into templates/custom so we can force-include custom CSS into the + # copy header.tmpl into templates/custom so we can inject custom CSS into the "C+ '${config.services.forgejo.customDir}/templates/custom/header.tmpl' - forgejo forgejo - ${ ../styling/forgejo/header.tmpl }"