bugfixe: to submodule, workflow, lots

.github/workflows/beta.yml

@@ -26,19 +26,19 @@ jobs:
     - name: Build Hugo Site
       run: |
         source /home/runner/.nix-profile/etc/profile.d/nix.sh
-        nix develop --extra-experimental-features nix-command --command website
+        nix develop --extra-experimental-features nix-command --command build
 
     - name: Set directory permissions for FTP Deploy
       run: |
-        chmod -R 755 result/
+        chmod -R 755 public/
 
     - name: Deploy to FTP server
       uses: SamKirkland/[email protected]
       with:
         server: ${{ secrets.FTP_SERVER }}
         username: ${{ secrets.FTP_USERNAME_BETA }}
         password: ${{ secrets.FTP_PASSWORD_BETA }}
-        local-dir: result/
+        local-dir: public/
         server-dir: website/
         state-name: ../.ftp-deploy-sync-state.json
         protocol: ftps

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "submodules/rosenpass"]
 	path = submodules/rosenpass
 	url = https://github.com/rosenpass/rosenpass
+[submodule "themes/docsy"]
+	path = themes/docsy
+	url = https://github.com/google/docsy

config.toml

@@ -68,6 +68,7 @@ enableRobotsTXT = true
     target = "assets/vendor/bootstrap/dist"
 
   # Imports defined in the docsy theme's hugo.yaml
+
   [[module.imports]]
     path = "./github.com/twbs/bootstrap"
     disable = false

content/en/contributors.html

@@ -98,7 +98,7 @@ <h3 id="team">Team</h3>
 </div>
 
 {{< blocks/lead color="primary" >}}
-<h3 id="codethanks">Code Contributors</h3>
+<h3 id="codethanks">Code Contributors</h3> TITTIES
 {{< /blocks/lead >}}
 {{< blocks/section color="white" >}}
 <p class="text-center codethanks-blerb">

flake.nix

@@ -70,8 +70,7 @@
               command = ''
                 ./changelog-check.sh
                 git submodule update --init --recursive
-                npm ci
-                hugo $@
+                nix build
               '';
               help = "Build the website with submodules included and export to the result folder.";
             }

go.mod

@@ -4,5 +4,6 @@ go 1.19
 
 require (
 	github.com/FortAwesome/Font-Awesome v4.7.0+incompatible // indirect
+	github.com/google/docsy v0.10.0 // indirect
 	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
 )

go.sum

@@ -1,4 +1,7 @@
+github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
 github.com/FortAwesome/Font-Awesome v4.7.0+incompatible h1:3trjm7NtX5NXlju1AxSWSzedDMq2hsfH78Qtqrc8EgY=
 github.com/FortAwesome/Font-Awesome v4.7.0+incompatible/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/google/docsy v0.10.0 h1:6tMDacPwAyRWNCfvsn/9qGOZDQ8b0aRzjRZvnZPY5dg=
+github.com/google/docsy v0.10.0/go.mod h1:c0nIAqmRTOuJ01F85U/wJPQtc3Zj9N58Kea9bOT2AJc=
 github.com/twbs/bootstrap v5.3.3+incompatible h1:goFoqinzdHfkeegpFP7pvhbd0g+A3O2hbU3XCjuNrEQ=
 github.com/twbs/bootstrap v5.3.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=

layouts/partials/page-description.html

@@ -0,0 +1,11 @@
+{{ with .Description | plainify -}}
+  {{ . -}}
+{{ else -}}
+  {{ if .IsPage -}}
+    {{ .Summary | plainify | chomp -}}
+  {{ else -}}
+    {{ with .Site.Params.description | plainify -}}
+      {{ . -}}
+    {{ end -}}
+  {{ end -}}
+{{ end -}}