comparing b3e21ae58fb414cce5de23585178a22b6d151e1d and main on andreijiroh.dev/site

+4 -4

.tangled/workflows/site-deploy.yml

···

       2
       2
        
       # to Cloudflare Pages/Workers Static Sites. Secret management is handled via

     

       3
       3
        
       # Doppler (setting the DOPPLER_TOKEN secret on repo settings -> spindle is required).

     

       4
       4
        
       when:

     

       5
       5
       -
       - event: ["push", "manual"]

     

       6
       6
       -
         branch: ["main"]

     

       5
       5
       +
         - event: ["push", "manual"]

     

       6
       6
       +
           branch: ["main"]

     

       7
       7
        
       

     

       8
       8
        
       engine: nixery

     

       9
       9
        
       

     
···

       31
       31
        
           - pngquant

     

       32
       32
        
           # needed to generate LD_LIBRARY_PATH for cairo and friends

     

       33
       33
        
           - findutils

     

       34
       34
       +
           - coreutils

     

       34
       35
        
       

     

       35
       36
        
       environment:

     

       36
       37
        
         CI: "true" # https://tangled.org/tangled.org/core/issues/310 (resolved via merging https://tangled.org/tangled.org/core/pulls/843)

     
···

       39
       40
        
         CI_PIPELINE_SOURCE: "push"

     

       40
       41
        
         # technically we have --ingore-pipfile in the install command below, but just to be safe

     

       41
       42
        
         PIPENV_IGNORE_PIPFILE: "true"

     

       42
       42
       -
         # 

     

       43
       43
        
       

     

       44
       44
        
       steps:

     

       45
       45
        
         - name: Install deps

     
···

       53
       53
        
         - name: Deploy to Cloudflare Workers (as Static Site)

     

       54
       54
        
           command: |

     

       55
       55
        
             export LD_LIBRARY_PATH=$(find /nix/store -maxdepth 3 -type d -name lib | grep -E 'cairo|pango|gdk-pixbuf|librsvg|fontconfig|freetype|zlib' | tr '\n' ':')

     

       56
       56
       -
             doppler run -- npm run deploy:cf
     

       56
       56
       +
             doppler run -- npm run deploy:cf

+2 -2

.tool-versions

···

       1
       1
       -
       python 3.12.3

     

       2
       2
       -
       nodejs 22.8.0

     

       1
       1
       +
       python 3.14.0

     

       2
       2
       +
       nodejs 22.21.1

+8 -1

Pipfile

···

       19
       19
        
       [dev-packages]

     

       20
       20
        
       

     

       21
       21
        
       [requires]

     

       22
       22
       -
       python_version = "3.13"

     

       22
       22
       +
       python_version = "3.14"

     

       23
       23
        
       

     

       24
       24
        
       [scripts]

     

       25
       25
        
       dev = "mkdocs serve --watch overrides --watch-theme"

     

       26
       26
        
       build = "mkdocs build -d public --verbose"

     

       27
       27
        
       build-staging = "pipenv run build -f mkdocs.readthedocs.yml --verbose"

     

       28
       28
       +
       # next under zensical

     

       29
       29
       +
       next-dev = "zensical serve"

     

       30
       30
       +
       next-build = "zensical build"

     

       31
       31
       +
       # legacy builds under mkdocs

     

       32
       32
       +
       legacy-build = "mkdocs build -d public --verbose"

     

       33
       33
       +
       legacy-build-staging = "pipenv run build -f mkdocs.readthedocs.yml --verbose"

     

       34
       34
       +
       legacy-dev = "mkdocs serve --watch overrides --watch-theme"

+8 -8

Pipfile.lock

