feat: better theme support

Author: neurosnap

Makefile

@@ -28,7 +28,7 @@ static: build clean
 		--desc "static site generator for git" \
 		--clone-url "https://github.com/picosh/pgit.git" \
 		--home-url "https://git.erock.io" \
-		--theme "algol" \
+		--theme "dracula" \
 		--revs main
 .PHONY:
 

README.md

@@ -23,6 +23,22 @@ To learn more about the options run:
 ./pgit --help
 ```
 
+## themes
+
+We support all [chroma](https://xyproto.github.io/splash/docs/all.html) themes.
+We do our best to adapt the theme of the entire site to match the chroma syntax
+highlighting theme. This is a "closet approximation" as we are not testing every
+single theme.
+
+```bash
+./pgit --revs main --label pico --out ./public --theme onedark
+```
+
+The default theme is `dracula`. If you want to change the colors for your site,
+we generate a `vars.css` file that you are welcome to overwrite before
+deploying, it will _not_ change the syntax highlighting colors, only the main
+site colors.
+
 # inspiration
 
 This project was heavily inspired by

go.mod

@@ -3,13 +3,13 @@ module github.com/picosh/pgit
 go 1.18
 
 require (
-	github.com/alecthomas/chroma v0.10.0
+	github.com/alecthomas/chroma/v2 v2.13.0
 	github.com/dustin/go-humanize v1.0.0
 	github.com/gogs/git-module v1.6.0
 )
 
 require (
-	github.com/dlclark/regexp2 v1.7.0 // indirect
+	github.com/dlclark/regexp2 v1.11.0 // indirect
 	github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75 // indirect
 	github.com/stretchr/testify v1.8.1 // indirect
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect

go.sum

@@ -1,15 +1,17 @@
-github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
-github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
+github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU=
+github.com/alecthomas/chroma/v2 v2.13.0 h1:VP72+99Fb2zEcYM0MeaWJmV+xQvz5v5cxRHd+ooU1lI=
+github.com/alecthomas/chroma/v2 v2.13.0/go.mod h1:BUGjjsD+ndS6eX37YgTchSEG+Jg9Jv1GiZs9sqPqztk=
+github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=
-github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
+github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/gogs/git-module v1.6.0 h1:71GdRM9/pFxGgSUz8t2DKmm3RYuHUnTjsOuFInJXnkM=
 github.com/gogs/git-module v1.6.0/go.mod h1:8jFYhDxLUwEOhM2709l2CJXmoIIslobU1xszpT0NcAI=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75 h1:Pijfgr7ZuvX7QIQiEwLdRVr3RoMG+i0SbBO1Qu+7yVk=
 github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -18,7 +20,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=

html/base.layout.tmpl

@@ -10,6 +10,7 @@
 
     {{template "meta" .}}
 
+    <link rel="stylesheet" href="/vars.css" />
     <link rel="stylesheet" href="/smol.css" />
     <link rel="stylesheet" href="/main.css" />
   </head>

html/log.page.tmpl

@@ -26,7 +26,7 @@
 
       <div class="flex items-center gap-xs">
         <span>{{.AuthorStr}}</span>
-        <span>&centerdot;</span>
+        <span>&nbsp;&centerdot;&nbsp;</span>
         <span>{{.WhenStr}}</span>
       </div>
 

main.go

@@ -16,10 +16,10 @@ import (
 	"sync"
 	"unicode/utf8"
 
-	"github.com/alecthomas/chroma"
-	formatterHtml "github.com/alecthomas/chroma/formatters/html"
-	"github.com/alecthomas/chroma/lexers"
-	"github.com/alecthomas/chroma/styles"
+	"github.com/alecthomas/chroma/v2"
+	formatterHtml "github.com/alecthomas/chroma/v2/formatters/html"
+	"github.com/alecthomas/chroma/v2/lexers"
+	"github.com/alecthomas/chroma/v2/styles"
 	"github.com/dustin/go-humanize"
 	git "github.com/gogs/git-module"
 )
@@ -1008,6 +1008,30 @@ func (c *Config) writeRevision(repo *git.Repository, pageData *PageData, refs []
 	return output
 }
 
+func style(theme chroma.Style) string {
+	bg := theme.Get(chroma.Background)
+	txt := theme.Get(chroma.Text)
+	kw := theme.Get(chroma.Keyword)
+	nv := theme.Get(chroma.NameVariable)
+	cm := theme.Get(chroma.Comment)
+	ln := theme.Get(chroma.LiteralNumber)
+	return fmt.Sprintf(`:root {
+  --bg-color: %s;
+  --text-color: %s;
+  --border: %s;
+  --link-color: %s;
+  --hover: %s;
+  --visited: %s;
+}`,
+		bg.Background.String(),
+		txt.Colour.String(),
+		cm.Colour.String(),
+		nv.Colour.String(),
+		kw.Colour.String(),
+		ln.Colour.String(),
+	)
+}
+
 func main() {
 	var outdir = flag.String("out", "./public", "output directory")
 	var rpath = flag.String("repo", ".", "path to git repo")
@@ -1043,7 +1067,7 @@ func main() {
 
 	formatter := formatterHtml.New(
 		formatterHtml.WithLineNumbers(true),
-		formatterHtml.LinkableLineNumbers(true, ""),
+		formatterHtml.WithLinkableLineNumbers(true, ""),
 		formatterHtml.WithClasses(true),
 	)
 
@@ -1071,6 +1095,13 @@ func main() {
 	config.writeRepo()
 	config.copyStatic("static")
 
+	styles := style(*theme)
+	fmt.Println(styles)
+	err = os.WriteFile(filepath.Join(out, "vars.css"), []byte(styles), 0644)
+	if err != nil {
+		panic(err)
+	}
+
 	fp := filepath.Join(out, "syntax.css")
 	w, err := os.OpenFile(fp, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
 	if err != nil {

static/main.css

@@ -1,15 +1,19 @@
+pre {
+  border: 1px solid var(--border);
+}
+
+body {
+  max-width: 900px;
+}
+
 .border-b {
-  border-bottom: 1px solid var(--grey);
+  border-bottom: 1px solid var(--border);
 }
 
 .border-b:last-child {
   border-bottom: 0;
 }
 
-body {
-  max-width: 900px;
-}
-
 .box {
   margin: 1rem 0;
 }
@@ -24,7 +28,7 @@ body {
 }
 
 .tree-row:hover {
-  background-color: var(--grey);
+  background-color: var(--border);
 }
 
 @media only screen and (max-width: 900px) {