Refactor

Signed-off-by: Oliver Davies <oliver@oliverdavies.uk>
Update zet script
2025-09-23 12:31:56 +01:00 · 2025-09-22 22:31:01 +01:00 · 2025-09-22 19:53:33 +01:00 · 2025-09-22 19:33:43 +01:00 · 2025-09-22 19:23:55 +01:00 · 2025-09-22 08:42:30 +01:00
433 changed files with 5418 additions and 4766 deletions
--- a/.forgejo/workflows/update-inputs.yml
+++ b/.forgejo/workflows/update-inputs.yml
@ -0,0 +1,90 @@
+name: update-inputs
+
+on:
+  schedule:
+    - cron: "0 6 * * 2,5" # Tue & Fri
+  workflow_dispatch:
+
+jobs:
+  update-flake-lock:
+    runs-on: nixos
+
+    env:
+      BASE_BRANCH: main
+      BRANCH_PREFIX: flake-lock-update
+      FJ_URL: https://code.oliverdavies.uk
+      GIT_AUTHOR_EMAIL: flake-bot@local
+      GIT_AUTHOR_NAME: flake-bot
+      GIT_COMMITTER_EMAIL: ${{ env.GIT_AUTHOR_EMAIL }}
+      GIT_COMMITTER_NAME: ${{ env.GIT_AUTHOR_NAME }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with: { fetch-depth: 0 }
+
+      - name: Update inputs & commit
+        id: bump
+        run: |
+          set -o errexit
+          set -o nounset
+          set -o pipefail
+
+          BRANCH="${BRANCH_PREFIX}-${GITHUB_RUN_ID}"
+          git switch -c "$BRANCH"
+
+          BEFORE=$(git rev-parse HEAD)
+
+          # Nix updates inputs and commits if needed
+          nix flake update --commit-lock-file
+
+          AFTER=$(git rev-parse HEAD)
+          if [ "$BEFORE" = "$AFTER" ]; then
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          # ── Grab commit info ────────────────────────────────────────────────
+          # Full message
+          COMMIT_RAW=$(git log -1 --pretty=%B)
+
+          # First line is the short summary; we keep lines AFTER the first blank
+          COMMIT_BODY=$(printf '%s\n' "$COMMIT_RAW" \
+            | sed '1,/^$/d' \
+            | sed 's/^• */* /') # nicer Markdown bullet
+
+          # Title becomes first line of the PR
+          COMMIT_TITLE=$(printf '%s\n' "$COMMIT_RAW" | head -n1)
+
+          # JSON-escape the body so \n etc. are valid JSON
+          BODY_JSON=$(printf '%s' "$COMMIT_BODY" | jq -Rs .)
+
+          echo "changed=true" >> "$GITHUB_OUTPUT"
+          echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
+          echo "title=$COMMIT_TITLE" >> "$GITHUB_OUTPUT"
+          echo "body_json=$BODY_JSON" >> "$GITHUB_OUTPUT"
+
+          git push -u origin "$BRANCH"
+
+      - name: Open pull-request
+        if: steps.bump.outputs.changed == 'true'
+        env:
+          TOKEN: ${{ secrets.FLAKE_UPDATE_PAT }}
+          BRANCH: ${{ steps.bump.outputs.branch }}
+          TITLE: ${{ steps.bump.outputs.title }}
+          BODY_JSON: ${{ steps.bump.outputs.body_json }}
+        run: |
+          set -o errexit
+          set -o nounset
+
+          OWNER="${GITHUB_REPOSITORY%%/*}"
+          REPO="${GITHUB_REPOSITORY#*/}"
+
+          curl -fSs -X POST "$FJ_URL/api/v1/repos/$OWNER/$REPO/pulls" \
+            -H "Authorization: token $TOKEN" \
+            --json '{
+              "base": "'"$BASE_BRANCH"'",
+              "body": '"$BODY_JSON"',
+              "draft": false,
+              "head": "'"$BRANCH"'",
+              "title": "'"$TITLE"'"
+            }'
--- a/.mailmap
+++ b/.mailmap
@ -4,3 +4,4 @@ Oliver Davies <oliver@oliverdavies.uk> <oliver.davies@tfw.wales>
 Oliver Davies <oliver@oliverdavies.uk> <oliver@microserve.io>
 Oliver Davies <oliver@oliverdavies.uk> <oliver@oliverdavies.dev>
 Oliver Davies <oliver@oliverdavies.uk> <opdavies@gmail.com>
+Oliver Davies <oliver@oliverdavies.uk> <opdavies@noreply.code.oliverdavies.uk>
--- a/README.md
+++ b/README.md
@ -0,0 +1,3 @@
+# nix-config
+
+Originally my `dotfiles` repository, this repository contains my NixOS and Home Manager-based configurations for my personal laptop (`t480`) and home server/homelab (`nixedo`).
--- a/flake.lock
+++ b/flake.lock
@ -4,15 +4,17 @@
      "inputs": {
        "darwin": "darwin",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1750173260,
-        "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
+        "lastModified": 1754433428,
+        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
+        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
        "type": "github"
      },
      "original": {
@ -21,6 +23,38 @@
        "type": "github"
      }
    },
+    "bop-scripts": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756931648,
+        "narHash": "sha256-bfAmJ1IY0B6eNbJvoWkUMQ7Ya4ShrIoVSdQrnE/cn40=",
+        "owner": "breadonpenguins",
+        "repo": "scripts",
+        "rev": "d04bcbe63176e623e1ce8edc4c3840c506a28d96",
+        "type": "github"
+      },
+      "original": {
+        "owner": "breadonpenguins",
+        "repo": "scripts",
+        "type": "github"
+      }
+    },
+    "conf-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1507549264,
+        "narHash": "sha256-AjiTJsoim0BAnyfqk1IQzNsa6jhFM2+A66E7q9sJqz0=",
+        "owner": "tjdevries",
+        "repo": "conf.vim",
+        "rev": "a716df0fd5d7ba558c07dac2e07f05d5eba11afb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tjdevries",
+        "repo": "conf.vim",
+        "type": "github"
+      }
+    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@ -43,6 +77,27 @@
        "type": "github"
      }
    },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "git-repo-updater",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741473158,
+        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
    "disko": {
      "inputs": {
        "nixpkgs": [
@ -50,11 +105,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750903843,
-        "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
+        "lastModified": 1756733629,
+        "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
+        "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
        "type": "github"
      },
      "original": {
@ -63,35 +118,32 @@
        "type": "github"
      }
    },
-    "flake-compat": {
+    "edit-alternate-vim": {
      "flake": false,
      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "lastModified": 1635180789,
+        "narHash": "sha256-mEKnqYAhgrdxPRoKf4S4yYecdFIHGg8bDxpqPuC1+S4=",
+        "owner": "tjdevries",
+        "repo": "edit_alternate.vim",
+        "rev": "ef3019115d9bb7ffd691d2859eda213dd99e0b0a",
        "type": "github"
      },
      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
+        "owner": "tjdevries",
+        "repo": "edit_alternate.vim",
        "type": "github"
      }
    },
    "flake-parts": {
      "inputs": {
-        "nixpkgs-lib": [
-          "nixvim",
-          "nixpkgs"
-        ]
+        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "lastModified": 1756770412,
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
        "type": "github"
      },
      "original": {
@ -139,6 +191,33 @@
        "type": "github"
      }
    },
+    "git-repo-updater": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "import-tree": [
+          "import-tree"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1757018109,
+        "narHash": "sha256-KfRzBPOOM5cf8mFVeWjV7TGa3p+ul/flxnUdwGW4Sds=",
+        "ref": "refs/heads/main",
+        "rev": "63235768261976efe0d9c825e69c44fff8c80e5d",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://code.oliverdavies.uk/opdavies/git-repo-updater"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://code.oliverdavies.uk/opdavies/git-repo-updater"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -167,11 +246,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1751336185,
-        "narHash": "sha256-ptnVr2x+sl7cZcTuGx/0BOE2qCAIYHTcgfA+/h60ml0=",
+        "lastModified": 1756991914,
+        "narHash": "sha256-4ve/3ah5H/SpL2m3qmZ9GU+VinQYp2MN1G7GamimTds=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "96354906f58464605ff81d2f6c2ea23211cbf051",
+        "rev": "b08f8737776f10920c330657bee8b95834b7a70f",
        "type": "github"
      },
      "original": {
@ -181,6 +260,21 @@
        "type": "github"
      }
    },
+    "import-tree": {
+      "locked": {
+        "lastModified": 1752730890,
+        "narHash": "sha256-GES8fapSLGz36MMPRVNkSUWXUTtqvGQNXHjRmRLfJUY=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "6ebb8cb87987b20264c09296166543fd3761d274",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vic",
+        "repo": "import-tree",
+        "type": "github"
+      }
+    },
    "ixx": {
      "inputs": {
        "flake-utils": [
@ -195,27 +289,47 @@
        ]
      },
      "locked": {
-        "lastModified": 1748294338,
-        "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
+        "lastModified": 1754860581,
+        "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
        "owner": "NuschtOS",
        "repo": "ixx",
-        "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
+        "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
        "type": "github"
      },
      "original": {
        "owner": "NuschtOS",
-        "ref": "v0.0.8",
+        "ref": "v0.1.1",
        "repo": "ixx",
        "type": "github"
      }
    },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1756612744,