···

       1
       1
        
       {

     

       2
       2
        
           "_meta": {

     

       3
       3
        
               "hash": {

     

       4
       4
       -
                   "sha256": "21bc35e4a60508ada7a4d1d46af7744213b9370926f34e073458dd8fb13ee997"

     

       4
       4
       +
                   "sha256": "a54f862fd105133810703030592c31182334be6733f29a2b959e3d75ef3993dc"

     

       5
       5
        
               },

     

       6
       6
        
               "pipfile-spec": 6,

     

       7
       7
        
               "requires": {

     

       8
       8
       -
                   "python_version": "3.13"

     

       8
       8
       +
                   "python_version": "3.14"

     

       9
       9
        
               },

     

       10
       10
        
               "sources": [

     

       11
       11
        
                   {

     
···

       809
       809
        
               },

     

       810
       810
        
               "pymdown-extensions": {

     

       811
       811
        
                   "hashes": [

     

       812
       812
       -
                       "sha256:26bb3d7688e651606260c90fb46409fbda70bf9fdc3623c7868643a1aeee4713",

     

       813
       813
       -
                       "sha256:bffae79a2e8b9e44aef0d813583a8fea63457b7a23643a43988055b7b79b4992"

     

       812
       812
       +
                       "sha256:090bca72be43f7d3186374e23c782899dbef9dc153ef24c59dcd3c346f9ffcae",

     

       813
       813
       +
                       "sha256:20252abe6367354b24191431617a072ee6be9f68c5afcc74ea5573508a61f9e5"

     

       814
       814
        
                   ],

     

       815
       815
        
                   "markers": "python_version >= '3.9'",

     

       816
       816
       -
                   "version": "==10.17.2"

     

       816
       816
       +
                   "version": "==10.18"

     

       817
       817
        
               },

     

       818
       818
        
               "python-dateutil": {

     

       819
       819
        
                   "hashes": [

     
···

       944
       944
        
               },

     

       945
       945
        
               "urllib3": {

     

       946
       946
        
                   "hashes": [

     

       947
       947
       -
                       "sha256:c90f7a39f716c572c4e3e58509581ebd83f9b59cced005b7db7ad2d22b0db99f",

     

       948
       948
       -
                       "sha256:cb9bcef5a4b345d5da5d145dc3e30834f58e8018828cbc724d30b4cb7d4d49f1"

     

       947
       947
       +
                       "sha256:5379eb6e1aba4088bae84f8242960017ec8d8e3decf30480b3a1abdaa9671a3f",

     

       948
       948
       +
                       "sha256:e67d06fe947c36a7ca39f4994b08d73922d40e6cca949907be05efa6fd75110b"

     

       949
       949
        
                   ],

     

       950
       950
        
                   "markers": "python_version >= '3.9'",

     

       951
       951
       -
                   "version": "==2.6.0"

     

       951
       951
       +
                   "version": "==2.6.1"

     

       952
       952
        
               },

     

       953
       953
        
               "watchdog": {

     

       954
       954
        
                   "hashes": [

-1

build.sh

···

       1
       1
       -
       bin/build.sh

+52 -17

devenv.lock

···

       3
       3
        
           "devenv": {

     

       4
       4
        
             "locked": {

     

       5
       5
        
               "dir": "src/modules",

     

       6
       6
       -
               "lastModified": 1759936850,

     

       6
       6
       +
               "lastModified": 1764927628,

     

       7
       7
        
               "owner": "cachix",

     

       8
       8
        
               "repo": "devenv",

     

       9
       9
       -
               "rev": "ab228ad83419185654869e2e7ef3de84935be669",

     

       9
       9
       +
               "rev": "247d7027f91368054fb0eefbd755a73d42b66fee",

     

       10
       10
        
               "type": "github"

     

       11
       11
        
             },

     

       12
       12
        
             "original": {

     
···

       19
       19
        
           "flake-compat": {

     

       20
       20
        
             "flake": false,

     

       21
       21
        
             "locked": {

     

       22
       22
       -
               "lastModified": 1747046372,

     

       22
       22
       +
               "lastModified": 1765121682,

     

       23
       23
        
               "owner": "edolstra",

     

       24
       24
        
               "repo": "flake-compat",

     

       25
       25
       -
               "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",

     

       25
       25
       +
               "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",

     

       26
       26
        
               "type": "github"

     

       27
       27
        
             },

     

       28
       28
        
             "original": {

     
···

       34
       34
        
           "flake-compat_2": {

     

       35
       35
        
             "flake": false,

     

       36
       36
        
             "locked": {

     

       37
       37
       -
               "lastModified": 1747046372,

     

       37
       37
       +
               "lastModified": 1765121682,

     

       38
       38
        
               "owner": "edolstra",

     

       39
       39
        
               "repo": "flake-compat",

     

       40
       40
       -
               "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",

     

       40
       40
       +
               "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",

     

       41
       41
        
               "type": "github"

     

       42
       42
        
             },

     

       43
       43
        
             "original": {

     
···

       55
       55
        
               ]

     

       56
       56
        
             },

     

       57
       57
        
             "locked": {

     

       58
       58
       -
               "lastModified": 1759523803,

     

       58
       58
       +
               "lastModified": 1765016596,

     

       59
       59
        
               "owner": "cachix",

     

       60
       60
        
               "repo": "git-hooks.nix",

     

       61
       61
       -
               "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",

     

       61
       61
       +
               "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",

     

       62
       62
        
               "type": "github"

     

       63
       63
        
             },

     

       64
       64
        
             "original": {

     
···

       75
       75
        
               ]

     

       76
       76
        
             },

     

       77
       77
        
             "locked": {

     

       78
       78
       -
               "lastModified": 1709087332,

     

       78
       78
       +
               "lastModified": 1762808025,

     

       79
       79
        
               "owner": "hercules-ci",

     

       80
       80
        
               "repo": "gitignore.nix",

     

       81
       81
       -
               "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",

     

       81
       81
       +
               "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",

     

       82
       82
        
               "type": "github"

     

       83
       83
        
             },

     

       84
       84
        
             "original": {

     
···

       87
       87
        
               "type": "github"

     

       88
       88
        
             }

     

       89
       89
        
           },

     

       90
       90
       +
           "mk-shell-bin": {

     

       91
       91
       +
             "locked": {

     

       92
       92
       +
               "lastModified": 1677004959,

     

       93
       93
       +
               "owner": "rrbutani",

     

       94
       94
       +
               "repo": "nix-mk-shell-bin",

     

       95
       95
       +
               "rev": "ff5d8bd4d68a347be5042e2f16caee391cd75887",

     

       96
       96
       +
               "type": "github"

     

       97
       97
       +
             },

     

       98
       98
       +
             "original": {

     

       99
       99
       +
               "owner": "rrbutani",

     

       100
       100
       +
               "repo": "nix-mk-shell-bin",

     

       101
       101
       +
               "type": "github"

     

       102
       102
       +
             }

     

       103
       103
       +
           },

     

       104
       104
       +
           "nix2container": {

     

       105
       105
       +
             "inputs": {

     

       106
       106
       +
               "nixpkgs": [

     

       107
       107
       +
                 "nixpkgs"

     

       108
       108
       +
               ]

     

       109
       109
       +
             },

     

       110
       110
       +
             "locked": {

     

       111
       111
       +
               "lastModified": 1761716996,

     

       112
       112
       +
               "owner": "nlewo",

     

       113
       113
       +
               "repo": "nix2container",

     

       114
       114
       +
               "rev": "e5496ab66e9de9e3f67dc06f692dfbc471b6316e",

     

       115
       115
       +
               "type": "github"

     

       116
       116
       +
             },

     

       117
       117
       +
             "original": {

     

       118
       118
       +
               "owner": "nlewo",

     

       119
       119
       +
               "repo": "nix2container",

     

       120
       120
       +
               "type": "github"

     

       121
       121
       +
             }

     

       122
       122
       +
           },

     

       90
       123
        
           "nixpkgs": {

     

       91
       124
        
             "locked": {

     

       92
       92
       -
               "lastModified": 1759632233,

     

       93
       93
       -
               "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=",

     

       94
       94
       -
               "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",

     

       95
       95
       -
               "revCount": 871443,

     

       125
       125
       +
               "lastModified": 1764611609,

     

       126
       126
       +
               "narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=",

     

       127
       127
       +
               "rev": "8c29968b3a942f2903f90797f9623737c215737c",

     

       128
       128
       +
               "revCount": 905078,

     

       96
       129
        
               "type": "tarball",

     

       97
       97
       -
               "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.871443%2Brev-d7f52a7a640bc54c7bb414cca603835bf8dd4b10/0199bd2b-6c92-7223-94cf-69e43f5561ee/source.tar.gz"

     

       130
       130
       +
               "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.905078%2Brev-8c29968b3a942f2903f90797f9623737c215737c/019add91-3add-7a0d-8a25-9569cbe01efe/source.tar.gz"

     

       98
       131
        
             },

     

       99
       132
        
             "original": {

     

       100
       133
        
               "type": "tarball",

     
···

       109
       142
        
               ]

     

       110
       143
        
             },

     

       111
       144
        
             "locked": {

     

       112
       112
       -
               "lastModified": 1759888105,

     

       145
       145
       +
               "lastModified": 1765052656,

     

       113
       146
        
               "owner": "cachix",

     

       114
       147
        
               "repo": "nixpkgs-python",

     

       115
       115
       -
               "rev": "4c568014f7408f7546461b25bb8a3511eab02bec",

     

       148
       148
       +
               "rev": "04b27dbad2e004cb237db202f21154eea3c4f89f",

     

       116
       149
        
               "type": "github"

     

       117
       150
        
             },

     

       118
       151
        
             "original": {

     
···

       125
       158
        
             "inputs": {

     

       126
       159
        
               "devenv": "devenv",

     

       127
       160
        
               "git-hooks": "git-hooks",

     

       161
       161
       +
               "mk-shell-bin": "mk-shell-bin",

     

       162
       162
       +
               "nix2container": "nix2container",

     

       128
       163
        
               "nixpkgs": "nixpkgs",

     

       129
       164
        
               "nixpkgs-python": "nixpkgs-python",

     

       130
       165
        
               "pre-commit-hooks": [

+7 -5

devenv.nix

···

       1
       1
        
       { pkgs, lib, ... }: {

     

       2
       2
        
       

     

       3
       3
       +
         name = "site";

     

       4
       4
       +
       

     

       3
       5
        
         packages = with pkgs; [

     

       4
       6
        
           gitFull

     

       5
       7
        
           pipenv

     
···

       41
       43
        
           };

     

       42
       44
        
           python = {

     

       43
       45
        
             enable = true;

     

       44
       44
       -
             version = "3.13.3";

     

       46
       46
       +
             version = "3.14.0";

     

       45
       47
        
           };

     

       46
       48
        
         };

     

       47
       49
        
       

     

       48
       48
       -
         enterShell = ''

     

       49
       49
       -
           pipenv install

     

       50
       50
       -
           npm install

     

       51
       51
       -
         '';

     

       50
       50
       +
         #enterShell = ''

     

       51
       51
       +
         #  pipenv install

     

       52
       52
       +
         #  npm install

     

       53
       53
       +
         #'';

     

       52
       54
        
       

     

       53
       55
        
         tasks = {

     

       54
       56
        
           "site:build".exec = "pipenv run build";

+9 -4

devenv.yaml

···

       1
       1
        
       inputs:

     

       2
       2
       +
         mk-shell-bin:

     

       3
       3
       +
           url: github:rrbutani/nix-mk-shell-bin

     

       4
       4
       +
         nix2container:

     

       5
       5
       +
           url: github:nlewo/nix2container

     

       6
       6
       +
           inputs:

     

       7
       7
       +
             nixpkgs:

     

       8
       8
       +
               follows: nixpkgs

     

       9
       9
       +
         nixpkgs:

     

       10
       10
       +
           url: https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/*.tar.gz

     

       2
       11
        
         nixpkgs-python:

     

       3
       12
        
           url: github:cachix/nixpkgs-python

     

       4
       13
        
           inputs:

     

       5
       14
        
             nixpkgs:

     

       6
       15
        
               follows: nixpkgs

     

       7
       7
       -
         nixpkgs:

     

       8
       8
       -
           url: https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/*.tar.gz

     

       9
       9
       -
       

     

       10
       10
       -
       # If you're using non-OSS software, you can set allowUnfree to true.

     

       11
       16
        
       allowUnfree: true

+1 -1

markdown/_headers

···

       1
       1
        
       # enable CORS on well-known routes

     

       2
       2
       -
       /.well-known/*:

     

       2
       2
       +
       /.well-known/*

     

       3
       3
        
         Access-Control-Allow-Origin: *

     

       4
       4
        
         X-Robots-Tag: nosnippet

     

       5
       5

+1

markdown/_redirects

···

       30
       30
        
       /security.txt /.well-known/security.txt

     

       31
       31
        
       /ads.txt /.well-known/ads.txt

     

       32
       32
        
       /keybase.txt /.well-known/keybase.txt

     

       33
       33
       +
       /keys/ssh-trustfile.txt /keys/ssh/trustfile.txt

     

       33
       34
        
       

     

       34
       35
        
       # anything else

     

       35
       36
        
       /socials /links

+6 -4

markdown/keys/index.md

···

       53
       53
        
       

     

       54
       54
        
       You can also get all the keys in one file (and its signers file) at the following URLs:

     

       55
       55
        
       

     

       56
       56
       -
       * Website as its deployed via CI: <https://andreijiroh.dev/keys/ssh-trustfile.txt>

     

       57
       57
       -
       * As pushed via Git: <https://mau.dev/andreijiroh-dev/website/-/blob/main/markdown/keys/ssh-trustfile.txt>

     

       56
       56
       +
       * Website as its deployed via CI: <https://andreijiroh.dev/keys/ssh/trustfile.txt>

     

       57
       57
       +
       * As pushed via Git: <https://gitlab.com/andreijiroh-dev/website/-/blob/main/markdown/keys/ssh/trustfile.txt>

     

       58
       58
        
       

     

       59
       59
       -
       These SSH keys are used for signing Git commits and tags occassionally, as well for signing checksums file and identity verification on

     

       60
       60
       -
       account recovery for sr.ht and Miraheze.

     

       59
       59
       +
       These SSH keys are used for signing Git commits and tags occasionally, as well

     

       60
       60
       +
       for signing checksums file on release tarballs, encrypting and decrypting

     

       61
       61
       +
       secrets via `agenix` and friends and identity verification on account recovery

     

       62
       62
       +
       for sr.ht and Miraheze.

+7

markdown/keys/ssh.pub

···

       1
       1
       +
       # This is @ajhalili2006's SSH keys in one place. It may

     

       2
       2
       +
       # be differs from those at his authorized_keys in the dotfiles

     

       3
       3
       +
       # repo.

     

       4
       4
       +
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXuD3hJwInlcHs3wkXWAWNo8es3bPAd2e8ipjyqgGp2 SSH Key - main personal key, circa 2022

     

       5
       5
       +
       ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCzMlrUe7qMA1P0lP56lq2dKTrwFU6CrVltQ9um+PhOMLkoi31kAlujHtWF6mqGRLXcK0Ao/0Wqug++r82Zu0u7dpAv8LCExtaRRMzagwPkEe4OOqUBOpS6mggfsik8mNA+1UtpkXJ+ZiB4cXtNKEZC0jtxWOTXSV67qgkSxuO+YBWB+7pnESkB0KorqwOoWGGUVfYQtbKUAt6VqM4s6dn7saXqwmN0tCPO6a+4L4mazkYjFD11HhktYsjP9dvnxYSOtMrSFb9JOXRST2LdiIJgwg+HTqBSWGO7aBRHMJaTF3ajlbMtKDQI/EcNQLyGgX6yFdjjzz9DRY+2oU0vPTytdqM2BKsfLlR0GVg7BVL7TZPaLJ1lgpCl4Z1oClW9FOzhnYJVT0W+IKPsnYsFPfv/BVgjWF7YtLdc5zqFJ31PULtikCyd0I6Kt95YD0HdrlR2faWcBHI8KKEAwCCanodGnK/xTOxisTX2dXOxx3mvR/L3Wil2ca5hnD+vt500/o8= SSH Key - ajhalili2006@launchpad.net

     

       6
       6
       +
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDEYDna7HlVN6FL+Mxaof+WH5EoVmaUrM7GFAdQSveTJ RecapTIme.dev Crew SSH Key - @ajhalili2006

     

       7
       7
       +
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFI1Mj7gTG1IwnxPyr2AsXDq2kBq98hnijhgkGklkhWH

+1 -1

mkdocs.yml

···

       32
       32
        
               - "Anything else":

     

       33
       33
        
                 - contact/else.md

     

       34
       34
        
                 - "Show all contact details": contact/details.md

     

       35
       35
       -
                 - "PGP and SSH keys": keys.md

     

       35
       35
       +
                 - "PGP and SSH keys": keys/index.md

     

       36
       36
        
             - Legal:

     

       37
       37
        
                 - Security policy: security.md

     

       38
       38
        
                 - Code of Conduct: https://policies.recaptime.dev/code-of-conduct

Compare changes