diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 diff --git a/.woodpecker.yml b/.woodpecker.yml index 29d75c8..a678a73 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,7 +5,6 @@ steps: - hugo mod tidy - hugo mod npm pack - npm install - - rm -rf /korhonen.cc/* - - hugo --gc -d /korhonen.cc + - hugo --gc --cleanDestinationDir --enableGitInfo -d /korhonen.cc volumes: - /var/www/korhonen.cc:/korhonen.cc diff --git a/assets/favicon-32x32.png b/assets/favicon.png similarity index 100% rename from assets/favicon-32x32.png rename to assets/favicon.png diff --git a/assets/jsconfig.json b/assets/jsconfig.json new file mode 100644 index 0000000..aa57a76 --- /dev/null +++ b/assets/jsconfig.json @@ -0,0 +1,10 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "*": [ + "../../../.cache/hugo_cache/modules/filecache/modules/pkg/mod/github.com/hugo-toha/toha/v4@v4.1.1/assets/*", + ], + }, + }, +} diff --git a/config/_default/module.toml b/config/_default/module.toml index e6f7928..92e9ee7 100644 --- a/config/_default/module.toml +++ b/config/_default/module.toml @@ -2,8 +2,8 @@ path = "github.com/hugo-toha/toha/v4" [[mounts]] -source = "static/files" -target = "static/files" +source = "static" +target = "static" [[mounts]] source = "./node_modules/flag-icon-css/flags" diff --git a/config/_default/outputs.toml b/config/_default/outputs.toml new file mode 100644 index 0000000..b394ff1 --- /dev/null +++ b/config/_default/outputs.toml @@ -0,0 +1 @@ +home = ["HTML", "RSS", "JSON"] diff --git a/config/_default/params.toml b/config/_default/params.toml index c6f0588..214f9a2 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -11,7 +11,7 @@ enable = false [logo] main = "/images/marko.png" inverted = "/images/marko.png" -favicon = "/favicon-32x32.png" +favicon = "/favicon.png" [features.toc] enable = true diff --git a/content/posts/migrate_misskey_root_account/index.adoc b/content/posts/migrate_misskey_root_account/index.adoc index 405179a..24c47c3 100644 --- a/content/posts/migrate_misskey_root_account/index.adoc +++ b/content/posts/migrate_misskey_root_account/index.adoc @@ -36,7 +36,7 @@ Misskey seems to save all of it's known users to the `user` table, not only the actual local accounts. To find the local accounts only, you can use the following query -[source] +[source,sql] ---- include::code/query_users[] ---- @@ -44,7 +44,7 @@ include::code/query_users[] Now you can simply make your new root account's `isRoot` column `true` and your actual user account `false`. After that, the migration will work. -[source] +[source,sql] ---- include::code/update_users[] ---- diff --git a/layouts/partials/header.html b/layouts/partials/header.html new file mode 100644 index 0000000..5030464 --- /dev/null +++ b/layouts/partials/header.html @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + +{{ partial "helpers/style-bundle.html" . }} + + +{{/* add favicon only if the site author has provided the the favicon */}} +{{ if site.Params.logo.favicon }} + {{ $favicon := site.Params.logo.favicon }} + + {{/* resize the favicon. don't resize svg because it is not supported */}} + {{ $favicon = resources.Get $favicon }} + {{ if and $favicon (ne $favicon.MediaType.SubType "svg") }} + {{ $favicon = $favicon.Resize "42x" }} + {{ end }} + {{ $favicon = $favicon.RelPermalink}} + + +{{end}} diff --git a/assets/android-chrome-192x192.png b/static/android-chrome-192x192.png similarity index 100% rename from assets/android-chrome-192x192.png rename to static/android-chrome-192x192.png diff --git a/assets/android-chrome-512x512.png b/static/android-chrome-512x512.png similarity index 100% rename from assets/android-chrome-512x512.png rename to static/android-chrome-512x512.png diff --git a/assets/apple-touch-icon.png b/static/apple-touch-icon.png similarity index 100% rename from assets/apple-touch-icon.png rename to static/apple-touch-icon.png diff --git a/assets/browserconfig.xml b/static/browserconfig.xml similarity index 100% rename from assets/browserconfig.xml rename to static/browserconfig.xml diff --git a/assets/favicon-16x16.png b/static/favicon-16x16.png similarity index 100% rename from assets/favicon-16x16.png rename to static/favicon-16x16.png diff --git a/static/favicon-32x32.png b/static/favicon-32x32.png new file mode 100644 index 0000000..ebc05f5 Binary files /dev/null and b/static/favicon-32x32.png differ diff --git a/assets/favicon.ico b/static/favicon.ico similarity index 100% rename from assets/favicon.ico rename to static/favicon.ico diff --git a/assets/mstile-150x150.png b/static/mstile-150x150.png similarity index 100% rename from assets/mstile-150x150.png rename to static/mstile-150x150.png diff --git a/static/rouge.css b/static/rouge.css new file mode 100644 index 0000000..c753d5c --- /dev/null +++ b/static/rouge.css @@ -0,0 +1,214 @@ +.highlight table td { + padding: 5px; +} +.highlight table pre { + margin: 0; +} +.highlight .gh { + color: #999999; +} +.highlight .sr { + color: #f6aa11; +} +.highlight .go { + color: #888888; +} +.highlight .gp { + color: #555555; +} +.highlight .gs { +} +.highlight .gu { + color: #aaaaaa; +} +.highlight .nb { + color: #f6aa11; +} +.highlight .cm { + color: #75715e; +} +.highlight .cp { + color: #75715e; +} +.highlight .c1 { + color: #75715e; +} +.highlight .cs { + color: #75715e; +} +.highlight .c, +.highlight .ch, +.highlight .cd, +.highlight .cpf { + color: #75715e; +} +.highlight .err { + color: #960050; +} +.highlight .gr { + color: #960050; +} +.highlight .gt { + color: #960050; +} +.highlight .gd { + color: #49483e; +} +.highlight .gi { + color: #49483e; +} +.highlight .ge { + color: #49483e; +} +.highlight .kc { + color: #66d9ef; +} +.highlight .kd { + color: #66d9ef; +} +.highlight .kr { + color: #66d9ef; +} +.highlight .no { + color: #66d9ef; +} +.highlight .kt { + color: #66d9ef; +} +.highlight .mf { + color: #ae81ff; +} +.highlight .mh { + color: #ae81ff; +} +.highlight .il { + color: #ae81ff; +} +.highlight .mi { + color: #ae81ff; +} +.highlight .mo { + color: #ae81ff; +} +.highlight .m, +.highlight .mb, +.highlight .mx { + color: #ae81ff; +} +.highlight .sc { + color: #ae81ff; +} +.highlight .se { + color: #ae81ff; +} +.highlight .ss { + color: #ae81ff; +} +.highlight .sd { + color: #e6db74; +} +.highlight .s2 { + color: #e6db74; +} +.highlight .sb { + color: #e6db74; +} +.highlight .sh { + color: #e6db74; +} +.highlight .si { + color: #e6db74; +} +.highlight .sx { + color: #e6db74; +} +.highlight .s1 { + color: #e6db74; +} +.highlight .s, +.highlight .sa, +.highlight .dl { + color: #e6db74; +} +.highlight .na { + color: #a6e22e; +} +.highlight .nc { + color: #a6e22e; +} +.highlight .nd { + color: #a6e22e; +} +.highlight .ne { + color: #a6e22e; +} +.highlight .nf, +.highlight .fm { + color: #a6e22e; +} +.highlight .vc { + color: #ffffff; + background-color: #272822; +} +.highlight .nn { + color: #ffffff; + background-color: #272822; +} +.highlight .nl { + color: #ffffff; + background-color: #272822; +} +.highlight .ni { + color: #ffffff; + background-color: #272822; +} +.highlight .bp { + color: #ffffff; + background-color: #272822; +} +.highlight .vg { + color: #ffffff; + background-color: #272822; +} +.highlight .vi { + color: #ffffff; + background-color: #272822; +} +.highlight .nv, +.highlight .vm { + color: #ffffff; + background-color: #272822; +} +.highlight .w { + color: #ffffff; + background-color: #272822; +} +.highlight { + color: #ffffff; + background-color: #272822; +} +.highlight .n, +.highlight .py, +.highlight .nx { + color: #ffffff; + background-color: #272822; +} +.highlight .ow { + color: #f92672; +} +.highlight .nt { + color: #f92672; +} +.highlight .k, +.highlight .kv { + color: #f92672; +} +.highlight .kn { + color: #f92672; +} +.highlight .kp { + color: #f92672; +} +.highlight .o { + color: #f92672; +} diff --git a/assets/safari-pinned-tab.svg b/static/safari-pinned-tab.svg similarity index 100% rename from assets/safari-pinned-tab.svg rename to static/safari-pinned-tab.svg diff --git a/assets/site.webmanifest b/static/site.webmanifest similarity index 100% rename from assets/site.webmanifest rename to static/site.webmanifest diff --git a/assets/sw.js b/static/sw.js similarity index 100% rename from assets/sw.js rename to static/sw.js