Add floorplan config

Enable
Add pkgs
2025-01-05 22:06:59 +00:00 · 2025-01-05 19:18:22 +00:00 · 2025-01-05 19:16:34 +00:00 · 2025-01-05 19:14:34 +00:00 · 2025-01-05 15:11:04 +00:00 · 2025-01-05 14:47:53 +00:00
62 changed files with 2523 additions and 713 deletions
--- 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,8 +6,8 @@ System and user configuration for NixOS-based systems.
 |-|-|
 | **Shell:** | zsh |
 | **DE:** | GNOME |
-| **Theme:** | adwaita |
-| **Terminal:** | Console |
+| **Theme:** | Adwaita |
+| **Terminal:** | Ptyxis |

 ## Provisioning a new host
 > [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used
--- a/flake.lock
+++ b/flake.lock
@ -8,11 +8,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1716561646,
-        "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
+        "lastModified": 1723293904,
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
        "type": "github"
      },
      "original": {
@ -66,11 +66,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1715699772,
-        "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=",
+        "lastModified": 1727447169,
+        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
        "owner": "serokell",
        "repo": "deploy-rs",
-        "rev": "b3ea6f333f9057b77efd9091119ba67089399ced",
+        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
        "type": "github"
      },
      "original": {
@ -81,18 +81,17 @@
    },
    "devshell": {
      "inputs": {
-        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixvim",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1713532798,
-        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
+        "lastModified": 1728330715,
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
        "type": "github"
      },
      "original": {
@ -108,11 +107,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717177033,
-        "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=",
+        "lastModified": 1735468753,
+        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c",
+        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
        "type": "github"
      },
      "original": {
@ -124,11 +123,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1716813977,
-        "narHash": "sha256-8fabA8OY1n2OcJFbbE03+bMydVANSBrNGo8hkzhXxxU=",
+        "lastModified": 1735511798,
+        "narHash": "sha256-U9WjPisByrvw8Kt6Ufg9kLrvg7uHPsFSyG93GR3I1iE=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "8171c0578feb835ce66d49edba7429f46b7ac3f6",
+        "rev": "097c98cb4a7568f6f83a43e37950c08b575dd126",
        "type": "github"
      },
      "original": {
@ -183,22 +182,6 @@
        "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": [
@ -207,11 +190,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1715865404,
-        "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
        "type": "github"
      },
      "original": {
@ -220,31 +203,16 @@
        "type": "github"
      }
    },
-    "flake-root": {
-      "locked": {
-        "lastModified": 1713493429,
-        "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
-        "owner": "srid",
-        "repo": "flake-root",
-        "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "repo": "flake-root",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@ -255,7 +223,10 @@
    },
    "git-hooks": {
      "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
        "gitignore": "gitignore",
        "nixpkgs": [
          "nixvim",
@ -267,11 +238,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1716213921,
-        "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
+        "lastModified": 1734797603,
+        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
+        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
        "type": "github"
      },
      "original": {
@ -283,11 +254,11 @@
    "gitea-github-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1715978309,
-        "narHash": "sha256-L9FYLtrK8Lm/wBeafb6eTRL5l2BYov6X6nJOL6rYZvY=",
+        "lastModified": 1717248105,
+        "narHash": "sha256-BwSsIkl7DpN/c8HNXOh2aKjOuPmFsGybv4RegOC7Xq0=",
        "ref": "main",
-        "rev": "1b61f3f5cb38a1198d0a525d059a5a1905f2cfca",
-        "revCount": 96,
+        "rev": "4f829f88e6f443ff048c4d337bd010315aa4b50a",
+        "revCount": 101,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/gitea-github-theme.git"
      },
@ -347,16 +318,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1716736833,
-        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
+        "lastModified": 1735344290,
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
        "repo": "home-manager",
        "type": "github"
      }
@ -369,19 +340,64 @@
        ]
      },
      "locked": {
-        "lastModified": 1717052710,
-        "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=",
+        "lastModified": 1735344290,
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
        "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": [
@ -390,11 +406,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1716993688,
-        "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
+        "lastModified": 1735218083,
+        "narHash": "sha256-MoUAbmXz9TEr7zlKDRO56DBJHe30+7B5X7nhXm+Vpc8=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
+        "rev": "bc03f7818771a75716966ce8c23110b715eff2aa",
        "type": "github"
      },
      "original": {
@ -405,11 +421,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1716987116,
-        "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=",
+        "lastModified": 1735388221,
+        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "8251761f93d6f5b91cee45ac09edb6e382641009",
+        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
        "type": "github"
      },
      "original": {
@ -425,14 +441,14 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "utils": "utils_2"
+        "nixpkgs-24_11": "nixpkgs-24_11"
      },
      "locked": {
-        "lastModified": 1714720456,
-        "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
+        "lastModified": 1735230346,
+        "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
+        "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
        "type": "gitlab"
      },
      "original": {
@ -457,13 +473,28 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
+    "nixpkgs-24_11": {
      "locked": {
-        "lastModified": 1716948383,
-        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
+        "lastModified": 1734083684,
+        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-24.11",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
        "type": "github"
      },
      "original": {
@ -490,16 +521,16 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1717144377,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "lastModified": 1735669367,
+        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
        "type": "indirect"
      }
    },
@ -508,29 +539,76 @@
        "devshell": "devshell",
        "flake-compat": "flake-compat_3",
        "flake-parts": "flake-parts",
-        "flake-root": "flake-root",
        "git-hooks": "git-hooks",
        "home-manager": "home-manager_3",
        "nix-darwin": "nix-darwin",
        "nixpkgs": [
          "nixpkgs"
        ],
+        "nuschtosSearch": "nuschtosSearch",
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1717188043,
-        "narHash": "sha256-qg8Tq7OcKtc0BS4RVUYrMZ+KofgMv6DiXOnqz7TN8CA=",
+        "lastModified": 1735389157,
+        "narHash": "sha256-3co5A7PUEN+Bm7b3/6BxFsmvplg3XYUNR2MzWnheZoE=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "1bbd58b6b293840716355e63fb3d5aa5af00d389",
+        "rev": "c8fa65c6ac35dba157de0873d645ab398c370123",
        "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": 1733773348,
+        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735049224,
+        "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "agenix": "agenix",
@ -539,11 +617,13 @@
        "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",
        "secrets": "secrets",
        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
      }
@ -551,11 +631,11 @@
    "secrets": {
      "flake": false,
      "locked": {
-        "lastModified": 1716018239,
-        "narHash": "sha256-Ai13Sbj4DzuQSIrX2rjO0PG6PPpmvfwbCpTxX0kB7FI=",
+        "lastModified": 1730732927,
+        "narHash": "sha256-t3MTEgi6O7DMxMjdi3xcTAztLDQmEtqQ+oU+ZbWz2AI=",
        "ref": "refs/heads/master",
-        "rev": "c2adb575ca3a816287c7d8f3c23cde6dfd316e6f",
-        "revCount": 19,
+        "rev": "4ae2ac777c38f60a29384b70c456f41847cdf1b5",
+        "revCount": 28,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
      },
@ -609,29 +689,14 @@
        "type": "github"
      }
    },
-    "systems_4": {
-      "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": 1710774977,
-        "narHash": "sha256-nQBz2PW3YF3+RTflPzDoAcs6vH1PTozESIYUGAwvSdA=",
+        "lastModified": 1732643121,
+        "narHash": "sha256-i0Uo5EN45rlGuR85hvPet43zW/thOQTwHypVg9shTHU=",
        "owner": "rafaelmardojai",
        "repo": "thunderbird-gnome-theme",
-        "rev": "65d5c03fc9172d549a3ea72fd366d544981a002b",
+        "rev": "1994e7ec0649053e2a0811973245758d41e33f5f",
        "type": "github"
      },
      "original": {
@ -648,11 +713,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1715940852,
-        "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
+        "lastModified": 1735135567,
+        "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
+        "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
        "type": "github"
      },
      "original": {
@ -678,24 +743,6 @@
        "repo": "flake-utils",
        "type": "github"
      }
-    },
-    "utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -2,7 +2,7 @@
  description = "NixOS system configuration";

  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
    # nixpkgs-master.url = "nixpkgs";
    agenix.url = "github:ryantm/agenix";
@ -12,7 +12,7 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/release-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    firefox-gnome-theme = {
@ -23,15 +23,24 @@
      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";
+      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";
+    };
    secrets = {
      url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
      flake = false;
@ -42,64 +51,60 @@
    };
  };

-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, agenix, deploy-rs, disko, home-manager, nixos-hardware, nixos-mailserver, 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";
+      forEverySystem = lib.getAttrs lib.systems.flakeExposed;
+      forEachSystem = lib.genAttrs [
+        "x86_64-linux"
+        "aarch64-linux"
      ];
-      commonModules = [
-        agenix.nixosModules.age
-        disko.nixosModules.disko
-        nixos-mailserver.nixosModule
-        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"; };
-        mail = mkNixosSystem { system = "x86_64-linux"; name = "mail"; };
-        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;
      };

+      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}
+            ];
+          }))
+      ];
+
      devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
        buildInputs = [
-          deploy-rs.packages.x86_64-linux.deploy-rs
+          inputs.agenix.packages.x86_64-linux.agenix
+          inputs.deploy-rs.packages.x86_64-linux.deploy-rs
        ];
      };

@ -107,35 +112,15 @@
        magicRollback = true;
        autoRollback = true;
        sshUser = "root";
-        nodes = {
-          mail = {
-            hostname = "mail.mesh.vimium.net";
-
-            profiles.system = {
-              user = "root";
-              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.mail;
-            };
-          };
-          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;
+      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
    };
 }

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

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

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

+  virtualisation.virtualbox.host.enable = true;
+  users.extraGroups.vboxusers.members = [ "jordan" ];
+
  modules = {
    desktop = {
      apps = {
--- a/hosts/common.nix
+++ b/hosts/common.nix
@ -1,6 +1,22 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, self, ... }:

 {
+  imports = [
+    self.inputs.agenix.nixosModules.age
+    self.inputs.home-manager.nixosModule
+    ../modules
+  ];
+
+  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 +31,7 @@
    LC_TELEPHONE = "en_GB.UTF-8";
    LC_TIME = "en_GB.UTF-8";
  };
-  
+
  console.keyMap = "uk";

  security.sudo.execWheelOnly = true;
@ -38,10 +54,21 @@
  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;
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@ -1,14 +1,17 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:

 {
  imports = [
    ./common.nix
  ];

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

-  sound.enable = true;
  hardware.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
@ -30,6 +33,7 @@
      "nocto"
      "ro"
      "x-systemd.automount"
+      "x-systemd.requires=tailscaled.service"
      "noauto"
    ];
  };
@ -58,7 +62,7 @@
    fd
    ffmpeg
    iotop
-    unstable.nix-du
+    # unstable.nix-du
    # unstable.nix-melt
    unstable.nix-tree
    unstable.nix-visualize
--- a/hosts/eos/default.nix
+++ b/hosts/eos/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, ... }:

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

