flake.lock: Update

Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3?narHash=sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA%3D' (2025-03-05) → 'github:NixOS/nixpkgs/52e3095f6d812b91b22fb7ad0bfc1ab416453634?narHash=sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE%3D' (2025-03-08) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/10069ef4cf863633f57238f179a0297de84bd8d3?narHash=sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U%3D' (2025-03-06) → 'github:NixOS/nixpkgs/36fd87baa9083f34f7f5027900b62ee6d09b1f2f?narHash=sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw%3D' (2025-03-07) • Updated input 'nixvim': 'github:nix-community/nixvim/7e27ae55d17db65bd3ff02bcbec0615d50584910?narHash=sha256-8jEXQsZUiG86T/H8dCxYOJ%2BkAT%2BppVylaPYiFwrNL6g%3D' (2025-03-02) → 'github:nix-community/nixvim/af8a201b44bd7ccadcdd143cb38b5adcffaddc25?narHash=sha256-XQ5nJgVwYzH0mHqp3c/59%2BMLgnsXKoe/bUtkrB1BoCk%3D' (2025-03-09) • Updated input 'nixvim/flake-parts': 'github:hercules-ci/flake-parts/32ea77a06711b758da0ad9bd6a844c5740a87abd?narHash=sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm%2BzmZ7vxbJdo%3D' (2025-02-01) → 'github:hercules-ci/flake-parts/f4330d22f1c5d2ba72d3d22df5597d123fdb60a9?narHash=sha256-%2Bu2UunDA4Cl5Fci3m7S643HzKmIDAe%2BfiXrLqYsR2fs%3D' (2025-03-07) • Updated input 'nixvim/git-hooks': 'github:cachix/git-hooks.nix/9364dc02281ce2d37a1f55b6e51f7c0f65a75f17?narHash=sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg%3D' (2025-01-21) → 'github:cachix/git-hooks.nix/b5a62751225b2f62ff3147d0a334055ebadcd5cc?narHash=sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc%3D' (2025-03-07) • Updated input 'nixvim/nix-darwin': 'github:lnl7/nix-darwin/353846417f985e74fdc060555f17939e4472ea2c?narHash=sha256-L4ou3xfOr17EAe836djRoQ7auVkYOREMtiQa82wVGqU%3D' (2025-02-14) → 'github:lnl7/nix-darwin/c172f50b55b087f8e7801631de977461603bb976?narHash=sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU%3D' (2025-03-04) • Updated input 'pre-commit-hooks': 'github:cachix/git-hooks.nix/ca78dfc9652483f3ae52cfe70fdfbfe664451e2b?narHash=sha256-QKp83UTH0hGc7TYkQdX5JdagvBnP5169WyxXkMrkPqY%3D' (2025-03-07) → 'github:cachix/git-hooks.nix/b5a62751225b2f62ff3147d0a334055ebadcd5cc?narHash=sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc%3D' (2025-03-07)
flake.lock: Update
2025-03-10 08:51:09 +00:00 · 2025-03-07 12:38:31 +00:00 · 2025-03-03 23:50:40 +00:00 · 2025-03-03 21:53:07 +00:00 · 2025-03-03 21:52:21 +00:00 · 2025-03-02 22:05:20 +00:00
147 changed files with 6375 additions and 2174 deletions
--- a/.gitea/workflows/check.yml
+++ b/.gitea/workflows/check.yml
@ -0,0 +1,15 @@
+name: Check flake
+on:
+  push:
+    branches: ['master']
+jobs:
+  build-amd64-linux:
+    runs-on: nix
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Check flake
+        run: |
+          echo "Checking flake at ${{ gitea.ref }}"
+          nix flake check
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Copyright (C) 2023 by Jordan Holt <jordan@vimium.com>
+Copyright (C) 2025 by Jordan Holt <jordan@vimium.com>

 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted.
--- a/README.md
+++ b/README.md
@ -6,19 +6,49 @@ System and user configuration for NixOS-based systems.
 |-|-|
 | **Shell:** | zsh |
 | **DE:** | GNOME |
-| **Theme:** | adwaita |
-| **Terminal:** | Console |
+| **Theme:** | Adwaita |
+| **Terminal:** | Ghostty |

-## Provisioning
-> [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used for provisioning
+## Provisioning a new host
+> [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used
+> for provisioning

 Generate a new SSH host key in "$temp/etc/ssh" as per [this guide](https://nix-community.github.io/nixos-anywhere/howtos/secrets.html#example-decrypting-an-openssh-host-key-with-pass).
+```
+ssh-keygen -t ed25519 -f /tmp/ssh_host_ed25519_key
+```

-Then run;
+Update [nix-secrets](/jordan/nix-secrets) with the new host key to enable the system to decrypt
+any relevant secrets.
+
+In order to use the borgmatic module for backups, go to [borgbase.com](https://borgbase.com).
+Add the generated SSH host key and create a new repository for the system.
+
+Create a new directory under `hosts/` with a system configuration and disk layout.
+
+Boot the NixOS installer (or any Linux distribution) on the target.
+
+Then run:
 ```
 nix run github:nix-community/nixos-anywhere -- \
  --disk-encryption-keys /tmp/secret.key /tmp/secret.key \
  --extra-files "$temp" \
  --flake .#<hostname> \
-  root@<ip>
+  root@<target-ip>
 ```
+
+### Post install
+
+If backups are configured, you'll need to run:
+```
+borgmatic init --encryption repokey-blake2
+```
+then restart `borgmatic`.
+
+To join the Tailscale network, run:
+```
+tailscale up --login-server https://headscale.vimium.net
+```
+then visit the URL, SSH onto `vps1` and run `headscale --user mesh nodes register --key <key>`.
+
+The new node can optionally be given a friendly name with `headscale node rename -i <index> <hostname>`.
--- a/flake.lock
+++ b/flake.lock
@ -8,11 +8,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1707830867,
-        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
+        "lastModified": 1736955230,
+        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
+        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
        "type": "github"
      },
      "original": {
@ -21,6 +21,22 @@
        "type": "github"
      }
    },
+    "blobs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1604995301,
+        "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "type": "gitlab"
+      }
+    },
    "darwin": {
      "inputs": {
        "nixpkgs": [
@ -50,11 +66,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1708091384,
-        "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=",
+        "lastModified": 1727447169,
+        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
        "owner": "serokell",
        "repo": "deploy-rs",
-        "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790",
+        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
        "type": "github"
      },
      "original": {
@ -63,6 +79,27 @@
        "type": "github"
      }
    },
+    "devshell": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735644329,
+        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
    "disko": {
      "inputs": {
        "nixpkgs": [
@ -70,11 +107,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709439398,
-        "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=",
+        "lastModified": 1740485968,
+        "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57",
+        "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
        "type": "github"
      },
      "original": {
@ -86,11 +123,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1708965002,
-        "narHash": "sha256-gIBZCPB0sA8Gagrxd8w4+y9uUkWBnXJBmq9Ur5BYTQU=",
+        "lastModified": 1741299385,
+        "narHash": "sha256-400XWumq2SDwI/KfiJamd4ZRO1YllS6rEw0x8mcPXU4=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "4e966509c180f93ba8665cd73cad8456bf44baab",
+        "rev": "73fb2369cda11fc2a37101c4a9c992a0b356ee6d",
        "type": "github"
      },
      "original": {
@ -115,6 +152,177 @@
        "type": "github"
      }
    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "revCount": 69,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
+      }
+    },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741352980,
+        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741379162,
+        "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitea-github-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717248105,
+        "narHash": "sha256-BwSsIkl7DpN/c8HNXOh2aKjOuPmFsGybv4RegOC7Xq0=",
+        "ref": "main",
+        "rev": "4f829f88e6f443ff048c4d337bd010315aa4b50a",
+        "revCount": 101,
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/gitea-github-theme.git"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/gitea-github-theme.git"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_2": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -143,27 +351,115 @@
        ]
      },
      "locked": {
-        "lastModified": 1706981411,
-        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
+        "lastModified": 1739757849,
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.11",
        "repo": "home-manager",
        "type": "github"
      }
    },
+    "home-manager_3": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739757849,
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729958008,
+        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.0.6",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
+    "kvlibadwaita": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1710621848,
+        "narHash": "sha256-xBl6zmpqTAH5MIT5iNAdW6kdOcB5MY0Dtrb95hdYpwA=",
+        "owner": "GabePoel",
+        "repo": "KvLibadwaita",
+        "rev": "87c1ef9f44ec48855fd09ddab041007277e30e37",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GabePoel",
+        "repo": "KvLibadwaita",
+        "type": "github"
+      }
+    },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741126078,
+        "narHash": "sha256-ng0a4cIq3c9E3iGKomlwqKzVYs2RLOzQho2U1Mc2sqU=",
+        "owner": "lnl7",
+        "repo": "nix-darwin",
+        "rev": "c172f50b55b087f8e7801631de977461603bb976",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lnl7",
+        "ref": "nix-darwin-24.11",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1709410583,
-        "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
+        "lastModified": 1741325094,
+        "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
+        "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16",
        "type": "github"
      },
      "original": {
@ -172,6 +468,29 @@
        "type": "github"
      }
    },
+    "nixos-mailserver": {
+      "inputs": {
+        "blobs": "blobs",
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-24_11": "nixpkgs-24_11"
+      },
+      "locked": {
+        "lastModified": 1740437053,
+        "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "nixos-mailserver",
+        "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "repo": "nixos-mailserver",
+        "type": "gitlab"
+      }
+    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1703013332,
@ -188,13 +507,28 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
+    "nixpkgs-24_11": {
      "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1734083684,
+        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-24.11",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1741379970,
+        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
        "type": "github"
      },
      "original": {
@ -221,29 +555,132 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1709309926,
-        "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
+        "lastModified": 1741445498,
+        "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
+        "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.11",
        "type": "indirect"
      }
    },
+    "nixvim": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-compat": "flake-compat_3",
+        "flake-parts": "flake-parts",
+        "git-hooks": "git-hooks",
+        "home-manager": "home-manager_3",
+        "nix-darwin": "nix-darwin",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nuschtosSearch": "nuschtosSearch",
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1741533061,
+        "narHash": "sha256-XQ5nJgVwYzH0mHqp3c/59+MLgnsXKoe/bUtkrB1BoCk=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "af8a201b44bd7ccadcdd143cb38b5adcffaddc25",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "nixos-24.11",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "ixx": "ixx",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739738736,
+        "narHash": "sha256-Rl4Fw+3PsLTEzzUGlB8kePaiIersDbv5voAif3D6LoM=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "9ff62c8e1fbe5dc649dee680c7eb4935936c8ac3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1740569341,
+        "narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741379162,
+        "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "agenix": "agenix",
        "deploy-rs": "deploy-rs",
        "disko": "disko",
        "firefox-gnome-theme": "firefox-gnome-theme",
+        "gitea-github-theme": "gitea-github-theme",
        "home-manager": "home-manager_2",
+        "kvlibadwaita": "kvlibadwaita",
        "nixos-hardware": "nixos-hardware",
+        "nixos-mailserver": "nixos-mailserver",
        "nixpkgs": "nixpkgs_3",
        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixvim": "nixvim",
+        "plasma-manager": "plasma-manager",
+        "pre-commit-hooks": "pre-commit-hooks",
        "secrets": "secrets",
        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
      }
@ -251,11 +688,11 @@
    "secrets": {
      "flake": false,
      "locked": {
-        "lastModified": 1709495020,
-        "narHash": "sha256-eiz0qUjUbdeb6m28XPY7OVnrGMZ45JiT2dZZ0Bmq2X0=",
+        "lastModified": 1740407512,
+        "narHash": "sha256-Hy+8DoWLZUFfls5XwaMGPDOck2dDKyIrEgo9T+AkjjU=",
        "ref": "refs/heads/master",
-        "rev": "d135b4d6d5f0079999188895f8b5f35e821b0d4b",
-        "revCount": 14,
+        "rev": "4e69a52227a61bf4bfbfd9b781bef4bf1fa0bd2b",
+        "revCount": 29,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
      },
@ -294,14 +731,29 @@
        "type": "github"
      }
    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "thunderbird-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1701889124,
-        "narHash": "sha256-K+6oh7+J6RDBFkxphY/pzf0B+q5+IY54ZMKZrFSKXlc=",
+        "lastModified": 1732643121,
+        "narHash": "sha256-i0Uo5EN45rlGuR85hvPet43zW/thOQTwHypVg9shTHU=",
        "owner": "rafaelmardojai",
        "repo": "thunderbird-gnome-theme",
-        "rev": "966e9dd54bd2ce9d36d51cd6af8c3bac7a764a68",
+        "rev": "1994e7ec0649053e2a0811973245758d41e33f5f",
        "type": "github"
      },
      "original": {
@ -310,6 +762,27 @@
        "type": "github"
      }
    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739829690,
+        "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "3d0579f5cc93436052d94b73925b48973a104204",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
    "utils": {
      "inputs": {
        "systems": "systems_2"
--- a/flake.nix
+++ b/flake.nix
@ -2,7 +2,7 @@
  description = "NixOS system configuration";

  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.11";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
    # nixpkgs-master.url = "nixpkgs";
    agenix.url = "github:ryantm/agenix";
@ -12,14 +12,39 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    firefox-gnome-theme = {
      url = "github:rafaelmardojai/firefox-gnome-theme";
      flake = false;
    };
+    gitea-github-theme = {
+      url = "git+ssh://git@git.vimium.com/jordan/gitea-github-theme.git?ref=main";
+      flake = false;
+    };
+    kvlibadwaita = {
+      url = "github:GabePoel/KvLibadwaita";
+      flake = false;
+    };
    nixos-hardware.url = "github:NixOS/nixos-hardware";
+    nixos-mailserver = {
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixvim = {
+      url = "github:nix-community/nixvim/nixos-24.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    plasma-manager = {
+      url = "github:nix-community/plasma-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
+    pre-commit-hooks = {
+      url = "github:cachix/git-hooks.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    secrets = {
      url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
      flake = false;
@ -30,90 +55,111 @@
    };
  };

-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, agenix, deploy-rs, disko, home-manager, nixos-hardware, secrets, ... }:
+  outputs =
+    inputs@{ self, nixpkgs, ... }:
    let
-      mkPkgsForSystem = system: inputs.nixpkgs;
-      overlays = [
-        agenix.overlays.default
-        (import ./overlays/gnome.nix)
-        (
-          final: prev: {
-            unstable = import inputs.nixpkgs-unstable { system = final.system; };
-            custom = self.packages { system = final.system; };
-          }
-        )
+      inherit (nixpkgs) lib;
+
+      domain = "mesh.vimium.net";
+      forEachSystem = lib.genAttrs [
+        "x86_64-linux"
+        "aarch64-linux"
      ];
-      commonModules = [
-        agenix.nixosModules.age
-        disko.nixosModules.disko
-        home-manager.nixosModule
-        ./modules
-      ];
-      mkNixosSystem = { system, name, extraModules ? [] }:
-        let
-          nixpkgs = mkPkgsForSystem system;
-          lib = (import nixpkgs { inherit overlays system; }).lib;
-        in
-        inputs.nixpkgs.lib.nixosSystem {
-          inherit lib system;
-          specialArgs = { modulesPath = toString (nixpkgs + "/nixos/modules"); inherit inputs; };
-          baseModules = import (nixpkgs + "/nixos/modules/module-list.nix");
-          modules = commonModules ++ [
-            ({ config, ... }:
-              {
-                nixpkgs.pkgs = import nixpkgs {
-                  inherit overlays system;
-                  config.allowUnfree = true;
-                };
-                networking.hostName = name;
-              })
-            ./hosts/${name}
-          ] ++ extraModules;
+      mkDeployNode = hostName: {
+        hostname = "${hostName}.${domain}";
+
+        profiles.system = {
+          user = "root";
+          path =
+            inputs.deploy-rs.lib.${
+              self.nixosConfigurations.${hostName}.config.system.build.toplevel.system
+            }.activate.nixos
+              self.nixosConfigurations.${hostName};
        };
+      };
    in
    {
-      nixosConfigurations = {
-        atlas = mkNixosSystem { system = "x86_64-linux"; name = "atlas"; };
-        eos = mkNixosSystem { system = "x86_64-linux"; name = "eos"; };
-        helios = mkNixosSystem { system = "x86_64-linux"; name = "helios"; };
-        hypnos = mkNixosSystem { system = "x86_64-linux"; name = "hypnos"; };
-        library = mkNixosSystem { system = "x86_64-linux"; name = "library"; };
-        odyssey = mkNixosSystem { system = "x86_64-linux"; name = "odyssey"; };
-        pi = mkNixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
-        vps1 = mkNixosSystem { system = "x86_64-linux"; name = "vps1"; };
+      overlays = lib.packagesFromDirectoryRecursive {
+        callPackage = path: overrides: import path;
+        directory = ./overlays;
      };

-      devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
-        buildInputs = [
-          deploy-rs.packages.x86_64-linux.deploy-rs
-        ];
-      };
+      legacyPackages = forEachSystem (
+        system:
+        lib.packagesFromDirectoryRecursive {
+          callPackage = nixpkgs.legacyPackages.${system}.callPackage;
+          directory = ./pkgs;
+        }
+      );
+
+      nixosConfigurations = lib.pipe ./hosts [
+        builtins.readDir
+        (lib.filterAttrs (name: value: value == "directory"))
+        (lib.mapAttrs (
+          name: value:
+          lib.nixosSystem {
+            specialArgs = { inherit self; };
+
+            modules = [
+              {
+                networking = {
+                  inherit domain;
+                  hostName = name;
+                };
+              }
+              ./hosts/${name}
+            ];
+          }
+        ))
+      ];
+
+      checks =
+        builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib
+        // (forEachSystem (system: {
+          pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
+            src = ./.;
+            hooks = {
+              check-case-conflicts.enable = true;
+              check-executables-have-shebangs.enable = true;
+              check-merge-conflicts.enable = true;
+              deadnix = {
+                enable = true;
+                settings = {
+                  noLambdaArg = true;
+                };
+              };
+              detect-private-keys.enable = true;
+              end-of-file-fixer.enable = true;
+              fix-byte-order-marker.enable = true;
+              mixed-line-endings.enable = true;
+              nixfmt-rfc-style.enable = true;
+              trim-trailing-whitespace.enable = true;
+            };
+          };
+        }));
+
+      formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
+
+      devShells = forEachSystem (system: {
+        default = nixpkgs.legacyPackages.${system}.mkShell {
+          inherit (self.checks.${system}.pre-commit-check) shellHook;
+          buildInputs = [
+            inputs.agenix.packages.${system}.agenix
+            inputs.deploy-rs.packages.${system}.deploy-rs
+          ] ++ self.checks.${system}.pre-commit-check.enabledPackages;
+        };
+      });

      deploy = {
        magicRollback = true;
        autoRollback = true;
        sshUser = "root";
-        nodes = {
-          vps1 = {
-            hostname = "vps1.mesh.vimium.net";
-
-            profiles.system = {
-              user = "root";
-              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.vps1;
-            };
-          };
-          # pi = {
-          #   hostname = "10.0.1.191";
-          #
-          #   profiles.system = {
-          #     user = "root";
-          #     path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pi;
-          #   };
-          # };
-        };
+        nodes = lib.genAttrs [
+          "mail"
+          # "pi"
+          # "skycam"
+          "vps1"
+        ] mkDeployNode;
      };
-
-      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
    };
 }