+        "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1750837715,
-        "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
+        "lastModified": 1756925795,
+        "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
+        "rev": "ba6fab29768007e9f2657014a6e134637100c57d",
        "type": "github"
      },
      "original": {
@ -225,49 +339,44 @@
        "type": "github"
      }
    },
-    "nixos-wsl": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs_2"
-      },
+    "nixpkgs": {
      "locked": {
-        "lastModified": 1749574455,
-        "narHash": "sha256-fm2/8KPOYvvIAnNVtjDlTt/My00lIbZQ+LMrfQIWVzs=",
-        "owner": "nix-community",
-        "repo": "NixOS-WSL",
-        "rev": "917af390377c573932d84b5e31dd9f2c1b5c0f09",
+        "lastModified": 1756787288,
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "ref": "main",
-        "repo": "NixOS-WSL",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs": {
+    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1745391562,
-        "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
+        "lastModified": 1754788789,
+        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
        "type": "github"
      }
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1751048012,
-        "narHash": "sha256-MYbotu4UjWpTsq01wglhN5xDRfZYLFtNk7SBY0BcjkU=",
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a684c58d46ebbede49f280b653b9e56100aa3877",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
        "type": "github"
      },
      "original": {
@ -277,57 +386,11 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1749173751,
-        "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1751271578,
-        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1751271578,
-        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixvim": {
      "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": [
+          "flake-parts"
+        ],
        "nixpkgs": [
          "nixpkgs"
        ],
@ -335,11 +398,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1751144320,
-        "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=",
+        "lastModified": 1756946299,
+        "narHash": "sha256-N4PjGA0rittpNZGscKPel+mr/dMcKF73j0yr4rbG3T0=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "ceb52aece5d571b37096945c2815604195a04eb4",
+        "rev": "63496f00c681b3e200bd17878a43ec68b7139a66",
        "type": "github"
      },
      "original": {
@ -351,15 +414,16 @@
    "nur": {
      "inputs": {
        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_4",
-        "treefmt-nix": "treefmt-nix"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1751345783,
-        "narHash": "sha256-83GecBM/Tli7m+tr47S8pKLcAz2HihbXaVRosQiEKSg=",
+        "lastModified": 1757050467,
+        "narHash": "sha256-Rps0Ga0g/TdY49rR2ZRBsdBYybSzPccEsaI9IvwuE98=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "50fd93fb7d46e97b5dc30909754f597c2b703a29",
+        "rev": "985abf0197c75dd64c24691a7e5e0acf308d7f20",
        "type": "github"
      },
      "original": {
@ -378,11 +442,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749730855,
-        "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=",
+        "lastModified": 1755555503,
+        "narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742",
+        "rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea",
        "type": "github"
      },
      "original": {
@ -394,14 +458,58 @@
    "root": {
      "inputs": {
        "agenix": "agenix",
+        "bop-scripts": "bop-scripts",
+        "conf-vim": "conf-vim",
        "disko": "disko",
+        "edit-alternate-vim": "edit-alternate-vim",
+        "flake-parts": "flake-parts",
+        "git-repo-updater": "git-repo-updater",
        "home-manager": "home-manager_2",
+        "import-tree": "import-tree",
+        "nix-index-database": "nix-index-database",
        "nixos-hardware": "nixos-hardware",
-        "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
        "nixpkgs-stable": "nixpkgs-stable",
        "nixvim": "nixvim",
-        "nur": "nur"
+        "nur": "nur",
+        "rwxrob-dot": "rwxrob-dot",
+        "standard-vim": "standard-vim",
+        "vim-heritage": "vim-heritage",
+        "vim-textobj-xmlattr": "vim-textobj-xmlattr",
+        "voidrice": "voidrice",
+        "zet": "zet"
+      }
+    },
+    "rwxrob-dot": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751898094,
+        "narHash": "sha256-kGpHL2l9p/yOtmG+AZvOb0Y5mH1d+Zoh2dd5N3Xjizc=",
+        "owner": "rwxrob",
+        "repo": "dot",
+        "rev": "90794c77061f270078e847af45c376610768c6e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rwxrob",
+        "repo": "dot",
+        "type": "github"
+      }
+    },
+    "standard-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1539613748,
+        "narHash": "sha256-9VwkvV1Dv6cE4uDkPp36DozjWJOclDR883yDMYw000E=",
+        "owner": "tjdevries",
+        "repo": "standard.vim",
+        "rev": "b333ef9a9cf6cf66536deda017a542843613fa75",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tjdevries",
+        "repo": "standard.vim",
+        "type": "github"
      }
    },
    "systems": {
@ -449,26 +557,69 @@
        "type": "github"
      }
    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
+    "vim-heritage": {
+      "flake": false,
      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "lastModified": 1716350150,
+        "narHash": "sha256-YzqP2+Go8bW3heFyzzcS/91LrMkwjpZ89+ptrjjBKrM=",
+        "owner": "jessarcher",
+        "repo": "vim-heritage",
+        "rev": "574baeb0679681a710adce5110a0d8b2ae1c2637",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
+        "owner": "jessarcher",
+        "repo": "vim-heritage",
        "type": "github"
      }
+    },
+    "vim-textobj-xmlattr": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1464940962,
+        "narHash": "sha256-+91FVP95oh00flINdltqx6qJuijYo56tHIh3J098G2Q=",
+        "owner": "whatyouhide",
+        "repo": "vim-textobj-xmlattr",
+        "rev": "694a297f1d75fd527e87da9769f3c6519a87ebb1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "whatyouhide",
+        "repo": "vim-textobj-xmlattr",
+        "type": "github"
+      }
+    },
+    "voidrice": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1744355318,
+        "narHash": "sha256-9U1Do0w2oT5E6uZxSKoHAzbGbSLQRQlT65KcPGzwhW8=",
+        "owner": "lukesmithxyz",
+        "repo": "voidrice",
+        "rev": "f853f1884a8f0c244765192dc6f5a910a7e2b8e5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lukesmithxyz",
+        "repo": "voidrice",
+        "type": "github"
+      }
+    },
+    "zet": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1758576585,
+        "narHash": "sha256-hWQE45nFaSN8agYMP8xt5kaUMfBXVj5k9zInZNs/xAI=",
+        "ref": "refs/heads/main",
+        "rev": "23505f6c31c7cc903e63621b52b5f92eea1facc5",
+        "revCount": 35,
+        "type": "git",
+        "url": "https://code.oliverdavies.uk/opdavies/zet"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://code.oliverdavies.uk/opdavies/zet"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -1,135 +1,106 @@
 {
  inputs = {
-    agenix.url = "github:ryantm/agenix";
+    agenix = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:ryantm/agenix";
+    };

-    disko.inputs.nixpkgs.follows = "nixpkgs";
-    disko.url = "github:nix-community/disko";
+    bop-scripts = {
+      flake = false;
+      url = "github:breadonpenguins/scripts";
+    };

-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.url = "github:nix-community/home-manager/master";
+    conf-vim = {
+      flake = false;
+      url = "github:tjdevries/conf.vim";
+    };
+
+    disko = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/disko";
+    };
+
+    edit-alternate-vim = {
+      flake = false;
+      url = "github:tjdevries/edit_alternate.vim";
+    };
+
+    flake-parts.url = "github:hercules-ci/flake-parts";
+
+    git-repo-updater = {
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.import-tree.follows = "import-tree";
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "git+https://code.oliverdavies.uk/opdavies/git-repo-updater";
+    };
+
+    home-manager = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager/master";
+    };
+
+    import-tree.url = "github:vic/import-tree";
+
+    nix-index-database = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/nix-index-database";
+    };

    nixos-hardware.url = "github:NixOS/nixos-hardware/master";

-    nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
-
-    nixvim.inputs.nixpkgs.follows = "nixpkgs";
-    nixvim.url = "github:nix-community/nixvim";
+    nixvim = {
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/nixvim";
+    };

    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
+
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

-    nur.url = "github:nix-community/NUR";
+    nur = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/NUR";
+    };
+
+    rwxrob-dot = {
+      flake = false;
+      url = "github:rwxrob/dot";
+    };
+
+    standard-vim = {
+      flake = false;
+      url = "github:tjdevries/standard.vim";
+    };
+
+    vim-heritage = {
+      flake = false;
+      url = "github:jessarcher/vim-heritage";
+    };
+
+    vim-textobj-xmlattr = {
+      flake = false;
+      url = "github:whatyouhide/vim-textobj-xmlattr";
+    };
+
+    voidrice = {
+      flake = false;
+      url = "github:lukesmithxyz/voidrice";
+    };
+
+    zet = {
+      flake = false;
+      url = "git+https://code.oliverdavies.uk/opdavies/zet";
+    };
  };

  outputs =
