diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e94d4d4..df9c138 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,9 @@ stages:
build:
stage: build
+ image: "nixos/nix:latest"
tags:
- - nix
+ - kubernetes
script:
- nix run ".#podman" -- login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- nix build .
diff --git a/config.toml b/config.toml
index bad66f6..8c7921a 100644
--- a/config.toml
+++ b/config.toml
@@ -5,8 +5,10 @@ theme = "Gregroad"
enableEmoji = true
enableRobotsTXT = true
-# Enable Disqus
-disqusShortname = "thehellings"
+[services]
+ [services.disqus]
+ # Enable Disqus
+ shortname = "thehellings"
# Google Analytics
#googleAnalytics = "UA-123-45"
diff --git a/flake.lock b/flake.lock
index 8bf0f18..04be786 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,15 +2,14 @@
"nodes": {
"devshell": {
"inputs": {
- "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1713532798,
- "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
+ "lastModified": 1741473158,
+ "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
"owner": "numtide",
"repo": "devshell",
- "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
+ "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
"type": "github"
},
"original": {
@@ -24,11 +23,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1712014858,
- "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+ "lastModified": 1756770412,
+ "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+ "rev": "4524271976b625a4a605beefd893f270620fd751",
"type": "github"
},
"original": {
@@ -39,11 +38,11 @@
},
"flake-root": {
"locked": {
- "lastModified": 1713493429,
- "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
+ "lastModified": 1723604017,
+ "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=",
"owner": "srid",
"repo": "flake-root",
- "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
+ "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e",
"type": "github"
},
"original": {
@@ -52,31 +51,13 @@
"type": "github"
}
},
- "flake-utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1701680307,
- "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
- "lastModified": 1704161960,
- "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
+ "lastModified": 1722073938,
+ "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
+ "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
"type": "github"
},
"original": {
@@ -88,29 +69,26 @@
},
"nixpkgs-lib": {
"locked": {
- "dir": "lib",
- "lastModified": 1711703276,
- "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
+ "lastModified": 1754788789,
+ "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
"type": "github"
},
"original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1682960002,
- "narHash": "sha256-5Zjh4pT3lAjFGN1gVrjqj1LLJHKCAlGdLD8raU7oEMc=",
+ "lastModified": 1759036355,
+ "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8670e496ffd093b60e74e7fa53526aa5920d09eb",
+ "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
"type": "github"
},
"original": {
@@ -122,27 +100,27 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1708475490,
- "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
+ "lastModified": 1754340878,
+ "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
+ "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
+ "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"process-compose": {
"locked": {
- "lastModified": 1713665906,
- "narHash": "sha256-kuOJ5pK03axDx4F5GBhNMn6ZtTG3V4Cd85iHUsu5eWk=",
+ "lastModified": 1758658658,
+ "narHash": "sha256-y5GSCqlGe/uZzlocCPZcjc7Gj+mTq7m0P6xPGx88+No=",
"owner": "Platonic-Systems",
"repo": "process-compose-flake",
- "rev": "128a50fb7bb03eb41c8f65923c355ad4d7a57935",
+ "rev": "e968a94633788f5d9595d727f41c2baf0714be7b",
"type": "github"
},
"original": {
@@ -161,31 +139,16 @@
"treefmt-nix": "treefmt-nix"
}
},
- "systems": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"treefmt-nix": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1711963903,
- "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
+ "lastModified": 1758728421,
+ "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
+ "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index f9e2742..218b95a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,7 +79,7 @@
name = "Greg's homepage";
nativeBuildInputs = [ pkgs.hugo ];
buildPhase = ''
- hugo -v
+ hugo build
'';
installPhase = ''
mkdir -p $out
diff --git a/themes/Gregroad/layouts/_default/baseof.html b/themes/Gregroad/layouts/_default/baseof.html
index ec4b96d..e676004 100644
--- a/themes/Gregroad/layouts/_default/baseof.html
+++ b/themes/Gregroad/layouts/_default/baseof.html
@@ -36,13 +36,6 @@
{{- end }}
- {{- if not .Site.IsServer }}
- {{- if hasPrefix .Site.GoogleAnalytics "G-" }}
- {{ template "_internal/google_analytics.html" . }}
- {{- else }}
- {{ template "_internal/google_analytics_async.html" . }}
- {{- end }}
- {{- end }}
diff --git a/themes/Gregroad/layouts/partials/comments.html b/themes/Gregroad/layouts/partials/comments.html
index 50b87a7..4cfefb5 100644
--- a/themes/Gregroad/layouts/partials/comments.html
+++ b/themes/Gregroad/layouts/partials/comments.html
@@ -1,4 +1,4 @@
-{{ if and .Site.DisqusShortname (index .Params "comments" | default "true") (not .Site.IsServer) }}
+{{ if and .Site.Config.Services.Disqus.Shortname (index .Params "comments" | default "true") (not hugo.IsServer) }}