-
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:

 {
  imports = [
@ -6,6 +6,8 @@
    ../desktop.nix
  ];

+  nixpkgs.hostPlatform = "x86_64-linux";
+
  boot.loader = {
    systemd-boot.enable = true;
    efi.canTouchEfiVariables = true;
@ -16,31 +18,26 @@
    networkmanager.enable = true;
  };

+  virtualisation.virtualbox.host.enable = true;
+  users.extraGroups.vboxusers.members = [ "jordan" ];
+
  modules = {
-    desktop = {
-      apps = {
-        qbittorrent.enable = true;
-        thunderbird.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
      };
-      browsers = {
-        firefox.enable = true;
-      };
-      media.graphics = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      graphics = {
        raster.enable = true;
        vector.enable = true;
      };
-      office.libreoffice.enable = true;
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
+      libreoffice.enable = true;
      neovim.enable = true;
-      vscode.enable = true;
-    };
-    security = {
-      gpg.enable = true;
      pass.enable = true;
+      qbittorrent.enable = true;
+      thunderbird.enable = true;
    };
    services = {
      borgmatic = {
@ -52,7 +49,6 @@
      };
    };
    shell = {
-      git.enable = true;
      zsh.enable = true;
    };
  };
--- a/hosts/atlas/hardware-configuration.nix
+++ b/hosts/atlas/hardware-configuration.nix
@ -1,4 +1,9 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:

 {
  imports = [
@ -6,7 +11,14 @@
  ];

  boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "ehci_pci"
+      "ahci"
+      "usbhid"
+      "usb_storage"
+      "sd_mod"
+    ];
    initrd.kernelModules = [ ];
    initrd.supportedFilesystems = [ "zfs" ];
    kernelModules = [ "kvm-intel" ];
--- a/hosts/common.nix
+++ b/hosts/common.nix
@ -1,6 +1,25 @@
-{ config, lib, pkgs, ... }:
+{
+  pkgs,
+  self,
+  ...
+}:

 {
+  imports = [
+    self.inputs.agenix.nixosModules.age
+    self.inputs.home-manager.nixosModule
+    ../modules/home-manager
+    ../modules/nixos
+  ];
+
+  nixpkgs.overlays = [
+    self.inputs.agenix.overlays.default
+    (import ../overlays/default.nix)
+    (final: prev: {
+      unstable = import self.inputs.nixpkgs-unstable { system = final.system; };
+    })
+  ];
+
  time.timeZone = "Europe/London";

  i18n.defaultLocale = "en_GB.UTF-8";
@ -15,7 +34,7 @@
    LC_TELEPHONE = "en_GB.UTF-8";
    LC_TIME = "en_GB.UTF-8";
  };
-  
+
  console.keyMap = "uk";

  security.sudo.execWheelOnly = true;
@ -38,17 +57,31 @@
  programs.zsh.enable = true;

  nix = {
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
    extraOptions = ''
      experimental-features = nix-command flakes
    '';
+    buildMachines = [
+      {
+        hostName = "10.0.1.79";
+        sshUser = "root";
+        system = "aarch64-linux";
+        maxJobs = 6;
+        speedFactor = 1;
+        supportedFeatures = [
+          "big-parallel"
+          "benchmark"
+        ];
+      }
+    ];
+    distributedBuilds = true;
    settings = {
      connect-timeout = 5;
      log-lines = 25;
      min-free = 128000000;
      max-free = 1000000000;
      fallback = true;
-      allowed-users = [ "@wheel" ];
+      trusted-users = [ "@wheel" ];
      auto-optimise-store = true;
      substituters = [
        "http://odyssey.mesh.vimium.net"
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@ -1,14 +1,17 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:

 {
  imports = [
    ./common.nix
  ];

+  nixpkgs.overlays = [
+    (import ../overlays/gnome.nix)
+  ];
+
  services.printing.enable = true;
  services.openssh.startWhenNeeded = true;

-  sound.enable = true;
  hardware.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
@ -21,7 +24,18 @@
  fileSystems."/mnt/library" = {
    device = "library.mesh.vimium.net:/mnt/library";
    fsType = "nfs";
-    options = [ "nfsvers=4.2" "soft" "nocto" "ro" "x-systemd.automount" "noauto" ];
+    options = [
+      "nfsvers=4.2"
+      "bg"
+      "soft"
+      "timeo=20"
+      "retry=5"
+      "nocto"
+      "ro"
+      "x-systemd.automount"
+      "x-systemd.requires=tailscaled.service"
+      "noauto"
+    ];
  };

  system.autoUpgrade = {
@ -30,8 +44,42 @@
    randomizedDelaySec = "10min";
  };

+  systemd.services.NetworkManager-wait-online.enable = false;
+
+  fonts.packages = with pkgs; [
+    noto-fonts
+    (nerdfonts.override {
+      fonts = [
+        "BigBlueTerminal"
+        "ComicShannsMono"
+        "Terminus"
+        "UbuntuMono"
+      ];
+    })
+  ];
+
  modules = {
-    desktop.gnome.enable = true;
-    networking.tailscale.enable = true;
+    system.desktop.gnome.enable = true;
+    services.tailscale.enable = true;
  };
+
+  environment.systemPackages = with pkgs; [
+    bind
+    bmon
+    fd
+    ffmpeg
+    iotop
+    # unstable.nix-du
+    # unstable.nix-melt
+    unstable.nix-tree
+    unstable.nix-visualize
+    ripgrep
+    rsync
+    tcpdump
+    tokei
+    tree
+    wl-clipboard
+  ];
+
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 }
--- a/hosts/eos/default.nix
+++ b/hosts/eos/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ ... }:

 {
  imports = [
@ -6,6 +6,8 @@
    ../desktop.nix
  ];

+  nixpkgs.hostPlatform = "x86_64-linux";
+
  boot.loader = {
    systemd-boot.enable = true;
    efi.canTouchEfiVariables = true;
@ -23,24 +25,18 @@
  };

  modules = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
      };
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
+      firefox.enable = true;
+      git.enable = true;
      gpg.enable = true;
+      neovim.enable = true;
      pass.enable = true;
+      qbittorrent.enable = true;
    };
    shell = {
-      git.enable = true;
      zsh.enable = true;
    };
  };
--- a/hosts/eos/hardware-configuration.nix
+++ b/hosts/eos/hardware-configuration.nix
@ -1,4 +1,9 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:

 {
  imports = [
@ -6,12 +11,19 @@
  ];

  boot = {
-    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-    initrd.kernelModules = [ ];
+    initrd.availableKernelModules = [
+      "ehci_pci"
+      "ahci"
+      "usb_storage"
+      "sd_mod"
+      "sdhci_pci"
+    ];
    initrd.supportedFilesystems = [ "zfs" ];
-    kernelModules = [ ];
+    kernel.sysctl = {
+      "kernel.nmi_watchdog" = 0;
+      "vm.laptop_mode" = 5;
+    };
    kernelParams = [ "elevator=none" ];
-    extraModulePackages = [ ];
    supportedFilesystems = [ "zfs" ];
  };

--- a/hosts/helios/default.nix
+++ b/hosts/helios/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ pkgs, ... }:

 {
  imports = [
@ -6,6 +6,8 @@
    ../desktop.nix
  ];

+  nixpkgs.hostPlatform = "x86_64-linux";
+
  boot = {
    loader.grub = {
      enable = true;
@ -19,22 +21,21 @@
    networkmanager.enable = true;
  };

+  environment.systemPackages = [
+    pkgs.moonlight-qt
+  ];
+
  modules = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
      };
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
+      firefox.enable = true;
+      git.enable = true;
      gpg.enable = true;
+      neovim.enable = true;
      pass.enable = true;
+      qbittorrent.enable = true;
    };
    services = {
      borgmatic = {
@ -46,7 +47,6 @@
      };
    };
    shell = {
-      git.enable = true;
      zsh.enable = true;
    };
  };
--- a/hosts/helios/hardware-configuration.nix
+++ b/hosts/helios/hardware-configuration.nix
@ -1,4 +1,9 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:

 {
  imports = [
@ -6,7 +11,15 @@
  ];

  boot = {
-    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
+    initrd.availableKernelModules = [
+      "ehci_pci"
+      "ahci"
+      "usbhid"
+      "usb_storage"
+      "sd_mod"
+      "sr_mod"
+      "zfs"
+    ];
    initrd.kernelModules = [ ];
    initrd.supportedFilesystems = [ "zfs" ];
    kernelModules = [ "kvm-intel" ];
--- a/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch
+++ b/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch
@ -0,0 +1,101 @@
+From d310ddee0fb8e7a5a8b89668c6cb8f9dc863ce94 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sun, 28 Apr 2024 15:59:52 +0100
+Subject: [PATCH] Add apple_set_os EFI boot service
+
+---
+ drivers/firmware/efi/libstub/x86-stub.c | 59 +++++++++++++++++++++++++
+ include/linux/efi.h                     |  1 +
+ 2 files changed, 60 insertions(+)
+
+diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
+index d5a8182cf..be722c43a 100644
+--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
+@@ -449,6 +449,63 @@ static void setup_graphics(struct boot_params *boot_params)
+ 	}
+ }
+
+typedef struct {
+	u64 version;
+	void (*set_os_version) (const char *os_version);
+	void (*set_os_vendor) (const char *os_vendor);
+} apple_set_os_interface_t;
+
+static efi_status_t apple_set_os()
+{
+	apple_set_os_interface_t *set_os;
+	efi_guid_t set_os_guid = APPLE_SET_OS_PROTOCOL_GUID;
+	efi_status_t status;
+	void **handles;
+	unsigned long i, nr_handles, size = 0;
+
+	status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL,
+			     &set_os_guid, NULL, &size, handles);
+
+	if (status == EFI_BUFFER_TOO_SMALL) {
+		status = efi_bs_call(allocate_pool, EFI_LOADER_DATA,
+				     size, &handles);
+
+		if (status != EFI_SUCCESS)
+			return status;
+
+		status = efi_bs_call(locate_handle, EFI_LOCATE_BY_PROTOCOL,
+				     &set_os_guid, NULL, &size, handles);
+	}
+
+	if (status != EFI_SUCCESS)
+		goto free_handle;
+
+	nr_handles = size / sizeof(void *);
+	for (i = 0; i < nr_handles; i++) {
+		void *h = handles[i];
+
+		status = efi_bs_call(handle_protocol, h,
+				     &set_os_guid, &set_os);
+
+		if (status != EFI_SUCCESS || !set_os)
+			continue;
+
+		if (set_os->version > 0) {
+			efi_bs_call((unsigned long)set_os->set_os_version,
+					"Mac OS X 10.9");
+		}
+
+		if (set_os->version >= 2) {
+			efi_bs_call((unsigned long)set_os->set_os_vendor,
+					"Apple Inc.");
+		}
+	}
+
+free_handle:
+	efi_bs_call(free_pool, uga_handle);
+
+	return status;
+}
+
+ static void __noreturn efi_exit(efi_handle_t handle, efi_status_t status)
+ {
+@@ -951,6 +1008,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle,
+
+ 	setup_unaccepted_memory();
+
+	apple_set_os();
+
+ 	status = exit_boot(boot_params, handle);
+ 	if (status != EFI_SUCCESS) {
+ 		efi_err("exit_boot() failed!\n");
+diff --git a/include/linux/efi.h b/include/linux/efi.h
+index d59b0947f..81158014f 100644
+--- a/include/linux/efi.h
+++ b/include/linux/efi.h
+@@ -385,6 +385,7 @@ void efi_native_runtime_setup(void);
+ #define EFI_MEMORY_ATTRIBUTES_TABLE_GUID	EFI_GUID(0xdcfa911d, 0x26eb, 0x469f,  0xa2, 0x20, 0x38, 0xb7, 0xdc, 0x46, 0x12, 0x20)
+ #define EFI_CONSOLE_OUT_DEVICE_GUID		EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4,  0x9a, 0x46, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d)
+ #define APPLE_PROPERTIES_PROTOCOL_GUID		EFI_GUID(0x91bd12fe, 0xf6c3, 0x44fb,  0xa5, 0xb7, 0x51, 0x22, 0xab, 0x30, 0x3a, 0xe0)
+#define APPLE_SET_OS_PROTOCOL_GUID		EFI_GUID(0xc5c5da95, 0x7d5c, 0x45e6,  0xb2, 0xf1, 0x3f, 0xd5, 0x2b, 0xb1, 0x00, 0x77)
+ #define EFI_TCG2_PROTOCOL_GUID			EFI_GUID(0x607f766c, 0x7455, 0x42be,  0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f)
+ #define EFI_TCG2_FINAL_EVENTS_TABLE_GUID	EFI_GUID(0x1e2ed096, 0x30e2, 0x4254,  0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25)
+ #define EFI_LOAD_FILE_PROTOCOL_GUID		EFI_GUID(0x56ec3091, 0x954c, 0x11d2,  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
+--
+2.42.0
--- a/hosts/hypnos/default.nix
+++ b/hosts/hypnos/default.nix
@ -1,12 +1,27 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  self,
+  pkgs,
+  ...
+}:

 {
  imports = [
+    self.inputs.disko.nixosModules.disko
    ./hardware-configuration.nix
    ./disko-config.nix
    ../desktop.nix
  ];

+  nixpkgs = {
+    hostPlatform = "x86_64-linux";
+    config = {
+      allowUnfree = true;
+      nvidia.acceptLicense = true;
+    };
+  };
+
  boot.loader = {
    systemd-boot.enable = true;
    efi.canTouchEfiVariables = true;
@ -14,27 +29,40 @@

  networking.hostId = "cf791898";

+  # nvidia 470 driver doesn't work with Wayland
+  services = {
+    xserver = {
+      displayManager.gdm.wayland = lib.mkForce false;
+      videoDrivers = [ "nvidia" ];
+    };
+    displayManager = {
+      defaultSession = if config.modules.system.desktop.kde.enable then "plasmax11" else "gnome-xorg";
+      sddm.wayland.enable = lib.mkForce false;
+    };
+  };
+
+  # Workaround for label rendering bug in GTK4 with nvidia 470 driver
+  environment.sessionVariables.GSK_RENDERER = "gl";
+
+  environment.systemPackages = [
+    pkgs.moonlight-qt
+  ];
+
  modules = {
-    desktop = {
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
      };
-      media.recording = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      neovim.enable = true;
+      pass.enable = true;
+      recording = {
        audio.enable = true;
      };
    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
-      gpg.enable = true;
-      pass.enable = true;
-    };
    shell = {
-      git.enable = true;
      zsh.enable = true;
    };
  };
--- a/hosts/hypnos/disko-config.nix
+++ b/hosts/hypnos/disko-config.nix
@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 {
  disko.devices = {
    disk = {
@ -123,4 +123,3 @@
    };
  };
 }
-
--- a/hosts/hypnos/hardware-configuration.nix
+++ b/hosts/hypnos/hardware-configuration.nix
@ -1,4 +1,10 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

 {
  imports = [
@ -6,10 +12,26 @@
  ];

  boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    initrd.kernelModules = [ ];
-    kernelModules = [ "applesmc" "kvm-intel" "wl" ];
-    extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "ahci"
+      "usbhid"
+      "usb_storage"
+      "sd_mod"
+    ];
+    kernel.sysctl = {
+      "kernel.nmi_watchdog" = 0;
+      "vm.laptop_mode" = 5;
+    };
+    kernelModules = [
+      "applesmc"
+      "kvm-intel"
+      "wl"
+    ];
+    extraModulePackages = [
+      config.boot.kernelPackages.broadcom_sta
+      config.boot.kernelPackages.nvidiaPackages.legacy_470
+    ];
  };

  networking.useDHCP = lib.mkDefault true;
@ -19,9 +41,16 @@
  hardware = {
    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
    nvidia = {
+      package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
      modesetting.enable = true;
      powerManagement.enable = true;
    };
+    graphics = {
+      enable = true;
+      extraPackages = with pkgs; [
+        libvdpau-va-gl
+      ];
+      enable32Bit = true;
+    };
  };
 }
-
--- a/hosts/library/README.md
+++ b/hosts/library/README.md
@ -43,4 +43,3 @@ See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datase
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `library.mesh.vimium.net`.
-
--- a/hosts/library/default.nix
+++ b/hosts/library/default.nix
@ -1,12 +1,13 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:

-with lib.my;
 {
  imports = [
    ./hardware-configuration.nix
    ../server.nix
  ];

+  nixpkgs.hostPlatform = "x86_64-linux";
+
  boot = {
    loader.systemd-boot.enable = true;
    loader.efi.canTouchEfiVariables = true;
@ -14,19 +15,16 @@ with lib.my;
  };

  networking = {
-    domain = "mesh.vimium.net";
    hostId = "d24ae953";
+    hosts = {
+      "100.64.0.1" = [ "auth.vimium.com" ];
+    };
    firewall = {
      enable = true;
      allowedTCPPorts = [
-        22  # SSH
+        22 # SSH
      ];
-      interfaces."podman+" = {
-        allowedUDPPorts = [ 53 ];
-        allowedTCPPorts = [ 53 ];
-      };
    };
-    networkmanager.enable = true;
  };

  services.zfs = {
@ -48,6 +46,17 @@ with lib.my;
    enable = true;
  };

+  services.grafana = {
+    enable = true;
+    settings = {
+      server = {
+        domain = "library.mesh.vimium.net";
+        http_addr = "0.0.0.0";
+        http_port = 3000;
+      };
+    };
+  };
+
  services.prometheus = {
    enable = true;
    port = 9001;
@ -64,13 +73,15 @@ with lib.my;
    };
    scrapeConfigs = [
      {
-        job_name = "library";
-        static_configs = [{
-          targets = [
-            "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
-            "127.0.0.1:${toString config.services.prometheus.exporters.zfs.port}"
-          ];
-        }];
+        job_name = "node";
+        static_configs = [
+          {
+            targets = [
+              "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
+              "127.0.0.1:${toString config.services.prometheus.exporters.zfs.port}"
+            ];
+          }
+        ];
      }
    ];
  };