-    { nixpkgs, self, ... }@inputs:
-    let
-      inherit (self) outputs;
-
-      system = "x86_64-linux";
-      pkgs = import nixpkgs { inherit system; };
-
-      username = "opdavies";
-
-      specialArgs = {
-        inherit
-          inputs
-          outputs
-          self
-          system
-          username
-          ;
+    inputs@{ flake-parts, ... }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      flake = {
+        overlays = import ./overlays { inherit inputs; };
      };

-      inherit (pkgs) mkShell;
-
-      nixvim = inputs.nixvim.legacyPackages.${system}.makeNixvimWithModule {
-        inherit pkgs;
-
-        module = import ./modules/home-manager/coding/neovim/config;
-      };
-    in
-    {
-      devShells.${system}.default = pkgs.mkShell {
-        packages = with pkgs; [
-          just
-          lua-language-server
-          lua54Packages.luacheck
-          nixd
-        ];
-      };
-
-      packages.${system} = {
-        inherit nixvim;
-
-        default = mkShell { buildInputs = with pkgs; [ just ]; };
-      };
-
-      formatter.${system} = pkgs.nixfmt-rfc-style;
-
-      overlays = import ./overlays { inherit inputs; };
-
-      homeManagerModules.default = import ./modules/home-manager;
-
-      nixosModules.default = import ./modules/nixos;
-
-      nixosConfigurations = {
-        lemp11 = nixpkgs.lib.nixosSystem {
-          modules = [
-            ./hosts/lemp11/configuration.nix
-          ];
-
-          specialArgs = specialArgs // {
-            hostname = "lemp11";
-            stateVersion = "22.11";
-          };
-        };
-
-        nixedo = nixpkgs.lib.nixosSystem {
-          modules = [
-            ./hosts/nixedo/configuration.nix
-          ];
-
-          specialArgs = specialArgs // {
-            hostname = "nixedo";
-            stateVersion = "24.11";
-          };
-        };
-
-        t480 = nixpkgs.lib.nixosSystem {
-          modules = [
-            ./hosts/t480/configuration.nix
-          ];
-
-          specialArgs = specialArgs // {
-            hostname = "t480";
-            stateVersion = "22.11";
-          };
-        };
-
-        t490 = nixpkgs.lib.nixosSystem {
-          modules = [
-            ./hosts/t490/configuration.nix
-          ];
-
-          specialArgs = specialArgs // {
-            hostname = "t490";
-            stateVersion = "22.11";
-          };
-        };
-
-        PW05CH3L = nixpkgs.lib.nixosSystem {
-          inherit system;
-
-          modules = [
-            ./hosts/PW05CH3L/configuration.nix
-          ];
-
-          specialArgs = specialArgs // {
-            hostname = "PW05CH3L";
-            stateVersion = "22.11";
-          };
-        };
-      };
+      imports = [ (inputs.import-tree ./modules) ];
    };
 }
--- a/home-manager/opdavies/nixedo.nix
+++ b/home-manager/opdavies/nixedo.nix
@ -0,0 +1,13 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./nixedo/email-filters.nix
+  ];
+
+  home.packages = with pkgs; [
+    import-to-jellyfin
+    vic
+    yt-dlp
+  ];
+}
--- a/home-manager/opdavies/nixedo/email-filters.nix
+++ b/home-manager/opdavies/nixedo/email-filters.nix
@ -12,7 +12,7 @@ in
 {
  options.nixedo.${name} = {
    configFile = lib.mkOption {
-      default = "${config.home.homeDirectory}/Code/${name}/config.lua";
+      default = "${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}/${name}/config.lua";
      internal = true;
    };
  };
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@ -0,0 +1,37 @@
+{ config, pkgs, ... }:
+
+{
+  programs = {
+    zsh.shellAliases =
+      let
+        inherit (config.xdg.userDirs) documents;
+      in
+      {
+        "wiki-push" =
+          "rsync -avzP ${documents}/wiki nixedo.oliverdavies.uk:${documents} --delete --delete-after";
+      };
+  };
+
+  home.packages = with pkgs; [
+    backup-websites
+    build-glove80
+    count-tags
+    create-script
+    get-tags
+    qrencode
+    mounter
+    move-firefox-screenshots
+    set-background
+    tag-release
+    time-until
+    timer
+    unmounter
+    update-all-git-repos
+    vic
+  ];
+
+  xdg.configFile."pam-gnupg".text = ''
+    098EE055DAD2B9CB68154C6759DD38292D2273B6
+    1E21B58D69FFEFAD077F152A50FEA938A3413F50
+  '';
+}
--- a/home/common/default.nix
+++ b/home/common/default.nix
@ -1,7 +0,0 @@
-{ outputs, ... }:
-
-{
-  imports = [
-    outputs.homeManagerModules.default
-  ];
-}
--- a/home/opdavies/PW05CH3L.nix
+++ b/home/opdavies/PW05CH3L.nix
@ -1,52 +0,0 @@
-{ config, options, ... }:
-
-{
-  imports = [ ../common ];
-
-  cli = {
-    bookmarkthis.enable = true;
-    direnv.enable = true;
-    fzf.enable = true;
-
-    git = {
-      enable = true;
-
-      user.emailAddress = "oliver.davies@tfw.wales";
-    };
-
-    node.enable = true;
-    notes.enable = true;
-    ranger.enable = true;
-    starship.enable = true;
-    tmux.enable = true;
-
-    tmux-sessionizer = {
-      enable = true;
-
-      directories =
-        let
-          inherit (config.xdg.userDirs) documents extraConfig;
-
-          repos = extraConfig.XDG_REPOS_DIR;
-        in
-        options.cli.tmux-sessionizer.directories.default
-        ++ [
-          repos
-          "${repos}/*"
-          documents
-        ];
-    };
-
-    todos.enable = true;
-    zsh.enable = true;
-  };
-
-  coding = {
-    neovim.enable = true;
-    phpactor.enable = true;
-  };
-
-  xdg.configFile."pam-gnupg".text = ''
-    C0D940F9A390F286FCAAE8439D501171E39D0A47
-  '';
-}
--- a/home/opdavies/lemp11.nix
+++ b/home/opdavies/lemp11.nix
@ -1,11 +0,0 @@
-{
-  imports = [ ../common ];
-
-  cli.zsh.enable = true;
-
-  desktop.media = {
-    handbrake.enable = true;
-    makemkv.enable = true;
-    mpv.enable = true;
-  };
-}
--- a/home/opdavies/nixedo.nix
+++ b/home/opdavies/nixedo.nix
@ -1,13 +0,0 @@
-{
-  imports = [
-    ../common
-
-    ./nixedo/modules/email-filters.nix
-  ];
-
-  cli = {
-    fzf.enable = true;
-    starship.enable = true;
-    zsh.enable = true;
-  };
-}
--- a/home/opdavies/t480.nix
+++ b/home/opdavies/t480.nix
@ -1,120 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common
-    ./t480/gammastep.nix
-  ];
-
-  cli = {
-    bluetuith.enable = true;
-    bookmarkthis.enable = true;
-    direnv.enable = true;
-    fzf.enable = true;
-
-    git = {
-      enable = true;
-
-      user.emailAddress = "oliver@oliverdavies.uk";
-    };
-
-    node.enable = true;
-
-    notes = {
-      enable = true;
-
-      directory = "${config.xdg.userDirs.documents}/wiki/notes";
-    };
-
-    ranger.enable = true;
-    sxhkd.enable = true;
-    starship.enable = true;
-    tmux.enable = true;
-
-    tmux-sessionizer = {
-      enable = true;
-      enableDmenuIntegration = true;
-
-      directories =
-        let
-          inherit (config.xdg.userDirs) documents extraConfig;
-
-          repos = extraConfig.XDG_REPOS_DIR;
-        in
-        [
-          repos
-          "${repos}/*"
-          documents
-        ];
-    };
-
-    todos.enable = true;
-    zsh.enable = true;
-  };
-
-  coding = {
-    neovim.enable = true;
-    phpactor.enable = true;
-  };
-
-  desktop = {
-    browsers = {
-      chromium.enable = true;
-
-      firefox = {
-        enable = true;
-
-        homepageUrl = "https://nixedo.oliverdavies.uk";
-      };
-
-      qutebrowser.enable = true;
-    };
-
-    flameshot.enable = true;
-    gtk.enable = true;
-
-    media = {
-      handbrake.enable = true;
-      makemkv.enable = true;
-      mpv.enable = true;
-    };
-
-    # redshift.enable = true;
-  };
-
-  programs = {
-    dev-commit = {
-      enable = false;
-
-      repoPaths =
-        let
-          personal = "${config.xdg.userDirs.extraConfig.XDG_REPOS_DIR}/personal";
-        in
-        [
-          "${personal}/email-filters"
-          "${personal}/nix-config"
-          "${personal}/oliverdavies.uk"
-          "${personal}/opentofu-dns"
-        ];
-
-      schedule = {
-        enable = true;
-        time = "daily";
-      };
-    };
-
-    zsh.shellAliases =
-      let
-        inherit (config.xdg.userDirs) documents;
-      in
-      {
-        "wiki-push" =
-          "rsync -avzP ${documents}/wiki nixedo.oliverdavies.uk:${documents} --delete --delete-after";
-      };
-  };
-
-  xdg.configFile."pam-gnupg".text = ''
-    098EE055DAD2B9CB68154C6759DD38292D2273B6
-    1E21B58D69FFEFAD077F152A50FEA938A3413F50
-  '';
-}
--- a/home/opdavies/t480/gammastep.nix
+++ b/home/opdavies/t480/gammastep.nix
@ -1,4 +0,0 @@
-{
-  services.gammastep.enable = true;
-  services.gammastep.provider = "geoclue2";
-}
--- a/home/opdavies/t490.nix
+++ b/home/opdavies/t490.nix
@ -1,3 +0,0 @@
-{
-  imports = [ ../common ];
-}
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@ -1,32 +0,0 @@
-{ inputs, pkgs, ... }:
-
-{
-  imports = [
-    inputs.agenix.nixosModules.default
-    inputs.disko.nixosModules.disko
-    inputs.nixos-wsl.nixosModules.default
-
-    ../common
-
-    ../../users/opdavies.nix
-  ];
-
-  cli = {
-    docker.enable = true;
-
-    password-store = {
-      enable = true;
-
-      extensions = with pkgs.passExtensions; [
-        pass-otp
-      ];
-    };
-  };
-
-  wsl = {
-    enable = true;
-    defaultUser = "opdavies";
-  };
-
-  home-manager.users.opdavies.home.sessionVariables.WAYLAND_DISPLAY = "";
-}
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@ -15,8 +15,6 @@
    ./users

    inputs.home-manager.nixosModules.home-manager
