From 3b62f996537a3df3ad8d3118b0eae0056bd49218 Mon Sep 17 00:00:00 2001 From: irl Date: Tue, 27 May 2025 14:12:17 +0100 Subject: [PATCH 1/3] feat: adds linting --- .forgejo/workflows/lint.yaml | 20 ++++++++++++ .markdownlint.json | 6 ++++ Justfile | 7 +++++ README.md | 17 +++++++--- flake.lock | 61 ++++++++++++++++++++++++++++++++++++ flake.nix | 32 +++++++++++++++++++ 6 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 .forgejo/workflows/lint.yaml create mode 100644 .markdownlint.json create mode 100644 Justfile create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.forgejo/workflows/lint.yaml b/.forgejo/workflows/lint.yaml new file mode 100644 index 0000000..fdc85b6 --- /dev/null +++ b/.forgejo/workflows/lint.yaml @@ -0,0 +1,20 @@ +name: Lint + +on: + push: + branches: + - main + +jobs: + lint: + runs-on: docker + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Nix + uses: https://guardianproject.dev/actions/install-nix-action@v15 + + - name: Run just lint + run: nix-shell --run "just lint" diff --git a/.markdownlint.json b/.markdownlint.json new file mode 100644 index 0000000..a97332c --- /dev/null +++ b/.markdownlint.json @@ -0,0 +1,6 @@ +{ + "MD033": false, + "line_length": { + "line_length": 92 + } +} diff --git a/Justfile b/Justfile new file mode 100644 index 0000000..9bdbc96 --- /dev/null +++ b/Justfile @@ -0,0 +1,7 @@ +lint: + markdownlint README.md + nixfmt -c flake.nix + +fmt: + markdownlint --fix README.md + nixfmt flake.nix diff --git a/README.md b/README.md index 08b93c6..c50c349 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,16 @@

- pronouns: he/him/his - Website - ISO 3166: GB-SCT -

\ No newline at end of file + pronouns: he/him/his + + Website + + + ISO 3166: GB-SCT + + + ORCiD + +

diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..d072398 --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..3fe2aa6 --- /dev/null +++ b/flake.nix @@ -0,0 +1,32 @@ +{ + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + outputs = + { + self, + nixpkgs, + flake-utils, + ... + }: + flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = import nixpkgs { + inherit system; + }; + in + with pkgs; + { + devShells.default = mkShell { + buildInputs = [ + git + markdownlint-cli + nixfmt-rfc-style + just + ]; + }; + } + ); +} From 3259634f0e22917b94a4a16790ee2eeaf4e03fef Mon Sep 17 00:00:00 2001 From: irl Date: Tue, 27 May 2025 14:13:17 +0100 Subject: [PATCH 2/3] fix: style for orcid badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c50c349..c31961b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ ISO 3166: GB-SCT - - ORCiD + + ORCiD

From 23e1867d628372989d8969e39469647504bf057a Mon Sep 17 00:00:00 2001 From: irl Date: Tue, 27 May 2025 14:14:38 +0100 Subject: [PATCH 3/3] ci: use runner image --- .forgejo/workflows/lint.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.forgejo/workflows/lint.yaml b/.forgejo/workflows/lint.yaml index fdc85b6..da64644 100644 --- a/.forgejo/workflows/lint.yaml +++ b/.forgejo/workflows/lint.yaml @@ -9,6 +9,9 @@ jobs: lint: runs-on: docker + container: + image: ghcr.io/catthehacker/ubuntu:runner-latest + steps: - name: Checkout code uses: actions/checkout@v4