.drone.jsonnet

@@ -1,59 +1,58 @@
 local Pipeline(isDev) = {
   kind: "pipeline",
-  type: "exec",
+  name: if isDev then "deploy-dev" else "deploy-prod",
-  name: if isDev then "Deploy to dev" else "Deploy to prod",
   # Dev ignores "master", prod only triggers on "master"
   trigger: { branch: { [if isDev then "exclude" else "include"]: [ "main" ] } },
+  # We want to clone the submodules, which isn't done by default
+  clone: { disable: true },
   steps: [
     {
-      # We want to clone the submodules, which isn't done by default
+      name: "clone",
-      name: "submodules",
+      image: "plugins/git",
-      commands: [
+      recursive: true,
-        "git submodule update --recursive --init",
-      ]
     },
     {
-      # Include pre-commit checks, which include markdownlint
+      name: "markdownlint",
-      name: "check",
+      image: "06kellyjac/markdownlint-cli",
       commands: [
-        "nix flake check",
+        "markdownlint --version",
+        "markdownlint content/",
       ],
     },
     {
-      # If dev, include drafts and future articles, change base URL
       name: "build",
+      image: "klakegg/hugo",
       commands: [
-        "nix develop -c make " + if isDev then "build-dev" else "build-prod",
+        "hugo version",
+        # If dev, include drafts and future articles, change base URL
+        "hugo --minify" + if isDev then " -D -F -b https://dev.belanyi.fr" else "",
       ],
+      [if !isDev then "environment"]: { HUGO_ENV: "production" }
     },
     {
       name: "deploy",
-      commands: [
+      image: "appleboy/drone-scp",
-        "nix run github:ambroisie/nix-config#drone-scp",
+      settings: {
-      ],
+        source: "public/*",
-      environment: {
+        strip_components: 1, # Remove 'public/' suffix from file paths
-        SCP_SOURCE: "public/*",
+        rm: true, # Remove previous files from target directory
-        SCP_STRIP_COMPONENTS: 1, # Remove 'public/' suffix from file paths
+        host: { from_secret: "ssh_host" },
-        SCP_RM: true, # Remove previous files from target directory
+        target: { from_secret: "ssh_target" + if isDev then "_dev" else "" },
-        SCP_HOST: { from_secret: "ssh_host" },
+        username: { from_secret: "ssh_user" },
-        SCP_TARGET: { from_secret: "ssh_target" + if isDev then "_dev" else "" },
+        key: { from_secret: "ssh_key" },
-        SCP_USERNAME: { from_secret: "ssh_user" },
+        port: { from_secret: "ssh_port" },
-        SCP_KEY: { from_secret: "ssh_key" },
-        SCP_PORT: { from_secret: "ssh_port" },
       },
     },
     {
       name: "notify",
-      commands: [
+      image: "plugins/matrix",
-        "nix run github:ambroisie/matrix-notifier",
+      settings: {
-      ],
+        homeserver: { from_secret: "matrix_homeserver" },
-      environment: {
+        roomid: { from_secret: "matrix_roomid" },
-        ADDRESS: { from_secret: "matrix_homeserver" },
+        username: { from_secret: "matrix_username" },
-        ROOM: { from_secret: "matrix_roomid" },
+        password: { from_secret: "matrix_password" },
-        USER: { from_secret: "matrix_username" },
-        PASS: { from_secret: "matrix_password" },
       },
-      when: { status: [ "failure", "success", ] },
+      trigger: { status: [ "failure", "success", ] },
     },
   ]
 };

Makefile

@@ -1,18 +1,28 @@
 .PHONY: all
-all: build-dev
+all: build
+
+.PHONY: build
+build: build-dev
 
 .PHONY: build-dev
 build-dev:
-	HUGO_TITLE="Ambroisie's dev blog" HUGO_BASEURL=https://dev.belanyi.fr hugo -D -F
+	hugo -D -F
 
 .PHONY: build-prod
 build-prod:
-	HUGO_ENV=production hugo --minify
+	HUGO_ENV=production hugo
 
 .PHONY: serve
-serve:
+serve: serve-dev
+
+.PHONY: serve-dev
+serve-dev:
 	hugo server -D -F
 
+.PHONY: serve-prod
+serve-prod:
+	hugo server
+
 .PHONY: clean
 clean:
 	$(RM) -r public

flake.lock

@@ -18,16 +18,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1628320020,
+        "lastModified": 1622282707,
-        "narHash": "sha256-4xBEb+TOHyIGpK37EVsZx6dGPwNMf5YWNBJaQ4VyZws=",
+        "narHash": "sha256-+GOrUDsdneUqrOm9d+9bHXjEVoVcU8tm14WGVzbt6gg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "67c80531be622641b5b2ccc3a7aff355cb02476b",
+        "rev": "6933d068c5d2fcff398e802f7c4e271bbdab6705",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -9,11 +9,12 @@
       ref = "master";
     };
 
+    # https://nixpk.gs/pr-tracker.html?pr=124808
     nixpkgs = {
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "nixpkgs-unstable";
+      ref = "nixos-unstable";
     };
 
     pre-commit-hooks = {

themes/anubis

@@ -1 +1 @@
-Subproject commit 5dab60e04a37896c09a32137aefe821c63b3af04
+Subproject commit b43d933019d2789c43914f20242c857f10029611