-
-    outputs.nixosModules.default
  ];

  nix = {
@ -64,21 +62,13 @@
    users."${username}" = import ./home.nix;
  };

-  nixpkgs = {
-    config = {
-      allowUnfree = true;
+  nixpkgs.overlays = [
+    inputs.nur.overlays.default

-      permittedInsecurePackages = [ "electron-27.3.11" ];
-    };
-
-    overlays = [
-      inputs.nur.overlays.default
-
-      outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.stable-packages
-    ];
-  };
+    outputs.overlays.additions
+    outputs.overlays.modifications
+    outputs.overlays.stable-packages
+  ];

  nix.extraOptions = ''
    trusted-users = root ${username}
--- a/hosts/common/home.nix
+++ b/hosts/common/home.nix
@ -9,8 +9,6 @@ let
  pkgs = import inputs.nixpkgs {
    inherit system;

-    config.allowUnfree = true;
-
    overlays = [
      outputs.overlays.additions
      outputs.overlays.stable-packages
@ -27,10 +25,6 @@ let
    ;
 in
 {
-  imports = [
-    outputs.homeManagerModules.default
-  ];
-
  home.username = "opdavies";
  home.homeDirectory = "/home/${config.home.username}";

--- a/hosts/common/users/opdavies.nix
+++ b/hosts/common/users/opdavies.nix
@ -1,7 +1,7 @@
-{ config, ... }:
+{ config, self, ... }:

 {
  users.users.opdavies = { };

-  home-manager.users.opdavies = import ../../../home/opdavies/${config.networking.hostName}.nix;
+  home-manager.users.opdavies = import "${self}/home-manager/opdavies/${config.networking.hostName}.nix";
 }
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@ -1,65 +0,0 @@
-{ inputs, pkgs, ... }:
-
-{
-  imports = [
-    inputs.agenix.nixosModules.default
-    inputs.nixos-hardware.nixosModules.common-cpu-intel
-    inputs.nixos-hardware.nixosModules.common-gpu-intel
-    inputs.nixos-hardware.nixosModules.common-pc-laptop
-    inputs.nixos-hardware.nixosModules.common-pc-laptop-hdd
-    inputs.nixos-hardware.nixosModules.system76
-
-    ../common
-    ./hardware-configuration.nix
-    ./programs.nix
-    ./services.nix
-
-    ../../users/opdavies.nix
-    ../../users/eric.nix
-  ];
-
-  core = {
-    bluetooth.enable = true;
-    zram.enable = true;
-  };
-
-  desktop.media.makemkv.enable = true;
-
-  nixpad.enable = true;
-
-  # Bootloader.
-  boot = {
-    loader = {
-      systemd-boot = {
-        enable = true;
-        configurationLimit = 25;
-      };
-
-      efi = {
-        canTouchEfiVariables = true;
-        efiSysMountPoint = "/boot/efi";
-      };
-    };
-  };
-
-  systemd.extraConfig = ''
-    DefaultTimeoutStopSec=10s
-  '';
-
-  networking.networkmanager.enable = true;
-
-  security = {
-    polkit.enable = true;
-    rtkit.enable = true;
-  };
-
-  users.users.eric.packages = with pkgs; [
-    git
-    vscodium
-  ];
-
-  environment.systemPackages = with pkgs; [
-    fastfetch
-    htop
-  ];
-}
--- a/hosts/lemp11/hardware-configuration.nix
+++ b/hosts/lemp11/hardware-configuration.nix
@ -1,50 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "thunderbolt"
-    "nvme"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-    "sdhci_pci"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/e577c869-18a1-4830-9e00-124fcabdab89";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot/efi" = {
-    device = "/dev/disk/by-uuid/48FE-D346";
-    fsType = "vfat";
-  };
-
-  swapDevices = [ { device = "/dev/disk/by-uuid/2dce327b-f18d-4727-a9a2-e79d2b5161f9"; } ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s13f0u1u2u4.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/hosts/lemp11/programs.nix
+++ b/hosts/lemp11/programs.nix
@ -1,13 +0,0 @@
-{
-  programs = {
-    firefox = {
-      enable = true;
-
-      languagePacks = [ "en-GB" ];
-      preferences = {
-        "intl.accept_languages" = "en-GB, en";
-        "intl.regional_prefs.use_os_locales" = true;
-      };
-    };
-  };
-}
--- a/hosts/lemp11/services.nix
+++ b/hosts/lemp11/services.nix
@ -1,32 +0,0 @@
-{
-  services = {
-    auto-cpufreq.enable = true;
-    gvfs.enable = true;
-    openssh.enable = true;
-    power-profiles-daemon.enable = false;
-    thermald.enable = true;
-
-    pipewire = {
-      enable = true;
-
-      alsa = {
-        enable = true;
-        support32Bit = true;
-      };
-
-      pulse.enable = true;
-    };
-
-    printing.enable = true;
-    pulseaudio.enable = false;
-
-    xserver = {
-      enable = true;
-
-      xkb = {
-        layout = "gb";
-        variant = "";
-      };
-    };
-  };
-}
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@ -19,10 +19,6 @@
    ../../users/opdavies.nix
  ];

-  core.openssh.enable = true;
-  cli.podman.enable = true;
-  desktop.dconf.enable = true;
-
  # TODO: why didn't it work when adding this to jitsi.nix?
  nixpkgs.config.permittedInsecurePackages = [
    "jitsi-meet-1.0.8043"
@ -31,10 +27,7 @@
  services.logind.lidSwitchExternalPower = "ignore";

  boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-    };
-
+    efi.canTouchEfiVariables = true;
    systemd-boot.enable = true;
  };

--- a/hosts/nixedo/hardware-configuration.nix
+++ b/hosts/nixedo/hardware-configuration.nix
@ -1,28 +1,43 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];

-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "thunderbolt"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+  ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-intel" ];
  boot.extraModulePackages = [ ];

-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/40649879-4ee6-4668-8257-fe81a7773024";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/40649879-4ee6-4668-8257-fe81a7773024";
+    fsType = "ext4";
+  };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/24B1-88CB";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/24B1-88CB";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };

  swapDevices = [ ];

--- a/hosts/nixedo/homelab.nix
+++ b/hosts/nixedo/homelab.nix
@ -8,7 +8,6 @@

    services = {
      audiobookshelf.enable = true;
-      gitea-actions-runner.enable = true;
      home-assistant.enable = true;
      homepage-dashboard.enable = true;
      jitsi.enable = true;
@ -16,7 +15,7 @@
      peertube.enable = true;
      tubearchivist.enable = true;
      uptime-kuma.enable = true;
-      vaultwarden.enable = true;
+      vaultwarden.enable = false;
    };
  };
 }
--- a/hosts/nixedo/modules/acme.nix
+++ b/hosts/nixedo/modules/acme.nix
@ -40,7 +40,6 @@
                "rebuilding-symfony"
                "tailwindcss-demo"
                "talking-drupal-tailwindcss"
-                "tome"
                "tubearchivist"
                "uptime"
                "vaultwarden"
--- a/hosts/nixedo/modules/forgejo.nix
+++ b/hosts/nixedo/modules/forgejo.nix
@ -8,10 +8,14 @@
    settings = {
      server = {
        DOMAIN = "code.oliverdavies.uk";
+        LANDING_PAGE = "explore";
        ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}";
+        SSH_DOMAIN = "ssh.oliverdavies.uk";
      };

      service.DISABLE_REGISTRATION = true;
+
+      ui.DEFAULT_THEME = "forgejo-auto";
    };
  };

--- a/hosts/nixedo/modules/nginx/sites.nix
+++ b/hosts/nixedo/modules/nginx/sites.nix
@ -11,6 +11,8 @@ let
    { inherit port root url; } // overrides;

  sites = [
+    (mkSite "books" {})
+
    (mkSite "eric" {
      rootSuffix = "/public";

@ -19,11 +21,31 @@ let
      '';
    })

-    (mkSite "luke" {
-      extraConfig = ''
-        add_header X-Robots-Tag "noindex, nofollow";
-      '';
-    })
-  ];
+    (mkSite "examples" {})
+  ]
+  ++
+    map
+      (
+        domain:
+        mkSite domain {
+          extraConfig = ''
+            add_header X-Robots-Tag "noindex, nofollow";
+          '';
+        }
+      )
+      [
+        "bootstrap-with-tailwind"
+        "florida-drupalcamp-tailwind-css"
+        "luke"
+        "phpsw-sculpin-demo"
+        "rebuilding-acquia"
+        "rebuilding-bartik"
+        "rebuilding-bristol-js"
+        "rebuilding-symfony"
+        "tailwindcss-demo"
+        "talking-drupal-tailwindcss"
+        "wp-tailwind"
+        "zet"
+      ];
 in
 sites