@ -84,8 +95,8 @@ with lib.my;
    ];
    wants = [ "network-online.target" ];
    serviceConfig = {
-      Type="simple";
-      ExecStart=pkgs.lib.mkForce ''
+      Type = "simple";
+      ExecStart = pkgs.lib.mkForce ''
        ${pkgs.openssh}/bin/ssh \
          -NT \
          -o ExitOnForwardFailure=yes \
@ -95,65 +106,83 @@ with lib.my;
          -R localhost:8000:localhost:8000 \
          jellyfin@vps1.mesh.vimium.net
      '';
-      Restart="always";
-      RestartSec=20;
+      Restart = "always";
+      RestartSec = 20;
    };
    wantedBy = [ "default.target" ];
  };

-  services.nginx = let
-    proxyConfig = ''
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Real-IP $remote_addr;
-      proxy_set_header Host $host;
+  services.nginx =
+    let
+      proxyConfig = ''
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;

-      proxy_set_header Range $http_range;
-      proxy_set_header If-Range $http_if_range;
+        proxy_set_header Range $http_range;
+        proxy_set_header If-Range $http_if_range;

-      proxy_http_version 1.1;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection "upgrade";
-    '';
-  in {
-    enable = true;
-    package = pkgs.openresty;
-    recommendedGzipSettings = true;
-    recommendedOptimisation = true;
-    recommendedTlsSettings = true;
-    clientMaxBodySize = "2G";
-    virtualHosts = {
-      "library.mesh.vimium.net" = {
-        locations."/" = {
-          root = "/mnt/library";
-          extraConfig = ''
-            autoindex on;
-          '';
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+      '';
+    in
+    {
+      enable = true;
+      package = pkgs.openresty;
+      recommendedGzipSettings = true;
+      recommendedOptimisation = true;
+      recommendedTlsSettings = true;
+      clientMaxBodySize = "2G";
+      virtualHosts = {
+        "library.mesh.vimium.net" = {
+          locations."/" = {
+            root = "/mnt/library";
+            extraConfig = ''
+              autoindex on;
+            '';
+          };
        };
-      };
-      "jellyfin.vimium.com" = {
-        default = true;
-        listen = [
-          {
-            addr = "127.0.0.1";
-            port = 8000;
-          }
-        ];
-        locations."/" = {
-          proxyPass = "http://localhost:8096";
-          extraConfig = proxyConfig;
-        };
-        locations."/metrics" = {
-          return = "404";
+        "jellyfin.vimium.com" = {
+          default = true;
+          listen = [
+            {
+              addr = "127.0.0.1";
+              port = 8000;
+            }
+          ];
+          locations."/" = {
+            proxyPass = "http://localhost:8096";
+            extraConfig = proxyConfig;
+          };
+          locations."/metrics" = {
+            return = "404";
+          };
        };
      };
    };
+
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      vaapiVdpau
+    ];
+  };
+  users.users.jellyfin.extraGroups = [
+    "video"
+    "render"
+  ];
+  services.jellyfin = {
+    enable = true;
+    package = pkgs.unstable.jellyfin;
+    cacheDir = "/var/cache/jellyfin";
+    dataDir = "/var/lib/jellyfin";
  };

-  services.jellyfin.enable = true;
-
  modules = {
-    security = {
+    podman.enable = true;
+    programs = {
      gpg.enable = true;
    };
    shell = {
@ -163,6 +192,7 @@ with lib.my;
      borgmatic = {
        enable = true;
        directories = [
+          config.services.jellyfin.dataDir
          "/home/jordan"
        ];
        repoPath = "ssh://b61758r4@b61758r4.repo.borgbase.com/./repo";
@ -172,4 +202,3 @@ with lib.my;

  system.stateVersion = "22.11";
 }
-
--- a/hosts/library/hardware-configuration.nix
+++ b/hosts/library/hardware-configuration.nix
@ -1,4 +1,9 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:

 {
  imports = [
@ -6,7 +11,13 @@
  ];

  boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "ahci"
+      "nvme"
+      "usb_storage"
+      "sd_mod"
+    ];
    initrd.kernelModules = [ ];
    kernelModules = [ "kvm-amd" ];
    extraModulePackages = [ ];
@ -65,4 +76,3 @@

  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
-
--- a/hosts/mail/README.md
+++ b/hosts/mail/README.md
@ -0,0 +1,17 @@
+# Mail server
+
+## Overview
+Mail server hosted in OVH.
+
+## Specs
+* CPU - ??
+* Memory - ??
+
+### Disks
+Device | Partitions _(filesystem, usage)_
+--- | ---
+NVMe | `/dev/sda1` (ext4, NixOS Root)
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `mail.mesh.vimium.net`.
--- a/hosts/mail/default.nix
+++ b/hosts/mail/default.nix
@ -0,0 +1,55 @@
+{
+  lib,
+  self,
+  ...
+}:
+
+{
+  imports = [
+    self.inputs.disko.nixosModules.disko
+    ./hardware-configuration.nix
+    ./disko-config.nix
+    ../server.nix
+  ];
+
+  nixpkgs.hostPlatform = "x86_64-linux";
+
+  networking = {
+    hostId = "08ac2f14";
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [
+        22 # SSH
+      ];
+    };
+  };
+
+  users = {
+    users = {
+      root = {
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+        ];
+      };
+    };
+  };
+
+  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
+
+  modules = {
+    services = {
+      borgmatic = {
+        enable = true;
+        directories = [
+          "/var/dkim"
+          "/var/lib"
+          "/var/vmail"
+        ];
+        repoPath = "ssh://kg2mpt28@kg2mpt28.repo.borgbase.com/./repo";
+      };
+      mail.enable = true;
+    };
+  };
+
+  system.stateVersion = "22.11";
+}
--- a/hosts/mail/disko-config.nix
+++ b/hosts/mail/disko-config.nix
@ -0,0 +1,55 @@
+{ lib, ... }:
+{
+  disko.devices = {
+    disk.disk1 = {
+      device = lib.mkDefault "/dev/sda";
+      type = "disk";
+      content = {
+        type = "gpt";
+        partitions = {
+          boot = {
+            name = "boot";
+            size = "2M";
+            type = "EF02";
+          };
+          esp = {
+            name = "ESP";
+            size = "300M";
+            type = "EF00";
+            content = {
+              type = "filesystem";
+              format = "vfat";
+              mountpoint = "/boot";
+            };
+          };
+          root = {
+            name = "root";
+            size = "100%";
+            content = {
+              type = "lvm_pv";
+              vg = "pool";
+            };
+          };
+        };
+      };
+    };
+    lvm_vg = {
+      pool = {
+        type = "lvm_vg";
+        lvs = {
+          root = {
+            size = "100%FREE";
+            content = {
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/";
+              mountOptions = [
+                "defaults"
+              ];
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/hosts/mail/hardware-configuration.nix
+++ b/hosts/mail/hardware-configuration.nix
@ -0,0 +1,29 @@
+{
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "ata_piix"
+        "uhci_hcd"
+        "xen_blkfront"
+        "vmw_pvscsi"
+      ];
+      kernelModules = [ "nvme" ];
+    };
+    loader.grub = {
+      efiSupport = true;
+      efiInstallAsRemovable = true;
+    };
+    tmp.cleanOnBoot = true;
+  };
+
+  zramSwap.enable = true;
+}
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@ -1,4 +1,9 @@
-{ config, lib, pkgs, inputs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

 {
  imports = [
@ -6,6 +11,14 @@
    ../desktop.nix
  ];

+  nixpkgs = {
+    hostPlatform = "x86_64-linux";
+    config = {
+      allowUnfree = true;
+      nvidia.acceptLicense = true;
+    };
+  };
+
  boot.loader = {
    systemd-boot = {
      enable = true;
@ -18,7 +31,10 @@
  networking = {
    hostId = "c5e68d78";
    networkmanager.enable = true;
-    firewall.trustedInterfaces = [ "lxdbr0" "virbr0" ]; # Work around https://github.com/NixOS/nixpkgs/issues/263359
+    firewall.trustedInterfaces = [
+      "lxdbr0"
+      "virbr0"
+    ]; # Work around https://github.com/NixOS/nixpkgs/issues/263359
  };

  virtualisation = {
@ -36,18 +52,26 @@
    recommendedProxySettings = true;
    virtualHosts = {
      "odyssey.mesh.vimium.net" = {
-        locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+        locations."/".proxyPass =
+          "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
      };
    };
  };

+  services.sunshine = {
+    enable = true;
+    package = pkgs.unstable.sunshine;
+    capSysAdmin = true;
+  };
+
+  services.displayManager.ly.enable = true;
+
  modules = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
      };
-      gaming.emulators = {
+      emulators = {
        gamecube.enable = true;
        ps2.enable = true;
        ps3.enable = true;
@ -55,41 +79,46 @@
        wii.enable = true;
        xbox.enable = true;
      };
-      media.graphics = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      graphics = {
        modeling.enable = true;
        raster.enable = true;
        vector.enable = true;
      };
-      media.recording = {
+      libreoffice.enable = true;
+      lutris.enable = true;
+      pass.enable = true;
+      neovim.enable = true;
+      qbittorrent.enable = true;
+      recording = {
        audio.enable = true;
        video.enable = true;
      };
    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-      vscode.enable = true;
-    };
    hardware.presonus-studio.enable = true;
-    security = {
-      gpg.enable = true;
-      pass.enable = true;
-    };
    services = {
      borgmatic = {
        enable = true;
        directories = [
          "/home/jordan/Documents"
+          "/home/jordan/Downloads"
+          "/home/jordan/Music"
+          "/home/jordan/Pictures"
+          "/home/jordan/projects"
+          "/home/jordan/Videos"
+          "/home/jordan/.mozilla"
        ];
        repoPath = "ssh://iqwu22oq@iqwu22oq.repo.borgbase.com/./repo";
      };
+      gitea-runner.enable = true;
    };
    shell = {
-      git.enable = true;
      zsh.enable = true;
    };
+    system.desktop.gnome.enable = lib.mkForce false;
+    system.desktop.hyprland.enable = true;
  };

  system.stateVersion = "22.11";
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/hosts/odyssey/hardware-configuration.nix
@ -1,4 +1,10 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

 {
  imports = [
@ -6,7 +12,14 @@
  ];

  boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "ehci_pci"
+      "nvme"
+      "usbhid"
+      "usb_storage"
+      "sd_mod"
+    ];
    initrd.kernelModules = [ ];
    initrd.supportedFilesystems = [ "zfs" ];
    kernelModules = [ "kvm-intel" ];
@ -19,6 +32,8 @@
    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
    nvidia = {
      modesetting.enable = true;
+      open = true;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
      powerManagement.enable = true;
    };
  };
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@ -1,12 +1,17 @@
-{ config, lib, pkgs, inputs, ... }:
+{
+  pkgs,
+  self,
+  ...
+}:

 {
  imports = [
+    self.inputs.nixos-hardware.nixosModules.raspberry-pi-4
    ./hardware-configuration.nix
    ../server.nix
  ];

-  networking.hostId = "731d1660";
+  nixpkgs.hostPlatform = "aarch64-linux";

  hardware = {
    raspberry-pi."4" = {
@ -97,7 +102,7 @@
    ];
  };

-  sound.enable = true;
+  networking.hostId = "731d1660";

  security.rtkit.enable = true;
  services.pipewire = {
@ -107,113 +112,8 @@
    pulse.enable = true;
  };

-  age.secrets."files/services/home-assistant/secrets.yaml" = {
-    file = "${inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
-    path = "${config.services.home-assistant.configDir}/secrets.yaml";
-    owner = "hass";
-    group = "hass";
-  };
-
-  services.home-assistant = {
-    enable = true;
-    extraComponents = [
-      "api"
-      "alert"
-      "auth"
-      "backup"
-      "command_line"
-      "default_config"
-      "homekit_controller"
-      "homekit"
-      "http"
-      "icloud"
-      "jellyfin"
-      "metoffice"
-      "mqtt"
-      "onkyo"
-      "ping"
-      "proximity"
-      "radio_browser"
-      "scrape"
-      "sensor"
-      "system_health"
-    ];
-    config = {
-      default_config = {};
-      backup = {};
-      homeassistant = {
-        name = "Home";
-        latitude = "!secret latitude";
-        longitude = "!secret longitude";
-        country = "GB";
-        temperature_unit = "C";
-        time_zone = config.time.timeZone;
-        unit_system = "metric";
-      };
-      mqtt = { };
-      scene = "!include scenes.yaml";
-      automation = "!include automations.yaml";
-      system_health = { };
-      recorder = {
-        purge_keep_days = 365;
-      };
-    };
-  };
-
-  services.mosquitto = {
-    enable = true;
-    listeners = [{
-      acl = [ "pattern readwrite #" ];
-      omitPasswordAuth = true;
-      port = 1883;
-      settings = {
-        allow_anonymous = true;
-      };
-    }];
-  };
-
-  age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
-    file = "${inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
-    path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
-    owner = "zigbee2mqtt";
-    group = "zigbee2mqtt";
-  };
-
-  services.zigbee2mqtt = {
-    package = pkgs.unstable.zigbee2mqtt;
-    enable = true;
-    dataDir = "/var/lib/zigbee2mqtt";
-    settings = {
-      homeassistant = lib.optionalAttrs config.services.home-assistant.enable {
-        discovery_topic = "homeassistant";
-        status_topic = "hass/status";
-        legacy_entity_attributes = true;
-        legacy_triggers = true;
-      };
-      availability = true;
-      frontend = true;
-      device_options = {
-        retain = true;
-      };
-      serial = {
-        port = "/dev/serial/by-id/usb-Silicon_Labs_Sonoff_Zigbee_3.0_USB_Dongle_Plus_0001-if00-port0";
-      };
-      advanced = {
-        channel = 20;
-        network_key = "!secret.yaml network_key";
-        pan_id = 13001;
-        ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
-        transmit_power = 20;
-      };
-      mqtt = {
-        version = 5;
-        server = "mqtt://localhost:1883";
-      };
-    };
-  };
-
  modules = {
-    networking = {
+    system = {
      wireless = {
        enable = true;
        interfaces = [ "wlan0" ];
@ -222,21 +122,20 @@
    services = {
      borgmatic = {
        enable = true;
-        directories = [
-          "/var/lib/mosquitto"
-          "/var/lib/zigbee2mqtt"
-        ];
        repoPath = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo";
      };
+      home-assistant.enable = true;
    };
  };

  # Connection to ONKYO HT-R990
  networking.interfaces.end0 = {
-    ipv4.addresses = [{
-      address = "172.16.0.1";
-      prefixLength = 30;
-    }];
+    ipv4.addresses = [
+      {
+        address = "172.16.0.1";
+        prefixLength = 30;
+      }
+    ];
  };

  environment.systemPackages = with pkgs; [
@ -247,4 +146,3 @@

  system.stateVersion = "22.11";
 }
-
--- a/hosts/pi/hardware-configuration.nix
+++ b/hosts/pi/hardware-configuration.nix
@ -1,4 +1,9 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

 {
  imports = [
@ -6,17 +11,80 @@
  ];

  boot = {
+    kernelPackages =
+      let
+        version = "6.1.73";
+        tag = "stable_20240124";
+        srcHash = "sha256-P4ExzxWqZj+9FZr9U2tmh7rfs/3+iHEv0m74PCoXVuM=";
+      in
+      pkgs.linuxPackagesFor (
+        pkgs.linux_rpi4.override {
+          argsOverride = {
+            src = pkgs.fetchFromGitHub {
+              owner = "raspberrypi";
+              repo = "linux";
+              rev = tag;
+              hash = srcHash;
+            };
+            version = version;
+            modDirVersion = version;
+            structuredExtraConfig = { };
+            kernelPatches = [
+              {
+                name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch";
+                patch = pkgs.fetchpatch {
+                  url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch";
+                  hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw=";
+                };
+              }
+              {
+                name = "iommu-bcm2712-don-t-allow-building-as-module.patch";
+                patch = pkgs.fetchpatch {
+                  url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch";
+                  hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A=";
+                };
+              }
+            ];
+          };
+        }
+      );
+
    # Stop ZFS kernel being built
-    supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ];
+    supportedFilesystems = lib.mkForce [
+      "btrfs"
+      "cifs"
+      "f2fs"
+      "jfs"
+      "ntfs"
+      "reiserfs"
+      "vfat"
+      "xfs"
+    ];
    tmp.cleanOnBoot = true;
  };

  # Fix missing modules
  # https://github.com/NixOS/nixpkgs/issues/154163
  nixpkgs.overlays = [
-    (final: super: {
-      makeModulesClosure = x:
-        super.makeModulesClosure (x // { allowMissing = true; });
+    (final: prev: {
+      makeModulesClosure = x: prev.makeModulesClosure (x // { allowMissing = true; });
+    })
+    (final: prev: {
+      raspberrypifw =
+        let
+          version = "1.20240529";
+          srcHash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
+        in
+        pkgs.raspberrypifw.override {
+          argsOverride = {
+            src = prev.fetchFromGitHub {
+              owner = "raspberrypi";
+              repo = "firmware";
+              rev = "${version}";
+              hash = srcHash;
+            };
+          };
+        };
    })
  ];

@ -28,4 +96,3 @@
    };
  };
 }
-
--- a/hosts/server.nix
+++ b/hosts/server.nix
@ -1,4 +1,6 @@
-{ config, lib, pkgs, ... }:
+{
+  ...
+}:

 {
  imports = [
@ -7,18 +9,54 @@

  documentation.enable = false;

+  fonts.fontconfig.enable = false;
+
  security = {
-    acme.acceptTerms = true;
-    auditd.enable = true;
-    audit = {
-      enable = true;
-      rules = [
-        "-a exit,always -F arch=b64 -S execve"
-      ];
+    acme = {
+      acceptTerms = true;
+      defaults = {
+        email = "hostmaster@vimium.com";
+        group = "nginx";
+        webroot = "/var/lib/acme/acme-challenge";
+      };
+    };
+    # auditd.enable = true;
+    # audit = {
+    #   enable = true;
+    #   rules = [
+    #     "-a exit,always -F arch=b64 -S execve"
+    #   ];
+    # };
+  };
+
+  systemd = {
+    enableEmergencyMode = false;
+
+    sleep.extraConfig = ''
+      AllowSuspend=no
+      AllowHibernation=no
+    '';
+
+    watchdog = {
+      runtimeTime = "20s";
+      rebootTime = "30s";
    };
  };

-  modules.networking.tailscale = {
+  services.fail2ban = {
+    enable = true;
+    bantime = "1h";
+    bantime-increment = {
+      enable = true;
+      maxtime = "24h";
+      rndtime = "7m";
+    };
+    ignoreIP = [
+      "100.64.0.0/10"
+    ];
+  };
+
+  modules.services.tailscale = {
    enable = true;
    restrictSSH = false;
  };
--- a/hosts/skycam/README.md
+++ b/hosts/skycam/README.md
@ -0,0 +1,28 @@
+# Skycam
+
+## Overview
+Raspberry Pi 4-based webcam
+
+## Specs
+* SoC - Broadcom BCM2711
+* CPU - ARM Cortex-A72 @ 1.8 GHz
+* Memory - 8 GB LPDDR4
+
+### Disks
+Device | Partitions _(filesystem, usage)_
+--- | ---
+SD card | `/dev/mmcblk0` (ext4, NixOS Root)
+
+### Networks
+- DHCP on `10.0.1.0/24` subnet.
+- Tailscale on `100.64.0.0/10` subnet. FQDN: `skycam.mesh.vimium.net`.
+
+## Devices and connections
+- Camera Module 3 with wide-angle lens
+
+## Building
+To generate a compressed SD card image for Skycam, run:
+`nix build '.#nixosConfigurations.skycam.config.system.build.sdImage'`
+
+Once a card is imaged, the existing SSH host keys should be copied to
+`/etc/ssh` manually to enable secret decryption.
--- a/hosts/skycam/default.nix
+++ b/hosts/skycam/default.nix
@ -0,0 +1,127 @@
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:
+
+{
+  imports = [
+    self.inputs.nixos-hardware.nixosModules.raspberry-pi-4
+    ./hardware-configuration.nix
+    ../server.nix
+  ];
+
+  nixpkgs.hostPlatform = "aarch64-linux";
+
+  hardware = {
+    raspberry-pi."4" = {
+      apply-overlays-dtmerge.enable = true;
+      audio.enable = false;
+      xhci.enable = false;
+    };
+    deviceTree = {
+      enable = true;
+      filter = "*rpi-4-*.dtb";
+      # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
+      overlays =
+        let
+          mkCompatibleDtsFile =
+            dtbo:
+            let
+              drv =
+                pkgs.runCommand "fix-dts"
+                  {
+                    nativeBuildInputs = with pkgs; [
+                      dtc
+                      gnused
+                    ];
+                  }
+                  ''
+                    mkdir "$out"
+                    dtc -I dtb -O dts ${dtbo} | sed -e 's/bcm2835/bcm2711/' > $out/overlay.dts
+                  '';
+            in
+            "${drv}/overlay.dts";
+
+          inherit (config.boot.kernelPackages) kernel;
+        in
+        [
+          {
+            name = "imx708.dtbo";
+            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/imx708.dtbo";
+          }
+          {
+            name = "vc4-kms-v3d-pi4.dtbo";
+            dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/vc4-kms-v3d-pi4.dtbo";
+          }
+        ];
+    };
+    firmware = with pkgs; [
+      firmwareLinuxNonfree
+    ];
+  };
+
+  services.udev.extraRules = ''
+    SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660"
+    KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
+    SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660"
+  '';
+
+  nixpkgs.overlays = [
+    (import ./../../overlays/libcamera.nix)
+  ];
+
+  networking = {
+    hostId = "731d1660";
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [ 8080 ];
+      allowedUDPPorts = [ 8080 ];
+    };
+  };
+
+  users.users.root = {
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+    ];
+  };
+
+  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
+
+  systemd.services.ustreamer = {
+    enable = true;
+    description = "uStreamer service";
+    unitConfig = {
+      Type = "simple";
+      ConditionPathExists = "/sys/bus/i2c/drivers/imx708/10-001a/video4linux";
+    };
+    serviceConfig = {
+      ExecStart = ''
+        ${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
+                --host=0.0.0.0 \
+                --resolution=4608x2592
+      '';
+      DynamicUser = "yes";
+      SupplementaryGroups = [ "video" ];
+      Restart = "always";
+      RestartSec = 10;
+    };
+    wantedBy = [ "network-online.target" ];
+    confinement.mode = "chroot-only";
+  };
+
+  environment.systemPackages = with pkgs; [
+    camera-streamer
+    git
+    neovim
+    libcamera
+    libraspberrypi
+    raspberrypi-eeprom
+    v4l-utils
+    unstable.ustreamer
+  ];
+
+  system.stateVersion = "24.05";
+}
--- a/hosts/skycam/hardware-configuration.nix
+++ b/hosts/skycam/hardware-configuration.nix
@ -0,0 +1,39 @@
+{
+  lib,
+  modulesPath,
+  ...
+}:
+
+{
+  imports = [
+    (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
+  ];
+
+  boot = {
+    kernelModules = [ "bcm2835-v4l2" ];
+    kernelParams = [
+      "cma=512M"
+      "panic=0"
+    ];
+    supportedFilesystems = lib.mkForce [
+      "f2fs"
+      "vfat"
+      "xfs"
+    ];
+    tmp.cleanOnBoot = false;
+  };
+
+  nixpkgs.overlays = [
+    (final: super: {
+      makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
+    })
+  ];
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-label/NIXOS_SD";
+      fsType = "ext4";
+      options = [ "noatime" ];
+    };
+  };
+}
--- a/hosts/vps1/README.md
+++ b/hosts/vps1/README.md
@ -15,4 +15,3 @@ NVMe | `/dev/sda1` (ext4, NixOS Root)
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `vps1.mesh.vimium.net`.
-
--- a/hosts/vps1/default.nix
+++ b/hosts/vps1/default.nix
@ -1,4 +1,10 @@
-{ config, lib, pkgs, inputs, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  self,
+  ...
+}:

 {
  imports = [
@ -6,13 +12,17 @@
    ../server.nix
  ];

+  nixpkgs = {
+    hostPlatform = "x86_64-linux";
+    config.allowUnfree = true;
+  };
+
  networking = {
    hostId = "08bf6db3";
-    domain = "mesh.vimium.net";
    firewall = {
      enable = true;
      allowedTCPPorts = [
-        22    # SSH
+        22 # SSH
      ];
    };
  };
@ -36,17 +46,92 @@
    groups = {
      jellyfin = { };
    };
+    extraGroups.acme.members = [
+      "kanidm"
+      "nginx"
+    ];
  };

  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";

-  security.acme.defaults = {
-    email = "hostmaster@vimium.com";
-    group = "nginx";
-    webroot = "/var/lib/acme/acme-challenge";
+  security.acme.certs."auth.vimium.com" = {
+    postRun = "systemctl restart kanidm.service";
+    group = "acme";
  };

-  modules = {
+  services.kanidm =
+    let
+      baseDomain = "vimium.com";
+      domain = "auth.${baseDomain}";
+      uri = "https://${domain}";
+    in
+    {
+      package = pkgs.unstable.kanidm;
+      enableClient = true;
+      enableServer = true;
+      clientSettings = {
+        inherit uri;
+      };
+      serverSettings = {
+        bindaddress = "127.0.0.1:3013";
+        ldapbindaddress = "100.64.0.1:636";
+        domain = baseDomain;
+        origin = uri;
+        tls_chain = "${config.security.acme.certs.${domain}.directory}/full.pem";
+        tls_key = "${config.security.acme.certs.${domain}.directory}/key.pem";
+      };
+    };
+
+  services.nginx.virtualHosts = {
+    "auth.vimium.com" = {
+      useACMEHost = "auth.vimium.com";
+      forceSSL = true;
+      locations."/" = {
+        proxyPass = "https://127.0.0.1:3013";
+      };
+    };
+    "outline.vimium.com" = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/" = {
+        proxyPass = "http://127.0.0.1:3000";
+        extraConfig = ''
+          proxy_set_header Upgrade $http_upgrade;
+          proxy_set_header Connection "Upgrade";
+          proxy_set_header Host $host;
+
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Scheme $scheme;
+          proxy_set_header X-Forwarded-Proto $scheme;
+          proxy_redirect off;
+        '';
+      };
+    };
+  };
+
+  age.secrets."passwords/services/outline/oidc-client-secret" = {
+    file = "${self.inputs.secrets}/passwords/services/outline/oidc-client-secret.age";
+    owner = "outline";
+    group = "outline";
+  };
+
+  services.outline = {
+    enable = true;
+    forceHttps = false;
+    oidcAuthentication = {
+      clientId = "outline";
+      clientSecretFile = config.age.secrets."passwords/services/outline/oidc-client-secret".path;
+      displayName = "Vimium";
+      authUrl = "https://auth.vimium.com/ui/oauth2";
+      tokenUrl = "https://auth.vimium.com/oauth2/token";
+      userinfoUrl = "https://auth.vimium.com/oauth2/openid/outline/userinfo";
+    };
+    publicUrl = "https://outline.vimium.com";
+    storage.storageType = "local";
+  };
+
+  modules = rec {
    services = {
      borgmatic = {
        enable = true;
@ -57,11 +142,24 @@
        ];
        repoPath = "ssh://p91y8oh7@p91y8oh7.repo.borgbase.com/./repo";
      };
-      coturn.enable = true;
+      coturn = {
+        enable = true;
+        realm = "turn.vimium.com";
+        matrixIntegration = true;
+      };
      gitea.enable = true;
      headscale.enable = true;
-      matrix-synapse.enable = true;
+      matrix = {
+        enable = true;
+        bridges = {
+          signal = true;
+          whatsapp = true;
+        };
+        usePostgresql = services.postgresql.enable;
+      };
      nginx.enable = true;
+      photoprism.enable = true;
+      postgresql.enable = true;
    };
  };

--- a/hosts/vps1/hardware-configuration.nix
+++ b/hosts/vps1/hardware-configuration.nix
@ -1,4 +1,7 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  modulesPath,
+  ...
+}:

 {
  imports = [
@ -7,7 +10,12 @@

  boot = {
    initrd = {
-      availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
+      availableKernelModules = [
+        "ata_piix"
+        "uhci_hcd"
+        "xen_blkfront"
+        "vmw_pvscsi"
+      ];
      kernelModules = [ "nvme" ];
    };
    loader.grub.device = "/dev/sda";
@ -23,4 +31,3 @@
    };
  };
 }
-
--- a/modules/default.nix
+++ b/modules/default.nix
@ -1,42 +0,0 @@
-{
-  imports = [
-    ./options.nix
-    ./desktop/gnome.nix
-    ./desktop/mimeapps.nix
-    ./desktop/apps/qbittorrent.nix
-    ./desktop/apps/slack.nix
-    ./desktop/apps/thunderbird.nix
-    ./desktop/apps/zoom.nix
-    ./desktop/browsers/firefox.nix
-    ./desktop/gaming/emulators.nix
-    ./desktop/gaming/lutris.nix
-    ./desktop/gaming/steam.nix
-    ./desktop/media/graphics.nix
-    ./desktop/media/recording.nix
-    ./desktop/office/libreoffice.nix
-    ./dev/cc.nix
-    ./dev/java.nix
-    ./dev/lua.nix
-    ./dev/node.nix
-    ./dev/python.nix
-    ./dev/rust.nix
-    ./dev/scala.nix
-    ./dev/shell.nix
-    ./dev/zig.nix
-    ./editors/neovim
-    ./editors/vscode.nix
-    ./hardware/presonus-studio.nix
-    ./networking/tailscale.nix
-    ./networking/wireless.nix
-    ./security/gpg.nix
-    ./security/pass.nix
-    ./services/borgmatic
-    ./services/coturn
-    ./services/gitea
-    ./services/headscale
-    ./services/matrix-synapse
-    ./services/nginx
-    ./shell/git
-    ./shell/zsh
-  ];
-}
--- a/modules/desktop/gaming/emulators.nix
+++ b/modules/desktop/gaming/emulators.nix
@ -1,74 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.modules.desktop.gaming.emulators;
-in {
-  options.modules.desktop.gaming.emulators = {
-    ds.enable       = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    gb.enable       = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    gba.enable      = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    gamecube.enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    ps1.enable      = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    ps2.enable      = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    ps3.enable      = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    psp.enable      = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    snes.enable     = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    switch.enable   = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    wii.enable      = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    xbox.enable     = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = {
-    user.packages = with pkgs.unstable; [
-      (lib.mkIf cfg.ps1.enable duckstation)
-      (lib.mkIf cfg.ps2.enable pcsx2)
-      (lib.mkIf cfg.ps3.enable rpcs3)
-      (lib.mkIf cfg.psp.enable ppsspp)
-      (lib.mkIf cfg.ds.enable desmume)
-      (lib.mkIf (cfg.gba.enable ||
-             cfg.gb.enable  ||
-             cfg.snes.enable)
-        higan)
-      (lib.mkIf cfg.switch.enable yuzuPackages.mainline)
-      (lib.mkIf (cfg.wii.enable ||
-             cfg.gamecube.enable)
-        dolphin-emu)
-      (lib.mkIf cfg.xbox.enable xemu)
-    ];
-  };
-}
--- a/modules/desktop/gaming/lutris.nix
+++ b/modules/desktop/gaming/lutris.nix
@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.modules.desktop.gaming.lutris;
-in {
-  options.modules.desktop.gaming.lutris = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
-      lutris
-      vulkan-loader
-      vulkan-tools
-    ];
-
-    hardware.opengl = {
-      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
-    };
-  };
-}
--- a/modules/desktop/media/recording.nix
+++ b/modules/desktop/media/recording.nix
@ -1,28 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.modules.desktop.media.recording;
-in {
-  options.modules.desktop.media.recording = {
-    audio.enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    video.enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = {
-    user.packages = with pkgs;
-      (if cfg.audio.enable then [
-        ardour
-        audacity
-      ] else []) ++
-      (if cfg.video.enable then [
-        handbrake
-        mkvtoolnix
-        obs-studio
-      ] else []);
-  };
-}
--- a/modules/desktop/office/libreoffice.nix
+++ b/modules/desktop/office/libreoffice.nix
@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.modules.desktop.office.libreoffice;
-in {
-  options.modules.desktop.office.libreoffice = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
-      libreoffice
-    ];
-  };
-}
--- a/modules/editors/neovim/default.nix
+++ b/modules/editors/neovim/default.nix
@ -1,135 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.modules.editors.neovim;
-  dev = config.modules.dev;
-in {
-  options.modules.editors.neovim = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
-      (neovim.override {
-        configure = {
-          customRC = ''
-            luafile ~/.config/nvim/init.lua
-          '';
-          packages.myPlugins = with pkgs.vimPlugins; {
-            start = [
-              (nvim-treesitter.withPlugins (
-                plugins: with plugins; [
-                  bash
-                  c
-                  cmake
-                  cpp
-                  css
-                  dockerfile
-                  elm
-                  glsl
-                  graphql
-                  haskell
-                  http
-                  html
-                  java
-                  javascript
-                  jsdoc
-                  json
-                  json5
-                  latex
-                  lua
-                  markdown
-                  ninja
-                  nix
-                  org
-                  perl
-                  php
-                  pug
-                  python
-                  regex
-                  rst
-                  ruby
-                  rust
-                  scala
-                  scss
-                  toml
-                  tsx
-                  typescript
-                  vim
-                  yaml
-                  zig
-                ]
-              ))
-              nvim-treesitter-context
-              nvim-treesitter-textobjects
-              nvim-lspconfig
-            ];
-          };
-        };
-      })
-    ] ++
-
-    # Install appropriate language servers
-    (if dev.cc.enable then [
-      ccls                                            # C/C++
-    ] else []) ++
-    (if dev.java.enable then [
-      java-language-server                            # Java
-      ltex-ls                                         # LaTeX
-    ] else []) ++
-    (if dev.lua.enable then [
-      sumneko-lua-language-server                     # Lua
-    ] else []) ++
-    (if dev.node.enable then [
-      nodePackages.bash-language-server               # Bash
-      nodePackages.dockerfile-language-server-nodejs  # Dockerfile
-      nodePackages.graphql-language-service-cli       # GraphQL
-      nodePackages.purescript-language-server         # PureScript
-      nodePackages.svelte-language-server             # Svelte
-      nodePackages.typescript-language-server         # JavaScript/TypeScript
-      nodePackages.vim-language-server                # Vim
-      nodePackages.vscode-langservers-extracted       # HTML, CSS, JSON, ESLint
-      nodePackages.vue-language-server                # Vue.js
-      nodePackages.yaml-language-server               # YAML
-    ] else []) ++
-    (if dev.python.enable then [
-      cmake-language-server                           # CMake
-      python310Packages.python-lsp-server             # Python
-    ] else []) ++
-    (if dev.rust.enable then [
-      rust-analyzer                                   # Rust
-    ] else []) ++
-    (if dev.scala.enable then [
-      metals                                          # Scala
-    ] else []) ++
-    (if dev.zig.enable then [
-      zls                                             # Zig
-    ] else []);
-
-    home.configFile = {
-      "nvim/init.lua".source = ./init.lua;
-      "nvim/lua" = { source = ./lua; recursive = true; };
-      "nvim/lua/config/lsp.lua".text = ''
-        -- This file is autogenerated, do not edit.
-        ${if dev.cc.enable then "require('config.lsp.cc')\n" else ""}
-        ${if dev.java.enable then "require('config.lsp.java')\n" else ""}
-        ${if dev.lua.enable then "require('config.lsp.lua')\n" else ""}
-        ${if dev.node.enable then "require('config.lsp.node')\n" else ""}
-        ${if dev.python.enable then "require('config.lsp.python')\n" else ""}
-        ${if dev.rust.enable then "require('config.lsp.rust')\n" else ""}
-        ${if dev.scala.enable then "require('config.lsp.scala')\n" else ""}
-        ${if dev.zig.enable then "require('config.lsp.zig')\n" else ""}
-      '';
-    };
-
-    env.EDITOR = "nvim";
-
-    environment.shellAliases = {
-      vim = "nvim";
-      v   = "nvim";
-    };
-  };
-}
--- a/modules/editors/neovim/init.lua
+++ b/modules/editors/neovim/init.lua
@ -1,6 +0,0 @@
-require("config.core")
-require("config.keymap")
-require("config.treesitter")
-require("config.plugins")
-require("config.lsp")
-
--- a/modules/editors/neovim/lua/config/core.lua
+++ b/modules/editors/neovim/lua/config/core.lua
@ -1,36 +0,0 @@
-local o = vim.opt
-local wo = vim.wo
-local bo = vim.bo
-
-- Global dirs
-local cachedir = os.getenv("XDG_CACHE_HOME")
-o.backupdir = cachedir .. "/nvim/backup/"
-o.directory = cachedir .. "/nvim/swap/"
-o.undodir   = cachedir .. "/nvim/undo/"
-
-- Global
-o.breakindent = true
-o.clipboard = "unnamedplus"
-o.compatible = false
-o.encoding = "utf-8"
-o.expandtab = true
-o.foldlevel = 99
-o.hidden = true
-o.hlsearch = false
-o.ignorecase = true
-o.laststatus = 2
-o.listchars = { eol = '↲', tab = '▸ ', trail = '·' }
-o.relativenumber = true
-o.shiftwidth = 2
-o.showmode = false
-o.smartcase = true
-o.smarttab = true
-o.softtabstop = 2
-o.synmaxcol = 150
-o.tabstop = 4
-o.undofile = true
-o.wildmenu = true
-
-- Window
-
-- Buffer
--- a/modules/editors/neovim/lua/config/keymap.lua
+++ b/modules/editors/neovim/lua/config/keymap.lua
@ -1,35 +0,0 @@
-local keymap = vim.keymap.set
-local opts = { noremap = true, silent = true }
-
-vim.g.mapleader = ","
-
-- Modes
--   Normal = "n",
--   Insert = "i",
--   Visual = "v",
--   Visual Block = "x",
--   Term = "t",
--   Command = "c"
-
-keymap("n", "<Left>", "<Nop>", opts)
-keymap("n", "<Right>", "<Nop>", opts)
-keymap("n", "<Up>", "<Nop>", opts)
-keymap("n", "<Down>", "<Nop>", opts)
-
-keymap("n", "<C-h>", "<C-w>h", { noremap = true })
-keymap("n", "<C-j>", "<C-w>j", { noremap = true })
-keymap("n", "<C-k>", "<C-w>k", { noremap = true })
-keymap("n", "<C-l>", "<C-w>l", { noremap = true })
-
-keymap("n", "gV", "`[v`]", opts)
-
-keymap("n", ";", ":", { noremap = true })
-
-- Bubble single lines with vim-unimpaired
-keymap("n", "<C-Up>", "[e", opts)
-keymap("n", "<C-Down>", "]e", opts)
-
-- Bubble multiple lines with vim-unimpaired
-keymap("v", "<C-Up>", "[egv", opts)
-keymap("v", "<C-Down>", "]egv", opts)
-
--- a/modules/editors/neovim/lua/config/lsp/cc.lua
+++ b/modules/editors/neovim/lua/config/lsp/cc.lua
@ -1,5 +0,0 @@
-lspconfig = require('lspconfig')
-
-- Requires C/C++
-lspconfig.ccls.setup{}
-
--- a/modules/editors/neovim/lua/config/lsp/java.lua
+++ b/modules/editors/neovim/lua/config/lsp/java.lua
@ -1,6 +0,0 @@
-lspconfig = require('lspconfig')
-
-- Requires Java
-lspconfig.java_language_server.setup{}
-lspconfig.ltex.setup{}
-
--- a/modules/editors/neovim/lua/config/lsp/lua.lua
+++ b/modules/editors/neovim/lua/config/lsp/lua.lua
@ -1,22 +0,0 @@
-lspconfig = require('lspconfig')
-
-- Requires Lua
-lspconfig.sumneko_lua.setup {
-  settings = {
-    Lua = {
-      runtime = {
-        -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
-        version = 'LuaJIT',
-      },
-      diagnostics = {
-        -- Get the language server to recognize the `vim` global
-        globals = {'vim'},
-      },
-      -- Do not send telemetry data containing a randomized but unique identifier
-      telemetry = {
-        enable = false,
-      },
-    },
-  },
-}
-
--- a/modules/editors/neovim/lua/config/lsp/node.lua
+++ b/modules/editors/neovim/lua/config/lsp/node.lua
@ -1,17 +0,0 @@
-lspconfig = require('lspconfig')
-
-- Requires Node.js
-lspconfig.bashls.setup{}
-lspconfig.cssls.setup{}
-lspconfig.dockerls.setup{}
-lspconfig.eslint.setup{}
-lspconfig.graphql.setup{}
-lspconfig.html.setup{}
-lspconfig.jsonls.setup{}
-lspconfig.purescriptls.setup{}
-lspconfig.svelte.setup{}
-lspconfig.tsserver.setup{}
-lspconfig.vimls.setup{}
-lspconfig.vuels.setup{}
-lspconfig.yamlls.setup{}
-
--- a/modules/editors/neovim/lua/config/lsp/python.lua
+++ b/modules/editors/neovim/lua/config/lsp/python.lua
@ -1,6 +0,0 @@
-lspconfig = require('lspconfig')
-
-- Requires Python
-lspconfig.cmake.setup{}
-lspconfig.pylsp.setup{}
-
--- a/modules/editors/neovim/lua/config/lsp/rust.lua
+++ b/modules/editors/neovim/lua/config/lsp/rust.lua
@ -1,5 +0,0 @@
-lspconfig = require('lspconfig')
-
-- Requires Rust
-lspconfig.rls.setup{}
-
--- a/modules/editors/neovim/lua/config/lsp/scala.lua
+++ b/modules/editors/neovim/lua/config/lsp/scala.lua
@ -1,5 +0,0 @@
-lspconfig = require('lspconfig')
-
-- Requires Scala
-lspconfig.metals.setup{}
-
--- a/modules/editors/neovim/lua/config/lsp/zig.lua
+++ b/modules/editors/neovim/lua/config/lsp/zig.lua
@ -1,5 +0,0 @@
-lspconfig = require('lspconfig')
-
-- Requires Zig
-lspconfig.zls.setup{}
-
--- a/modules/editors/neovim/lua/config/plugins.lua
+++ b/modules/editors/neovim/lua/config/plugins.lua
@ -1,77 +0,0 @@
-local fn = vim.fn
-
-local install_path = fn.stdpath "data" .. "/site/pack/packer/start/packer.nvim"
-if fn.empty(fn.glob(install_path)) > 0 then
-  PACKER_BOOTSTRAP = fn.system {
-    "git",
-    "clone",
-    "--depth",
-    "1",
-    "https://github.com/wbthomason/packer.nvim",
-    install_path,
-  }
-  print "Installing packer close and reopen Neovim..."
-  vim.cmd [[packadd packer.nvim]]
-end
-
-vim.cmd [[
-  augroup packer_user_config
-    autocmd!
-    autocmd BufWritePost plugins.lua source <afile> | PackerSync
-  augroup end
-]]
-
-local status_ok, packer = pcall(require, "packer")
-if not status_ok then
-  return
-end
-
-packer.init {
-  display = {
-    open_fn = function()
-      return require("packer.util").float { border = "rounded" }
-    end,
-  },
-}
-
-return packer.startup(function(use)
-  -- Utilities
-  use { "wbthomason/packer.nvim", opt = true }
-  use { "mbbill/undotree" }
-  use { "nvim-lua/plenary.nvim" }
-  use { "tpope/vim-fugitive", event = "User InGitRepo" }
-
-  -- Editing
-  use { "andymass/vim-matchup" }
-  use { "godlygeek/tabular" }
-  use { "JoosepAlviste/nvim-ts-context-commentstring" }
-  use { "kana/vim-textobj-user" }
-  use { "mg979/vim-visual-multi", branch = "master" }
-  use { "p00f/nvim-ts-rainbow" }
-  use { "terryma/vim-expand-region" }
-  use { "tommcdo/vim-exchange", event = "VimEnter" }
-  use { "tpope/vim-abolish" }
-  use { "tpope/vim-commentary", event = "VimEnter" }
-  use { "tpope/vim-repeat", event = "VimEnter" }
-  use { "tpope/vim-surround", event = "VimEnter" }
-  use { "windwp/nvim-autopairs" }
-  use { "windwp/nvim-ts-autotag" }
-
-  -- UI
-  use { "junegunn/goyo.vim" }
-  use { "junegunn/limelight.vim" }
-  use { "markonm/traces.vim" }
-
-  -- Searching
-  use { "nvim-telescope/telescope.nvim", config = [[require('config.telescope')]] }
-  use { "cljoly/telescope-repo.nvim", requires = "telescope.nvim" }
-  use { "dyng/ctrlsf.vim" }
-
-  -- LSP
-  use { "jose-elias-alvarez/null-ls.nvim" }
-
-  if PACKER_BOOTSTRAP then
-    require("packer").sync()
-  end
-end)
-
--- a/modules/editors/neovim/lua/config/telescope.lua
+++ b/modules/editors/neovim/lua/config/telescope.lua
@ -1,46 +0,0 @@
-local status_ok, telescope = pcall(require, "telescope")
-if not status_ok then
-  return
-end
-
-local actions = require("telescope.actions")
-
-telescope.setup({
-  defaults = {
-    file_ignore_patterns = { ".git/", "node_modules" },
-  },
-  mappings = {
-    i = {
-      ["<Down>"] = actions.cycle_history_next,
-      ["<Up>"] = actions.cycle_history_prev,
-      ["<C-j>"] = actions.move_selection_next,
-      ["<C-k>"] = actions.move_selection_previous,
-    },
-  },
-  extensions = {
-    repo = {
-      list = {
-        fd_opts = {
-          "--no-ignore-vcs",
-        },
-        search_dirs = {
-          "~/projects",
-          "~/repos",
-          "~/workspace",
-        },
-      },
-    },
-  },
-})
-
-telescope.load_extension("repo")
-
-local keymap = vim.keymap.set
-local opts = { noremap = true, silent = true }
-
-keymap("n", "<Leader>ff", "<cmd>Telescope find_files<cr>", opts)
-keymap("n", "<Leader>fg", "<cmd>Telescope live_grep<cr>", opts)
-keymap("n", "<Leader>fb", "<cmd>Telescope buffers<cr>", opts)
-keymap("n", "<Leader>fh", "<cmd>Telescope help_tags<cr>", opts)
-keymap("n", "<Leader>fr", "<cmd>Telescope repo list<cr>", opts)
-
--- a/modules/editors/neovim/lua/config/treesitter.lua
+++ b/modules/editors/neovim/lua/config/treesitter.lua
@ -1,35 +0,0 @@
-require("nvim-treesitter.configs").setup({
-  ignore_install = {},
-  highlight = {
-    enable = true,
-    disable = {},
-  },
-  indent = { enable = true },
-  incremental_selection = {
-    enable = true,
-    keymaps = {
-      init_selection = "gnn",
-      node_incremental = "grn",
-      scope_incremental = "grc",
-      node_decremental = "grm",
-    },
-  },
-  -- Extensions
-  autotag = { enable = true },
-  context_commentstring = { enable = true },
-  matchup = { enable = true },
-  rainbow = { enable = true },
-  textobjects = {
-    select = {
-      enable = true,
-      keymaps = {
-        ["af"] = "@function.outer",
-        ["if"] = "@function.inner",
-      },
-    },
-  },
-})
-
-vim.opt.foldmethod = "expr"
-vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-
--- a/modules/hardware/presonus-studio.nix
+++ b/modules/hardware/presonus-studio.nix
@ -1,69 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.modules.hardware.presonus-studio;
-  snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
-    kernel = config.boot.kernelPackages.kernel;
-  };
-  patched = snd-usb-audio-module.overrideAttrs (prev: {
-    patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
-  });
-  upmixConfig = ''
-    stream.properties = {
-      channelmix.upmix = true
-      channelmix.upmix-method = psd
-    }
-  '';
-in {
-  options.modules.hardware.presonus-studio = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    boot.kernelModules = [ "snd-usb-audio" ];
-    boot.extraModulePackages = [
-      (patched)
-    ];
-
-    environment.etc = {
-      "pipewire/pipewire.conf.d/10-network.conf".text = ''
-        context.modules = [
-          {
-            name = libpipewire-module-rtp-session
-            args = {
-              stream.props = {
-                node.name = "rtp-source"
-              }
-            }
-          }
-        ]
-      '';
-      "pipewire/pipewire.conf.d/surround.conf".text = ''
-        context.modules = [
-          {
-            name = libpipewire-module-loopback
-            args = {
-              node.description = "Genelec 4.1 Surround"
-              capture.props = {
-                node.name = "Genelec_Speakers"
-                media.class = "Audio/Sink"
-                audio.position = [ FL FR SL SR LFE ]
-              }
-              playback.props = {
-                node.name = "playback.Genelec_Speakers"
-                audio.position = [ AUX0 AUX1 AUX3 AUX4 AUX5 ]
-                target.object = "alsa_output.usb-PreSonus_Studio_1824c_SC4E21110775-00.multichannel-output"
-                stream.dont-remix = true
-                node.passive = true
-              }
-            }
-          }
-        ]
-      '';
-      "pipewire/pipewire-pulse.conf.d/40-upmix.conf".text = upmixConfig;
-      "pipewire/client-rt.conf.d/40-upmix.conf".text = upmixConfig;
-    };
-  };
- } 
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@ -0,0 +1,33 @@
+{
+  imports = [
+    ./options.nix
+    ./programs/brave.nix
+    ./programs/dev/cc.nix
+    ./programs/dev/java.nix
+    ./programs/dev/lua.nix
+    ./programs/dev/node.nix
+    ./programs/dev/python.nix
+    ./programs/dev/rust.nix
+    ./programs/dev/scala.nix
+    ./programs/dev/shell.nix
+    ./programs/dev/zig.nix
+    ./programs/emulators.nix
+    ./programs/firefox.nix
+    ./programs/forensics.nix
+    ./programs/git
+    ./programs/gpg.nix
+    ./programs/graphics.nix
+    ./programs/libreoffice.nix
+    ./programs/lutris.nix
+    ./programs/neovim.nix
+    ./programs/pass.nix
+    ./programs/qbittorrent.nix
+    ./programs/recording.nix
+    ./programs/slack.nix
+    ./programs/steam.nix
+    ./programs/thunderbird.nix
+    ./programs/vscode.nix
+    ./programs/zoom.nix
+    ./shell/zsh
+  ];
+}
--- a/modules/home-manager/options.nix
+++ b/modules/home-manager/options.nix
@ -0,0 +1,137 @@
+{
+  config,
+  options,
+  lib,
+  self,
+  ...
+}:
+
+with lib;
+{
+  options = with types; {
+    user = mkOption {
+      type = attrs;
+      default = { };
+    };
+
+    home = {
+      configFile = mkOption {
+        type = attrs;
+        default = { };
+        description = "Files to place in $XDG_CONFIG_HOME";
+      };
+      dataFile = mkOption {
+        type = attrs;
+        default = { };
+        description = "Files to place in $XDG_DATA_HOME";
+      };
+      file = mkOption {
+        type = attrs;
+        default = { };
+        description = "Files to place directly in $HOME";
+      };
+      packages = mkOption {
+        type = attrs;
+        default = { };
+        description = "User-level installed packages";
+      };
+      programs = mkOption {
+        type = attrs;
+        default = { };
+        description = "Programs managed directly from home-manager";
+      };
+      services = mkOption {
+        type = attrs;
+        default = { };
+        description = "Services managed directly from home-manager";
+      };
+    };
+
+    dconf.settings = mkOption {
+      type = attrs;
+      default = { };
+      description = "dconf settings to enable";
+    };
+
+    env = mkOption {
+      type = attrsOf (oneOf [
+        str
+        path
+        (listOf (either str path))
+      ]);
+      apply = mapAttrs (
+        n: v: if isList v then concatMapStringsSep ":" (x: toString x) v else (toString v)
+      );
+      default = { };
+      description = "";
+    };
+  };
+
+  config = {
+    age.secrets."passwords/users/jordan".file = "${self.inputs.secrets}/passwords/users/jordan.age";
+    user =
+      let
+        user = builtins.getEnv "USER";
+        name =
+          if
+            elem user [
+              ""
+              "root"
+            ]
+          then
+            "jordan"
+          else
+            user;
+      in
+      {
+        inherit name;
+        isNormalUser = true;
+        extraGroups = [
+          "audio"
+          "lxd"
+          "networkmanager"
+          "wheel"
+        ];
+        description = "Jordan Holt";
+        useDefaultShell = true;
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+        ];
+        hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
+        home = "/home/${name}";
+        group = "users";
+        uid = 1000;
+      };
+
+    home-manager = {
+      useGlobalPkgs = true;
+      useUserPackages = true;
+
+      users.${config.user.name} = {
+        home = {
+          file = mkAliasDefinitions options.home.file;
+          stateVersion = config.system.stateVersion;
+        };
+        programs = mkAliasDefinitions options.home.programs;
+        services = mkAliasDefinitions options.home.services;
+        xdg = {
+          enable = true;
+          configFile = mkAliasDefinitions options.home.configFile;
+          dataFile = mkAliasDefinitions options.home.dataFile;
+        };
+        dconf.settings = mkAliasDefinitions options.dconf.settings;
+      };
+
+      sharedModules = [
+        self.inputs.nixvim.homeManagerModules.nixvim
+        self.inputs.plasma-manager.homeManagerModules.plasma-manager
+      ];
+    };
+
+    users.users.${config.user.name} = mkAliasDefinitions options.user;
+
+    environment.extraInit = concatStringsSep "\n" (
+      mapAttrsToList (n: v: "export ${n}=\"${v}\"") config.env
+    );
+  };
+}
--- a/modules/home-manager/programs/brave.nix
+++ b/modules/home-manager/programs/brave.nix
@ -0,0 +1,24 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.programs.brave;
+in
+{
+  options.modules.programs.brave = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      brave
+    ];
+  };
+}
--- a/modules/home-manager/programs/dev/cc.nix
+++ b/modules/home-manager/programs/dev/cc.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.dev.cc;
-in {
-  options.modules.dev.cc = {
+let
+  cfg = config.modules.programs.dev.cc;
+in
+{
+  options.modules.programs.dev.cc = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/dev/java.nix
+++ b/modules/home-manager/programs/dev/java.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.dev.java;
-in {
-  options.modules.dev.java = {
+let
+  cfg = config.modules.programs.dev.java;
+in
+{
+  options.modules.programs.dev.java = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/dev/lua.nix
+++ b/modules/home-manager/programs/dev/lua.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.dev.lua;
-in {
-  options.modules.dev.lua = {
+let
+  cfg = config.modules.programs.dev.lua;
+in
+{
+  options.modules.programs.dev.lua = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/dev/node.nix
+++ b/modules/home-manager/programs/dev/node.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.dev.node;
-in {
-  options.modules.dev.node = {
+let
+  cfg = config.modules.programs.dev.node;
+in
+{
+  options.modules.programs.dev.node = {
    enable = lib.mkOption {
      default = false;
      example = true;
@ -11,7 +18,7 @@ in {

  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
-      nodejs_latest
+      nodejs_22
    ];
  };
 }
--- a/modules/home-manager/programs/dev/python.nix
+++ b/modules/home-manager/programs/dev/python.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.dev.python;
-in {
-  options.modules.dev.python = {
+let
+  cfg = config.modules.programs.dev.python;
+in
+{
+  options.modules.programs.dev.python = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/dev/rust.nix
+++ b/modules/home-manager/programs/dev/rust.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.dev.rust;
-in {
-  options.modules.dev.rust = {
+let
+  cfg = config.modules.programs.dev.rust;
+in
+{
+  options.modules.programs.dev.rust = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/dev/scala.nix
+++ b/modules/home-manager/programs/dev/scala.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.dev.scala;
-in {
-  options.modules.dev.scala = {
+let
+  cfg = config.modules.programs.dev.scala;
+in
+{
+  options.modules.programs.dev.scala = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/dev/shell.nix
+++ b/modules/home-manager/programs/dev/shell.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.dev.shell;
-in {
-  options.modules.dev.shell = {
+let
+  cfg = config.modules.programs.dev.shell;
+in
+{
+  options.modules.programs.dev.shell = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/dev/zig.nix
+++ b/modules/home-manager/programs/dev/zig.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.dev.zig;
-in {
-  options.modules.dev.zig = {
+let
+  cfg = config.modules.programs.dev.zig;
+in
+{
+  options.modules.programs.dev.zig = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/emulators.nix
+++ b/modules/home-manager/programs/emulators.nix
@ -0,0 +1,76 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.programs.emulators;
+in
+{
+  options.modules.programs.emulators = {
+    ds.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gb.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gba.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gamecube.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps1.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps2.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps3.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    psp.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    snes.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    switch.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    wii.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    xbox.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = {
+    user.packages = with pkgs; [
+      (lib.mkIf cfg.ps1.enable duckstation)
+      (lib.mkIf cfg.ps2.enable unstable.pcsx2)
+      (lib.mkIf cfg.ps3.enable rpcs3)
+      (lib.mkIf cfg.psp.enable unstable.ppsspp)
+      (lib.mkIf cfg.ds.enable desmume)
+      (lib.mkIf (cfg.gba.enable || cfg.gb.enable || cfg.snes.enable) higan)
+      (lib.mkIf cfg.switch.enable yuzuPackages.mainline)
+      (lib.mkIf (cfg.wii.enable || cfg.gamecube.enable) dolphin-emu)
+      (lib.mkIf cfg.xbox.enable unstable.xemu)
+    ];
+  };
+}
--- a/modules/home-manager/programs/firefox.nix
+++ b/modules/home-manager/programs/firefox.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, inputs, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:

-let cfg = config.modules.desktop.browsers.firefox;
-in {
-  options.modules.desktop.browsers.firefox = {
+let
+  cfg = config.modules.programs.firefox;
+in
+{
+  options.modules.programs.firefox = {
    enable = lib.mkOption {
      default = false;
      example = true;
@ -10,7 +17,8 @@ in {
  };

  config = lib.mkIf cfg.enable {
-    home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
+    home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source =
+      self.inputs.firefox-gnome-theme;

    home.programs.firefox = {
      enable = true;
@ -35,23 +43,79 @@ in {

          ## Preferences
          "browser.ctrlTab.sortByRecentlyUsed" = true;
+          "browser.discovery.enabled" = false;
+          "browser.download.open_pdf_attachments_inline" = true;
+          "browser.menu.showViewImageInfo" = true;
          "browser.newtabpage.enabled" = false;
+          "browser.newtabpage.activity-stream.showSponsored" = false;
+          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+          "browser.newtabpage.activity-stream.default.sites" = "";
+          "browser.privatebrowsing.forceMediaMemoryCache" = true;
          "browser.search.widget.inNavBar" = true;
          "browser.startup.page" = 3;
          "browser.startup.homepage" = "https://www.vimium.com";
          "browser.toolbars.bookmarks.visibility" = "never";
+          "browser.uitour.enabled" = false;
+          "browser.urlbar.suggest.engines" = false;
+          "browser.urlbar.suggest.calculator" = true;
+          "browser.urlbar.trending.featureGate" = false;
+          "browser.urlbar.unitConversion.enabled" = true;
+          "cookiebanners.service.mode" = 1;
+          "cookiebanners.service.mode.privateBrowsing" = 1;
+          "network.IDN_show_punycode" = true;
+
+          ## Performance
+          "browser.cache.jsbc_compression_level" = 3;
+          "content.notify.interval" = 100000;
+          "dom.enable_web_task_scheduling" = true;
+          "dom.security.sanitizer.enabled" = true;
+          "gfx.canvas.accelerated.cache-items" = 4096;
+          "gfx.canvas.accelerated.cache-size" = 512;
+          "gfx.content.skia-font-cache-size" = 20;
+          "gfx.webrender.all" = true;
+          "gfx.webrender.compositor" = true;
+          "gfx.webrender.enable" = true;
+          "image.mem.decode_bytes_at_a_time" = 32768;
+          "layers.acceleration.force-enabled" = true;
+          "layout.css.grid-template-masonry-value.enabled" = true;
+          "media.ffmpeg.vaapi.enabled" = true;
+          "media.memory_cache_max_size" = 65536;
+          "media.cache_readahead_limit" = 7200;
+          "media.cache_resume_threshold" = 3600;
+          "network.dns.disablePrefetch" = true;
+          "network.dns.disablePrefetchFromHTTPS" = true;
+          "network.dnsCacheExpiration" = 3600;
+          "network.http.max-connections" = 1800;
+          "network.http.max-persistent-connections-per-server" = 10;
+          "network.http.max-urgent-start-excessive-connections-per-host" = 5;
+          "network.http.pacing.requests.enabled" = false;
+          "network.predictor.enabled" = false;
+          "network.prefetch-next" = false;
+          "network.ssl_tokens_cache_capacity" = 10240;
+          "pdfjs.enableScripting" = false;
+          "security.mixed_content.block_display_content" = true;

          ## Experiments
          "app.normandy.enabled" = false;
          "app.normandy.api_url" = "";
          "app.normandy.user_id" = "";
+          "app.shield.optoutstudies.enabled" = false;
+          "browser.shopping.experience2023.active" = false;
+          "browser.shopping.experience2023.enabled" = false;
          "extensions.screenshots.disabled" = true;
          "extensions.screenshots.upload-disabled" = true;
          "experiments.supported" = false;
          "experiments.enabled" = false;
          "experiments.manifest.uri" = "";
          "network.allow-experiments" = false;
-          "privacy.trackingprotection.enabled" = false;
+
+          ## Privacy
+          "dom.private-attribution.submission.enabled" = false;
+          # "privacy.resistFingerprinting" = true;
+          "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = false;
+          "privacy.trackingprotection.enabled" = true;
+          "privacy.trackingprotection.pbmode.enabled" = true;
+          "privacy.userContext.enabled" = true;

          ## Geo
          "geo.enabled" = false;
@ -98,12 +162,34 @@ in {
          "dom.battery.enabled" = false;
          "dom.vr.enabled" = false;
          "media.navigator.enabled" = false;
-          "dom.webaudio.enabled" = false;
+          # "dom.webaudio.enabled" = false;

          ## Isolation
          "privacy.firstparty.isolate" = true;
          "privacy.firstparty.isolate.restrict_opener_access" = true;

+          ## Telemetry
+          "beacon.enabled" = false;
+          "browser.newtabpage.activity-stream.feeds.telemetry" = false;
+          "browser.newtabpage.activity-stream.telemetry" = false;
+          "browser.send_pings" = false;
+          "datareporting.policy.dataSubmissionEnabled" = false;
+          "datareporting.healthReport.uploadEnabled" = false;
+          "toolkit.coverage.opt-out" = true;
+          "toolkit.coverage.endpoint.base" = "";
+          "toolkit.telemetry.archive.enabled" = false;
+          "toolkit.telemetry.bhrPing.enabled" = false;
+          "toolkit.telemetry.coverage.opt-out" = true;
+          "toolkit.telemetry.enabled" = false;
+          "toolkit.telemetry.firstShutdownPing.enabled" = false;
+          "toolkit.telemetry.hybridContent.enabled" = false;
+          "toolkit.telemetry.newProfilePing.enabled" = false;
+          "toolkit.telemetry.reportingPolicy.firstRun" = false;
+          "toolkit.telemetry.server" = "data:,";
+          "toolkit.telemetry.shutdownPingSender.enabled" = false;
+          "toolkit.telemetry.unified" = false;
+          "toolkit.telemetry.updatePing.enabled" = false;
+
          ## Pocket/Hello
          "loop.enabled" = false;
          "loop.feedback.baseUrl" = "";
@ -125,6 +211,10 @@ in {
          "browser.pocket.useLocaleList" = false;
          "brwoser.pocket.enabledLocales" = "";

+          ## Plugins
+          "plugin.state.flash" = 0;
+          "plugin.state.java" = 0;
+
          ## Misc
          "browser.selfsupport.url" = "";
        };
--- a/modules/home-manager/programs/forensics.nix
+++ b/modules/home-manager/programs/forensics.nix
@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.programs.forensics;
+in
+{
+  options.modules.programs.forensics = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      acquire
+      afflib
+      autopsy
+      fatcat
+      foremost
+      hstsparser
+      networkminer
+      sleuthkit
+      testdisk-qt
+      tracee
+    ];
+  };
+}
--- a/modules/home-manager/programs/git/default.nix
+++ b/modules/home-manager/programs/git/default.nix
@ -1,8 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  ...
+}:

-let cfg = config.modules.shell.git;
-in {
-  options.modules.shell.git = {
+let
+  cfg = config.modules.programs.git;
+in
+{
+  options.modules.programs.git = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/git/ignore
+++ b/modules/home-manager/programs/git/ignore
--- a/modules/home-manager/programs/gpg.nix
+++ b/modules/home-manager/programs/gpg.nix
@ -1,8 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  ...
+}:

-let cfg = config.modules.security.gpg;
-in {
-  options.modules.security.gpg = {
+let
+  cfg = config.modules.programs.gpg;
+in
+{
+  options.modules.programs.gpg = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/graphics.nix
+++ b/modules/home-manager/programs/graphics.nix
@ -1,17 +1,24 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.desktop.media.graphics;
-in {
-  options.modules.desktop.media.graphics = {
+let
+  cfg = config.modules.programs.graphics;
+in
+{
+  options.modules.programs.graphics = {
    modeling.enable = lib.mkOption {
      default = false;
      example = true;
    };
-    raster.enable   = lib.mkOption {
+    raster.enable = lib.mkOption {
      default = false;
      example = true;
    };
-    vector.enable   = lib.mkOption {
+    vector.enable = lib.mkOption {
      default = false;
      example = true;
    };
--- a/modules/home-manager/programs/libreoffice.nix
+++ b/modules/home-manager/programs/libreoffice.nix
@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.programs.libreoffice;
+in
+# libreoffice-gtk4 = pkgs.libreoffice.override {
+#   extraMakeWrapperArgs = [
+#     "--set SAL_USE_VCLPLUGIN gtk4"
+#   ];
+#   unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: {
+#     buildInputs = oldAttrs.buildInputs ++ [
+#       pkgs.gtk4
+#     ];
+#     configureFlags = oldAttrs.configureFlags ++ [
+#       "--disable-werror"
+#       "--enable-gtk4"
+#     ];
+#     passthru = oldAttrs.passthru // {
+#       inherit (pkgs) gtk4;
+#     };
+#   });
+# };
+{
+  options.modules.programs.libreoffice = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      (if config.modules.system.desktop.kde.enable == true then libreoffice-qt else libreoffice)
+      hunspell
+      hunspellDicts.en-gb-large
+      hunspellDicts.en-us-large
+    ];
+  };
+}
--- a/modules/home-manager/programs/lutris.nix
+++ b/modules/home-manager/programs/lutris.nix
@ -0,0 +1,36 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.programs.lutris;
+in
+{
+  options.modules.programs.lutris = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      (lutris.override {
+        extraPkgs = pkgs: [
+          winePackages.staging
+          wine64Packages.staging
+        ];
+      })
+      vulkan-loader
+      vulkan-tools
+    ];
+
+    hardware.graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
+  };
+}
--- a/modules/home-manager/programs/neovim.nix
+++ b/modules/home-manager/programs/neovim.nix
@ -0,0 +1,146 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.modules.programs.neovim;
+in
+{
+  options.modules.programs.neovim = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.programs.nixvim.config = {
+      enable = true;
+      defaultEditor = true;
+
+      viAlias = true;
+      vimAlias = true;
+
+      options = {
+        number = true;
+        tabstop = 2;
+        shiftwidth = 2;
+        expandtab = true;
+        foldlevel = 99;
+        splitbelow = true;
+        splitright = true;
+        undofile = true;
+        updatetime = 100;
+        list = true;
+      };
+
+      globals = {
+        mapleader = ",";
+        maplocalleader = ",";
+      };
+
+      clipboard = {
+        register = "unnamedplus";
+
+        providers.wl-copy.enable = true;
+      };
+
+      plugins.comment.enable = true;
+
+      plugins.hmts.enable = true;
+
+      plugins.lightline.enable = true;
+
+      plugins.luasnip.enable = true;
+
+      plugins.lsp = {
+        enable = true;
+        servers = {
+          bashls.enable = true;
+          ccls.enable = true;
+          cssls.enable = true;
+          eslint.enable = true;
+          gopls.enable = true;
+          html.enable = true;
+          lua_ls.enable = true;
+          pylsp.enable = true;
+          nixd.enable = true;
+          rust_analyzer = {
+            enable = true;
+            installCargo = true;
+            installRustc = true;
+          };
+          ts_ls.enable = true;
+        };
+      };
+
+      plugins.nvim-autopairs.enable = true;
+
+      plugins.cmp = {
+        enable = true;
+        autoEnableSources = true;
+        settings = {
+          sources = [
+            { name = "nvim_lsp"; }
+            { name = "path"; }
+            { name = "buffer"; }
+          ];
+          mapping = {
+            "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+            "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+            "<CR>" = "cmp.mapping.confirm({ select = true })";
+          };
+        };
+      };
+
+      plugins.telescope = {
+        enable = true;
+        keymaps = {
+          "<leader>ff" = "find_files";
+          "<leader>fg" = "live_grep";
+          "<leader>b" = "buffers";
+          "<leader>fh" = "help_tags";
+          "<C-p>" = "git_files";
+          "<C-f>" = "live_grep";
+        };
+      };
+
+      plugins.treesitter = {
+        enable = true;
+
+        nixvimInjections = true;
+
+        folding = true;
+        settings.indent.enable = true;
+      };
+
+      plugins.treesitter-refactor = {
+        enable = true;
+        highlightDefinitions = {
+          enable = true;
+          clearOnCursorMove = false;
+        };
+      };
+
+      plugins.undotree.enable = true;
+
+      plugins.web-devicons.enable = true;
+
+      # plugins.gitsigns.enable = true;
+      # plugins.gitgutter.enable = true;
+      # plugins.goyo.enable = true;
+      # plugins.fugitive.enable = true;
+      # plugins.fzf-lua.enable = true;
+      # plugins.neo-tree.enable = true;
+      # plugins.none-ls.enable = true;
+      # plugins.nvim-tree.enable = true;
+      # plugins.oil.enable = true;
+      # plugins.project-nvim.enable = true;
+      # plugins.surround.enable = true;
+    };
+
+    env.EDITOR = "nvim";
+  };
+}
--- a/modules/home-manager/programs/pass.nix
+++ b/modules/home-manager/programs/pass.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.security.pass;
-in {
-  options.modules.security.pass = {
+let
+  cfg = config.modules.programs.pass;
+in
+{
+  options.modules.programs.pass = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/qbittorrent.nix
+++ b/modules/home-manager/programs/qbittorrent.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.desktop.apps.qbittorrent;
-in {
-  options.modules.desktop.apps.qbittorrent = {
+let
+  cfg = config.modules.programs.qbittorrent;
+in
+{
+  options.modules.programs.qbittorrent = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/recording.nix
+++ b/modules/home-manager/programs/recording.nix
@ -0,0 +1,46 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.programs.recording;
+in
+{
+  options.modules.programs.recording = {
+    audio.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    video.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = {
+    user.packages =
+      with pkgs;
+      (
+        if cfg.audio.enable then
+          [
+            ardour
+            audacity
+          ]
+        else
+          [ ]
+      )
+      ++ (
+        if cfg.video.enable then
+          [
+            handbrake
+            mkvtoolnix
+            obs-studio
+          ]
+        else
+          [ ]
+      );
+  };
+}
--- a/modules/home-manager/programs/slack.nix
+++ b/modules/home-manager/programs/slack.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.desktop.apps.slack;
-in {
-  options.modules.desktop.apps.slack = {
+let
+  cfg = config.modules.programs.slack;
+in
+{
+  options.modules.programs.slack = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/steam.nix
+++ b/modules/home-manager/programs/steam.nix
@ -1,8 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  ...
+}:

-let cfg = config.modules.desktop.gaming.steam;
-in {
-  options.modules.desktop.gaming.steam = {
+let
+  cfg = config.modules.programs.steam;
+in
+{
+  options.modules.programs.steam = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/thunderbird.nix
+++ b/modules/home-manager/programs/thunderbird.nix
@ -1,16 +1,24 @@
-{ config, lib, pkgs, inputs, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:

-let cfg = config.modules.desktop.apps.thunderbird;
-in {
-  options.modules.desktop.apps.thunderbird = {
+let
+  cfg = config.modules.programs.thunderbird;
+in
+{
+  options.modules.programs.thunderbird = {
    enable = lib.mkOption {
      default = false;
      example = true;
    };
  };
-  
+
  config = lib.mkIf cfg.enable {
-    home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source = inputs.thunderbird-gnome-theme;
+    home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source =
+      self.inputs.thunderbird-gnome-theme;

    home.programs.thunderbird = {
      enable = true;
--- a/modules/home-manager/programs/vscode.nix
+++ b/modules/home-manager/programs/vscode.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.editors.vscode;
-in {
-  options.modules.editors.vscode = {
+let
+  cfg = config.modules.programs.vscode;
+in
+{
+  options.modules.programs.vscode = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/zoom.nix
+++ b/modules/home-manager/programs/zoom.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.desktop.apps.zoom;
-in {
-  options.modules.desktop.apps.zoom = {
+let
+  cfg = config.modules.programs.zoom;
+in
+{
+  options.modules.programs.zoom = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/shell/zsh/default.nix
+++ b/modules/home-manager/shell/zsh/default.nix
@ -0,0 +1,193 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.shell.zsh;
+in
+{
+  options.modules.shell.zsh = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    users.defaultUserShell = pkgs.zsh;
+
+    home.programs = {
+      zsh = {
+        enable = true;
+        autocd = true;
+        autosuggestion = {
+          enable = true;
+          strategy = [ "completion" ];
+        };
+        defaultKeymap = "viins";
+        dotDir = ".config/zsh";
+        enableCompletion = true;
+        enableVteIntegration = true;
+
+        history = {
+          append = true;
+          extended = true;
+          ignoreAllDups = true;
+          ignoreDups = true;
+          ignoreSpace = true;
+          save = 1000000;
+          size = 1000000;
+        };
+
+        initExtra = ''
+          ## Colors
+          autoload -U colors && colors
+
+          ## Directories
+          setopt AUTO_PUSHD
+          setopt CDABLE_VARS
+          setopt PUSHD_IGNORE_DUPS
+          setopt PUSHD_SILENT
+          setopt PUSHD_TO_HOME
+
+          ## Expansion and globbing
+          setopt EXTENDED_GLOB
+          unsetopt GLOB_DOTS
+          unsetopt NOMATCH
+
+          ## History
+          setopt BANG_HIST
+          setopt HIST_VERIFY
+          setopt INC_APPEND_HISTORY_TIME
+
+          ## I/O
+          setopt INTERACTIVE_COMMENTS
+          setopt MULTIOS
+          unsetopt CLOBBER
+
+          ## Jobs
+          setopt LONG_LIST_JOBS
+          setopt AUTO_RESUME
+          unsetopt BG_NICE
+          unsetopt NOTIFY
+          unsetopt HUP
+          unsetopt CHECK_JOBS
+
+          ## Shell emulation
+          setopt APPEND_CREATE
+
+          ## Prompt
+          PS1="%B%{$fg[magenta]%}%~%{$reset_color%} $%b "
+
+          ## Vi mode
+          export KEYTIMEOUT=1
+
+          ## Zsh line editor
+          unsetopt BEEP
+        '';
+
+        initExtraBeforeCompInit = ''
+          setopt HASH_LIST_ALL
+        '';
+
+        localVariables = {
+          # Prevent zsh-vi-mode overriding other keybinds
+          ZVM_INIT_MODE = "sourcing";
+        };
+
+        plugins = with pkgs; [
+          {
+            name = "zsh-vi-mode";
+            src = zsh-vi-mode;
+            file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
+          }
+          {
+            name = "fast-syntax-highlighting";
+            src = zsh-fast-syntax-highlighting;
+            file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
+          }
+          {
+            name = "jq-zsh-plugin";
+            src = jq-zsh-plugin;
+            file = "share/jq-zsh-plugin/jq.plugin.zsh";
+          }
+          {
+            name = "zsh-autopair";
+            src = zsh-autopair;
+            file = "share/zsh/zsh-autopair/autopair.zsh";
+          }
+          {
+            name = "zsh-forgit";
+            src = zsh-forgit;
+            file = "share/zsh/zsh-forgit/forgit.plugin.zsh";
+          }
+          {
+            name = "zsh-fzf-tab";
+            src = zsh-fzf-tab;
+            file = "share/fzf-tab/fzf-tab.plugin.zsh";
+          }
+        ];
+
+        sessionVariables = {
+          MODE_INDICATOR = "";
+          MODE_CURSOR_VIINS = "#b77ee0 blinking bar";
+          MODE_CURSOR_REPLACE = "$MODE_CURSOR_VIINS #ff3334";
+          MODE_CURSOR_VICMD = "#b77ee0 block";
+          MODE_CURSOR_SEARCH = "#e7c547 steady underline";
+          MODE_CURSOR_VISUAL = "$MODE_CURSOR_VICMD steady bar";
+          MODE_CURSOR_VLINE = "$MODE_CURSOR_VISUAL #54ced6";
+          ZVM_LINE_INIT_MODE = "i";
+        };
+
+        shellAliases = {
+          # Verbose file operations
+          cp = "cp -iv";
+          mv = "mv -iv";
+          rm = "rm -v";
+          mkdir = "mkdir -v";
+
+          # Colorize commands
+          ls = "ls -h --color=auto --group-directories-first";
+
+          # Abbreviations
+          e = "$EDITOR";
+          f = "$FILE";
+          g = "git";
+          m = "neomutt";
+          n = "$FILE";
+          v = "$EDITOR";
+        };
+      };
+
+      broot.enable = true;
+
+      direnv = {
+        enable = true;
+        nix-direnv.enable = true;
+      };
+
+      fzf = {
+        enable = true;
+        enableZshIntegration = true;
+        package = pkgs.unstable.fzf;
+      };
+
+      mcfly.enable = true;
+      navi.enable = true;
+      nix-index.enable = true;
+    };
+
+    user.packages = with pkgs; [
+      bat
+      btop
+      fd
+      jq
+      nix-zsh-completions
+      nnn
+      ripgrep
+    ];
+  };
+}
--- a/modules/networking/tailscale.nix
+++ b/modules/networking/tailscale.nix
@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.modules.networking.tailscale;
-in {
-  options.modules.networking.tailscale = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    restrictSSH = lib.mkOption {
-      default = true;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.tailscale.enable = true;
-    services.openssh.openFirewall = !cfg.restrictSSH;
-    networking.firewall = {
-      checkReversePath = "loose";
-      trustedInterfaces = [ "tailscale0" ];
-      allowedUDPPorts = [ config.services.tailscale.port ];
-    };
-  };
-}
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@ -0,0 +1,26 @@
+{
+  imports = [
+    ./hardware/presonus-studio
+    ./podman.nix
+    ./services/borgmatic.nix
+    ./services/chrony.nix
+    ./services/coturn.nix
+    ./services/gitea.nix
+    ./services/gitea-runner.nix
+    ./services/headscale.nix
+    ./services/home-assistant
+    ./services/mail.nix
+    ./services/matrix.nix
+    ./services/music-assistant.nix
+    ./services/netbird.nix
+    ./services/nginx.nix
+    ./services/photoprism.nix
+    ./services/postgresql.nix
+    ./services/tailscale.nix
+    ./system/desktop/gnome.nix
+    ./system/desktop/hyprland.nix
+    ./system/desktop/kde.nix
+    ./system/desktop/mimeapps.nix
+    ./system/wireless.nix
+  ];
+}
--- a/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch
+++ b/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch
@ -15,16 +15,16 @@ index ab5fed9f55b6..da50a4782414 100644
 --- a/sound/usb/format.c
 +++ b/sound/usb/format.c
@@ -378,8 +378,8 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip,
- 
+
 		for (rate = min; rate <= max; rate += res) {
- 
+
 -			/* Filter out invalid rates on Presonus Studio 1810c */
 -			if (chip->usb_id == USB_ID(0x194f, 0x010c) &&
 +			/* Filter out invalid rates on Presonus Studio 1824c */
 +			if (chip->usb_id == USB_ID(0x194f, 0x010d) &&
 			    !s1810c_valid_sample_rate(fp, rate))
 				goto skip_rate;
- 
+
 diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
 index 898bc3baca7b..c3135459c38c 100644
 --- a/sound/usb/mixer_quirks.c
@ -32,7 +32,7 @@ index 898bc3baca7b..c3135459c38c 100644
@@ -3445,7 +3445,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
 		err = snd_rme_controls_create(mixer);
 		break;
- 
+
 -	case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */
 +	case USB_ID(0x194f, 0x010d): /* Presonus Studio 1824c */
 		err = snd_sc1810_init_mixer(mixer);
@ -44,7 +44,7 @@ index fac4bbc6b275..5bc2e66d452c 100644
 +++ b/sound/usb/mixer_s1810c.c
@@ -552,7 +552,7 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer)
 		return 0;
- 
+
 	dev_info(&dev->dev,
 -		 "Presonus Studio 1810c, device_setup: %u\n", chip->setup);
 +		 "Presonus Studio 1824c, device_setup: %u\n", chip->setup);
@ -64,8 +64,7 @@ index ab2b938502eb..b86832edaaa0 100644
 +	/* presonus studio 1824c: skip altsets incompatible with device_setup */
 +	if (chip->usb_id == USB_ID(0x194f, 0x010d))
 		return s1810c_skip_setting_quirk(chip, iface, altno);
- 
- 
-- 
-2.42.0

+
+--
+2.42.0
--- a/modules/nixos/hardware/presonus-studio/default.nix
+++ b/modules/nixos/hardware/presonus-studio/default.nix
@ -0,0 +1,106 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.modules.hardware.presonus-studio;
+  snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
+    kernel = config.boot.kernelPackages.kernel;
+  };
+  patched = snd-usb-audio-module.overrideAttrs (prev: {
+    patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
+  });
+  upmixConfig = {
+    "stream.properties" = {
+      "channelmix.upmix" = true;
+      "channelmix.upmix-method" = "psd";
+    };
+  };
+in
+{
+  options.modules.hardware.presonus-studio = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    boot.kernelModules = [ "snd-usb-audio" ];
+    boot.extraModulePackages = [
+      (patched)
+    ];
+
+    # Workaround for mainline module loading instead of patched module
+    systemd.services.reload-snd-usb-audio = {
+      description = "Reload snd_usb_audio kernel module";
+      wantedBy = [ "sound.target" ];
+      serviceConfig.Type = "oneshot";
+      path = with pkgs; [
+        kmod
+      ];
+      script = ''
+        # Only reload if device hasn't been initialised
+        if ! cat /proc/asound/card*/usbmixer | grep -q "Mute Main Out Switch"; then
+          rmmod snd_usb_audio
+          insmod /run/booted-system/kernel-modules/lib/modules/$(uname -r)/extra/snd-usb-audio.ko.xz
+        fi
+      '';
+    };
+
+    services.pipewire.extraConfig = {
+      pipewire = {
+        "10-network" = {
+          "context.modules" = [
+            {
+              "name" = "libpipewire-module-rtp-session";
+              "args" = {
+                "stream.props" = {
+                  "node.name" = "rtp-source";
+                };
+              };
+            }
+          ];
+        };
+        "surround" = {
+          "context.modules" = [
+            {
+              "name" = "libpipewire-module-loopback";
+              "args" = {
+                "node.description" = "Genelec 4.1 Surround";
+                "capture.props" = {
+                  "node.name" = "Genelec_Speakers";
+                  "media.class" = "Audio/Sink";
+                  "audio.position" = [
+                    "FL"
+                    "FR"
+                    "SL"
+                    "SR"
+                    "LFE"
+                  ];
+                };
+                "playback.props" = {
+                  "node.name" = "playback.Genelec_Speakers";
+                  "audio.position" = [
+                    "AUX0"
+                    "AUX1"
+                    "AUX3"
+                    "AUX4"
+                    "AUX5"
+                  ];
+                  "target.object" = "alsa_output.usb-PreSonus_Studio_1824c_SC4E21110775-00.multichannel-output";
+                  "stream.dont-remix" = true;
+                  "node.passive" = true;
+                };
+              };
+            }
+          ];
+        };
+      };
+      pipewire-pulse."40-upmix" = upmixConfig;
+      client-rt."40-upmix" = upmixConfig;
+    };
+  };
+}
--- a/modules/nixos/hardware/presonus-studio/snd-usb-audio.nix
+++ b/modules/nixos/hardware/presonus-studio/snd-usb-audio.nix
@ -1,8 +1,17 @@
-{ pkgs, lib, kernel ? pkgs.linuxPackages_latest.kernel }:
+{
+  pkgs,
+  lib,
+  kernel ? pkgs.linuxPackages_latest.kernel,
+}:

 pkgs.stdenv.mkDerivation {
  pname = "snd-usb-audio";
-  inherit (kernel) src version postPatch nativeBuildInputs;
+  inherit (kernel)
+    src
+    version
+    postPatch
+    nativeBuildInputs
+    ;

  kernel_dev = kernel.dev;
  kernelVersion = kernel.modDirVersion;
@ -33,4 +42,3 @@ pkgs.stdenv.mkDerivation {
    license = lib.licenses.gpl2;
  };
 }
-
--- a/modules/nixos/podman.nix
+++ b/modules/nixos/podman.nix
@ -0,0 +1,51 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+
+let
+  cfg = config.modules.podman;
+in
+{
+  options.modules.podman = {
+    enable = mkOption {
+      default = false;
+      example = true;
+      description = mdDoc "Enable podman on this host";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    virtualisation = {
+      docker.enable = false;
+
+      podman = {
+        enable = true;
+        defaultNetwork.settings.dns_enabled = true;
+        autoPrune = {
+          enable = true;
+          dates = "weekly";
+          flags = [ "--all" ];
+        };
+        extraPackages = [ pkgs.zfs ];
+      };
+
+      containers.storage.settings.storage = {
+        driver = "zfs";
+        graphroot = "/var/lib/containers/storage";
+        runroot = "/run/containers/storage";
+      };
+
+      oci-containers.backend = "podman";
+    };
+
+    networking.firewall.interfaces."podman+" = {
+      allowedUDPPorts = [ 53 ];
+      allowedTCPPorts = [ 53 ];
+    };
+  };
+}
--- a/modules/nixos/services/borgmatic.nix
+++ b/modules/nixos/services/borgmatic.nix
@ -0,0 +1,72 @@
+{
+  config,
+  lib,
+  self,
+  ...
+}:
+
+let
+  cfg = config.modules.services.borgmatic;
+  hostname = config.networking.hostName;
+in
+{
+  options.modules.services.borgmatic = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+      description = lib.mdDoc "Enable backups on this host with `borgmatic`";
+    };
+    directories = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      example = [
+        "/home/jordan/Documents"
+      ];
+      description = lib.mdDoc "List of directories to backup";
+    };
+    repoPath = lib.mkOption {
+      type = lib.types.str;
+      example = "ssh://example@example.repo.borgbase.com/./repo";
+      description = lib.mdDoc "Destination borg repository for backup";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    age.secrets."passwords/services/borg/${hostname}-passphrase" = {
+      file = "${self.inputs.secrets}/passwords/services/borg/${hostname}-passphrase.age";
+    };
+
+    services.borgmatic = {
+      enable = true;
+      settings = {
+        source_directories = cfg.directories;
+        repositories = [
+          {
+            label = "borgbase";
+            path = cfg.repoPath;
+          }
+        ];
+        encryption_passcommand = "cat ${
+          config.age.secrets."passwords/services/borg/${hostname}-passphrase".path
+        }";
+        ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
+        keep_daily = 7;
+        keep_weekly = 4;
+        keep_monthly = 6;
+      };
+    };
+
+    services.postgresql.ensureUsers = [
+      {
+        name = "root";
+        ensureClauses.superuser = true;
+      }
+    ];
+
+    # Add `pg_dumpall` to unit environment
+    systemd.services.borgmatic.path = [ config.services.postgresql.package ];
+
+    # Without this override, `cat` is unavailable for `encryption_passcommand`
+    systemd.services.borgmatic.confinement.fullUnit = true;
+  };
+}
--- a/modules/nixos/services/chrony.nix
+++ b/modules/nixos/services/chrony.nix
@ -0,0 +1,46 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+with lib;
+
+let
+  cfg = config.modules.services.chrony;
+in
+{
+  options.modules.services.chrony = {
+    enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable chrony NTP deamon";
+    };
+
+    config = mkIf cfg.enable {
+      services.chrony = {
+        enable = true;
+
+        servers = [
+          "uk.pool.ntp.org"
+          "time.cloudflare.com"
+        ];
+
+        extraConfig = ''
+          makestep 1.0 3
+
+          bindaddress 0.0.0.0
+          port 123
+          allow
+        '';
+      };
+
+      services.timesyncd.enable = mkForce false;
+
+      networking.firewall = {
+        allowedUDPPorts = [ 123 ];
+        allowedTCPPorts = [ 123 ];
+      };
+    };
+  };
+}
--- a/modules/nixos/services/coturn.nix
+++ b/modules/nixos/services/coturn.nix
@ -0,0 +1,135 @@
+{
+  config,
+  lib,
+  self,
+  ...
+}:
+
+let
+  cfg = config.modules.services.coturn;
+in
+{
+  options.modules.services.coturn = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    realm = lib.mkOption {
+      type = lib.types.str;
+      description = "The realm to be used by the TURN server.";
+      example = "turn.vimium.com";
+    };
+    matrixIntegration = lib.mkOption {
+      default = false;
+      description = "Configure the matrix-synapse module to use this TURN server.";
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    networking.firewall =
+      let
+        range =
+          with config.services.coturn;
+          lib.singleton {
+            from = min-port;
+            to = max-port;
+          };
+      in
+      {
+        allowedTCPPorts = [
+          3478 # TURN listener
+          5349 # STUN TLS
+          5350 # STUN TLS alt
+        ];
+        allowedUDPPorts = [
+          3478 # TURN listener
+          5349 # TLS
+          5350 # TLS alt
+        ];
+        allowedUDPPortRanges = range; # TURN peer relays
+      };
+
+    security.acme.certs = {
+      "${config.services.coturn.realm}" = {
+        group = "turnserver";
+        reloadServices = [ "coturn" ];
+      };
+    };
+
+    age.secrets =
+      {
+        "passwords/services/coturn/static-auth-secret" = {
+          file = "${self.inputs.secrets}/passwords/services/coturn/static-auth-secret.age";
+          owner = "turnserver";
+          group = "turnserver";
+        };
+      }
+      // (
+        if cfg.matrixIntegration then
+          {
+            "passwords/services/coturn/matrix-turn-config.yml" = {
+              file = "${self.inputs.secrets}/passwords/services/coturn/matrix-turn-config.yml.age";
+              owner = "matrix-synapse";
+              group = "matrix-synapse";
+            };
+          }
+        else
+          { }
+      );
+
+    services.coturn = rec {
+      enable = true;
+      realm = cfg.realm;
+      use-auth-secret = true;
+      static-auth-secret-file = config.age.secrets."passwords/services/coturn/static-auth-secret".path;
+      cert = "${config.security.acme.certs.${realm}.directory}/full.pem";
+      pkey = "${config.security.acme.certs.${realm}.directory}/key.pem";
+      min-port = 49000;
+      max-port = 50000;
+      no-cli = true;
+      no-tcp-relay = true;
+      extraConfig = ''
+        cipher-list="HIGH"
+        no-multicast-peers
+
+        # Ban private CIDR blocks
+        denied-peer-ip=0.0.0.0-0.255.255.255
+        denied-peer-ip=10.0.0.0-10.255.255.255
+        denied-peer-ip=100.64.0.0-100.127.255.255
+        denied-peer-ip=127.0.0.0-127.255.255.255
+        denied-peer-ip=169.254.0.0-169.254.255.255
+        denied-peer-ip=172.16.0.0-172.31.255.255
+        denied-peer-ip=192.0.0.0-192.0.0.255
+        denied-peer-ip=192.0.2.0-192.0.2.255
+        denied-peer-ip=192.88.99.0-192.88.99.255
+        denied-peer-ip=192.168.0.0-192.168.255.255
+        denied-peer-ip=198.18.0.0-198.19.255.255
+        denied-peer-ip=198.51.100.0-198.51.100.255
+        denied-peer-ip=203.0.113.0-203.0.113.255
+        denied-peer-ip=240.0.0.0-255.255.255.255
+        denied-peer-ip=::1
+        denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff
+        denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255
+        denied-peer-ip=100::-100::ffff:ffff:ffff:ffff
+        denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff
+        denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+        denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+        denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+      '';
+    };
+
+    services.matrix-synapse = lib.mkIf cfg.matrixIntegration {
+      settings = with config.services.coturn; {
+        turn_uris = [
+          "turn:${realm}:3478?transport=udp"
+          "turn:${realm}:3478?transport=tcp"
+        ];
+        turn_user_lifetime = "1h";
+      };
+      extraConfigFiles = [
+        config.age.secrets."passwords/services/coturn/matrix-turn-config.yml".path
+      ];
+    };
+  };
+}
--- a/modules/nixos/services/gitea-runner.nix
+++ b/modules/nixos/services/gitea-runner.nix
@ -0,0 +1,242 @@
+{
+  pkgs,
+  config,
+  lib,
+  self,
+  ...
+}:
+
+# Based on: https://git.clan.lol/clan/clan-infra/src/branch/main/modules/web01/gitea/actions-runner.nix
+
+with lib;
+
+let
+  cfg = config.modules.services.gitea-runner;
+  hostname = config.networking.hostName;
+  giteaUrl = "https://git.vimium.com";
+
+  storeDepsBins = with pkgs; [
+    coreutils
+    findutils
+    gnugrep
+    gawk
+    git
+    nix
+    nix-update
+    bash
+    jq
+    nodejs
+  ];
+
+  storeDeps = pkgs.runCommand "store-deps" { } ''
+    mkdir -p $out/bin
+    for dir in ${toString storeDepsBins}; do
+      for bin in "$dir"/bin/*; do
+        ln -s "$bin" "$out/bin/$(basename "$bin")"
+      done
+    done
+
+    # Add SSL CA certs
+    mkdir -p $out/etc/ssl/certs
+    cp -a "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" $out/etc/ssl/certs/ca-bundle.crt
+  '';
+in
+{
+  options.modules.services.gitea-runner = {
+    enable = mkOption {
+      default = false;
+      example = true;
+      description = mdDoc "Enable a runner for Gitea Actions on this host";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    modules.podman.enable = true;
+
+    systemd.services = {
+      gitea-runner-nix-image = {
+        wantedBy = [ "multi-user.target" ];
+        after = [ "podman.service" ];
+        requires = [ "podman.service" ];
+        path = [
+          config.virtualisation.podman.package
+          pkgs.gnutar
+          pkgs.shadow
+          pkgs.getent
+        ];
+        script = ''
+          set -eux -o pipefail
+          mkdir -p etc/nix
+
+          # Create an unpriveleged user that we can use also without the run-as-user.sh script
+          touch etc/passwd etc/group
+          groupid=$(cut -d: -f3 < <(getent group nix-ci-user))
+          userid=$(cut -d: -f3 < <(getent passwd nix-ci-user))
+          groupadd --prefix $(pwd) --gid "$groupid" nix-ci-user
+          emptypassword='$6$1ero.LwbisiU.h3D$GGmnmECbPotJoPQ5eoSTD6tTjKnSWZcjHoVTkxFLZP17W9hRi/XkmCiAMOfWruUwy8gMjINrBMNODc7cYEo4K.'
+          useradd --prefix $(pwd) -p "$emptypassword" -m -d /tmp -u "$userid" -g "$groupid" -G nix-ci-user nix-ci-user
+
+          cat <<NIX_CONFIG > etc/nix/nix.conf
+          accept-flake-config = true
+          experimental-features = nix-command flakes
+          NIX_CONFIG
+
+          cat <<NSSWITCH > etc/nsswitch.conf
+          passwd:    files mymachines systemd
+          group:     files mymachines systemd
+          shadow:    files
+
+          hosts:     files mymachines dns myhostname
+          networks:  files
+
+          ethers:    files
+          services:  files
+          protocols: files
+          rpc:       files
+          NSSWITCH
+
+          # list the content as it will be imported into the container
+          tar -cv . | tar -tvf -
+          tar -cv . | podman import - gitea-runner-nix
+        '';
+        serviceConfig = {
+          RuntimeDirectory = "gitea-runner-nix-image";
+          WorkingDirectory = "/run/gitea-runner-nix-image";
+          Type = "oneshot";
+          RemainAfterExit = true;
+        };
+      };
+
+      gitea-runner-nix = {
+        after = [ "gitea-runner-nix-image.service" ];
+        requires = [ "gitea-runner-nix-image.service" ];
+
+        serviceConfig = {
+          # Hardening (may overlap with DynamicUser=)
+          # The following options are only for optimizing output of systemd-analyze
+          AmbientCapabilities = "";
+          CapabilityBoundingSet = "";
+          # ProtectClock= adds DeviceAllow=char-rtc r
+          DeviceAllow = "";
+          NoNewPrivileges = true;
+          PrivateDevices = true;
+          PrivateMounts = true;
+          PrivateTmp = true;
+          PrivateUsers = true;
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          ProtectSystem = "strict";
+          RemoveIPC = true;
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          UMask = "0066";
+          ProtectProc = "invisible";
+          SystemCallFilter = [
+            "~@clock"
+            "~@cpu-emulation"
+            "~@module"
+            "~@mount"
+            "~@obsolete"
+            "~@raw-io"
+            "~@reboot"
+            "~@swap"
+            # needed by go?
+            #"~@resources"
+            "~@privileged"
+            "~capset"
+            "~setdomainname"
+            "~sethostname"
+          ];
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+            "AF_NETLINK"
+          ];
+
+          # Needs network access
+          PrivateNetwork = false;
+          # Cannot be true due to Node
+          MemoryDenyWriteExecute = false;
+
+          # The more restrictive "pid" option makes `nix` commands in CI emit
+          # "GC Warning: Couldn't read /proc/stat"
+          # You may want to set this to "pid" if not using `nix` commands
+          ProcSubset = "all";
+          # Coverage programs for compiled code such as `cargo-tarpaulin` disable
+          # ASLR (address space layout randomization) which requires the
+          # `personality` syscall
+          # You may want to set this to `true` if not using coverage tooling on
+          # compiled code
+          LockPersonality = false;
+
+          # Note that this has some interactions with the User setting; so you may
+          # want to consult the systemd docs if using both.
+          DynamicUser = true;
+        };
+      };
+    };
+
+    users.users.nix-ci-user = {
+      group = "nix-ci-user";
+      description = "Used for running nix-based CI jobs";
+      home = "/var/empty";
+      isSystemUser = true;
+    };
+    users.groups.nix-ci-user = { };
+
+    age.secrets."files/services/gitea-runner/${hostname}-token" = {
+      file = "${self.inputs.secrets}/files/services/gitea-runner/${hostname}-token.age";
+      group = "podman";
+    };
+
+    services.gitea-actions-runner.instances = {
+      act = {
+        enable = true;
+        url = giteaUrl;
+        name = "act-runner-${hostname}";
+
+        tokenFile = config.age.secrets."files/services/gitea-runner/${hostname}-token".path;
+        settings = {
+          cache.enabled = true;
+          runner.capacity = 4;
+        };
+
+        labels = [
+          "debian-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest"
+          "ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest"
+        ];
+      };
+      nix = {
+        enable = true;
+        url = giteaUrl;
+        name = "nix-runner-${hostname}";
+
+        tokenFile = config.age.secrets."files/services/gitea-runner/${hostname}-token".path;
+        settings = {
+          cache.enabled = true;
+          container = {
+            options = "-e NIX_BUILD_SHELL=/bin/bash -e PAGER=cat -e PATH=/bin -e SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt --device /dev/kvm -v /nix:/nix -v ${storeDeps}/bin:/bin -v ${storeDeps}/etc/ssl:/etc/ssl --user nix-ci-user";
+            network = "host";
+            valid_volumes = [
+              "/nix"
+              "${storeDeps}/bin"
+              "${storeDeps}/etc/ssl"
+            ];
+          };
+          runner.capacity = 4;
+        };
+
+        labels = [
+          "nix:docker://gitea-runner-nix"
+        ];
+      };
+    };
+  };
+}
--- a/modules/services/gitea/default.nix
+++ b/modules/services/gitea/default.nix
@ -1,23 +1,29 @@
-{ config, lib, pkgs, inputs, ... }:
-
-with lib;
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:

 let
  cfg = config.modules.services.gitea;
-in {
+in
+{
  options.modules.services.gitea = {
-    enable = mkOption {
-      default = false;
-      example = true;
+    enable = lib.mkEnableOption "gitea";
+    domain = lib.mkOption {
+      type = lib.types.string;
+      default = "git.vimium.com";
    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    users = {
      users.git = {
        isSystemUser = true;
        useDefaultShell = true;
-        group =  "git";
+        group = "git";
        extraGroups = [ "gitea" ];
        home = config.services.gitea.stateDir;
      };
@ -31,7 +37,7 @@ in {
        };
      };
      virtualHosts = {
-        "git.vimium.com" = {
+        "${cfg.domain}" = {
          forceSSL = true;
          enableACME = true;
          locations."/".proxyPass = "http://gitea";
@ -39,6 +45,13 @@ in {
      };
    };

+    systemd.tmpfiles.rules = [
+      "d '${config.services.gitea.customDir}/public/assets/css' 0750 ${config.services.gitea.user} ${config.services.gitea.group} - -"
+      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github.css' - - - - ${self.inputs.gitea-github-theme}/theme-github.css"
+      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-auto.css' - - - - ${self.inputs.gitea-github-theme}/theme-github-auto.css"
+      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-dark.css' - - - - ${self.inputs.gitea-github-theme}/theme-github-dark.css"
+    ];
+
    services.gitea = rec {
      package = pkgs.unstable.gitea;
      enable = true;
@ -57,19 +70,23 @@ in {
      };
      settings = {
        server = {
-          SSH_USER = "git";
-          SSH_DOMAIN = "git.vimium.com";
-          SSH_PORT = lib.head config.services.openssh.ports;
+          DOMAIN = config.networking.domain;
+          LANDING_PAGE = "explore";
          OFFLINE_MODE = true;
          PROTOCOL = "http+unix";
-          DOMAIN = config.networking.domain;
-          ROOT_URL = "https://git.vimium.com/";
+          SSH_USER = "git";
+          SSH_DOMAIN = "${cfg.domain}";
+          SSH_PORT = lib.head config.services.openssh.ports;
+          ROOT_URL = "https://${cfg.domain}/";
        };
        service.DISABLE_REGISTRATION = true;
        session.COOKIE_SECURE = true;
-        log.ROOT_PATH = "${stateDir}/log";
+        log = {
+          ROOT_PATH = "${stateDir}/log";
+          "logger.router.MODE" = "";
+        };
        ui = {
-          THEMES = "gitea,arc-green,github-dark,bthree-dark";
+          THEMES = "gitea,arc-green,github,github-auto,github-dark";
          DEFAULT_THEME = "github-dark";
        };
        actions.ENABLED = true;
--- a/modules/nixos/services/headscale.nix
+++ b/modules/nixos/services/headscale.nix
@ -0,0 +1,72 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.services.headscale;
+  fqdn = "headscale.vimium.net";
+in
+{
+  options.modules.services.headscale = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.headscale ];
+
+    services.headscale = {
+      enable = true;
+
+      port = 8080;
+
+      settings = {
+        policy.path = null;
+        ip_prefixes = [
+          "100.64.0.0/10"
+        ];
+        server_url = "https://${fqdn}";
+        derp = {
+          auto_update_enable = false;
+          update_frequency = "24h";
+        };
+        dns = {
+          base_domain = "mesh.vimium.net";
+          extra_records = [
+            {
+              name = "grafana.mesh.vimium.net";
+              type = "A";
+              value = "100.64.0.6";
+            }
+            {
+              name = "home.mesh.vimium.net";
+              type = "A";
+              value = "100.64.0.7";
+            }
+          ];
+          magic_dns = true;
+          nameservers.global = [
+            "9.9.9.9"
+          ];
+        };
+        logtail.enabled = false;
+      };
+    };
+
+    services.nginx.virtualHosts = {
+      "${fqdn}" = {
+        forceSSL = true;
+        enableACME = true;
+        locations."/" = {
+          proxyPass = "http://localhost:${toString config.services.headscale.port}";
+          proxyWebsockets = true;
+        };
+      };
+    };
+  };
+}
--- a/modules/nixos/services/home-assistant/default.nix
+++ b/modules/nixos/services/home-assistant/default.nix
@ -0,0 +1,315 @@
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:
+
+let
+  cfg = config.modules.services.home-assistant;
+in
+{
+  imports = [
+    ./floorplan/default.nix
+    ./mqtt.nix
+  ];
+
+  options.modules.services.home-assistant.enable = lib.mkEnableOption "home-assistant";
+
+  config = lib.mkIf cfg.enable {
+
+    age.secrets."files/services/home-assistant/secrets.yaml" = {
+      file = "${self.inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
+      path = "${config.services.home-assistant.configDir}/secrets.yaml";
+      owner = "hass";
+      group = "hass";
+    };
+
+    services.home-assistant = {
+      enable = true;
+
+      config = {
+        automation = "!include automations.yaml";
+        backup = { };
+        binary_sensor = [ ];
+        default_config = { };
+        http = {
+          server_host = "::1";
+          trusted_proxies = [ "::1" ];
+          use_x_forwarded_for = true;
+        };
+        ffmpeg = { };
+        homeassistant = {
+          name = "Home";
+          latitude = "!secret latitude";
+          longitude = "!secret longitude";
+          country = "GB";
+          temperature_unit = "C";
+          time_zone = config.time.timeZone;
+          unit_system = "metric";
+          auth_providers = [
+            {
+              type = "trusted_networks";
+              trusted_networks = [
+                "100.64.0.0/10"
+                "127.0.0.1"
+              ];
+              allow_bypass_login = true;
+            }
+            {
+              type = "homeassistant";
+            }
+          ];
+        };
+        logger = {
+          default = "info";
+          logs = { };
+        };
+        lovelace = {
+          mode = "yaml";
+        };
+        media_player = [ ];
+        mobile_app = { };
+        onkyo = { };
+        open_meteo = { };
+        recorder = {
+          purge_keep_days = 365;
+        };
+        scene = "!include scenes.yaml";
+        script = "!include scripts.yaml";
+        sensor = [ ];
+        system_health = { };
+        zeroconf = { };
+      };
+
+      extraComponents = [
+        "air_quality"
+        "airly"
+        "alert"
+        "api"
+        "application_credentials"
+        "asuswrt"
+        "auth"
+        "automation"
+        "bayesian"
+        "binary_sensor"
+        # "blackbird"
+        "blueprint"
+        "bluetooth_adapters"
+        "bluetooth_le_tracker"
+        "button"
+        "calendar"
+        "camera"
+        "cast"
+        "cert_expiry"
+        "climate"
+        "co2signal"
+        "color_extractor"
+        "command_line"
+        "compensation"
+        "configurator"
+        "counter"
+        "cover"
+        "cpuspeed"
+        "default_config"
+        "demo"
+        "derivative"
+        "device_automation"
+        "device_sun_light_trigger"
+        "device_tracker"
+        "dlna_dmr"
+        "dlna_dms"
+        "dnsip"
+        "esphome"
+        "fail2ban"
+        "fan"
+        "feedreader"
+        "ffmpeg"
+        "file"
+        "file_upload"
+        "filesize"
+        "folder"
+        "folder_watcher"
+        "forecast_solar"
+        "frontend"
+        "gdacs"
+        "generic"
+        "generic_hygrostat"
+        "generic_thermostat"
+        "geo_json_events"
+        "geo_location"
+        "geo_rss_events"
+        "github"
+        "group"
+        "hardware"
+        "hdmi_cec"
+        "history_stats"
+        "homeassistant"
+        "homekit"
+        "homekit_controller"
+        "html5"
+        "http"
+        "humidifier"
+        "icloud"
+        "image_processing"
+        "input_boolean"
+        "input_button"
+        "input_datetime"
+        "input_number"
+        "input_select"
+        "input_text"
+        "integration"
+        "ios"
+        "jellyfin"
+        "light"
+        "local_calendar"
+        "local_file"
+        "local_ip"
+        "local_todo"
+        "lock"
+        "logentries"
+        "logger"
+        "lovelace"
+        "manual"
+        "manual_mqtt"
+        "matter"
+        "media_player"
+        "min_max"
+        "mjpeg"
+        "modern_forms"
+        "mold_indicator"
+        "moon"
+        "mysensors"
+        "network"
+        "nmap_tracker"
+        "notify"
+        "number"
+        "onboarding"
+        "onkyo"
+        "panel_custom"
+        "persistent_notification"
+        "person"
+        "ping"
+        "plant"
+        "prometheus"
+        "proximity"
+        "push"
+        "proximity"
+        "python_script"
+        "radio_browser"
+        "random"
+        "recorder"
+        "remote"
+        "repairs"
+        "rest"
+        "rest_command"
+        "rss_feed_template"
+        "scene"
+        "schedule"
+        "scrape"
+        "script"
+        "search"
+        "season"
+        "select"
+        "sense"
+        "sensor"
+        "sensorpush"
+        "shell_command"
+        "shopping_list"
+        "siren"
+        "smtp"
+        "snmp"
+        "sql"
+        "statistics"
+        "sun"
+        "switch"
+        "switch_as_x"
+        "system_health"
+        "system_log"
+        "systemmonitor"
+        "tag"
+        "tailscale"
+        "tcp"
+        "template"
+        "text"
+        "thread"
+        "threshold"
+        "time_date"
+        "timer"
+        "tod"
+        "todo"
+        "tomorrowio"
+        "trend"
+        "universal"
+        "upb"
+        "update"
+        "upnp"
+        "uptime"
+        "utility_meter"
+        "vacuum"
+        "vlc"
+        "vlc_telnet"
+        "wake_on_lan"
+        "water_heater"
+        "weather"
+        "websocket_api"
+        "wled"
+        "workday"
+        "worldclock"
+        "zone"
+      ];
+
+      extraPackages =
+        python3Packages: with python3Packages; [
+          onkyo-eiscp
+          zeroconf
+        ];
+
+      customComponents = with pkgs; [
+        home-assistant-browser-mod
+      ];
+
+      customLovelaceModules =
+        (with pkgs.home-assistant-custom-lovelace-modules; [
+          bubble-card
+          button-card
+          card-mod
+          light-entity-card
+          mini-graph-card
+          mini-media-player
+          mushroom
+          sankey-chart
+          universal-remote-card
+        ])
+        ++ (with pkgs; [
+          lovelace-auto-entities
+          lovelace-layout-card
+          lovelace-my-cards
+          lovelace-simple-weather-card
+          lovelace-state-switch
+          lovelace-weather-radar-card
+        ]);
+
+      lovelaceConfigWritable = true;
+    };
+
+    modules.services.borgmatic.directories = [
+      config.services.home-assistant.configDir
+    ];
+
+    services.nginx = {
+      enable = true;
+      virtualHosts."home.mesh.vimium.net" = {
+        forceSSL = false;
+        extraConfig = ''
+          proxy_buffering off;
+        '';
+        locations."/" = {
+          proxyPass = "http://[::1]:8123";
+          proxyWebsockets = true;
+        };
+      };
+    };
+  };
+}
--- a/Show More
+++ b/Show More