+  nixpkgs.hostPlatform = "x86_64-linux";
+
  boot.loader = {
    systemd-boot.enable = true;
    efi.canTouchEfiVariables = true;
--- a/hosts/eos/hardware-configuration.nix
+++ b/hosts/eos/hardware-configuration.nix
@ -7,11 +7,12 @@

  boot = {
    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-    initrd.kernelModules = [ ];
    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, ... }:
+{ config, ... }:

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

+  nixpkgs.hostPlatform = "x86_64-linux";
+
  boot = {
    loader.grub = {
      enable = true;
--- a/hosts/hypnos/default.nix
+++ b/hosts/hypnos/default.nix
@ -1,12 +1,21 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, self, ... }:

 {
  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,13 +23,26 @@

  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.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";
+
  modules = {
    desktop = {
      browsers = {
        firefox.enable = true;
      };
-      gnome.enable = lib.mkForce false;
-      kde.enable = true;
      media.recording = {
        audio.enable = true;
      };
--- a/hosts/hypnos/hardware-configuration.nix
+++ b/hosts/hypnos/hardware-configuration.nix
@ -7,14 +7,15 @@

  boot = {
    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" ];
-    kernelPatches = [
-      {
-        name = "spoof-mac-os-x";
-        patch = ./0001-Add-apple_set_os-EFI-boot-service.patch;
-      }
+    extraModulePackages = [
+      config.boot.kernelPackages.broadcom_sta
+      config.boot.kernelPackages.nvidiaPackages.legacy_470
    ];
-    extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
  };

  networking.useDHCP = lib.mkDefault true;
@ -23,19 +24,18 @@

  hardware = {
    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    opengl = {
+    nvidia = {
+      package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
+      modesetting.enable = true;
+      powerManagement.enable = true;
+    };
+    graphics = {
      enable = true;
      extraPackages = with pkgs; [
-        intel-vaapi-driver
-        intel-media-driver
        libvdpau-va-gl
      ];
-      driSupport = true;
+      enable32Bit = true;
    };
  };
-
-  environment.variables = {
-    VDPAU_DRIVER = "va_gl";
-  };
 }

--- 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,7 +15,6 @@ with lib.my;
  };

  networking = {
-    domain = "mesh.vimium.net";
    hostId = "d24ae953";
    firewall = {
      enable = true;
@ -22,7 +22,6 @@ with lib.my;
        22  # SSH
      ];
    };
-    networkmanager.enable = true;
  };

  services.zfs = {
@ -44,6 +43,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;
@ -60,7 +70,7 @@ with lib.my;
    };
    scrapeConfigs = [
      {
-        job_name = "library";
+        job_name = "node";
        static_configs = [{
          targets = [
            "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
@ -146,7 +156,19 @@ with lib.my;
    };
  };

-  services.jellyfin.enable = true;
+  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";
+  };

  modules = {
    podman.enable = true;
@ -160,6 +182,7 @@ with lib.my;
      borgmatic = {
        enable = true;
        directories = [
+          config.services.jellyfin.dataDir
          "/home/jordan"
        ];
        repoPath = "ssh://b61758r4@b61758r4.repo.borgbase.com/./repo";
--- a/hosts/mail/default.nix
+++ b/hosts/mail/default.nix
@ -1,15 +1,17 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, self, ... }:

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

+  nixpkgs.hostPlatform = "x86_64-linux";
+
  networking = {
    hostId = "08ac2f14";
-    domain = "mesh.vimium.net";
    firewall = {
      enable = true;
      allowedTCPPorts = [
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, ... }:

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

+  nixpkgs = {
+    hostPlatform = "x86_64-linux";
+    config = {
+      allowUnfree = true;
+      nvidia.acceptLicense = true;
+    };
+  };
+
  boot.loader = {
    systemd-boot = {
      enable = true;
@ -67,6 +75,7 @@
        audio.enable = true;
        video.enable = true;
      };
+      office.libreoffice.enable = true;
    };
    dev = {
      node.enable = true;
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/hosts/odyssey/hardware-configuration.nix
@ -19,6 +19,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,13 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, 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 +98,7 @@
    ];
  };

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

  security.rtkit.enable = true;
  services.pipewire = {
@ -107,111 +108,6 @@
    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 = {
      wireless = {
@ -222,12 +118,9 @@
    services = {
      borgmatic = {
        enable = true;
-        directories = [
-          "/var/lib/mosquitto"
-          "/var/lib/zigbee2mqtt"
-        ];
        repoPath = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo";
      };
+      home-assistant.enable = true;
    };
  };

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

 {
  imports = [
@ -6,6 +6,40 @@
  ];

  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" ];
    tmp.cleanOnBoot = true;
@ -14,9 +48,24 @@
  # Fix missing modules
  # https://github.com/NixOS/nixpkgs/issues/154163
  nixpkgs.overlays = [
-    (final: super: {
+    (final: prev: {
      makeModulesClosure = x:
-        super.makeModulesClosure (x // { allowMissing = true; });
+        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;
+            };
+          };
+        };
    })
  ];

--- a/hosts/server.nix
+++ b/hosts/server.nix
@ -18,13 +18,13 @@
        webroot = "/var/lib/acme/acme-challenge";
      };
    };
-    auditd.enable = true;
-    audit = {
-      enable = true;
-      rules = [
-        "-a exit,always -F arch=b64 -S execve"
-      ];
-    };
+    # auditd.enable = true;
+    # audit = {
+    #   enable = true;
+    #   rules = [
+    #     "-a exit,always -F arch=b64 -S execve"
+    #   ];
+    # };
  };

  systemd = {
--- a/hosts/skycam/README.md
+++ b/hosts/skycam/README.md
@ -0,0 +1,29 @@
+# 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,111 @@
+{ 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,33 @@
+{ config, 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/default.nix
+++ b/hosts/vps1/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, pkgs, lib, ... }:

 {
  imports = [
@ -6,9 +6,10 @@
    ../server.nix
  ];

+  nixpkgs.hostPlatform = "x86_64-linux";
+
  networking = {
    hostId = "08bf6db3";
-    domain = "mesh.vimium.net";
    firewall = {
      enable = true;
      allowedTCPPorts = [
@ -36,11 +37,49 @@
    groups = {
      jellyfin = { };
    };
+    extraGroups.acme.members = [ "kanidm" "nginx" ];
  };

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

-  modules = {
+  security.acme.certs."auth.vimium.com" = {
+    postRun = "systemctl restart kanidm.service";
+    group = "acme";
+  };
+
+  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 = "[::1]:3013";
+      ldapbindaddress = "[::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://[::1]:3013";
+      };
+    };
+  };
+
+  modules = rec {
+    databases.postgresql.enable = true;
    services = {
      borgmatic = {
        enable = true;
@ -51,10 +90,21 @@
        ];
        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 = databases.postgresql.enable;
+      };
      nginx.enable = true;
      photoprism.enable = true;
    };
--- a/modules/databases/postgresql.nix
+++ b/modules/databases/postgresql.nix
@ -0,0 +1,40 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.modules.databases.postgresql;
+in {
+  options.modules.databases.postgresql = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.postgresql = {
+      enable = true;
+      initdbArgs = [
+        "--allow-group-access"
+        "--encoding=UTF8"
+        "--locale=C"
+      ];
+      settings = {
+        log_connections = true;
+        log_disconnections = true;
+        log_destination = lib.mkForce "syslog";
+      };
+    };
+
+    services.borgmatic.settings = {
+      postgresql_databases = [
+        {
+          name = "all";
+        }
+      ];
+    };
+  };
+}
--- a/modules/default.nix
+++ b/modules/default.nix
@ -2,7 +2,9 @@
  imports = [
    ./options.nix
    ./podman.nix
+    ./databases/postgresql.nix
    ./desktop/gnome.nix
+    ./desktop/forensics.nix
    ./desktop/hyprland.nix
    ./desktop/kde.nix
    ./desktop/mimeapps.nix
@ -10,6 +12,7 @@
    ./desktop/apps/slack.nix
    ./desktop/apps/thunderbird.nix
    ./desktop/apps/zoom.nix
+    ./desktop/browsers/brave.nix
    ./desktop/browsers/firefox.nix
    ./desktop/gaming/emulators.nix
    ./desktop/gaming/lutris.nix
@ -29,6 +32,7 @@
    ./editors/neovim
    ./editors/vscode.nix
    ./hardware/presonus-studio.nix
+    ./networking/netbird.nix
    ./networking/tailscale.nix
    ./networking/wireless.nix
    ./security/gpg.nix
@ -39,8 +43,9 @@
    ./services/gitea
    ./services/gitea-runner
    ./services/headscale
+    ./services/home-assistant
    ./services/mail
-    ./services/matrix-synapse
+    ./services/matrix
    ./services/nginx
    ./services/photoprism
    ./shell/git
--- a/modules/desktop/apps/thunderbird.nix
+++ b/modules/desktop/apps/thunderbird.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, self, ... }:

 let cfg = config.modules.desktop.apps.thunderbird;
 in {
@ -10,7 +10,7 @@ in {
  };
  
  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/desktop/browsers/brave.nix
+++ b/modules/desktop/browsers/brave.nix
@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.desktop.browsers.brave;
+in {
+  options.modules.desktop.browsers.brave = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      brave
+    ];
+  };
+}
--- a/modules/desktop/browsers/firefox.nix
+++ b/modules/desktop/browsers/firefox.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, self, ... }:

 let cfg = config.modules.desktop.browsers.firefox;
 in {
@ -10,7 +10,7 @@ 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 +35,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 +154,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 +203,10 @@ in {
          "browser.pocket.useLocaleList" = false;
          "brwoser.pocket.enabledLocales" = "";

+          ## Plugins
+          "plugin.state.flash" = 0;
+          "plugin.state.java" = 0;
+
          ## Misc
          "browser.selfsupport.url" = "";
        };
--- a/modules/desktop/forensics.nix
+++ b/modules/desktop/forensics.nix
@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.desktop.forensics;
+in {
+  options.modules.desktop.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/desktop/gaming/lutris.nix
+++ b/modules/desktop/gaming/lutris.nix
@ -21,10 +21,9 @@ in {
      vulkan-tools
    ];

-    hardware.opengl = {
+    hardware.graphics = {
      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
    };
  };
 }
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, self, ... }:

 let cfg = config.modules.desktop.gnome;
 in {
@ -21,38 +21,106 @@ in {

    programs.dconf.enable = true;
    dconf.settings = {
+      "io/github/celluloid-player/celluloid" = {
+        draggable-video-area-enable = true;
+      };
+      "org/gnome/Console" = {
+        font-scale = 1.4;
+        use-system-font = false;
+        custom-font = "ComicShannsMono Nerd Font 10";
+      };
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+        cursor-theme = "Adwaita";
+        enable-hot-corners = false;
+        font-name = "Cantarell 11";
+        gtk-theme = "adw-gtk3-dark";
+        icon-theme = "MoreWaita";
+        monospace-font-name = "UbuntuMono Nerd Font 11";
+        toolbar-style = "both-horiz";
+      };
+      "org/gnome/desktop/peripherals/touchpad" = {
+        tap-to-click = true;
+      };
+      "org/gnome/desktop/sound" = {
+        theme-name = "freedesktop";
+      };
+      "org/gnome/desktop/search-providers" = {
+        disabled = [ "org.gnome.Epiphany.desktop" ];
+      };
+      "org/gnome/desktop/wm/keybindings" = {
+        switch-group = [ "<Super>grave" ];
+        switch-group-backward = [ "<Shift><Super>grave" ];
+      };
+      "org/gnome/desktop/wm/preferences" = {
+        button-layout = "appmenu:close";
+      };
+      "org/gnome/gnome-session" = {
+        auto-save-session = true;
+      };
+      "org/gnome/gnome-system-monitor" = {
+        show-dependencies = true;
+      };
+      "org/gnome/mutter" = {
+        center-new-windows = true;
+        edge-tiling = true;
+        experimental-features = [ "scale-monitor-framebuffer" ];
+      };
+      "org/gnome/Ptyxis" = {
+        use-system-font = false;
+        font-name = "ComicShannsMono Nerd Font 11";
+        audible-bell = false;
+      };
+      "org/gnome/settings-daemon/plugins/media-keys" = {
+        volume-up = [
+          "<Shift>F12"
+          "XF86AudioRaiseVolume"
+        ];
+        volume-down = [
+          "<Shift>F11"
+          "XF86AudioLowerVolume"
+        ];
+      };
      "org/gnome/shell" = {
        disable-user-extensions = false;
        enabled-extensions = [
-          # "another-window-session-manager@gmail.com"
+          "appindicatorsupport@rgcjonas.gmail.com"
+          # "arcmenu@arcmenu.com"
          "blur-my-shell@aunetx"
          "burn-my-windows@schneegans.github.com"
+          "clipboard-indicator@tudmotu.com"
+          "CoverflowAltTab@palatis.blogspot.com"
+          # "dash-to-panel@jderose9.github.com"
          # "desktop-cube@schneegans.github.com"
-          # "desktop-zoom@colin.kinlo.ch"
+          # "EasyScreenCast@iacopodeenosee.gmail.com"
          "espresso@coadmunkee.github.com"
-          # "flypie@schneegans.github.com"
+          "flypie@schneegans.github.com"
          # "forge@jmmaranan.com"
-          "hue-lights@chlumskyvaclav@gmail.com"
+          "gsconnect@andyholmes.github.io"
+          # "gSnap@micahosborne"
+          "hidetopbar@mathieu.bidon.ca"
          "just-perfection-desktop@just-perfection"
+          # "mediacontrols@cliffniff.github.com"
+          # "mousefollowsfocus@matthes.biz"
          # "pano@elhan.io"
          # "paperwm@hedning:matrix.org"
+          "pip-on-top@rafostar.github.com"
          # "search-light@icedman.github.com"
-          "space-bar@luchrioh"
          # "smart-auto-move@khimaros.com"
-          # "systemd-manager@hardpixel.eu"
-          # "tailscale-status@maxgallup.github.com"
+          "space-bar@luchrioh"
          # "tiling-assistant@leleat-on-github"
+          "tilingshell@ferrarodomenico.com"
          "Vitals@CoreCoding.com"
+          "windowIsReady_Remover@nunofarruca@gmail.com"
+          # "worksets@blipk.xyz"
          # "wsmatrix@martin.zurowietz.de"
        ];
        favorite-apps = [
          "firefox.desktop"
          "org.gnome.Nautilus.desktop"
+          "org.gnome.Ptyxis.desktop"
        ];
      };
-      "org/gnome/shell/extensions/another-window-session-manager" = {
-        enable-autorestore-sessions = true;
-      };
      "org/gnome/shell/extensions/blur-my-shell/panel" = {
        static-blur = true;
      };
@ -64,8 +132,14 @@ in {
        glide-open-effect = true;
        glide-close-effect = true;
      };
-      "org/gnome/shell/extensions/desktop-zoom" = {
-        mag-factor-delta = 0.07;
+      "org/gnome/shell/extensions/dash-to-panel" = {
+        intellihide = true;
+        panel-positions = ''
+          {"0":"TOP"}
+        '';
+        trans-panel-opacity = 0.3;
+        trans-use-custom-opacity = true;
+        trans-use-dynamic-opacity = true;
      };
      "org/gnome/shell/extensions/espresso" = {
        enable-fullscreen = true;
@ -75,18 +149,32 @@ in {
          "com.obsproject.Studio.desktop"
        ];
      };
-      "org/gnome/shell/extensions/paperwm" = {
-        use-default-background = true;
+      "org/gnome/shell/extensions/flypie" = {
+        preview-on-right-side = true;
      };
      "org/gnome/shell/extensions/forge" = {
        window-gap-size = 8;
        window-gap-hidden-on-single = false;
      };
+      "org/gnome/shell/extensions/hidetopbar" = {
+        mouse-sensitive = true;
+        mouse-sensitive-fullscreen-window = true;
+        enable-active-window = false;
+      };
      "org/gnome/shell/extensions/just-perfection" = {
        activities-button = false;
        window-demands-attention-focus = true;
        workspace-wrap-around = true;
      };
+      "org/gnome/shell/extensions/paperwm" = {
+        use-default-background = true;
+      };
+      "org/gnome/shell/extensions/pip-on-top" = {
+        stick = true;
+      };
+      "org/gnome/shell/extensions/search-light" = {
+        popup-at-cursor-monitor = true;
+      };
      "org/gnome/shell/extensions/space-bar/behavior" = {
        enable-activate-workspace-shortcuts = true;
        show-empty-workspaces = true;
@ -99,15 +187,10 @@ in {
        screen-left-gap = 8;
        window-gap = 8;
      };
-      "org/gnome/desktop/background" = {
-        picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.jxl";
-        picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.jxl";
-      };
-      "org/gnome/desktop/peripherals/touchpad" = {
-        tap-to-click = true;
-      };
-      "org/gnome/desktop/search-providers" = {
-        disabled = [ "org.gnome.Epiphany.desktop" ];
+      "org/gnome/shell/extensions/tilingshell" = {
+        inner-gaps = 16;
+        outer-gaps = 8;
+        enable-blur-snap-assistant = true;
      };
      "org/gtk/settings/file-chooser" = {
        show-hidden = true;
@ -117,44 +200,18 @@ in {
        show-hidden = true;
        sort-directories-first = true;
      };
-      "org/gnome/settings-daemon/plugins/media-keys" = {
-        volume-up = [
-          "<Shift>F12"
-          "XF86AudioRaiseVolume"
-        ];
-        volume-down = [
-          "<Shift>F11"
-          "XF86AudioLowerVolume"
-        ];
-      };
-      "org/gnome/gnome-session" = {
-        auto-save-session = true;
-      };
-      "org/gnome/gnome-system-monitor" = {
-        show-dependencies = true;
-      };
-      "org/gnome/Console" = {
-        font-scale = 1.4;
-        use-system-font = false;
-        custom-font = "ComicShannsMono Nerd Font 10";
-      };
-      "org/gnome/mutter" = {
-        center-new-windows = true;
-        edge-tiling = true;
-        experimental-features = [ "scale-monitor-framebuffer" ];
-      };
-      "org/gnome/desktop/interface" = {
-        enable-hot-corners = false;
-        icon-theme = "MoreWaita";
-        monospace-font-name = "UbuntuMono Nerd Font 11";
-      };
-      "org/gnome/desktop/wm/keybindings" = {
-        switch-group = [ "<Super>grave" ];
-        switch-group-backward = [ "<Shift><Super>grave" ];
-      };
-      "io/github/celluloid-player/celluloid" = {
-        draggable-video-area-enable = true;
+    };
+
+    environment.sessionVariables = {
+      QT_STYLE_OVERRIDE = lib.mkForce "kvantum";
+      QT_WAYLAND_DECORATION = lib.mkForce "adwaita";
+    };
+
+    home.configFile = {
+      "Kvantum/kvantum.kvconfig".text = lib.generators.toINI {} {
+        General.theme = "KvLibadwaitaDark";
      };
+      "Kvantum/KvLibadwaita".source = "${self.inputs.kvlibadwaita}/src/KvLibadwaita";
    };

    user.packages = with pkgs; [
@ -165,7 +222,8 @@ in {
      # d-spy
      # drawing
      # fragments
-      gnome.ghex
+      dconf-editor
+      ghex
      # gnome-builder
      gnome-decoder
      gnome-firmware
@ -173,49 +231,60 @@ in {
      # gnome-obfuscate
      gnome-podcasts
      identity
-      mission-center
+      # mission-center
+      mousam
      newsflash
+      ptyxis
      # schemes
      shortwave
-    ];
-
-    environment.systemPackages = with pkgs; [
-      adw-gtk3
-      gnome.gnome-boxes
-      gnomeExtensions.another-window-session-manager
-      # gnomeExtensions.bifocals
-      gnomeExtensions.blur-my-shell
-      gnomeExtensions.browser-tabs
-      gnomeExtensions.burn-my-windows
-      gnomeExtensions.desktop-cube
-      # gnomeExtensions.desktop-zoom
-      gnomeExtensions.espresso
-      gnome44Extensions."flypie@schneegans.github.com"
-      # gnomeExtensions.forge
-      # gnomeExtensions.gsnap
-      gnomeExtensions.hue-lights
-      gnomeExtensions.just-perfection
-      # gnomeExtensions.mutter-primary-gpu
-      gnomeExtensions.pano
-      gnomeExtensions.paperwm
-      # gnomeExtensions.pip-on-top
-      gnomeExtensions.rounded-window-corners
-      gnomeExtensions.search-light
-      gnomeExtensions.smart-auto-move
-      gnomeExtensions.space-bar
-      gnomeExtensions.systemd-manager
-      gnomeExtensions.tailscale-status
-      gnomeExtensions.tiling-assistant
-      # gnomeExtensions.todotxt
-      gnomeExtensions.vitals
-      # gnomeExtensions.window-is-ready-remover
-      # gnomeExtensions.worksets
-      # gnomeExtensions.workspace-matrix
-      unstable.morewaita-icon-theme
+      sysprof
    ] ++ (if config.virtualisation.podman.enable then [
      pods
    ] else []);

+    environment.systemPackages = with pkgs.unstable; [
+      adw-gtk3
+      kdePackages.qtstyleplugin-kvantum
+      libsForQt5.qtstyleplugin-kvantum
+      morewaita-icon-theme
+      nautilus-python
+      qadwaitadecorations
+      qadwaitadecorations-qt6
+
+      ## Shell extensions
+      gnomeExtensions.appindicator
+      gnomeExtensions.arcmenu
+      gnomeExtensions.blur-my-shell
+      gnomeExtensions.burn-my-windows
+      gnomeExtensions.clipboard-indicator
+      gnomeExtensions.coverflow-alt-tab
+      gnomeExtensions.dash-to-panel
+      gnomeExtensions.desktop-cube
+      gnomeExtensions.easyScreenCast
+      gnomeExtensions.espresso
+      gnomeExtensions.fly-pie
+      gnomeExtensions.forge
+      gnomeExtensions.gsconnect
+      gnomeExtensions.gsnap
+      gnomeExtensions.hide-top-bar
+      gnomeExtensions.just-perfection
+      gnomeExtensions.media-controls
+      gnomeExtensions.mouse-follows-focus
+      # gnomeExtensions.pano (disabled due to: https://github.com/NixOS/nixpkgs/issues/369438)
+      gnomeExtensions.paperwm
+      gnomeExtensions.pip-on-top
+      gnomeExtensions.search-light
+      gnomeExtensions.smart-auto-move
+      gnomeExtensions.space-bar
+      gnomeExtensions.tiling-assistant
+      gnomeExtensions.tiling-shell
+      gnomeExtensions.todotxt
+      gnomeExtensions.vitals
+      gnomeExtensions.window-is-ready-remover
+      gnomeExtensions.worksets
+      gnomeExtensions.workspace-matrix
+    ];
+
    home.services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
  };
 }
--- a/modules/desktop/kde.nix
+++ b/modules/desktop/kde.nix
@ -10,13 +10,15 @@ in {
  };

  config = lib.mkIf cfg.enable {
-    services.xserver = {
-      enable = true;
+    services = {
+      xserver = {
+        enable = true;
+      };
+      desktopManager.plasma6.enable = true;
      displayManager.sddm = {
        enable = true;
        wayland.enable = true;
      };
-      desktopManager.plasma5.enable = true;
    };

    networking.networkmanager.enable = true;
--- a/modules/desktop/office/libreoffice.nix
+++ b/modules/desktop/office/libreoffice.nix
@ -1,6 +1,24 @@
 { config, lib, pkgs, ... }:

-let cfg = config.modules.desktop.office.libreoffice;
+let
+  cfg = config.modules.desktop.office.libreoffice;
+  # 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;
+  #     };
+  #   });
+  # };
 in {
  options.modules.desktop.office.libreoffice = {
    enable = lib.mkOption {
--- a/modules/editors/neovim/default.nix
+++ b/modules/editors/neovim/default.nix
@ -11,7 +11,7 @@ in {
  };

  config = lib.mkIf cfg.enable {
-    home.programs.nixvim = {
+    home.programs.nixvim.config = {
      enable = true;
      defaultEditor = true;

@ -59,15 +59,15 @@ in {
          eslint.enable = true;
          gopls.enable = true;
          html.enable = true;
-          lua-ls.enable = true;
+          lua_ls.enable = true;
          pylsp.enable = true;
          nixd.enable = true;
-          rust-analyzer = {
+          rust_analyzer = {
            enable = true;
            installCargo = true;
            installRustc = true;
          };
-          tsserver.enable = true;
+          ts_ls.enable = true;
        };
      };

@ -108,7 +108,7 @@ in {
        nixvimInjections = true;

        folding = true;
-        indent = true;
+        settings.indent.enable = true;
      };

      plugins.treesitter-refactor = {
@ -121,6 +121,8 @@ in {

      plugins.undotree.enable = true;

+      plugins.web-devicons.enable = true;
+
      # plugins.gitsigns.enable = true;
      # plugins.gitgutter.enable = true;
      # plugins.goyo.enable = true;
--- a/modules/networking/netbird.nix
+++ b/modules/networking/netbird.nix
@ -0,0 +1,70 @@
+{ config, lib, self, ... }:
+
+let
+  cfg = config.modules.networking.netbird;
+  hostname = config.networking.hostName;
+in {
+  options.modules.networking.netbird = {
+    enable = lib.mkEnableOption "netbird";
+    coordinatorDomain = lib.mkOption {
+      type = lib.types.str;
+      default = "netbird.vimium.net";
+    };
+    meshDomain = lib.mkOption {
+      type = lib.types.str;
+      default = "mesh.vimium.net";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    age.secrets."passwords/services/netbird/data-store-encryption-key" = {
+      file = "${self.inputs.secrets}/passwords/services/netbird/data-store-encryption-key.age";
+    };
+
+    services.netbird = {
+      enable = true;
+    };
+
+    services.netbird.server = {
+      domain = cfg.coordinatorDomain;
+      enable = true;
+      enableNginx = true;
+      dashboard.settings = {
+        AUTH_AUTHORITY = "https://auth.vimium.com/oauth2/openid/netbird";
+      };
+      management = rec {
+        disableAnonymousMetrics = true;
+        dnsDomain = cfg.meshDomain;
+        oidcConfigEndpoint = "https://auth.vimium.com/oauth2/openid/netbird/.well-known/openid-configuration";
+        settings = {
+          DataStoreEncryptionKey = {
+            _secret = config.age.secrets."passwords/services/netbird/data-store-encryption-key".path;
+          };
+          HttpConfig = {
+            AuthAudience = "netbird";
+          };
+          StoreConfig = { Engine = "sqlite"; };
+          TURNConfig = {
+            Secret._secret = config.age.secrets."passwords/services/coturn/static-auth-secret".path;
+            TimeBasedCredentials = true;
+          };
+          PKCEAuthorizationFlow.ProviderConfig = {
+            AuthorizationEndpoint = "https://auth.vimium.com/ui/oauth2";
+            TokenEndpoint = "https://auth.vimium.com/oauth2/token";
+          };
+        };
+        singleAccountModeDomain = dnsDomain;
+        turnDomain = config.services.coturn.realm;
+        turnPort = config.services.coturn.listening-port;
+      };
+    };
+
+    systemd.services.netbird-signal.serviceConfig.RestartSec = "60";
+    systemd.services.netbird-management.serviceConfig.RestartSec = "60";
+
+    services.nginx.virtualHosts."netbird.vimium.net" = {
+      enableACME = true;
+      forceSSL = true;
+    };
+  };
+}
--- a/modules/networking/tailscale.nix
+++ b/modules/networking/tailscale.nix
@ -1,4 +1,4 @@
-{ config, inputs, lib, pkgs, ... }:
+{ config, lib, pkgs, self, ... }:

 let
  cfg = config.modules.networking.tailscale;
@ -18,7 +18,7 @@ in {

  config = lib.mkIf cfg.enable {
    age.secrets."passwords/services/tailscale/${hostname}-authkey" = {
-      file = "${inputs.secrets}/passwords/services/tailscale/${hostname}-authkey.age";
+      file = "${self.inputs.secrets}/passwords/services/tailscale/${hostname}-authkey.age";
    };

    environment.systemPackages = [ pkgs.tailscale ];
--- a/modules/networking/wireless.nix
+++ b/modules/networking/wireless.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, self, ... }:

 with lib;

@ -19,16 +19,16 @@ in {

  config = mkIf cfg.enable {
    age.secrets."passwords/networks" = {
-      file = "${inputs.secrets}/passwords/networks.age";
+      file = "${self.inputs.secrets}/passwords/networks.age";
    };

    networking = {
      wireless = {
        enable = true;
        interfaces = cfg.interfaces;
-        environmentFile = config.age.secrets."passwords/networks".path;
+        secretsFile = config.age.secrets."passwords/networks".path;
        networks = {
-          "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
+          "Apollo 600 Mbps".pskRaw = "ext:PSK_APOLLO";
        };
      };
      networkmanager.ensureProfiles.profiles = {
--- a/modules/options.nix
+++ b/modules/options.nix
@ -1,4 +1,4 @@
-{ config, options, lib, home-manager, inputs, ... }:
+{ config, options, lib, self, ... }:

 with lib;
 {
@ -29,14 +29,14 @@ with lib;
  };

  config = {
-    age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";
+    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 = [ "networkmanager" "wheel" "lxd" ];
+        extraGroups = [ "audio" "networkmanager" "wheel" "lxd" ];
        description = "Jordan Holt";
        useDefaultShell = true;
        openssh.authorizedKeys.keys = [
@ -68,7 +68,8 @@ with lib;
      };

      sharedModules = [
-        inputs.nixvim.homeManagerModules.nixvim
+        self.inputs.nixvim.homeManagerModules.nixvim
+        self.inputs.plasma-manager.homeManagerModules.plasma-manager
      ];
    };

--- a/modules/services/borgmatic/default.nix
+++ b/modules/services/borgmatic/default.nix
@ -1,35 +1,33 @@
-{ config, lib, pkgs, inputs, ... }:
-
-with lib;
+{ config, lib, self, ... }:

 let
  cfg = config.modules.services.borgmatic;
  hostname = config.networking.hostName;
 in {
  options.modules.services.borgmatic = {
-    enable = mkOption {
+    enable = lib.mkOption {
      default = false;
      example = true;
-      description = mdDoc "Enable backups on this host with `borgmatic`";
+      description = lib.mdDoc "Enable backups on this host with `borgmatic`";
    };
-    directories = mkOption {
-      type = types.listOf types.str;
+    directories = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
      default = [];
      example = [
        "/home/jordan/Documents"
      ];
-      description = mdDoc "List of directories to backup";
+      description = lib.mdDoc "List of directories to backup";
    };
-    repoPath = mkOption {
-      type = types.str;
+    repoPath = lib.mkOption {
+      type = lib.types.str;
      example = "ssh://example@example.repo.borgbase.com/./repo";
-      description = mdDoc "Destination borg repository for backup";
+      description = lib.mdDoc "Destination borg repository for backup";
    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    age.secrets."passwords/services/borg/${hostname}-passphrase" = {
-      file = "${inputs.secrets}/passwords/services/borg/${hostname}-passphrase.age";
+      file = "${self.inputs.secrets}/passwords/services/borg/${hostname}-passphrase.age";
    };

    services.borgmatic = {
@ -47,6 +45,16 @@ in {
      };
    };

+    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/services/coturn/default.nix
+++ b/modules/services/coturn/default.nix
@ -1,60 +1,118 @@
-{ config, lib, pkgs, inputs, ... }:
-
-with lib;
+{ config, lib, self, ... }:

 let
  cfg = config.modules.services.coturn;
 in {
  options.modules.services.coturn = {
-    enable = mkOption {
+    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 = mkIf cfg.enable {
-    networking.firewall = {
+  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
      ];
-      allowedUDPPortRanges = [
-        { from = 49152; to = 49999; } # TURN relay
+      allowedUDPPorts = [
+        3478  # TURN listener
+        5349  # TLS
+        5350  # TLS alt
      ];
+      allowedUDPPortRanges = range; # TURN peer relays
    };

    security.acme.certs = {
-      "turn.vimium.com" = {
+      "${config.services.coturn.realm}" = {
+        group = "turnserver";
        reloadServices = [ "coturn" ];
      };
    };

-    age.secrets."passwords/services/coturn/shared-secret" = {
-      file = "${inputs.secrets}/passwords/services/coturn/shared-secret.age";
-      owner = "turnserver";
-      group = "turnserver";
-    };
+    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 = {
+    services.coturn = rec {
      enable = true;
-      lt-cred-mech = true;
+      realm = cfg.realm;
      use-auth-secret = true;
-      static-auth-secret-file = config.age.secrets."passwords/services/coturn/shared-secret".path;
-      realm = "turn.vimium.com";
-      relay-ips = [
-        "198.244.190.160"
-      ];
+      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-loopback-peers
        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
      '';
-      secure-stun = true;
-      cert = "/var/lib/acme/turn.vimium.com/fullchain.pem";
-      pkey = "/var/lib/acme/turn.vimium.com/key.pem";
-      min-port = 49152;
-      max-port = 49999;
+    };
+
+    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/services/gitea-runner/default.nix
+++ b/modules/services/gitea-runner/default.nix
@ -1,4 +1,4 @@
-{ pkgs, config, lib, inputs, ... }:
+{ pkgs, config, lib, self, ... }:

 # Based on: https://git.clan.lol/clan/clan-infra/src/branch/main/modules/web01/gitea/actions-runner.nix

@ -176,7 +176,7 @@ in
    users.groups.nix-ci-user = { };

    age.secrets."files/services/gitea-runner/${hostname}-token" = {
-      file = "${inputs.secrets}/files/services/gitea-runner/${hostname}-token.age";
+      file = "${self.inputs.secrets}/files/services/gitea-runner/${hostname}-token.age";
      group = "podman";
    };

--- a/modules/services/gitea/default.nix
+++ b/modules/services/gitea/default.nix
@ -1,18 +1,17 @@
-{ config, lib, pkgs, inputs, ... }:
-
-with lib;
+{ config, lib, pkgs, self, ... }:

 let
  cfg = config.modules.services.gitea;
 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;
@ -31,7 +30,7 @@ in {
        };
      };
      virtualHosts = {
-        "git.vimium.com" = {
+        "${cfg.domain}" = {
          forceSSL = true;
          enableACME = true;
          locations."/".proxyPass = "http://gitea";
@ -41,9 +40,9 @@ 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' - - - - ${inputs.gitea-github-theme}/theme-github.css"
-      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-auto.css' - - - - ${inputs.gitea-github-theme}/theme-github-auto.css"
-      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-dark.css' - - - - ${inputs.gitea-github-theme}/theme-github-dark.css"
+      "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 {
@ -69,15 +68,15 @@ in {
          OFFLINE_MODE = true;
          PROTOCOL = "http+unix";
          SSH_USER = "git";
-          SSH_DOMAIN = "git.vimium.com";
+          SSH_DOMAIN = "${cfg.domain}";
          SSH_PORT = lib.head config.services.openssh.ports;
-          ROOT_URL = "https://git.vimium.com/";
+          ROOT_URL = "https://${cfg.domain}/";
        };
        service.DISABLE_REGISTRATION = true;
        session.COOKIE_SECURE = true;
        log = {
          ROOT_PATH = "${stateDir}/log";
-          DISABLE_ROUTER_LOG = true;
+          "logger.router.MODE" = "";
        };
        ui = {
          THEMES = "gitea,arc-green,github,github-auto,github-dark";
--- a/modules/services/headscale/default.nix
+++ b/modules/services/headscale/default.nix
@ -1,19 +1,17 @@
-{ config, lib, pkgs, inputs, ... }:
-
-with lib;
+{ config, lib, pkgs, ... }:

 let
  cfg = config.modules.services.headscale;
  fqdn = "headscale.vimium.net";
 in {
  options.modules.services.headscale = {
-    enable = mkOption {
+    enable = lib.mkOption {
      default = false;
      example = true;
    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    environment.systemPackages = [ pkgs.headscale ];

    services.headscale = {
@ -22,12 +20,33 @@ in {
      port = 8080;

      settings = {
+        policy.path = null;
        ip_prefixes = [
          "100.64.0.0/10"
        ];
        server_url = "https://${fqdn}";
-        dns_config = {
-          base_domain = "vimium.net";
+        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;
      };
--- a/modules/services/home-assistant/default.nix
+++ b/modules/services/home-assistant/default.nix
@ -0,0 +1,298 @@
+{ 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 = {
+          resources = [
+            {
+              url = "/local/nixos-lovelace-modulels/mushroom.js";
+              type = "module";
+            }
+          ];
+        };
+        media_player = [ ];
+        mobile_app = { };
+        onkyo = { };
+        open_meteo = { };
+        recorder = {
+          purge_keep_days = 365;
+        };
+        scene = "!include scenes.yaml";
+        script = "!include scripts.yaml";
+        sensor = [ ];
+        system_health = { };
+        zeroconf = { };
+      };
+
+      configDir = "/etc/home-assistant";
+
+      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
+      ];
+
+      customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
+        bubble-card
+        button-card
+        mushroom
+        sankey-chart
+        universal-remote-card
+        # zigbee2mqtt-networkmap
+      ];
+    };
+
+    systemd.services.home-assistant.preStart = lib.mkForce "";
+
+    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/modules/services/home-assistant/floorplan/default.nix
+++ b/modules/services/home-assistant/floorplan/default.nix
@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }: 
+
+let
+  cfg = config.modules.services.home-assistant;
+in {
+  config = lib.mkIf cfg.enable {
+    services.home-assistant = {
+      config.lovelace.resources = [{
+        url = "/local/nixos-lovelace-modules/floorplan.js";
+        type = "module";
+      }];
+      customLovelaceModules = [
+        pkgs.ha-floorplan
+      ];
+    };
+
+    environment.etc."home-assistant/www/floorplan/style.css".source = ./style.css;
+    environment.etc."home-assistant/www/floorplan/config.yaml".text = builtins.toJSON {
+      image = {
+        location = "/local/floorplan/beetham.svg";
+        cache = false;
+      };
+      stylesheet = {
+        location = "/local/floorplan/style.css";
+        cache = false;
+      };
+
+      defaults = {
+        hover_action = "hover-info";
+        hold_action = "toggle";
+        tap_action = "more-info";
+      };
+
+      rules = [
+        {
+          name = "Rooms";
+          entities = [
+            {
+              entity = "light.bedroom_lamps";
+              element = "area.bedroom";
+            }
+            {
+              entity = "light.hallway_spots";
+              element = "area.hallway";
+            }
+            {
+              entity = "light.living_room_lamps";
+              element = "area.livingroom";
+            }
+            {
+              entity = "light.office_lamps";
+              element = "area.office";
+            }
+          ];
+          tap_action = "light.toggle";
+          state_action = {
+            service = "floorplan.class_set";
+            service_data = ''
+              if (entity.state === "on") {
+                return "light-on";
+              }
+              return "light-off";
+            '';
+          };
+        }
+        {
+          name = "Temperature";
+          entities = [
+            "sensor.motion_sensor_temperature"
+          ];
+          state_action = [
+            {
+              service = "floorplan.text_set";
+              service_data = ''
+                if (!isNaN(entity.state)) {
+                  return Math.round(entity.state * 10) / 10 + "°";
+                }
+                return "Unknown";
+              '';
+            }
+            {
+              service = "floorplan.class_set";
+              service_data = {
+                class = "static-temp";
+              };
+            }
+          ];
+        }
+      ];
+    };
+  };
+}
--- a/modules/services/home-assistant/floorplan/style.css
+++ b/modules/services/home-assistant/floorplan/style.css
@ -0,0 +1,27 @@
+#floorplan {
+  padding: 10px;
+}
+
+svg, svg * {
+  vector-effect: non-scaling-stroke !important;
+  pointer-events: all !important;
+}
+
+path[id*="area."].light-on {
+  opacity: 0 !important;
+}
+
+path[id*="area."] {
+  opacity: 0.5 !important;
+  transition: opacity .25s;
+  -moz-transition: opacity .25s;
+  -webkit-transition: opacity .25s;
+}
+
+svg tspan {
+  fill: var(--primary-text-color);
+}
+
+.static-temp, .static-temp tspan {
+  fill: #ffffff;
+}
--- a/modules/services/home-assistant/mqtt.nix
+++ b/modules/services/home-assistant/mqtt.nix
@ -0,0 +1,75 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  cfg = config.modules.services.home-assistant;
+in {
+  config = lib.mkIf cfg.enable {
+    services.mosquitto = {
+      enable = true;
+      listeners = [{
+        acl = [ "pattern readwrite #" ];
+        omitPasswordAuth = true;
+        port = 1883;
+        settings = {
+          allow_anonymous = true;
+        };
+      }];
+    };
+
+    age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
+      file = "${self.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.services.borgmatic.directories = [
+      config.services.mosquitto.dataDir
+      config.services.zigbee2mqtt.dataDir
+    ];
+
+    services.home-assistant = {
+      config.mqtt = {};
+      extraComponents = [
+        "mqtt"
+        "mqtt_eventstream"
+        "mqtt_json"
+        "mqtt_room"
+        "mqtt_statestream"
+      ];
+    };
+  };
+}
--- a/modules/services/mail/default.nix
+++ b/modules/services/mail/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, self, ... }:

 let
  cfg = config.modules.services.mail;
@ -22,6 +22,10 @@ in {
    };
  };

+  imports = [
+    self.inputs.nixos-mailserver.nixosModule
+  ];
+
  config = lib.mkIf cfg.enable {
    services.roundcube = {
      enable = true;
@ -31,6 +35,7 @@ in {
        $config['smtp_user'] = "%u";
        $config['smtp_pass'] = "%p";
      '';
+      plugins = [ "contextmenu" ];
    };

    services.nginx.enable = true;
--- a/modules/services/matrix-synapse/default.nix
+++ b/modules/services/matrix-synapse/default.nix
@ -1,127 +0,0 @@
-{ config, lib, pkgs, inputs, ... }:
-
-with lib;
-
-let
-  cfg = config.modules.services.matrix-synapse;
-  matrixClientConfig = {
-    "m.homeserver" = {
-      base_url = "https://matrix.vimium.com";
-      server_name = "vimium.com";
-    };
-    "m.identity_server" = {};
-  };
-  matrixServerConfig."m.server" = "matrix.vimium.com:443";
-  mkWellKnown = data: ''
-    more_set_headers 'Content-Type: application/json';
-    return 200 '${builtins.toJSON data}';
-  '';
-in {
-  options.modules.services.matrix-synapse = {
-    enable = mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = [
-      8448 # Matrix federation
-    ];
-
-    security.acme.certs = {
-      "matrix.vimium.com" = {
-        reloadServices = [ "matrix-synapse" ];
-      };
-    };
-
-    services.nginx.virtualHosts = {
-      "chat.vimium.com" = {
-        forceSSL = true;
-        enableACME = true;
-        root = pkgs.unstable.element-web.override {
-          conf = {
-            default_server_config = matrixClientConfig;
-            brand = "Vimium Chat";
-            branding = {
-              auth_header_logo_url = "https://vimium.com/images/logo.svg";
-              auth_footer_links = [
-                { "text" = "Vimium.com"; "url" = "https://vimium.com"; }
-              ];
-            };
-          };
-        };
-      };
-      "matrix.vimium.com" = {
-        forceSSL = true;
-        enableACME = true;
-        listen = [
-          {
-            addr = "0.0.0.0";
-            port = 443;
-            ssl = true;
-          }
-          {
-            addr = "0.0.0.0";
-            port = 80;
-          }
-          {
-            addr = "0.0.0.0";
-            port = 8448;
-            ssl = true;
-          }
-          {
-            addr = "[::1]";
-            port = 443;
-            ssl = true;
-          }
-          {
-            addr = "[::1]";
-            port = 80;
-          }
-          {
-            addr = "[::1]";
-            port = 8448;
-            ssl = true;
-          }
-        ];
-        locations = {
-          "/" = {
-            proxyPass = "http://localhost:8008";
-            extraConfig = ''
-              proxy_set_header X-Forwarded-For $remote_addr;
-            '';
-          };
-          "/_matrix" = {
-            proxyPass = "http://localhost:8008";
-            extraConfig = ''
-              proxy_set_header X-Forwarded-For $remote_addr;
-              client_max_body_size 50M;
-            '';
-          };
-          "/_synapse/client".proxyPass = "http://localhost:8008";
-        };
-      };
-      "vimium.com" = {
-        locations."= /.well-known/matrix/server".extraConfig = (mkWellKnown matrixServerConfig);
-        locations."= /.well-known/matrix/client".extraConfig = (mkWellKnown matrixClientConfig);
-      };
-    };
-
-    services.matrix-synapse = {
-      enable = true;
-      settings = {
-        database.name = "sqlite3";
-        enable_registration = false;
-        server_name = "vimium.com";
-        # turn_shared_secret = "???";
-        # turn_uris = [
-        #   "turn:turn.vimium.com:5349?transport=udp"
-        #   "turn:turn.vimium.com:5350?transport=udp"
-        #   "turn:turn.vimium.com:5349?transport=tcp"
-        #   "turn:turn.vimium.com:5350?transport=tcp"
-        # ];
-      };
-    };
-  };
-}
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@ -0,0 +1,228 @@
+{ config, lib, pkgs, self, ... }:
+
+let
+  cfg = config.modules.services.matrix;
+in {
+  options.modules.services.matrix = {
+    enable = lib.mkEnableOption "matrix";
+    element = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+      };
+    };
+    bridges = {
+      signal = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Enable Signal bridge.";
+      };
+      whatsapp = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Enable WhatsApp bridge.";
+      };
+    };
+    serverName = lib.mkOption {
+      type = lib.types.str;
+      default = "vimium.com";
+      example = "vimium.com";
+    };
+    usePostgresql = lib.mkEnableOption "postgresql";
+  };
+
+  config = let
+    matrixSubdomain = "matrix.${cfg.serverName}";
+    elementSubdomain = "chat.${cfg.serverName}";
+    matrixClientConfig = {
+      "m.homeserver" = {
+        base_url = "https://${matrixSubdomain}";
+        server_name = cfg.serverName;
+      };
+      "m.identity_server" = {
+        "base_url" = "https://vector.im";
+      };
+    };
+    matrixServerConfig."m.server" = "${matrixSubdomain}:443";
+    commonBridgeSettings = bridge: {
+      appservice = {
+        database = lib.mkIf cfg.usePostgresql {
+          type = "postgres";
+          uri = "postgresql:///${bridge}?host=/run/postgresql";
+        };
+      };
+      bridge = {
+        encryption = {
+          allow = true;
+          default = true;
+          require = true;
+        };
+        permissions = {
+          "${cfg.serverName}" = "user";
+          "@jordan:${cfg.serverName}" = "admin";
+        };
+        provisioning = {
+          shared_secret = "disable";
+        };
+      };
+      homeserver = {
+        address = "https://${matrixSubdomain}";
+        domain = cfg.serverName;
+      };
+    };
+  in lib.mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = [
+      8448 # Matrix federation
+    ];
+
+    security.acme.certs = {
+      "${matrixSubdomain}" = {
+        reloadServices = [ "matrix-synapse" ];
+      };
+    };
+
+    services.nginx.virtualHosts = {
+      "${matrixSubdomain}" = {
+        forceSSL = true;
+        enableACME = true;
+        listen = [
+          {
+            addr = "0.0.0.0";
+            port = 443;
+            ssl = true;
+          }
+          {
+            addr = "0.0.0.0";
+            port = 80;
+          }
+          {
+            addr = "0.0.0.0";
+            port = 8448;
+            ssl = true;
+          }
+          {
+            addr = "[::1]";
+            port = 443;
+            ssl = true;
+          }
+          {
+            addr = "[::1]";
+            port = 80;
+          }
+          {
+            addr = "[::1]";
+            port = 8448;
+            ssl = true;
+          }
+        ];
+        locations = {
+          "/" = {
+            proxyPass = "http://localhost:8008";
+            extraConfig = ''
+              proxy_set_header X-Forwarded-For $remote_addr;
+            '';
+          };
+          "/_matrix" = {
+            proxyPass = "http://localhost:8008";
+            extraConfig = ''
+              proxy_set_header X-Forwarded-For $remote_addr;
+              client_max_body_size 50M;
+            '';
+          };
+          "/_synapse/client".proxyPass = "http://localhost:8008";
+        };
+      };
+      "${cfg.serverName}" = let
+        mkWellKnown = data: ''
+          more_set_headers 'Content-Type: application/json';
+          return 200 '${builtins.toJSON data}';
+        '';
+      in {
+        locations."= /.well-known/matrix/server".extraConfig = (mkWellKnown matrixServerConfig);
+        locations."= /.well-known/matrix/client".extraConfig = (mkWellKnown matrixClientConfig);
+      };
+    } // (if cfg.element.enable then {
+      "${elementSubdomain}" = {
+        forceSSL = true;
+        enableACME = true;
+        root = pkgs.unstable.element-web.override {
+          conf = {
+            default_server_config = matrixClientConfig;
+            brand = "Vimium Chat";
+            branding = {
+              auth_header_logo_url = "https://vimium.com/images/logo.svg";
+              auth_footer_links = [
+                { "text" = "Vimium.com"; "url" = "https://vimium.com"; }
+              ];
+            };
+          };
+        };
+      };
+    } else {});
+
+    nixpkgs.config.permittedInsecurePackages = [
+      "jitsi-meet-1.0.8043"
+      "olm-3.2.16"
+    ];
+
+    services.matrix-synapse = {
+      enable = true;
+      enableRegistrationScript = true;
+      settings = {
+        database.name = (if cfg.usePostgresql then "psycopg2" else "sqlite3");
+        enable_metrics = false;
+        enable_registration = false;
+        max_upload_size = "100M";
+        report_stats = false;
+        server_name = cfg.serverName;
+      };
+    };
+    systemd.services.matrix-synapse.serviceConfig.SupplementaryGroups =
+      (lib.optional cfg.bridges.whatsapp
+        config.systemd.services.mautrix-whatsapp.serviceConfig.Group);
+
+    services.postgresql = lib.mkIf cfg.usePostgresql {
+      ensureUsers = [
+        {
+          name = "matrix-synapse";
+          ensureDBOwnership = true;
+        }
+      ] ++ (lib.optional cfg.bridges.signal
+        {
+          name = "mautrix-signal";
+          ensureDBOwnership = true;
+        })
+        ++ (lib.optional cfg.bridges.whatsapp
+        {
+          name = "mautrix-whatsapp";
+          ensureDBOwnership = true;
+        });
+      ensureDatabases = [
+        "matrix-synapse"
+      ] ++ (lib.optional cfg.bridges.signal
+        "mautrix-signal")
+        ++ (lib.optional cfg.bridges.whatsapp
+        "mautrix-whatsapp");
+    };
+
+    services.mautrix-signal = lib.mkIf cfg.bridges.signal {
+      enable = true;
+      settings = commonBridgeSettings "mautrix-signal";
+    };
+
+    services.mautrix-whatsapp = lib.mkIf cfg.bridges.whatsapp {
+      enable = true;
+      settings = {
+        bridge = {
+          history_sync = {
+            backfill = true;
+            max_initial_conversations = -1;
+            message_count = 50;
+            request_full_sync = true;
+          };
+          mute_bridging = true;
+        };
+      } // commonBridgeSettings "mautrix-whatsapp";
+    };
+  };
+}
--- a/modules/services/nginx/default.nix
+++ b/modules/services/nginx/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:

 with lib;

@ -82,6 +82,13 @@ in {
        worker_connections 20000;
        multi_accept off;
      '';
+      proxyCachePath = {
+        "skycam" = {
+          enable = true;
+          keysZoneName = "skycam_cache";
+          maxSize = "100m";
+        };
+      };
      virtualHosts = {
        ## Static sites
        "jellyfin.vimium.com" = {
@ -105,6 +112,25 @@ in {
            '';
          };
        };
+        "jdholt.com" = {
+          forceSSL = true;
+          enableACME = true;
+          serverAliases = [ "www.jdholt.com" ];
+          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
+          locations."/skycam/snapshot.jpg" = {
+            extraConfig = ''
+              set $backend "skycam.mesh.vimium.net:8080";
+
+              resolver 100.100.100.100;
+
+              proxy_pass http://$backend/snapshot;
+              proxy_cache skycam_cache;
+              proxy_cache_valid any 10s;
+              proxy_ignore_headers Cache-Control Expires Set-Cookie;
+            '';
+          };
+          locations."/".return = "301 https://vimium.com$request_uri";
+        };
        "pki.vimium.com" = {
          addSSL = true;
          forceSSL = false;
@ -142,7 +168,6 @@ in {
      ## Redirects
      // (mkRedirect "h0lt.com" "jdholt.com")
      // (mkRedirect "jordanholt.xyz" "jdholt.com")
-      // (mkRedirect "jdholt.com" "vimium.com")
      // (mkRedirect "omnimagic.com" "vimium.com")
      // (mkRedirect "omnimagic.net" "vimium.com")
      // (mkRedirect "thelostlegend.com" "suhailhussain.com")
--- a/modules/services/photoprism/default.nix
+++ b/modules/services/photoprism/default.nix
@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, self, ... }:

 with lib;

@ -36,7 +36,7 @@ in {
    };

    age.secrets."passwords/services/photoprism/admin" = {
-      file = "${inputs.secrets}/passwords/services/photoprism/admin.age";
+      file = "${self.inputs.secrets}/passwords/services/photoprism/admin.age";
    };

    services.photoprism = {
--- a/modules/shell/zsh/default.nix
+++ b/modules/shell/zsh/default.nix
@ -21,7 +21,7 @@ in {

    user.packages = with pkgs; [
      fd
-      fzf
+      unstable.fzf
      jq
      nix-zsh-completions
      nnn
--- a/overlays/0001-Ignore-IPA-signing.patch
+++ b/overlays/0001-Ignore-IPA-signing.patch
@ -0,0 +1,25 @@
+From 625939e594ce255afa3fab3a40c3e524460e1f8b Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sat, 10 Aug 2024 18:28:08 +0100
+Subject: [PATCH] Ignore IPA signing
+
+---
+ src/libcamera/ipa_manager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
+index 6d5bbd05..43004175 100644
+--- a/src/libcamera/ipa_manager.cpp
+++ b/src/libcamera/ipa_manager.cpp
+@@ -295,7 +295,7 @@ bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const
+ 	if (data.empty())
+ 		return false;
+ 
+-	bool valid = pubKey_.verify(data, ipa->signature());
+	bool valid = true;
+ 
+ 	LOG(IPAManager, Debug)
+ 		<< "IPA module " << ipa->path() << " signature is "
+-- 
+2.44.1
+
--- a/overlays/0001-Remove-relative-config-lookups.patch
+++ b/overlays/0001-Remove-relative-config-lookups.patch
@ -0,0 +1,142 @@
+From 57128bb78f56cadf9e2dcca5ba4d710c3bd478a7 Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Mon, 5 Aug 2024 21:53:09 +0100
+Subject: [PATCH] Remove relative config lookups
+
+---
+ src/libcamera/ipa_manager.cpp      | 16 ----------
+ src/libcamera/ipa_proxy.cpp        | 48 ++----------------------------
+ src/libcamera/pipeline_handler.cpp | 21 ++-----------
+ 3 files changed, 4 insertions(+), 81 deletions(-)
+
+diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
+index f4e0b633..6d5bbd05 100644
+--- a/src/libcamera/ipa_manager.cpp
+++ b/src/libcamera/ipa_manager.cpp
+@@ -131,22 +131,6 @@ IPAManager::IPAManager()
+ 				<< "No IPA found in '" << modulePaths << "'";
+ 	}
+ 
+-	/*
+-	 * When libcamera is used before it is installed, load IPAs from the
+-	 * same build directory as the libcamera library itself.
+-	 */
+-	std::string root = utils::libcameraBuildPath();
+-	if (!root.empty()) {
+-		std::string ipaBuildPath = root + "src/ipa";
+-		constexpr int maxDepth = 2;
+-
+-		LOG(IPAManager, Info)
+-			<< "libcamera is not installed. Adding '"
+-			<< ipaBuildPath << "' to the IPA search path";
+-
+-		ipaCount += addDir(ipaBuildPath.c_str(), maxDepth);
+-	}
+-
+ 	/* Finally try to load IPAs from the installed system path. */
+ 	ipaCount += addDir(IPA_MODULE_DIR);
+ 
+diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp
+index 69975d8f..cd9284a3 100644
+--- a/src/libcamera/ipa_proxy.cpp
+++ b/src/libcamera/ipa_proxy.cpp
+@@ -122,33 +122,11 @@ std::string IPAProxy::configurationFile(const std::string &name,
+ 		}
+ 	}
+ 
+-	std::string root = utils::libcameraSourcePath();
+-	if (!root.empty()) {
+-		/*
+-		 * When libcamera is used before it is installed, load
+-		 * configuration files from the source directory. The
+-		 * configuration files are then located in the 'data'
+-		 * subdirectory of the corresponding IPA module.
+-		 */
+-		std::string ipaConfDir = root + "src/ipa/" + ipaName + "/data";
+-
+-		LOG(IPAProxy, Info)
+-			<< "libcamera is not installed. Loading IPA configuration from '"
+-			<< ipaConfDir << "'";
+-
+-		std::string confPath = ipaConfDir + "/" + name;
+	for (const auto &dir : utils::split(IPA_CONFIG_DIR, ":")) {
+		std::string confPath = dir + "/" + ipaName + "/" + name;
+ 		ret = stat(confPath.c_str(), &statbuf);
+ 		if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
+ 			return confPath;
+-
+-	} else {
+-		/* Else look in the system locations. */
+-		for (const auto &dir : utils::split(IPA_CONFIG_DIR, ":")) {
+-			std::string confPath = dir + "/" + ipaName + "/" + name;
+-			ret = stat(confPath.c_str(), &statbuf);
+-			if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
+-				return confPath;
+-		}
+ 	}
+ 
+ 	if (fallbackName.empty()) {
+@@ -197,28 +175,6 @@ std::string IPAProxy::resolvePath(const std::string &file) const
+ 		}
+ 	}
+ 
+-	/*
+-	 * When libcamera is used before it is installed, load proxy workers
+-	 * from the same build directory as the libcamera directory itself.
+-	 * This requires identifying the path of the libcamera.so, and
+-	 * referencing a relative path for the proxy workers from that point.
+-	 */
+-	std::string root = utils::libcameraBuildPath();
+-	if (!root.empty()) {
+-		std::string ipaProxyDir = root + "src/libcamera/proxy/worker";
+-
+-		LOG(IPAProxy, Info)
+-			<< "libcamera is not installed. Loading proxy workers from '"
+-			<< ipaProxyDir << "'";
+-
+-		std::string proxyPath = ipaProxyDir + proxyFile;
+-		if (!access(proxyPath.c_str(), X_OK))
+-			return proxyPath;
+-
+-		return std::string();
+-	}
+-
+-	/* Else try finding the exec target from the install directory. */
+ 	std::string proxyPath = std::string(IPA_PROXY_DIR) + proxyFile;
+ 	if (!access(proxyPath.c_str(), X_OK))
+ 		return proxyPath;
+diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
+index 5ea2ca78..fd8555ca 100644
+--- a/src/libcamera/pipeline_handler.cpp
+++ b/src/libcamera/pipeline_handler.cpp
+@@ -561,25 +561,8 @@ std::string PipelineHandler::configurationFile(const std::string &subdir,
+ 	struct stat statbuf;
+ 	int ret;
+ 
+-	std::string root = utils::libcameraSourcePath();
+-	if (!root.empty()) {
+-		/*
+-		 * When libcamera is used before it is installed, load
+-		 * configuration files from the source directory. The
+-		 * configuration files are then located in the 'data'
+-		 * subdirectory of the corresponding pipeline handler.
+-		 */
+-		std::string confDir = root + "src/libcamera/pipeline/";
+-		confPath = confDir + subdir + "/data/" + name;
+-
+-		LOG(Pipeline, Info)
+-			<< "libcamera is not installed. Loading platform configuration file from '"
+-			<< confPath << "'";
+-	} else {
+-		/* Else look in the system locations. */
+-		confPath = std::string(LIBCAMERA_DATA_DIR)
+-				+ "/pipeline/" + subdir + '/' + name;
+-	}
+	confPath = std::string(LIBCAMERA_DATA_DIR)
+			+ "/pipeline/" + subdir + '/' + name;
+ 
+ 	ret = stat(confPath.c_str(), &statbuf);
+ 	if (ret == 0 && (statbuf.st_mode & S_IFMT) == S_IFREG)
+-- 
+2.44.1
+
--- a/overlays/default.nix
+++ b/overlays/default.nix
@ -0,0 +1,35 @@
+final: prev:
+
+/*
+  Generate an overlay from `pkgs` by handling the `callPackage` behaviour
+  ourselves, making exceptions for namespaced package sets. We cannot reuse
+  the definitions from `self.legacyPackages.${prev.system}`, as that would
+  evaluate nixpkgs twice here (prev.system does not exist then).
+*/
+
+let
+  lib = prev.lib;
+
+  pkgs = lib.packagesFromDirectoryRecursive {
+    callPackage = path: overrides: path;
+    directory = ../pkgs;
+  };
+in
+  lib.mapAttrs
+    (name: value:
+      if lib.isAttrs value then
+        if lib.hasAttrByPath [ name "overrideScope" ] prev then
+          # Namespaced package sets created with `lib.makeScope pkgs.newScope`.
+          prev.${name}.overrideScope (final': prev':
+            lib.mapAttrs (name': value': final'.callPackage value' { }) value)
+        else if lib.hasAttrByPath [ name "extend" ] prev then
+          # Namespaced package sets created with `lib.makeExtensible`.
+          prev.${name}.extend (final': prev':
+            lib.mapAttrs (name': value': final.callPackage value' { }) value)
+        else
+          # Namespaced package sets in regular attrsets.
+          prev.${name} // value
+      else
+        final.callPackage value { })
+    pkgs
+
--- a/overlays/gnome.nix
+++ b/overlays/gnome.nix
@ -1,11 +1,22 @@
-self: super:
+final: prev:
 {
-  gnome = super.gnome.overrideScope' (gself: gsuper: {
-    mutter = gsuper.mutter.overrideAttrs (oldAttrs: {
-      src = super.fetchurl {
-        url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-46/mutter-triple-buffering-v4-46.tar.gz";
-        sha256 = "Rdao3TR6wG7YcpoD+nFFiCaE+97G0MreBgwsQJa3GCE=";
-      };
-    });
+  gvdb = prev.fetchgit {
+    url = "https://gitlab.gnome.org/GNOME/gvdb.git";
+    rev = "b54bc5da25127ef416858a3ad92e57159ff565b3"; # From gvdb_wrap
+    sha256 = "c56yOepnKPEYFcU1B1TrDl8ydU0JU+z6R8siAQP4d2A=";
+  };
+
+  mutter = prev.mutter.overrideAttrs (attrs: {
+    src = prev.fetchurl {
+      url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-47/mutter-triple-buffering-v4-47.tar.gz";
+      sha256 = "oeykTJRcG/SY83U8RYnyFFZ8zKqoyXvtbaS2f/s503U=";
+    };
+
+    postPatch = ''
+      mkdir -p subprojects/gvdb
+      cp -r ${final.gvdb}/* subprojects/gvdb/
+
+      ${attrs.postPatch or ""}
+    '';
  });
 }
--- a/overlays/libcamera.nix
+++ b/overlays/libcamera.nix
@ -0,0 +1,64 @@
+final: prev:
+{
+  libpisp = final.stdenv.mkDerivation {
+    name = "libpisp";
+    version = "1.0.5";
+    src = final.fetchFromGitHub {
+      owner = "raspberrypi";
+      repo = "libpisp";
+      rev = "v1.0.5";
+      hash = "sha256-CHd44CH5dBcZuK+5fZtONZ8HE/lwGKwK5U0BYUK8gG4=";
+    };
+
+    nativeBuildInputs = with final; [
+      pkg-config
+      meson
+      ninja
+    ];
+
+    buildInputs = with final; [
+      nlohmann_json
+      boost
+    ];
+
+    BOOST_INCLUDEDIR = "${prev.lib.getDev final.boost}/include";
+    BOOST_LIBRARYDIR = "${prev.lib.getLib final.boost}/lib";
+  };
+
+  libcamera = prev.libcamera.overrideAttrs (old: {
+    src = final.fetchFromGitHub {
+      owner = "raspberrypi";
+      repo = "libcamera";
+      rev = "eb00c13d7c9f937732305d47af5b8ccf895e700f";
+      hash = "sha256-p0/inkHPRUkxSIsTmj7VI7sIaX7OXdqjMGZ31W7cnt4=";
+    };
+
+    postPatch = ''
+      patchShebangs utils/ src/py/
+    '';
+
+    patches = [
+      ./0001-Remove-relative-config-lookups.patch
+      ./0001-Ignore-IPA-signing.patch
+    ];
+
+    buildInputs = old.buildInputs ++ (with final; [
+      libpisp
+      libglibutil
+    ]);
+
+    mesonFlags = old.mesonFlags ++ [
+      "--buildtype=release"
+      "-Dpipelines=rpi/vc4,rpi/pisp"
+      "-Dipas=rpi/vc4,rpi/pisp"
+      "-Dgstreamer=enabled"
+      "-Dtest=false"
+      "-Dcam=enabled"
+      "-Dpycamera=disabled"
+    ];
+  });
+
+  camera-streamer = prev.callPackage ../pkgs/camera-streamer/package.nix {
+    libcamera = final.libcamera;
+  };
+}
--- a/pkgs/camera-streamer/0001-Disable-libdatachannel.patch
+++ b/pkgs/camera-streamer/0001-Disable-libdatachannel.patch
@ -0,0 +1,25 @@
+From 0f17bb86772afe9495891e420a809a0b3c071caf Mon Sep 17 00:00:00 2001
+From: Jordan Holt <jordan@vimium.com>
+Date: Sat, 10 Aug 2024 15:37:15 +0100
+Subject: [PATCH] Disable libdatachannel
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index d5029bd..e50ba1a 100644
+--- a/Makefile
+++ b/Makefile
+@@ -23,7 +23,7 @@ USE_HW_H264 ?= 1
+ USE_FFMPEG ?= $(shell pkg-config libavutil libavformat libavcodec && echo 1)
+ USE_LIBCAMERA ?= $(shell pkg-config libcamera && echo 1)
+ USE_RTSP ?= $(shell pkg-config live555 && echo 1)
+-USE_LIBDATACHANNEL ?= $(shell [ -e $(LIBDATACHANNEL_PATH)/CMakeLists.txt ] && echo 1)
+USE_LIBDATACHANNEL ?= 0
+ 
+ ifeq (1,$(DEBUG))
+ CFLAGS += -g
+-- 
+2.44.1
+
--- a/pkgs/camera-streamer/package.nix
+++ b/pkgs/camera-streamer/package.nix
@ -0,0 +1,78 @@
+{ stdenv
+, fetchFromGitHub
+
+, cmake
+, gnumake
+, pkg-config
+, xxd
+
+, v4l-utils
+, nlohmann_json
+, ffmpegSupport ? true
+, ffmpeg
+, libcameraSupport ? true
+, libcamera
+, rtspSupport ? false
+, live555
+, webrtcSupport ? false
+, openssl
+
+, lib
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "camera-streamer";
+  version = "0.2.8";
+
+  src = fetchFromGitHub {
+    owner = "ayufan";
+    repo = "camera-streamer";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-8vV8BMFoDeh22I1/qxk6zttJROaD/lrThBxXHZSPpT4=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    ./0001-Disable-libdatachannel.patch
+  ];
+
+  # Second replacement fixes literal newline in generated version.h.
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace '/usr/local/bin' '/bin' \
+      --replace 'echo "#define' 'echo -e "#define'
+  '';
+
+  env.NIX_CFLAGS_COMPILE = builtins.toString [
+    "-Wno-error=stringop-overflow"
+    "-Wno-error=format"
+    "-Wno-format"
+    "-Wno-format-security"
+    "-Wno-error=unused-result"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    gnumake
+    pkg-config
+    xxd
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  buildInputs = [ nlohmann_json v4l-utils ]
+    ++ (lib.optional ffmpegSupport ffmpeg)
+    ++ (lib.optional libcameraSupport libcamera)
+    ++ (lib.optional rtspSupport live555)
+    ++ (lib.optional webrtcSupport openssl);
+
+  installFlags = [ "DESTDIR=${builtins.placeholder "out"}" ];
+  preInstall = "mkdir -p $out/bin";
+
+  meta = with lib; {
+    description = "High-performance low-latency camera streamer for Raspberry Pi's";
+    website = "https://github.com/ayufan/camera-streamer";
+    license = licenses.gpl3Only;
+  };
+})
+
--- a/pkgs/ha-floorplan/package.nix
+++ b/pkgs/ha-floorplan/package.nix
@ -0,0 +1,38 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "floorplan";
+  version = "1.0.44";
+
+  src = fetchFromGitHub {
+    owner = "ExperienceLovelace";
+    repo = "ha-floorplan";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ajEA47H9nFXVcuvhwkDsxc5YYQWMsUXqHQ3t6tuAaxc=";
+  };
+
+  npmDepsHash = "sha256-/6H3XMraD7/usZBwmQaCDpV2n1Eed+U+G0f2YnjyWgk=";
+
+  installPhase = ''
+    runHook preInstall
+    mkdir $out
+    cp -R dist/* $out/
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Floorplan for Home Assistant";
+    longDescription = ''
+      Bring new life to Home Assistant. By mapping entities to a SVG-object,
+      you're able to control devices, show states, calling services - and much
+      more. Add custom styling on top, to visualize whatever you can think of.
+      Your imagination just became the new limit.
+    '';
+    homepage = "https://github.com/ExperienceLovelace/ha-floorplan";
+    license = lib.licenses.asl20;
+  };
+}
--- a/pkgs/rpicam-apps/package.nix
+++ b/pkgs/rpicam-apps/package.nix
@ -0,0 +1,58 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, boost
+, ffmpeg
+, libcamera
+, libdrm
+, libexif
+, libjpeg
+, libpng
+, libtiff
+, lib
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rpicam-apps";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "rpicam-apps";
+    rev = "v" + finalAttrs.version;
+    hash = "sha256-3NG2ZE/Ub3lTbfne0LCXuDgLGTPaAAADRdElEbZwvls=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    ffmpeg
+    libcamera
+    libdrm
+    libexif
+    libjpeg
+    libpng
+    libtiff
+  ];
+
+  # Meson is no longer able to pick up Boost automatically:
+  # https://github.com/NixOS/nixpkgs/issues/86131
+  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
+  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
+
+  meta = with lib; {
+    description = ''
+      libcamera-based applications to drive the cameras on a Raspberry Pi platform
+    '';
+    homepage = "https://github.com/raspberrypi/rpicam-apps";
+    license = licenses.bsd2;
+  };
+})
+