--- a/hosts/nixedo/modules/nginx/www.oliverdavies.uk/default.nix
+++ b/hosts/nixedo/modules/nginx/www.oliverdavies.uk/default.nix
@ -13,6 +13,7 @@ let

    paths = [
      "archive"
+      "automated-testing"
      "core"
      "daily/.+"
      "examples"
@ -21,8 +22,8 @@ let
      "rss/bb.xml"
      "rss/daily.xml"
      "sites/default/files"
+      "testing"
      "themes/custom/opdavies"
-      "tome-test"
    ];

    port = ports.nginx-website-tome;
@ -78,36 +79,11 @@ in
        globalRedirect = "www.oliverdavies.uk";
        useACMEHost = "oliverdavies.uk";
      };
-
-      "tome.oliverdavies.uk" = {
-        listen = [
-          {
-            addr = "localhost";
-            port = tome.port;
-          }
-        ];
-
-        locations."/".tryFiles = "$uri $uri.html $uri/index.html =404";
-
-        root = tome.root;
-
-        extraConfig = ''
-          add_header X-Robots-Tag "noindex, nofollow";
-
-          port_in_redirect off;
-
-          # Remove trailing slashes.
-          rewrite ^/(.*)/$ /$1 permanent;
-        '';
-      };
    };

-    cloudflared.tunnels."e1514105-327f-4984-974e-e2fbaca76466" = {
-      ingress = {
-        "oliverdavies.uk" = "http://localhost:${toString port}";
-        "tome.oliverdavies.uk" = "http://localhost:${toString tome.port}";
-        "www.oliverdavies.uk" = "http://localhost:${toString port}";
-      };
+    cloudflared.tunnels."e1514105-327f-4984-974e-e2fbaca76466".ingress = {
+      "oliverdavies.uk" = "http://localhost:${toString port}";
+      "www.oliverdavies.uk" = "http://localhost:${toString port}";
    };
  };
 }
--- a/hosts/nixedo/modules/nginx/www.oliverdavies.uk/redirects.nix
+++ b/hosts/nixedo/modules/nginx/www.oliverdavies.uk/redirects.nix
@ -131,6 +131,10 @@
    from = "/ansistrano-slides";
    to = "/talks/deploying-php-ansible-ansistrano";
  }
+  {
+    from = "/archive";
+    to = "/blog";
+  }
  {
    from = "/archive/2022-08-28/how-started-programming";
    to = "/daily/2022-08-28/how-started-programming";
@ -2419,6 +2423,10 @@
    from = "/d7";
    to = "/drupal7";
  }
+  {
+    from = "/daily";
+    to = "/blog";
+  }
  {
    from = "/dcbristol-cfp";
    to = "https://www.papercall.io/drupalcamp-bristol-2019";
--- a/hosts/nixedo/modules/paperless.nix
+++ b/hosts/nixedo/modules/paperless.nix
@ -43,10 +43,7 @@ in
        enable = true;

        dataDir = "/mnt/media/${service}";
-
-        settings = {
-          PAPERLESS_URL = "https://${cfg.url}";
-        };
+        domain = "https://${cfg.url}";
      };

      nginx.virtualHosts."${cfg.url}" = {
--- a/hosts/nixedo/ports.nix
+++ b/hosts/nixedo/ports.nix
@ -19,8 +19,10 @@ in
    nginx-website-sculpin = 8095;
    nginx-website-tome = 8098;

+    nginx-books = 9002;
    nginx-bootstrap-with-tailwind = 8081;
    nginx-eric = 8084;
+    nginx-examples = 9003;
    nginx-florida-drupalcamp-tailwind-css = 8083;
    nginx-luke = 8094;
    nginx-phpsw-sculpin-demo = 8085;
--- a/hosts/nixedo/services/default.nix
+++ b/hosts/nixedo/services/default.nix
@ -17,7 +17,6 @@

  services = {
    postgresqlBackup.enable = true;
-    tailscale.enable = true;
  };

  services.gitea-actions-runner.instances.default = {
@ -30,6 +29,7 @@
      gawk
      gitMinimal
      gnused
+      jq
      nix
      nodejs
      wget
--- a/hosts/nixedo/services/vaultwarden.nix
+++ b/hosts/nixedo/services/vaultwarden.nix
@ -1,7 +1,7 @@
 {
  config,
+  inputs,
  lib,
-  options,
  ...
 }:

@ -20,26 +20,6 @@ in
      default = "${service}.${homelab.domain}";
      type = types.str;
    };
-
-    homepage.name = mkOption {
-      default = "Vaultwarden";
-      type = types.str;
-    };
-
-    homepage.description = mkOption {
-      default = "Unofficial Bitwarden compatible server written in Rust";
-      type = types.str;
-    };
-
-    homepage.icon = mkOption {
-      default = "bitwarden";
-      type = types.str;
-    };
-
-    homepage.category = mkOption {
-      default = "Services";
-      type = types.str;
-    };
  };

  config = mkIf cfg.enable {
@ -47,6 +27,8 @@ in
      ${service} = {
        enable = true;

+        environmentFile = config.age.secrets.vaultwarden-env.path;
+
        config = {
          DOMAIN = "https://${cfg.url}";
          ROCKET_ADDRESS = "127.0.0.1";
@ -55,11 +37,17 @@ in
        };
      };

-      cloudflared.tunnels.${homelab.cloudflared.tunnelId}.ingress = {
-        "${cfg.url}" = "http://${config.services.${service}.config.ROCKET_ADDRESS}:${
-          toString config.services.${service}.config.ROCKET_PORT
-        }";
+      nginx.virtualHosts.${cfg.url} = {
+        forceSSL = true;
+        useACMEHost = homelab.domain;
+
+        locations."/" = {
+          proxyPass = "http://localhost:${toString config.services.${service}.config.ROCKET_PORT}";
+          recommendedProxySettings = true;
+        };
      };
    };
+
+    age.secrets.vaultwarden-env.file = "${inputs.self}/secrets/vaultwarden-env.age";
  };
 }
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@ -9,68 +9,39 @@
    ../common

    ./hardware-configuration.nix
-    ./modules
+    ./cron.nix
+    ./neomutt.nix
+    ./newsboat
    ./secrets.nix
-    ./services
+    ./xserver.nix

    ../../users/opdavies.nix
  ];

-  services.geoclue2.enable = true;
-
-  cli = {
-    kanata = {
-      enable = true;
-
-      devices = [
-        "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
-      ];
-    };
-
-    password-store = {
-      enable = true;
-
-      extensions = with pkgs.passExtensions; [
-        pass-audit
-        pass-otp
-        pass-update
-      ];
-    };
-  };
-
-  core = {
-    bluetooth.enable = true;
-    openssh.enable = true;
-    pipewire.enable = true;
-    xbanish.enable = true;
-    zram.enable = true;
-  };
-
-  desktop = {
-    dconf.enable = true;
-    dwm.enable = true;
-    fonts.enable = true;
-    media.makemkv.enable = true;
-    st.enable = true;
-    thunar.enable = true;
+  services = {
+    auto-cpufreq.enable = true;
+    geoclue2.enable = true;
+    gvfs.enable = true;
+    power-profiles-daemon.enable = false;
+    printing.enable = true;
+    pulseaudio.enable = false;
+    thermald.enable = true;
+    throttled.enable = true;
+    upower.enable = true;
  };

  boot = {
    loader = {
-      systemd-boot = {
-        enable = true;
-        configurationLimit = 10;
-      };
+      systemd-boot.enable = true;
+      systemd-boot.configurationLimit = 10;

-      efi = {
-        canTouchEfiVariables = true;
-      };
+      efi.canTouchEfiVariables = true;
    };
  };

-  systemd.extraConfig = ''
-    DefaultTimeoutStopSec=10s
-  '';
+  systemd.settings.Manager = {
+    DefaultTimeoutStopSec = "10s";
+  };

  networking.networkmanager.enable = true;

@ -95,16 +66,13 @@
    abook
    acpi
    arandr
-    backup-websites
    brightnessctl
-    build-glove80
    cdrkit
    cpufrequtils
-    displayselect
    dvdbackup
    dvdplusrwtools
    ffmpegthumbnailer
-    gimp
+    gimp3
    gtypist
    hunspellDicts.en-gb-large
    isync
@ -120,16 +88,11 @@
    peek
    pmutils
    shotwell
-    slack
    stable.gscan2pdf
    sxiv
-    tailscale
    ttyper
-    upload-to-files
    xcape
    xsel
    yt-dlp
-    zeroad
-    zoom-us
  ];
 }
--- a/hosts/t480/modules/cron.nix
+++ b/hosts/t480/modules/cron.nix
--- a/hosts/t480/modules/default.nix
+++ b/hosts/t480/modules/default.nix
@ -1,8 +0,0 @@
-{
-  imports = [
-    ./cron.nix
-    ./neomutt.nix
-    ./newsboat
-    ./ollama.nix
-  ];
-}
--- a/hosts/t480/modules/ollama.nix
+++ b/hosts/t480/modules/ollama.nix
@ -1,10 +0,0 @@
-{
-  services = {
-    ollama = {
-      enable = false;
-      acceleration = "rocm";
-    };
-
-    open-webui.enable = false;
-  };
-}
--- a/hosts/t480/modules/neomutt.nix
+++ b/hosts/t480/modules/neomutt.nix
--- a/hosts/t480/modules/newsboat/default.nix
+++ b/hosts/t480/modules/newsboat/default.nix
--- a/hosts/t480/modules/newsboat/urls.nix
+++ b/hosts/t480/modules/newsboat/urls.nix
--- a/hosts/t480/services/default.nix
+++ b/hosts/t480/services/default.nix
@ -1,17 +0,0 @@
-{
-  imports = [
-    ./xserver.nix
-  ];
-
-  services = {
-    auto-cpufreq.enable = true;
-    gvfs.enable = true;
-    power-profiles-daemon.enable = false;
-    printing.enable = true;
-    pulseaudio.enable = false;
-    tailscale.enable = true;
-    throttled.enable = true;
-    thermald.enable = true;
-    upower.enable = true;
-  };
-}
--- a/hosts/t480/services/xserver.nix
+++ b/hosts/t480/services/xserver.nix
@ -9,6 +9,4 @@
      variant = "";
    };
  };
-
-  services.displayManager.ly.enable = true;
 }
--- a/hosts/t490/configuration.nix
+++ b/hosts/t490/configuration.nix
@ -1,46 +0,0 @@
-{ inputs, ... }:
-
-{
-  imports = [
-    inputs.agenix.nixosModules.default
-    inputs.nixos-hardware.nixosModules.common-gpu-intel
-    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t490
-
-    ../common
-
-    ./hardware-configuration.nix
-    ./hardware.nix
-    ./services
-
-    ../../users/luke.nix
-    ../../users/opdavies.nix
-  ];
-
-  core = {
-    bluetooth.enable = true;
-    zram.enable = true;
-  };
-
-  desktop.dconf.enable = true;
-
-  nixpad.enable = true;
-
-  boot = {
-    loader = {
-      systemd-boot = {
-        enable = true;
-        configurationLimit = 10;
-      };
-
-      efi = {
-        canTouchEfiVariables = true;
-      };
-    };
-  };
-
-  systemd.extraConfig = ''
-    DefaultTimeoutStopSec=10s
-  '';
-
-  networking.networkmanager.enable = true;
-}
--- a/hosts/t490/hardware-configuration.nix
+++ b/hosts/t490/hardware-configuration.nix
@ -1,54 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/001febe7-57e8-4c9a-bbaf-52c3d8305b63";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/5F0A-3374";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
-  };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/hosts/t490/hardware.nix
+++ b/hosts/t490/hardware.nix
@ -1,5 +0,0 @@
-{
-  hardware = {
-    bluetooth.enable = true;
-  };
-}
--- a/hosts/t490/services/cron.nix
+++ b/hosts/t490/services/cron.nix
@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.cron = {
-    enable = true;
-
-    systemCronJobs = [
-      "0 8,20 * * * opdavies ${pkgs.isync}/bin/mbsync -a"
-    ];
-  };
-}
--- a/hosts/t490/services/default.nix
+++ b/hosts/t490/services/default.nix
@ -1,30 +0,0 @@
-{
-  imports = [
-    ./cron.nix
-    ./interception-tools.nix
-    ./sound.nix
-    ./udev.nix
-    ./xserver.nix
-  ];
-
-  services = {
-    auto-cpufreq.enable = true;
-
-    avahi = {
-      enable = true;
-      nssmdns4 = true;
-      openFirewall = true;
-    };
-
-    blueman.enable = true;
-
-    gvfs.enable = true;
-    openssh.enable = true;
-    power-profiles-daemon.enable = false;
-    printing.enable = true;
-    pulseaudio.enable = false;
-    throttled.enable = true;
-    thermald.enable = true;
-    upower.enable = true;
-  };
-}
--- a/hosts/t490/services/interception-tools.nix
+++ b/hosts/t490/services/interception-tools.nix
@ -1,25 +0,0 @@
-{ pkgs, ... }:
-
-{
-  # Make Caps lock work as an Escape key on press and Ctrl on hold.
-  services.interception-tools =
-    let
-      dfkConfig = pkgs.writeText "dual-function-keys.yaml" ''
-        MAPPINGS:
-          - KEY: KEY_CAPSLOCK
-            TAP: KEY_ESC
-            HOLD: KEY_LEFTCTRL
-      '';
-    in
-    {
-      enable = true;
-      plugins = pkgs.lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ];
-      udevmonConfig = ''
-        - JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
-          DEVICE:
-            NAME: "AT Translated Set 2 keyboard"
-            EVENTS:
-              EV_KEY: [[KEY_CAPSLOCK, KEY_ESC, KEY_LEFTCTRL]]
-      '';
-    };
-}
--- a/hosts/t490/services/redshift.nix
+++ b/hosts/t490/services/redshift.nix
@ -1,31 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.redshift;
-in
-{
-  options.redshift.enable = mkEnableOption "Enable redshift";
-
-  config = mkIf cfg.enable {
-    location = {
-      latitude = 51.48;
-      longitude = -3.17;
-    };
-
-    services.redshift = {
-      enable = true;
-
-      brightness = {
-        day = "1";
-        night = "1";
-      };
-
-      temperature = {
-        day = 5500;
-        night = 3700;
-      };
-    };
-  };
-}
--- a/hosts/t490/services/sound.nix
+++ b/hosts/t490/services/sound.nix
@ -1,12 +0,0 @@
-{
-  services.pipewire = {
-    enable = true;
-
-    alsa = {
-      enable = true;
-      support32Bit = true;
-    };
-
-    pulse.enable = true;
-  };
-}
--- a/hosts/t490/services/udev.nix
+++ b/hosts/t490/services/udev.nix
@ -1,9 +0,0 @@
-{
-  services.udev = {
-    enable = true;
-
-    extraRules = ''
-      KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
-    '';
-  };
-}
--- a/hosts/t490/services/xserver.nix
+++ b/hosts/t490/services/xserver.nix
@ -1,10 +0,0 @@
-{
-  services.xserver = {
-    enable = true;
-
-    xkb = {
-      layout = "gb";
-      variant = "";
-    };
-  };
-}
--- a/7
+++ b/7
@ -13,8 +13,7 @@ check:
    nix flake check

 clean:
-    nix store optimise --verbose
-    nix store gc --verbose
+    nh clean all

 collect-garbage:
    nix-collect-garbage -d
@ -30,7 +29,7 @@ test *args:
    @just _nixos test {{ args }}

 update:
-    nix flake update
+    nix flake update --commit-lock-file

 _nixos command *args:
-    sudo nixos-rebuild {{ command }} --flake . {{ args }}
+    nh os {{ command }} . {{ args }}
--- a/hosts/nixedo/modules/nginx/ports.nix
+++ b/hosts/nixedo/modules/nginx/ports.nix
--- a/modules/nixos/core/avahi.nix
+++ b/modules/nixos/core/avahi.nix
@ -1,5 +1,5 @@
 {
-  services.avahi = {
+  flake.modules.nixos.pc.services.avahi = {
    enable = true;
    nssmdns4 = true;
    openFirewall = true;
--- a/modules/bluetooth.nix
+++ b/modules/bluetooth.nix
@ -0,0 +1,7 @@
+{
+  flake.modules.nixos.desktop = {
+    hardware.bluetooth.enable = true;
+
+    services.blueman.enable = true;
+  };
+}
--- a/modules/bluetuith.nix
+++ b/modules/bluetuith.nix
@ -0,0 +1,29 @@
+{
+  flake.modules.homeManager.base =
+    { pkgs, ... }:
+    {
+      home.packages = [
+        pkgs.bluetuith
+      ];
+
+      xdg.configFile."bluetuith/bluetuith.conf" = {
+        text = ''
+          {
+            adapter: ""
+            adapter-states: ""
+            connect-bdaddr: ""
+            gsm-apn: ""
+            gsm-number: ""
+
+            keybindings: {
+              NavigateDown: j
+              NavigateUp: k
+            }
+
+            receive-dir: ""
+            theme: {}
+          }
+        '';
+      };
+    };
+}
--- a/modules/bookmarkthis.nix
+++ b/modules/bookmarkthis.nix
@ -0,0 +1,57 @@
+{ lib, ... }:
+
+{
+  flake.modules.homeManager.gui =
+    { config, pkgs, ... }:
+    {
+      options.programs.bookmarkthis.snippetsFile = lib.mkOption {
+        default = "${config.xdg.dataHome}/snippets.txt";
+        type = lib.types.str;
+      };
+
+      config = {
+        home = {
+          packages = [
+            (pkgs.writeShellApplication {
+              name = "bookmarkthis";
+
+              text = ''
+                message() {
+                  if command -v  ${lib.getExe pkgs.libnotify} > /dev/null; then
+                    ${lib.getExe pkgs.libnotify} "$1" "$2"
+                  else
+                    echo "$2"
+                  fi
+                }
+
+                main() {
+                  bookmark="$(xclip -o)"
+                  file="$SNIPPETS_FILE"
+
+                  if grep -q "^$bookmark$" "$file"; then
+                    message "Oops." "Already bookmarked." >&2
+
+                    exit 2
+                  fi
+
+                  echo "$bookmark" >> "$file"
+
+                  message "Bookmark added!" "$bookmark is now saved to the file."
+                }
+
+                main
+              '';
+            })
+          ];
+
+          sessionVariables = {
+            SNIPPETS_FILE = config.programs.bookmarkthis.snippetsFile;
+          };
+        };
+
+        programs.zsh.zsh-abbr.abbreviations = lib.optionalAttrs (config.programs.zsh.enable) {
+          "sn" = "${config.home.sessionVariables.EDITOR} $SNIPPETS_FILE";
+        };
+      };
+    };
+}
--- a/modules/browsers/chromium.nix
+++ b/modules/browsers/chromium.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.programs.chromium.enable = true;
+}
--- a/modules/browsers/librewolf/enable.nix
+++ b/modules/browsers/librewolf/enable.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.programs.librewolf.enable = true;
+}
--- a/modules/browsers/librewolf/extensions.nix
+++ b/modules/browsers/librewolf/extensions.nix
@ -0,0 +1,17 @@
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      programs.librewolf.profiles.default.extensions.packages =
+        with pkgs.nur.repos.rycee.firefox-addons; [
+          awesome-rss
+          bitwarden
+          darkreader
+          tree-style-tab
+          ublock-origin
+          videospeed
+          vimium
+          web-developer
+        ];
+    };
+}
--- a/modules/browsers/librewolf/languages.nix
+++ b/modules/browsers/librewolf/languages.nix
@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.gui.programs.librewolf.languagePacks = [
+    "en-GB"
+  ];
+}
--- a/modules/browsers/librewolf/policies.nix
+++ b/modules/browsers/librewolf/policies.nix
@ -0,0 +1,70 @@
+{
+  flake.modules.homeManager.gui.programs.librewolf.policies = {
+    CaptivePortal = false;
+    DisableFirefoxAccounts = true;
+    DisableFirefoxStudies = true;
+    DisablePocket = true;
+    DisableTelemetry = true;
+
+    EnableTrackingProtection = {
+      Cryptomining = true;
+      Fingerprinting = true;
+      Value = true;
+    };
+
+    ExtensionSettings = {
+      "jid1-ZAdIEUB7XOzOJw@jetpack" = {
+        install_url = "https://addons.mozilla.org/firefox/downloads/latest/duckduckgo-for-firefox/latest.xpi";
+        installation_mode = "force_installed";
+      };
+
+      "uBlock0@raymondhill.net" = {
+        install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+        installation_mode = "force_installed";
+      };
+    };
+
+    FirefoxHome = {
+      Highlights = false;
+      Pocket = false;
+      Search = true;
+      Snippets = false;
+      SponsoredPocket = false;
+      SponsoredTopSites = false;
+      TopSites = true;
+    };
+
+    FirefoxSuggest = {
+      ImproveSuggest = false;
+      SponsoredSuggestions = false;
+      WebSuggestions = false;
+    };
+
+    NoDefaultBookmarks = true;
+    OfferToSaveLogins = false;
+    OfferToSaveLoginsDefault = false;
+    PasswordManagerEnabled = false;
+
+    Preferences = {
+      "browser.newtabpage.enabled" = false;
+      "cookiebanners.service.mode" = 2; # Block cookie banners
+      "cookiebanners.service.mode.privateBrowsing" = 2; # Block cookie banners in private browsing
+      "privacy.donottrackheader.enabled" = true;
+      "privacy.fingerprintingProtection" = true;
+      "privacy.resistFingerprinting" = true;
+      "privacy.trackingprotection.emailtracking.enabled" = true;
+      "privacy.trackingprotection.enabled" = true;
+      "privacy.trackingprotection.fingerprinting.enabled" = true;
+      "privacy.trackingprotection.socialtracking.enabled" = true;
+    };
+
+    HardwareAcceleration = true;
+    TranslateEnabled = true;
+
+    UserMessaging = {
+      ExtensionRecommendations = false;
+      UrlbarInterventions = false;
+      SkipOnboarding = true;
+    };
+  };
+}
--- a/modules/browsers/librewolf/search-engines.nix
+++ b/modules/browsers/librewolf/search-engines.nix
@ -0,0 +1,19 @@
+{
+  flake.modules.homeManager.gui.programs.librewolf.profiles.default.search.engines = {
+    # TODO: Drupal.org users.
+    # TODO: Mastodon.
+    # TODO: GitHub.
+    # TODO: Forgejo.
+    drupal_projects = {
+      name = "Drupal.org projects";
+      urls = [ { template = "https://www.drupal.org/project/{searchTerms}"; } ];
+      definedAliases = [ "@dp" ];
+    };
+
+    nixvim = {
+      name = "Nixvim options search";
+      urls = [ { template = "https://nix-community.github.io/nixvim/search/?query={searchTerms}"; } ];
+      definedAliases = [ "@nxv" ];
+    };
+  };
+}
--- a/modules/browsers/librewolf/search.nix
+++ b/modules/browsers/librewolf/search.nix
@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.gui.programs.librewolf.profiles.default.search = {
+    default = "ddg";
+    force = true;
+    privateDefault = "ddg";
+  };
+}
--- a/modules/browsers/librewolf/settings.nix
+++ b/modules/browsers/librewolf/settings.nix
@ -0,0 +1,10 @@
+{
+  flake.modules.homeManager.gui.programs.librewolf.profiles.default.settings = {
+    "browser.search.isUS" = false;
+    "browser.search.region" = "GB";
+    "distribution.searchplugins.defaultLocale" = "en-GB";
+    "general.useragent.locale" = "en-GB";
+    "intl.accept_languages" = "en-GB, en";
+    "intl.regional_prefs.use_os_locales" = true;
+  };
+}
--- a/modules/browsers/qutebrowser/enable.nix
+++ b/modules/browsers/qutebrowser/enable.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.programs.qutebrowser.enable = true;
+}
--- a/modules/browsers/qutebrowser/key-bindings.nix
+++ b/modules/browsers/qutebrowser/key-bindings.nix
@ -0,0 +1,14 @@
+{ lib, ... }:
+
+{
+  flake.modules.homeManager.gui.programs.qutebrowser.keyBindings.normal = {
+    "<Ctrl-d>" = "config-cycle colors.webpage.darkmode.enabled true false";
+
+    "xb" = "config-cycle statusbar.show always never";
+    "xt" = "config-cycle tabs.show always never";
+    "xx" = lib.mkMerge [
+      "config-cycle statusbar.show always never"
+      "config-cycle tabs.show always never"
+    ];
+  };
+}
--- a/modules/browsers/qutebrowser/package.nix
+++ b/modules/browsers/qutebrowser/package.nix
@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      programs.qutebrowser.package = pkgs.stable.qutebrowser;
+    };
+}
--- a/modules/browsers/qutebrowser/search-engines.nix
+++ b/modules/browsers/qutebrowser/search-engines.nix
@ -0,0 +1,10 @@
+{
+  flake.modules.homeManager.gui.programs.qutebrowser.searchEngines = {
+    dp = "https://www.drupal.org/project/{}";
+    du = "https://www.drupal.org/u/{}";
+    gh = "https://github.com/search?q={}";
+    mn = "https://mynixos.com/search?q={}";
+    nx = "https://search.nixos.org/packages?query={}";
+    yt = "https://www.youtube.com/results?search_query={}";
+  };
+}
--- a/modules/browsers/qutebrowser/settings.nix
+++ b/modules/browsers/qutebrowser/settings.nix
@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.gui.programs.qutebrowser.settings = {
+    colors.webpage.darkmode.enabled = true;
+  };
+}
--- a/modules/calculator.nix
+++ b/modules/calculator.nix
@ -0,0 +1,7 @@
+{
+  flake.modules.nixos.pc =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.bc ];
+    };
+}
--- a/modules/dconf.nix
+++ b/modules/dconf.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.programs.dconf.enable = true;
+}
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@ -0,0 +1,7 @@
+{ config, ... }:
+
+{
+  flake.modules.nixos.desktop.imports = with config.flake.modules.nixos; [
+    pc
+  ];
+}
--- a/modules/dev-commit.nix
+++ b/modules/dev-commit.nix
@ -0,0 +1,83 @@
+{ lib, ... }:
+
+{
+  flake.modules.homeManager.base =
+    { config, pkgs, ... }:
+    {
+      options.programs.dev-commit = {
+        enable = lib.mkEnableOption "Enable dev-commit";
+
+        repoPaths = lib.mkOption {
+          default = [ ];
+          description = "A list of repository paths that should have automated commits";
+          type = lib.types.listOf lib.types.path;
+        };
+
+        schedule = lib.mkOption {
+          type = lib.types.submodule {
+            options = {
+              enable = lib.mkEnableOption "Enable automated dev commits with systemd";
+
+              time = lib.mkOption {
+                description = ''
+                  Time expression for when to run the dev-commit job.
+
+                  This uses systemd's `OnCalendar` syntax.
+
+                  Examples:
+                    - "hourly" (once every hour)
+                    - "daily" (once per day at midnight)
+                    - "Mon *-*-01 12:00:00" (every Monday at 12:00 PM)
+
+                  See `man systemd.time` for full syntax reference.
+                '';
+                default = "hourly";
+                type = lib.types.str;
+              };
+            };
+          };
+
+          default = {
+            enable = false;
+            time = "hourly";
+          };
+        };
+      };
+
+      config =
+        let
+          cfg = config.programs.dev-commit;
+          repoPaths = lib.concatStringsSep ":" cfg.repoPaths;
+        in
+        {
+          home = lib.mkIf cfg.enable {
+            packages = [ pkgs.dev-commit ];
+
+            sessionVariables.DEV_COMMIT_PATHS = repoPaths;
+          };
+
+          systemd.user = lib.mkIf cfg.schedule.enable {
+            services.dev-commit = {
+              Service = {
+                Environment = [ "DEV_COMMIT_PATHS=${repoPaths}" ];
+                ExecStart = "${lib.getExe pkgs.dev-commit}";
+                Type = "oneshot";
+              };
+
+              Unit.Description = "dev-commit";
+            };
+
+            timers.dev-commit = {
+              Install.WantedBy = [ "timers.target" ];
+
+              Timer = {
+                OnCalendar = cfg.schedule.time;
+                Unit = "dev-commit.service";
+              };
+
+              Unit.Description = "Runs automated development commits in select project repositories.";
+            };
+          };
+        };
+    };
+}
--- a/modules/direnv/enable.nix
+++ b/modules/direnv/enable.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.base.programs.direnv.enable = true;
+}
--- a/modules/direnv/nix-direnv.nix
+++ b/modules/direnv/nix-direnv.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.base.programs.direnv.nix-direnv.enable = true;
+}
--- a/modules/direnv/silent.nix
+++ b/modules/direnv/silent.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.base.programs.direnv.silent = true;
+}
--- a/modules/direnv/zsh.nix
+++ b/modules/direnv/zsh.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.base.programs.direnv.enableZshIntegration = true;
+}
--- a/modules/displayselect/default.nix
+++ b/modules/displayselect/default.nix
@ -0,0 +1,35 @@
+{ inputs, ... }:
+
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      home.packages = [
+        (pkgs.stdenv.mkDerivation {
+          pname = "displayselect";
+          version = "unstable";
+
+          src = inputs.voidrice;
+
+          dontUnpack = true;
+
+          buildInputs = with pkgs; [
+            bash
+            xorg.xrandr
+          ];
+
+          prePatch = ''
+            cp "$src/.local/bin/displayselect" displayselect
+          '';
+
+          patches = [ ./scaling.patch ];
+
+          installPhase = ''
+            mkdir -p $out/bin
+            cp displayselect $out/bin
+            chmod +x $out/bin/displayselect
+          '';
+        })
+      ];
+    };
+}
--- a/modules/displayselect/scaling.patch
+++ b/modules/displayselect/scaling.patch
--- a/modules/dmenu-sys.nix
+++ b/modules/dmenu-sys.nix
@ -0,0 +1,26 @@
+{ inputs, ... }:
+
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      home.packages = [
+        (pkgs.stdenv.mkDerivation rec {
+          pname = "dmenu_sys";
+          version = "unstable";
+
+          src = inputs.bop-scripts;
+
+          dontUnpack = true;
+
+          buildInputs = with pkgs; [ dmenu ];
+
+          installPhase = ''
+            mkdir -p $out/bin
+            cp $src/${pname} $out/bin
+            chmod +x $out/bin/${pname}
+          '';
+        })
+      ];
+    };
+}
--- a/modules/dmenu-timer.nix
+++ b/modules/dmenu-timer.nix
@ -0,0 +1,26 @@
+{ inputs, ... }:
+
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      home.packages = [
+        (pkgs.stdenv.mkDerivation rec {
+          pname = "dmenu_timer";
+          version = "unstable";
+
+          src = inputs.bop-scripts;
+
+          dontUnpack = true;
+
+          buildInputs = with pkgs; [ dmenu ];
+
+          installPhase = ''
+            mkdir -p $out/bin
+            cp $src/${pname} $out/bin
+            chmod +x $out/bin/${pname}
+          '';
+        })
+      ];
+    };
+}
--- a/modules/docker.nix
+++ b/modules/docker.nix
@ -0,0 +1,24 @@
+{ config, lib, ... }:
+
+{
+  flake.modules.nixos.pc = args: {
+    options.docker.enable = lib.mkEnableOption "Enable Docker";
+
+    config = lib.mkIf args.config.docker.enable {
+      virtualisation = {
+        oci-containers.backend = "docker";
+
+        docker = {
+          enable = true;
+
+          autoPrune = {
+            enable = true;
+            dates = "weekly";
+          };
+        };
+      };
+
+      users.users.${config.flake.meta.owner.username}.extraGroups = [ "docker" ];
+    };
+  };
+}
--- a/modules/dwm/config.nix
+++ b/modules/dwm/config.nix
@ -0,0 +1,11 @@
+{
+  flake.modules.homeManager.gui =
+    { config, ... }:
+    {
+      home = {
+        file."${config.home.sessionVariables.XINITRC}".source = ./xinitrc;
+
+        sessionVariables.XINITRC = "${config.xdg.configHome}/X11/xinitrc";
+      };
+    };
+}
--- a/modules/dwm/dmenu-center-noop.patch
+++ b/modules/dwm/dmenu-center-noop.patch
@ -0,0 +1,14 @@
+diff --git a/dmenu.c b/dmenu.c
+
+index fd49549..e9e2648 100644
+--- a/dmenu.c
+++ b/dmenu.c
+@@ -757,6 +757,8 @@ main(int argc, char *argv[])
+ 			colors[SchemeSel][ColFg] = argv[++i];
+ 		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
+ 			embed = argv[++i];
+		else if (!strcmp(argv[i], "-c"))
+			continue;
+ 		else
+ 			usage();
+ 
--- a/modules/dwm/packages.nix
+++ b/modules/dwm/packages.nix
@ -0,0 +1,21 @@
+{
+  flake.modules.nixos.pc =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = with pkgs; [
+        (dmenu.override {
+          patches = [
+            ./dmenu-center-noop.patch
+          ];
+        })
+
+        dmenu-bluetooth
+        dunst
+        networkmanager_dmenu
+        poweralertd
+        slock
+        xdotool
+        xwallpaper
+      ];
+    };
+}
--- a/modules/nixos/desktop/dwm/xinitrc
+++ b/modules/nixos/desktop/dwm/xinitrc
@ -1,7 +1,8 @@
 systemctl --user import-environment DISPLAY
 poweralertd -s &
-setbg &
-systemctl --user start dwm-status &
+set-background &
+dwmblocks &
+gammastep &

 sxhkd &

--- a/modules/firmware.nix
+++ b/modules/firmware.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.desktop.services.fwupd.enable = true;
+}
--- a/modules/flameshot/enable.nix
+++ b/modules/flameshot/enable.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.services.flameshot.enable = true;
+}
--- a/modules/flameshot/settings.nix
+++ b/modules/flameshot/settings.nix
@ -0,0 +1,13 @@
+{
+  flake.modules.homeManager.gui =
+    { config, ... }:
+    {
+      services.flameshot.settings.General = {
+        disabledTrayIcon = false;
+        saveAfterCopy = true;
+        savePath = "${config.xdg.userDirs.pictures}/Screenshots";
+        showHelp = false;
+        uiColor = "#60a5fa";
+      };
+    };
+}
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@ -0,0 +1,16 @@
+{
+  flake.modules.nixos.desktop =
+    { pkgs, ... }:
+    {
+      fonts = {
+        fontconfig.enable = true;
+
+        packages = with pkgs; [
+          nerd-fonts.jetbrains-mono
+          nerd-fonts.meslo-lg
+          terminus_font
+          terminus_font_ttf
+        ];
+      };
+    };
+}
--- a/modules/fzf/enable.nix
+++ b/modules/fzf/enable.nix
@ -0,0 +1,6 @@
+{
+  flake.modules.homeManager.base.programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+}
--- a/modules/fzf/session-variables.nix
+++ b/modules/fzf/session-variables.nix
@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.base.home.sessionVariables = {
+    FZF_DEFAULT_OPTS = "--reverse";
+  };
+}
--- a/modules/games/steam.nix
+++ b/modules/games/steam.nix
@ -0,0 +1,8 @@
+{
+  nixpkgs.allowedUnfreePackages = [
+    "steam"
+    "steam-unwrapped"
+  ];
+
+  flake.modules.nixos.desktop.programs.steam.enable = true;
+}
--- a/modules/games/zeroad.nix
+++ b/modules/games/zeroad.nix
@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      home.packages = with pkgs; [ zeroad ];
+    };
+}
--- a/modules/gammastep/enable.nix
+++ b/modules/gammastep/enable.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homManager.gui.services.gammastep.enable = true;
+}
--- a/modules/gammastep/provider.nix
+++ b/modules/gammastep/provider.nix
@ -0,0 +1,3 @@
+{
+  flake.modules.homManager.gui.services.gammastep.provider = "geoclue2";
+}
--- a/Show more
+++ b/Show more