Add immich module

2024-09-27 17:09:23 +01:00
116 changed files with 1568 additions and 3007 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Copyright (C) 2025 by Jordan Holt <jordan@vimium.com>
+Copyright (C) 2023 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:** | Ptyxis |
+| **Theme:** | adwaita |
+| **Terminal:** | Console |

 ## Provisioning a new host
 > [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used
@ -52,3 +52,4 @@ tailscale up --login-server https://headscale.vimium.net
 then visit the URL, SSH onto `vps1` and run `headscale --user mesh nodes register --key <key>`.

 The new node can optionally be given a friendly name with `headscale node rename -i <index> <hostname>`.
+
--- a/flake.lock
+++ b/flake.lock
@ -8,11 +8,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1736955230,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
+        "lastModified": 1723293904,
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
        "type": "github"
      },
      "original": {
@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735644329,
-        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
        "type": "github"
      },
      "original": {
@ -107,11 +107,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737038063,
-        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
+        "lastModified": 1727359191,
+        "narHash": "sha256-5PltTychnExFwzpEnY3WhOywaMV/M6NxYI/y3oXuUtw=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
+        "rev": "67dc29be3036cc888f0b9d4f0a788ee0f6768700",
        "type": "github"
      },
      "original": {
@ -123,11 +123,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1736899990,
-        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
+        "lastModified": 1723137499,
+        "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
+        "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
        "type": "github"
      },
      "original": {
@ -206,11 +206,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+        "lastModified": 1725234343,
+        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
+        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
        "type": "github"
      },
      "original": {
@ -219,42 +219,25 @@
        "type": "github"
      }
    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "git-hooks": {
      "inputs": {
-        "flake-compat": [
-          "nixvim",
-          "flake-compat"
-        ],
+        "flake-compat": "flake-compat_4",
        "gitignore": "gitignore",
        "nixpkgs": [
          "nixvim",
          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1737043064,
-        "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=",
+        "lastModified": 1724857454,
+        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
+        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
        "type": "github"
      },
      "original": {
@ -302,27 +285,6 @@
        "type": "github"
      }
    },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@ -351,16 +313,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-24.05",
        "repo": "home-manager",
        "type": "github"
      }
@ -373,48 +335,20 @@
        ]
      },
      "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1720042825,
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-24.05",
        "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": {
@ -439,27 +373,26 @@
        ]
      },
      "locked": {
-        "lastModified": 1736820923,
-        "narHash": "sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk=",
+        "lastModified": 1725189302,
+        "narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "944c2b181792ae7ae6b20c0df3f44879c11706c9",
+        "rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda",
        "type": "github"
      },
      "original": {
        "owner": "lnl7",
-        "ref": "nix-darwin-24.11",
        "repo": "nix-darwin",
        "type": "github"
      }
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1737751639,
-        "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
+        "lastModified": 1727437159,
+        "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
+        "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2",
        "type": "github"
      },
      "original": {
@ -475,18 +408,20 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_11": "nixpkgs-24_11"
+        "nixpkgs-24_05": "nixpkgs-24_05",
+        "utils": "utils_2"
      },
      "locked": {
-        "lastModified": 1737201600,
-        "narHash": "sha256-JBh5+g8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk=",
+        "lastModified": 1718084203,
+        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "ade37b2765032f83d2d4bd50b6204a40a4c05eb4",
+        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
        "type": "gitlab"
      },
      "original": {
        "owner": "simple-nixos-mailserver",
+        "ref": "nixos-24.05",
        "repo": "nixos-mailserver",
        "type": "gitlab"
      }
@ -507,28 +442,28 @@
        "type": "github"
      }
    },
-    "nixpkgs-24_11": {
+    "nixpkgs-24_05": {
      "locked": {
-        "lastModified": 1734083684,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
        "type": "indirect"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1737632463,
-        "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
+        "lastModified": 1727122398,
+        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
+        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
        "type": "github"
      },
      "original": {
@ -555,16 +490,16 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1737672001,
-        "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
+        "lastModified": 1727264057,
+        "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
+        "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
        "type": "indirect"
      }
    },
@ -579,47 +514,23 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nuschtosSearch": "nuschtosSearch",
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1737283156,
-        "narHash": "sha256-FyHmM6vvz+UxCrPZo/poIaZBZejLHVKkAH4cjtUxZDA=",
+        "lastModified": 1725350106,
+        "narHash": "sha256-TaMMlI2KPJ3wCyxJk6AShOLhNuTeabHCnvYRkLBlEFs=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "abcbd250b8a2c7aab1f4b2b9e01598ee24b42337",
+        "rev": "0f2c31e6a57a83ed4e6fa3adc76749620231055d",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
        "repo": "nixvim",
        "type": "github"
      }
    },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "ixx": "ixx",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735854821,
-        "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
-        "type": "github"
-      }
-    },
    "plasma-manager": {
      "inputs": {
        "home-manager": [
@ -630,11 +541,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736549395,
-        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
+        "lastModified": 1727210241,
+        "narHash": "sha256-lufS6uzSbSrggNCSgubymMQWnQMh7PvQ+lRZ8qH9Uoc=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
+        "rev": "a02fef2ece8084aff0b41700bb57d24d73574cd1",
        "type": "github"
      },
      "original": {
@ -643,28 +554,6 @@
        "type": "github"
      }
    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_4",
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737465171,
-        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "agenix": "agenix",
@ -680,7 +569,6 @@
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nixvim": "nixvim",
        "plasma-manager": "plasma-manager",
-        "pre-commit-hooks": "pre-commit-hooks",
        "secrets": "secrets",
        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
      }
@ -688,11 +576,11 @@
    "secrets": {
      "flake": false,
      "locked": {
-        "lastModified": 1730732927,
-        "narHash": "sha256-t3MTEgi6O7DMxMjdi3xcTAztLDQmEtqQ+oU+ZbWz2AI=",
+        "lastModified": 1724093899,
+        "narHash": "sha256-VohYwTIBq7NEssFibuu+HMXXwuCoLmMOmEwQf7sESSI=",
        "ref": "refs/heads/master",
-        "rev": "4ae2ac777c38f60a29384b70c456f41847cdf1b5",
-        "revCount": 28,
+        "rev": "7f5901bb5d6eeaa94d7e1f18f66093be9df014e4",
+        "revCount": 27,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
      },
@ -749,11 +637,11 @@
    "thunderbird-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1732643121,
-        "narHash": "sha256-i0Uo5EN45rlGuR85hvPet43zW/thOQTwHypVg9shTHU=",
+        "lastModified": 1721874544,
+        "narHash": "sha256-BHW9jlx92CsHY84FT0ce5Vxl0KFheLhNn2vndcIf7no=",
        "owner": "rafaelmardojai",
        "repo": "thunderbird-gnome-theme",
-        "rev": "1994e7ec0649053e2a0811973245758d41e33f5f",
+        "rev": "628fcccb7788e3e0ad34f67114f563c87ac8c1dc",
        "type": "github"
      },
      "original": {
@ -770,11 +658,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737103437,
-        "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
+        "lastModified": 1724833132,
+        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
+        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
        "type": "github"
      },
      "original": {
@ -800,6 +688,24 @@
        "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.11";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
    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.11";
+      url = "github:nix-community/home-manager/release-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    firefox-gnome-theme = {
@ -29,11 +29,11 @@
    };
    nixos-hardware.url = "github:NixOS/nixos-hardware";
    nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.11";
+      url = "github:nix-community/nixvim/nixos-24.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    plasma-manager = {
@ -41,10 +41,6 @@
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.home-manager.follows = "home-manager";
    };
-    pre-commit-hooks = {
-      url = "github:cachix/git-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
    secrets = {
      url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
      flake = false;
@ -55,12 +51,12 @@
    };
  };

-  outputs =
-    inputs@{ self, nixpkgs, ... }:
+  outputs = inputs @ { self, nixpkgs, ... }:
    let
      inherit (nixpkgs) lib;

      domain = "mesh.vimium.net";
+      forEverySystem = lib.getAttrs lib.systems.flakeExposed;
      forEachSystem = lib.genAttrs [
        "x86_64-linux"
        "aarch64-linux"
@ -70,11 +66,7 @@

        profiles.system = {
          user = "root";
-          path =
-            inputs.deploy-rs.lib.${
-              self.nixosConfigurations.${hostName}.config.system.build.toplevel.system
-            }.activate.nixos
-              self.nixosConfigurations.${hostName};
+          path = inputs.deploy-rs.lib.${self.nixosConfigurations.${hostName}.config.system.build.toplevel.system}.activate.nixos self.nixosConfigurations.${hostName};
        };
      };
    in
@ -84,19 +76,16 @@
        directory = ./overlays;
      };

-      legacyPackages = forEachSystem (
-        system:
+      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.mapAttrs (name: value:
          lib.nixosSystem {
            specialArgs = { inherit self; };

@ -109,46 +98,15 @@
              }
              ./hosts/${name}
            ];
-          }
-        ))
+          }))
      ];

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

      deploy = {
        magicRollback = true;
@ -161,5 +119,8 @@
          "vps1"
        ] mkDeployNode;
      };
+
+      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, ... }:

 {
  imports = [
@ -22,22 +22,29 @@
  users.extraGroups.vboxusers.members = [ "jordan" ];

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

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

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

 {
  imports = [
    self.inputs.agenix.nixosModules.age
    self.inputs.home-manager.nixosModule
-    ../modules/home-manager
-    ../modules/nixos
+    ../modules
  ];

  nixpkgs.overlays = [
    self.inputs.agenix.overlays.default
    (import ../overlays/default.nix)
-    (final: prev: {
-      unstable = import self.inputs.nixpkgs-unstable { system = final.system; };
-    })
+    (
+      final: prev: {
+        unstable = import self.inputs.nixpkgs-unstable { system = final.system; };
+      }
+    )
  ];

  time.timeZone = "Europe/London";
@ -57,7 +54,7 @@
  programs.zsh.enable = true;

  nix = {
-    package = pkgs.nixVersions.stable;
+    package = pkgs.nixFlakes;
    extraOptions = ''
      experimental-features = nix-command flakes
    '';
@ -68,10 +65,7 @@
        system = "aarch64-linux";
        maxJobs = 6;
        speedFactor = 1;
-        supportedFeatures = [
-          "big-parallel"
-          "benchmark"
-        ];
+        supportedFeatures = [ "big-parallel" "benchmark" ];
      }
    ];
    distributedBuilds = true;
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:

 {
  imports = [
@ -9,9 +9,10 @@
    (import ../overlays/gnome.nix)
  ];

-  services.printing.enable = false;
+  services.printing.enable = true;
  services.openssh.startWhenNeeded = true;

+  sound.enable = true;
  hardware.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
@ -48,19 +49,12 @@

  fonts.packages = with pkgs; [
    noto-fonts
-    (nerdfonts.override {
-      fonts = [
-        "BigBlueTerminal"
-        "ComicShannsMono"
-        "Terminus"
-        "UbuntuMono"
-      ];
-    })
+    (nerdfonts.override { fonts = [ "BigBlueTerminal" "ComicShannsMono" "Terminus" "UbuntuMono" ]; })
  ];

  modules = {
-    system.desktop.gnome.enable = true;
-    services.tailscale.enable = true;
+    desktop.gnome.enable = true;
+    networking.tailscale.enable = true;
  };

  environment.systemPackages = with pkgs; [
--- a/hosts/eos/default.nix
+++ b/hosts/eos/default.nix
@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:

 {
  imports = [
@ -25,18 +25,24 @@
  };

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

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

  boot = {
-    initrd.availableKernelModules = [
-      "ehci_pci"
-      "ahci"
-      "usb_storage"
-      "sd_mod"
-      "sdhci_pci"
-    ];
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
    initrd.supportedFilesystems = [ "zfs" ];
    kernel.sysctl = {
      "kernel.nmi_watchdog" = 0;
--- a/hosts/helios/default.nix
+++ b/hosts/helios/default.nix
@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:

 {
  imports = [
@ -22,16 +22,21 @@
  };

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

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

  boot = {
-    initrd.availableKernelModules = [
-      "ehci_pci"
-      "ahci"
-      "usbhid"
-      "usb_storage"
-      "sd_mod"
-      "sr_mod"
-      "zfs"
-    ];
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
    initrd.kernelModules = [ ];
    initrd.supportedFilesystems = [ "zfs" ];
    kernelModules = [ "kvm-intel" ];
--- a/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch
+++ b/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch
@ -15,7 +15,7 @@ index d5a8182cf..be722c43a 100644
@@ -449,6 +449,63 @@ static void setup_graphics(struct boot_params *boot_params)
 	}
 }
-
+ 
 +typedef struct {
 +	u64 version;
 +	void (*set_os_version) (const char *os_version);
@ -73,13 +73,13 @@ index d5a8182cf..be722c43a 100644
 +
 +	return status;
 +}
-
+ 
 static void __noreturn efi_exit(efi_handle_t handle, efi_status_t status)
 {
@@ -951,6 +1008,8 @@ void __noreturn efi_stub_entry(efi_handle_t handle,
-
+ 
 	setup_unaccepted_memory();
-
+ 
 +	apple_set_os();
 +
 	status = exit_boot(boot_params, handle);
@ -97,5 +97,6 @@ index d59b0947f..81158014f 100644
 #define EFI_TCG2_PROTOCOL_GUID			EFI_GUID(0x607f766c, 0x7455, 0x42be,  0x93, 0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f)
 #define EFI_TCG2_FINAL_EVENTS_TABLE_GUID	EFI_GUID(0x1e2ed096, 0x30e2, 0x4254,  0xbd, 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25)
 #define EFI_LOAD_FILE_PROTOCOL_GUID		EFI_GUID(0x56ec3091, 0x954c, 0x11d2,  0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
--
+-- 
 2.42.0
+
--- a/hosts/hypnos/default.nix
+++ b/hosts/hypnos/default.nix
@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
+{ config, lib, self, ... }:

 {
  imports = [
@ -35,7 +30,7 @@
      videoDrivers = [ "nvidia" ];
    };
    displayManager = {
-      defaultSession = if config.modules.system.desktop.kde.enable then "plasmax11" else "gnome-xorg";
+      defaultSession = if config.modules.desktop.kde.enable then "plasmax11" else "gnome-xorg";
      sddm.wayland.enable = lib.mkForce false;
    };
  };
@ -44,20 +39,26 @@
  environment.sessionVariables.GSK_RENDERER = "gl";

  modules = {
-    programs = {
-      dev = {
-        node.enable = true;
+    desktop = {
+      browsers = {
+        firefox.enable = true;
      };
-      firefox.enable = true;
-      git.enable = true;
-      gpg.enable = true;
-      neovim.enable = true;
-      pass.enable = true;
-      recording = {
+      media.recording = {
        audio.enable = true;
      };
    };
+    dev = {
+      node.enable = true;
+    };
+    editors = {
+      neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
+      pass.enable = true;
+    };
    shell = {
+      git.enable = true;
      zsh.enable = true;
    };
  };
--- a/hosts/hypnos/disko-config.nix
+++ b/hosts/hypnos/disko-config.nix
@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 {
  disko.devices = {
    disk = {
@ -123,3 +123,4 @@
    };
  };
 }
+
--- a/hosts/hypnos/hardware-configuration.nix
+++ b/hosts/hypnos/hardware-configuration.nix
@ -1,10 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:

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

  boot = {
-    initrd.availableKernelModules = [
-      "xhci_pci"
-      "ahci"
-      "usbhid"
-      "usb_storage"
-      "sd_mod"
-    ];
+    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"
-    ];
+    kernelModules = [ "applesmc" "kvm-intel" "wl" ];
    extraModulePackages = [
      config.boot.kernelPackages.broadcom_sta
      config.boot.kernelPackages.nvidiaPackages.legacy_470
@ -45,12 +29,14 @@
      modesetting.enable = true;
      powerManagement.enable = true;
    };
-    graphics = {
+    opengl = {
      enable = true;
      extraPackages = with pkgs; [
        libvdpau-va-gl
      ];
-      enable32Bit = true;
+      driSupport = true;
+      driSupport32Bit = true;
    };
  };
 }
+
--- a/hosts/library/README.md
+++ b/hosts/library/README.md
@ -43,3 +43,4 @@ See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datase
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `library.mesh.vimium.net`.
+
--- a/hosts/library/default.nix
+++ b/hosts/library/default.nix
@ -19,7 +19,7 @@
    firewall = {
      enable = true;
      allowedTCPPorts = [
-        22 # SSH
+        22  # SSH
      ];
    };
  };
@ -71,14 +71,12 @@
    scrapeConfigs = [
      {
        job_name = "node";
-        static_configs = [
-          {
-            targets = [
-              "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
-              "127.0.0.1:${toString config.services.prometheus.exporters.zfs.port}"
-            ];
-          }
-        ];
+        static_configs = [{
+          targets = [
+            "127.0.0.1:${toString config.services.prometheus.exporters.node.port}"
+            "127.0.0.1:${toString config.services.prometheus.exporters.zfs.port}"
+          ];
+        }];
      }
    ];
  };
@ -92,8 +90,8 @@
    ];
    wants = [ "network-online.target" ];
    serviceConfig = {
-      Type = "simple";
-      ExecStart = pkgs.lib.mkForce ''
+      Type="simple";
+      ExecStart=pkgs.lib.mkForce ''
        ${pkgs.openssh}/bin/ssh \
          -NT \
          -o ExitOnForwardFailure=yes \
@ -103,83 +101,78 @@
          -R localhost:8000:localhost:8000 \
          jellyfin@vps1.mesh.vimium.net
      '';
-      Restart = "always";
-      RestartSec = 20;
+      Restart="always";
+      RestartSec=20;
    };
    wantedBy = [ "default.target" ];
  };

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

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

-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-      '';
-    in
-    {
-      enable = true;
-      package = pkgs.openresty;
-      recommendedGzipSettings = true;
-      recommendedOptimisation = true;
-      recommendedTlsSettings = true;
-      clientMaxBodySize = "2G";
-      virtualHosts = {
-        "library.mesh.vimium.net" = {
-          locations."/" = {
-            root = "/mnt/library";
-            extraConfig = ''
-              autoindex on;
-            '';
-          };
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+    '';
+  in {
+    enable = true;
+    package = pkgs.openresty;
+    recommendedGzipSettings = true;
+    recommendedOptimisation = true;
+    recommendedTlsSettings = true;
+    clientMaxBodySize = "2G";
+    virtualHosts = {
+      "library.mesh.vimium.net" = {
+        locations."/" = {
+          root = "/mnt/library";
+          extraConfig = ''
+            autoindex on;
+          '';
        };
-        "jellyfin.vimium.com" = {
-          default = true;
-          listen = [
-            {
-              addr = "127.0.0.1";
-              port = 8000;
-            }
-          ];
-          locations."/" = {
-            proxyPass = "http://localhost:8096";
-            extraConfig = proxyConfig;
-          };
-          locations."/metrics" = {
-            return = "404";
-          };
+      };
+      "jellyfin.vimium.com" = {
+        default = true;
+        listen = [
+          {
+            addr = "127.0.0.1";
+            port = 8000;
+          }
+        ];
+        locations."/" = {
+          proxyPass = "http://localhost:8096";
+          extraConfig = proxyConfig;
+        };
+        locations."/metrics" = {
+          return = "404";
        };
      };
    };
+  };

-  hardware.graphics = {
+  hardware.opengl = {
    enable = true;
    extraPackages = with pkgs; [
      vaapiVdpau
    ];
+    driSupport = true;
  };
-  users.users.jellyfin.extraGroups = [
-    "video"
-    "render"
-  ];
+  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;
-    programs = {
+    security = {
      gpg.enable = true;
    };
    shell = {
@ -199,3 +192,4 @@

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

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

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

  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
+
--- a/hosts/mail/README.md
+++ b/hosts/mail/README.md
@ -15,3 +15,4 @@ NVMe | `/dev/sda1` (ext4, NixOS Root)
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `mail.mesh.vimium.net`.
+
--- a/hosts/mail/default.nix
+++ b/hosts/mail/default.nix
@ -1,8 +1,4 @@
-{
-  lib,
-  self,
-  ...
-}:
+{ config, lib, self, ... }:

 {
  imports = [
@ -19,7 +15,7 @@
    firewall = {
      enable = true;
      allowedTCPPorts = [
-        22 # SSH
+        22    # SSH
      ];
    };
  };
--- a/hosts/mail/hardware-configuration.nix
+++ b/hosts/mail/hardware-configuration.nix
@ -1,7 +1,4 @@
-{
-  modulesPath,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:

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

  boot = {
    initrd = {
-      availableKernelModules = [
-        "ata_piix"
-        "uhci_hcd"
-        "xen_blkfront"
-        "vmw_pvscsi"
-      ];
+      availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
      kernelModules = [ "nvme" ];
    };
    loader.grub = {
@ -27,3 +19,4 @@

  zramSwap.enable = true;
 }
+
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@ -26,10 +26,7 @@
  networking = {
    hostId = "c5e68d78";
    networkmanager.enable = true;
-    firewall.trustedInterfaces = [
-      "lxdbr0"
-      "virbr0"
-    ]; # Work around https://github.com/NixOS/nixpkgs/issues/263359
+    firewall.trustedInterfaces = [ "lxdbr0" "virbr0" ]; # Work around https://github.com/NixOS/nixpkgs/issues/263359
  };

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

  modules = {
-    programs = {
-      dev = {
-        node.enable = true;
+    desktop = {
+      apps.qbittorrent.enable = true;
+      browsers = {
+        firefox.enable = true;
      };
-      emulators = {
-        gamecube.enable = true;
-        ps2.enable = true;
-        ps3.enable = true;
-        psp.enable = true;
-        wii.enable = true;
-        xbox.enable = true;
+      gaming = {
+        emulators = {
+          gamecube.enable = true;
+          ps2.enable = true;
+          ps3.enable = true;
+          psp.enable = true;
+          wii.enable = true;
+          xbox.enable = true;
+        };
+        lutris.enable = true;
      };
-      firefox.enable = true;
-      git.enable = true;
-      gpg.enable = true;
-      graphics = {
+      media.graphics = {
        modeling.enable = true;
        raster.enable = true;
        vector.enable = true;
      };
-      libreoffice.enable = true;
-      lutris.enable = true;
-      pass.enable = true;
-      neovim.enable = true;
-      qbittorrent.enable = true;
-      recording = {
+      media.recording = {
        audio.enable = true;
        video.enable = true;
      };
+      office.libreoffice.enable = true;
+    };
+    dev = {
+      node.enable = true;
+    };
+    editors = {
+      neovim.enable = true;
    };
    hardware.presonus-studio.enable = true;
+    security = {
+      gpg.enable = true;
+      pass.enable = true;
+    };
    services = {
      borgmatic = {
        enable = true;
@ -102,6 +105,7 @@
      gitea-runner.enable = true;
    };
    shell = {
+      git.enable = true;
      zsh.enable = true;
    };
  };
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/hosts/odyssey/hardware-configuration.nix
@ -1,10 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:

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

  boot = {
-    initrd.availableKernelModules = [
-      "xhci_pci"
-      "ehci_pci"
-      "nvme"
-      "usbhid"
-      "usb_storage"
-      "sd_mod"
-    ];
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
    initrd.kernelModules = [ ];
    initrd.supportedFilesystems = [ "zfs" ];
    kernelModules = [ "kvm-intel" ];
@ -32,7 +19,6 @@
    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,8 +1,4 @@
-{
-  pkgs,
-  self,
-  ...
-}:
+{ config, lib, pkgs, self, ... }:

 {
  imports = [
@ -104,6 +100,8 @@

  networking.hostId = "731d1660";

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

+  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;
+    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 = "${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 = {
-    system = {
+    networking = {
      wireless = {
        enable = true;
        interfaces = [ "wlan0" ];
@ -122,20 +225,21 @@
    services = {
      borgmatic = {
        enable = true;
+        directories = [
+          "/var/lib/mosquitto"
+          "/var/lib/zigbee2mqtt"
+        ];
        repoPath = "ssh://qcw86s11@qcw86s11.repo.borgbase.com/./repo";
      };
-      home-assistant.enable = true;
    };
  };

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

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

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

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

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

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

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

 {
  imports = [
@ -56,7 +54,7 @@
    ];
  };

-  modules.services.tailscale = {
+  modules.networking.tailscale = {
    enable = true;
    restrictSSH = false;
  };
--- a/hosts/skycam/README.md
+++ b/hosts/skycam/README.md
@ -26,3 +26,4 @@ To generate a compressed SD card image for Skycam, run:

 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
@ -1,10 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
+{ config, lib, pkgs, self, ... }:

 {
  imports = [
@ -27,36 +21,27 @@
      # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
      overlays =
        let
-          mkCompatibleDtsFile =
-            dtbo:
+          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
-                  '';
+              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";
+              "${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";
-          }
-        ];
+          [
+            {
+              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
@ -98,10 +83,9 @@
      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
+      ExecStart = ''${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
+        --host=0.0.0.0 \
+        --resolution=4608x2592
      '';
      DynamicUser = "yes";
      SupplementaryGroups = [ "video" ];
--- a/hosts/skycam/hardware-configuration.nix
+++ b/hosts/skycam/hardware-configuration.nix
@ -1,8 +1,4 @@
-{
-  lib,
-  modulesPath,
-  ...
-}:
+{ config, lib, modulesPath, ... }:

 {
  imports = [
@ -15,17 +11,14 @@
      "cma=512M"
      "panic=0"
    ];
-    supportedFilesystems = lib.mkForce [
-      "f2fs"
-      "vfat"
-      "xfs"
-    ];
+    supportedFilesystems = lib.mkForce [ "f2fs" "vfat" "xfs" ];
    tmp.cleanOnBoot = false;
  };

  nixpkgs.overlays = [
    (final: super: {
-      makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
+      makeModulesClosure = x:
+        super.makeModulesClosure (x // { allowMissing = true; });
    })
  ];

@ -37,3 +30,4 @@
    };
  };
 }
+
--- a/hosts/vps1/README.md
+++ b/hosts/vps1/README.md
@ -15,3 +15,4 @@ NVMe | `/dev/sda1` (ext4, NixOS Root)
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `vps1.mesh.vimium.net`.
+
--- a/hosts/vps1/default.nix
+++ b/hosts/vps1/default.nix
@ -1,9 +1,4 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ config, pkgs, lib, ... }:

 {
  imports = [
@ -18,7 +13,7 @@
    firewall = {
      enable = true;
      allowedTCPPorts = [
-        22 # SSH
+        22    # SSH
      ];
    };
  };
@ -42,10 +37,7 @@
    groups = {
      jellyfin = { };
    };
-    extraGroups.acme.members = [
-      "kanidm"
-      "nginx"
-    ];
+    extraGroups.acme.members = [ "kanidm" "nginx" ];
  };

  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
@ -55,28 +47,26 @@
    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.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" = {
@ -89,6 +79,7 @@
  };

  modules = rec {
+    databases.postgresql.enable = true;
    services = {
      borgmatic = {
        enable = true;
@ -112,11 +103,10 @@
          signal = true;
          whatsapp = true;
        };
-        usePostgresql = services.postgresql.enable;
+        usePostgresql = databases.postgresql.enable;
      };
      nginx.enable = true;
      photoprism.enable = true;
-      postgresql.enable = true;
    };
  };

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

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

  boot = {
    initrd = {
-      availableKernelModules = [
-        "ata_piix"
-        "uhci_hcd"
-        "xen_blkfront"
-        "vmw_pvscsi"
-      ];
+      availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
      kernelModules = [ "nvme" ];
    };
    loader.grub.device = "/dev/sda";
@ -31,3 +23,4 @@
    };
  };
 }
+
--- a/modules/nixos/services/postgresql.nix
+++ b/modules/nixos/services/postgresql.nix
@ -5,10 +5,9 @@
 }:

 let
-  cfg = config.modules.services.postgresql;
-in
-{
-  options.modules.services.postgresql = {
+  cfg = config.modules.databases.postgresql;
+in {
+  options.modules.databases.postgresql = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/default.nix
+++ b/modules/default.nix
@ -0,0 +1,54 @@
+{
+  imports = [
+    ./options.nix
+    ./podman.nix
+    ./databases/postgresql.nix
+    ./desktop/gnome.nix
+    ./desktop/forensics.nix
+    ./desktop/hyprland.nix
+    ./desktop/kde.nix
+    ./desktop/mimeapps.nix
+    ./desktop/apps/qbittorrent.nix
+    ./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
+    ./desktop/gaming/steam.nix
+    ./desktop/media/graphics.nix
+    ./desktop/media/recording.nix
+    ./desktop/office/libreoffice.nix
+    ./dev/cc.nix
+    ./dev/java.nix
+    ./dev/lua.nix
+    ./dev/node.nix
+    ./dev/python.nix
+    ./dev/rust.nix
+    ./dev/scala.nix
+    ./dev/shell.nix
+    ./dev/zig.nix
+    ./editors/neovim
+    ./editors/vscode.nix
+    ./hardware/presonus-studio.nix
+    ./networking/netbird.nix
+    ./networking/tailscale.nix
+    ./networking/wireless.nix
+    ./security/gpg.nix
+    ./security/pass.nix
+    ./services/borgmatic
+    ./services/chrony
+    ./services/coturn
+    ./services/gitea
+    ./services/gitea-runner
+    ./services/headscale
+    ./services/immich
+    ./services/mail
+    ./services/matrix
+    ./services/nginx
+    ./services/photoprism
+    ./shell/git
+    ./shell/zsh
+  ];
+}
--- a/modules/home-manager/programs/qbittorrent.nix
+++ b/modules/home-manager/programs/qbittorrent.nix
@ -1,15 +1,8 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:

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

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

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

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

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

-let
-  cfg = config.modules.programs.brave;
-in
-{
-  options.modules.programs.brave = {
+let cfg = config.modules.desktop.browsers.brave;
+in {
+  options.modules.desktop.browsers.brave = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/firefox.nix
+++ b/modules/home-manager/programs/firefox.nix
@ -1,15 +1,8 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
+{ config, lib, self, ... }:

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

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

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

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

-let
-  cfg = config.modules.programs.emulators;
-in
-{
-  options.modules.programs.emulators = {
-    ds.enable = lib.mkOption {
+let cfg = config.modules.desktop.gaming.emulators;
+in {
+  options.modules.desktop.gaming.emulators = {
+    ds.enable       = lib.mkOption {
      default = false;
      example = true;
    };
-    gb.enable = lib.mkOption {
+    gb.enable       = lib.mkOption {
      default = false;
      example = true;
    };
-    gba.enable = lib.mkOption {
+    gba.enable      = lib.mkOption {
      default = false;
      example = true;
    };
@ -26,35 +19,35 @@ in
      default = false;
      example = true;
    };
-    ps1.enable = lib.mkOption {
+    ps1.enable      = lib.mkOption {
      default = false;
      example = true;
    };
-    ps2.enable = lib.mkOption {
+    ps2.enable      = lib.mkOption {
      default = false;
      example = true;
    };
-    ps3.enable = lib.mkOption {
+    ps3.enable      = lib.mkOption {
      default = false;
      example = true;
    };
-    psp.enable = lib.mkOption {
+    psp.enable      = lib.mkOption {
      default = false;
      example = true;
    };
-    snes.enable = lib.mkOption {
+    snes.enable     = lib.mkOption {
      default = false;
      example = true;
    };
-    switch.enable = lib.mkOption {
+    switch.enable   = lib.mkOption {
      default = false;
      example = true;
    };
-    wii.enable = lib.mkOption {
+    wii.enable      = lib.mkOption {
      default = false;
      example = true;
    };
-    xbox.enable = lib.mkOption {
+    xbox.enable     = lib.mkOption {
      default = false;
      example = true;
    };
@ -67,9 +60,14 @@ in
      (lib.mkIf cfg.ps3.enable rpcs3)
      (lib.mkIf cfg.psp.enable unstable.ppsspp)
      (lib.mkIf cfg.ds.enable desmume)
-      (lib.mkIf (cfg.gba.enable || cfg.gb.enable || cfg.snes.enable) higan)
+      (lib.mkIf (cfg.gba.enable ||
+             cfg.gb.enable  ||
+             cfg.snes.enable)
+        higan)
      (lib.mkIf cfg.switch.enable yuzuPackages.mainline)
-      (lib.mkIf (cfg.wii.enable || cfg.gamecube.enable) dolphin-emu)
+      (lib.mkIf (cfg.wii.enable ||
+             cfg.gamecube.enable)
+        dolphin-emu)
      (lib.mkIf cfg.xbox.enable unstable.xemu)
    ];
  };
--- a/modules/home-manager/programs/lutris.nix
+++ b/modules/home-manager/programs/lutris.nix
@ -1,15 +1,8 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:

-let
-  cfg = config.modules.programs.lutris;
-in
-{
-  options.modules.programs.lutris = {
+let cfg = config.modules.desktop.gaming.lutris;
+in {
+  options.modules.desktop.gaming.lutris = {
    enable = lib.mkOption {
      default = false;
      example = true;
@ -28,9 +21,10 @@ in
      vulkan-tools
    ];

-    hardware.graphics = {
+    hardware.opengl = {
      enable = true;
-      enable32Bit = true;
+      driSupport = true;
+      driSupport32Bit = true;
    };
  };
 }
--- a/modules/home-manager/programs/steam.nix
+++ b/modules/home-manager/programs/steam.nix
@ -1,14 +1,8 @@
-{
-  config,
-  lib,
-  ...
-}:
+{ config, lib, pkgs, ... }:

-let
-  cfg = config.modules.programs.steam;
-in
-{
-  options.modules.programs.steam = {
+let cfg = config.modules.desktop.gaming.steam;
+in {
+  options.modules.desktop.gaming.steam = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/nixos/system/desktop/gnome.nix
+++ b/modules/nixos/system/desktop/gnome.nix
@ -1,16 +1,8 @@
-{
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
+{ config, lib, pkgs, self, ... }:

-let
-  cfg = config.modules.system.desktop.gnome;
-in
-{
-  options.modules.system.desktop.gnome = {
+let cfg = config.modules.desktop.gnome;
+in {
+  options.modules.desktop.gnome = {
    enable = lib.mkOption {
      default = false;
      example = true;
@ -32,11 +24,6 @@ in
      "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";
@ -74,11 +61,6 @@ in
        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"
@ -95,6 +77,7 @@ in
          "appindicatorsupport@rgcjonas.gmail.com"
          # "arcmenu@arcmenu.com"
          "blur-my-shell@aunetx"
+          # "browser-tabs@com.github.harshadgavali"
          "burn-my-windows@schneegans.github.com"
          "clipboard-indicator@tudmotu.com"
          "CoverflowAltTab@palatis.blogspot.com"
@ -106,13 +89,14 @@ in
          # "forge@jmmaranan.com"
          "gsconnect@andyholmes.github.io"
          # "gSnap@micahosborne"
-          "hidetopbar@mathieu.bidon.ca"
+          # "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"
+          # "rounded-window-corners@yilozt"
          # "search-light@icedman.github.com"
          # "smart-auto-move@khimaros.com"
          "space-bar@luchrioh"
@ -126,7 +110,6 @@ in
        favorite-apps = [
          "firefox.desktop"
          "org.gnome.Nautilus.desktop"
-          "org.gnome.Ptyxis.desktop"
        ];
      };
      "org/gnome/shell/extensions/blur-my-shell/panel" = {
@ -200,6 +183,11 @@ in
        outer-gaps = 8;
        enable-blur-snap-assistant = true;
      };
+      "org/gnome/Console" = {
+        font-scale = 1.4;
+        use-system-font = false;
+        custom-font = "ComicShannsMono Nerd Font 10";
+      };
      "org/gtk/settings/file-chooser" = {
        show-hidden = true;
        sort-directories-first = true;
@ -216,47 +204,38 @@ in
    };

    home.configFile = {
-      "Kvantum/kvantum.kvconfig".text = lib.generators.toINI { } {
+      "Kvantum/kvantum.kvconfig".text = lib.generators.toINI {} {
        General.theme = "KvLibadwaitaDark";
      };
      "Kvantum/KvLibadwaita".source = "${self.inputs.kvlibadwaita}/src/KvLibadwaita";
    };

-    user.packages =
-      with pkgs;
-      [
-        authenticator
-        # bottles
-        # bustle
-        celluloid
-        # d-spy
-        # drawing
-        # fragments
-        dconf-editor
-        ghex
-        # gnome-builder
-        gnome-decoder
-        gnome-firmware
-        gnome-frog
-        # gnome-obfuscate
-        gnome-podcasts
-        identity
-        # mission-center
-        mousam
-        newsflash
-        ptyxis
-        # schemes
-        shortwave
-        sysprof
-      ]
-      ++ (
-        if config.virtualisation.podman.enable then
-          [
-            pods
-          ]
-        else
-          [ ]
-      );
+    user.packages = with pkgs; [
+      authenticator
+      # bottles
+      # bustle
+      celluloid
+      # d-spy
+      # drawing
+      # fragments
+      gnome.dconf-editor
+      gnome.ghex
+      # gnome-builder
+      gnome-decoder
+      gnome-firmware
+      gnome-frog
+      # gnome-obfuscate
+      gnome-podcasts
+      identity
+      mission-center
+      mousam
+      newsflash
+      # schemes
+      shortwave
+      sysprof
+    ] ++ (if config.virtualisation.podman.enable then [
+      pods
+    ] else []);

    environment.systemPackages = with pkgs.unstable; [
      adw-gtk3
@ -271,6 +250,7 @@ in
      gnomeExtensions.appindicator
      gnomeExtensions.arcmenu
      gnomeExtensions.blur-my-shell
+      gnomeExtensions.browser-tabs
      gnomeExtensions.burn-my-windows
      gnomeExtensions.clipboard-indicator
      gnomeExtensions.coverflow-alt-tab
@ -286,9 +266,10 @@ in
      gnomeExtensions.just-perfection
      gnomeExtensions.media-controls
      gnomeExtensions.mouse-follows-focus
-      # gnomeExtensions.pano (disabled due to: https://github.com/NixOS/nixpkgs/issues/369438)
+      gnomeExtensions.pano
      gnomeExtensions.paperwm
      gnomeExtensions.pip-on-top
+      gnomeExtensions.rounded-window-corners
      gnomeExtensions.search-light
      gnomeExtensions.smart-auto-move
      gnomeExtensions.space-bar
--- a/modules/nixos/system/desktop/hyprland.nix
+++ b/modules/nixos/system/desktop/hyprland.nix
@ -1,15 +1,8 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:

-let
-  cfg = config.modules.system.desktop.hyprland;
-in
-{
-  options.modules.system.desktop.hyprland = {
+let cfg = config.modules.desktop.hyprland;
+in {
+  options.modules.desktop.hyprland = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/nixos/system/desktop/kde.nix
+++ b/modules/nixos/system/desktop/kde.nix
@ -1,15 +1,8 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:

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

-let
-  cfg = config.modules.programs.graphics;
-in
-{
-  options.modules.programs.graphics = {
+let cfg = config.modules.desktop.media.graphics;
+in {
+  options.modules.desktop.media.graphics = {
    modeling.enable = lib.mkOption {
      default = false;
      example = true;
    };
-    raster.enable = lib.mkOption {
+    raster.enable   = lib.mkOption {
      default = false;
      example = true;
    };
-    vector.enable = lib.mkOption {
+    vector.enable   = lib.mkOption {
      default = false;
      example = true;
    };
--- a/modules/desktop/media/recording.nix
+++ b/modules/desktop/media/recording.nix
@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.desktop.media.recording;
+in {
+  options.modules.desktop.media.recording = {
+    audio.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    video.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = {
+    user.packages = with pkgs;
+      (if cfg.audio.enable then [
+        ardour
+        audacity
+      ] else []) ++
+      (if cfg.video.enable then [
+        handbrake
+        mkvtoolnix
+        obs-studio
+      ] else []);
+  };
+}
--- a/modules/nixos/system/desktop/mimeapps.nix
+++ b/modules/nixos/system/desktop/mimeapps.nix
@ -1,16 +1,11 @@
-{
-  config,
-  lib,
-  ...
-}:
+{ config, lib, pkgs, ... }:

 let
-  cfg = config.modules.system.desktop.mimeapps;
+  cfg = config.modules.desktop.mimeapps;
  avApp = "io.github.celluloid_player.Celluloid.desktop";
  imageApp = "org.gnome.eog.desktop";
-in
-{
-  options.modules.system.desktop.mimeapps = {
+in {
+  options.modules.desktop.mimeapps = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/desktop/office/libreoffice.nix
+++ b/modules/desktop/office/libreoffice.nix
@ -0,0 +1,38 @@
+{ config, lib, pkgs, ... }:
+
+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 {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice)
+      hunspell
+      hunspellDicts.en-gb-large
+      hunspellDicts.en-us-large
+    ];
+  };
+}
--- a/modules/home-manager/programs/dev/cc.nix
+++ b/modules/home-manager/programs/dev/cc.nix
@ -1,15 +1,8 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:

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

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

-let
-  cfg = config.modules.programs.dev.lua;
-in
-{
-  options.modules.programs.dev.lua = {
+let cfg = config.modules.dev.lua;
+in {
+  options.modules.dev.lua = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/dev/node.nix
+++ b/modules/dev/node.nix
@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.dev.node;
+in {
+  options.modules.dev.node = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      nodejs_latest
+    ];
+  };
+}
--- a/modules/home-manager/programs/dev/python.nix
+++ b/modules/home-manager/programs/dev/python.nix
@ -1,15 +1,8 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:

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

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

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

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

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

 let
-  cfg = config.modules.programs.neovim;
-in
-{
-  options.modules.programs.neovim = {
+  cfg = config.modules.editors.neovim;
+in {
+  options.modules.editors.neovim = {
    enable = lib.mkOption {
      default = false;
      example = true;
@ -16,7 +11,7 @@ in
  };

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

@ -64,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;
          };
-          ts_ls.enable = true;
+          tsserver.enable = true;
        };
      };

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

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

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

      plugins.undotree.enable = true;

-      plugins.web-devicons.enable = true;
-
      # plugins.gitsigns.enable = true;
      # plugins.gitgutter.enable = true;
      # plugins.goyo.enable = true;
--- a/modules/home-manager/programs/vscode.nix
+++ b/modules/home-manager/programs/vscode.nix
@ -1,15 +1,8 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:

-let
-  cfg = config.modules.programs.vscode;
-in
-{
-  options.modules.programs.vscode = {
+let cfg = config.modules.editors.vscode;
+in {
+  options.modules.editors.vscode = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch
+++ b/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch
@ -15,16 +15,16 @@ index ab5fed9f55b6..da50a4782414 100644
 --- a/sound/usb/format.c
 +++ b/sound/usb/format.c
@@ -378,8 +378,8 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip,
-
+ 
 		for (rate = min; rate <= max; rate += res) {
-
+ 
 -			/* Filter out invalid rates on Presonus Studio 1810c */
 -			if (chip->usb_id == USB_ID(0x194f, 0x010c) &&
 +			/* Filter out invalid rates on Presonus Studio 1824c */
 +			if (chip->usb_id == USB_ID(0x194f, 0x010d) &&
 			    !s1810c_valid_sample_rate(fp, rate))
 				goto skip_rate;
-
+ 
 diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
 index 898bc3baca7b..c3135459c38c 100644
 --- a/sound/usb/mixer_quirks.c
@ -32,7 +32,7 @@ index 898bc3baca7b..c3135459c38c 100644
@@ -3445,7 +3445,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
 		err = snd_rme_controls_create(mixer);
 		break;
-
+ 
 -	case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */
 +	case USB_ID(0x194f, 0x010d): /* Presonus Studio 1824c */
 		err = snd_sc1810_init_mixer(mixer);
@ -44,7 +44,7 @@ index fac4bbc6b275..5bc2e66d452c 100644
 +++ b/sound/usb/mixer_s1810c.c
@@ -552,7 +552,7 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer)
 		return 0;
-
+ 
 	dev_info(&dev->dev,
 -		 "Presonus Studio 1810c, device_setup: %u\n", chip->setup);
 +		 "Presonus Studio 1824c, device_setup: %u\n", chip->setup);
@ -64,7 +64,8 @@ index ab2b938502eb..b86832edaaa0 100644
 +	/* presonus studio 1824c: skip altsets incompatible with device_setup */
 +	if (chip->usb_id == USB_ID(0x194f, 0x010d))
 		return s1810c_skip_setting_quirk(chip, iface, altno);
-
-
--
+ 
+ 
+-- 
 2.42.0
+
--- a/modules/nixos/hardware/presonus-studio/default.nix
+++ b/modules/nixos/hardware/presonus-studio/default.nix
@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:
 let
  cfg = config.modules.hardware.presonus-studio;
  snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
@ -18,8 +13,7 @@ let
      "channelmix.upmix-method" = "psd";
    };
  };
-in
-{
+in {
  options.modules.hardware.presonus-studio = {
    enable = lib.mkOption {
      default = false;
@ -73,23 +67,11 @@ in
                "capture.props" = {
                  "node.name" = "Genelec_Speakers";
                  "media.class" = "Audio/Sink";
-                  "audio.position" = [
-                    "FL"
-                    "FR"
-                    "SL"
-                    "SR"
-                    "LFE"
-                  ];
+                  "audio.position" = [ "FL" "FR" "SL" "SR" "LFE" ];
                };
                "playback.props" = {
                  "node.name" = "playback.Genelec_Speakers";
-                  "audio.position" = [
-                    "AUX0"
-                    "AUX1"
-                    "AUX3"
-                    "AUX4"
-                    "AUX5"
-                  ];
+                  "audio.position" = [ "AUX0" "AUX1" "AUX3" "AUX4" "AUX5" ];
                  "target.object" = "alsa_output.usb-PreSonus_Studio_1824c_SC4E21110775-00.multichannel-output";
                  "stream.dont-remix" = true;
                  "node.passive" = true;
@ -103,4 +85,4 @@ in
      client-rt."40-upmix" = upmixConfig;
    };
  };
-}
+ } 
--- a/modules/nixos/hardware/presonus-studio/snd-usb-audio.nix
+++ b/modules/nixos/hardware/presonus-studio/snd-usb-audio.nix
@ -1,17 +1,8 @@
-{
-  pkgs,
-  lib,
-  kernel ? pkgs.linuxPackages_latest.kernel,
-}:
+{ pkgs, lib, kernel ? pkgs.linuxPackages_latest.kernel }:

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

  kernel_dev = kernel.dev;
  kernelVersion = kernel.modDirVersion;
@ -42,3 +33,4 @@ pkgs.stdenv.mkDerivation {
    license = lib.licenses.gpl2;
  };
 }
+
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@ -1,33 +0,0 @@
-{
-  imports = [
-    ./options.nix
-    ./programs/brave.nix
-    ./programs/dev/cc.nix
-    ./programs/dev/java.nix
-    ./programs/dev/lua.nix
-    ./programs/dev/node.nix
-    ./programs/dev/python.nix
-    ./programs/dev/rust.nix
-    ./programs/dev/scala.nix
-    ./programs/dev/shell.nix
-    ./programs/dev/zig.nix
-    ./programs/emulators.nix
-    ./programs/firefox.nix
-    ./programs/forensics.nix
-    ./programs/git
-    ./programs/gpg.nix
-    ./programs/graphics.nix
-    ./programs/libreoffice.nix
-    ./programs/lutris.nix
-    ./programs/neovim.nix
-    ./programs/pass.nix
-    ./programs/qbittorrent.nix
-    ./programs/recording.nix
-    ./programs/slack.nix
-    ./programs/steam.nix
-    ./programs/thunderbird.nix
-    ./programs/vscode.nix
-    ./programs/zoom.nix
-    ./shell/zsh
-  ];
-}
--- a/modules/home-manager/options.nix
+++ b/modules/home-manager/options.nix
@ -1,137 +0,0 @@
-{
-  config,
-  options,
-  lib,
-  self,
-  ...
-}:
-
-with lib;
-{
-  options = with types; {
-    user = mkOption {
-      type = attrs;
-      default = { };
-    };
-
-    home = {
-      configFile = mkOption {
-        type = attrs;
-        default = { };
-        description = "Files to place in $XDG_CONFIG_HOME";
-      };
-      dataFile = mkOption {
-        type = attrs;
-        default = { };
-        description = "Files to place in $XDG_DATA_HOME";
-      };
-      file = mkOption {
-        type = attrs;
-        default = { };
-        description = "Files to place directly in $HOME";
-      };
-      packages = mkOption {
-        type = attrs;
-        default = { };
-        description = "User-level installed packages";
-      };
-      programs = mkOption {
-        type = attrs;
-        default = { };
-        description = "Programs managed directly from home-manager";
-      };
-      services = mkOption {
-        type = attrs;
-        default = { };
-        description = "Services managed directly from home-manager";
-      };
-    };
-
-    dconf.settings = mkOption {
-      type = attrs;
-      default = { };
-      description = "dconf settings to enable";
-    };
-
-    env = mkOption {
-      type = attrsOf (oneOf [
-        str
-        path
-        (listOf (either str path))
-      ]);
-      apply = mapAttrs (
-        n: v: if isList v then concatMapStringsSep ":" (x: toString x) v else (toString v)
-      );
-      default = { };
-      description = "";
-    };
-  };
-
-  config = {
-    age.secrets."passwords/users/jordan".file = "${self.inputs.secrets}/passwords/users/jordan.age";
-    user =
-      let
-        user = builtins.getEnv "USER";
-        name =
-          if
-            elem user [
-              ""
-              "root"
-            ]
-          then
-            "jordan"
-          else
-            user;
-      in
-      {
-        inherit name;
-        isNormalUser = true;
-        extraGroups = [
-          "audio"
-          "lxd"
-          "networkmanager"
-          "wheel"
-        ];
-        description = "Jordan Holt";
-        useDefaultShell = true;
-        openssh.authorizedKeys.keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
-        ];
-        hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
-        home = "/home/${name}";
-        group = "users";
-        uid = 1000;
-      };
-
-    home-manager = {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-
-      users.${config.user.name} = {
-        home = {
-          file = mkAliasDefinitions options.home.file;
-          stateVersion = config.system.stateVersion;
-        };
-        programs = mkAliasDefinitions options.home.programs;
-        services = mkAliasDefinitions options.home.services;
-        xdg = {
-          enable = true;
-          configFile = mkAliasDefinitions options.home.configFile;
-          dataFile = mkAliasDefinitions options.home.dataFile;
-        };
-        dconf.settings = mkAliasDefinitions options.dconf.settings;
-      };
-
-      sharedModules = [
-        self.inputs.nixvim.homeManagerModules.nixvim
-        self.inputs.plasma-manager.homeManagerModules.plasma-manager
-      ];
-    };
-
-    users.users.${config.user.name} = mkAliasDefinitions options.user;
-
-    environment.extraInit = concatStringsSep "\n" (
-      mapAttrsToList (n: v: "export ${n}=\"${v}\"") config.env
-    );
-  };
-}
--- a/modules/home-manager/programs/dev/node.nix
+++ b/modules/home-manager/programs/dev/node.nix
@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.modules.programs.dev.node;
-in
-{
-  options.modules.programs.dev.node = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
-      nodejs_22
-    ];
-  };
-}
--- a/modules/home-manager/programs/libreoffice.nix
+++ b/modules/home-manager/programs/libreoffice.nix
@ -1,44 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.modules.programs.libreoffice;
-in
-# libreoffice-gtk4 = pkgs.libreoffice.override {
-#   extraMakeWrapperArgs = [
-#     "--set SAL_USE_VCLPLUGIN gtk4"
-#   ];
-#   unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: {
-#     buildInputs = oldAttrs.buildInputs ++ [
-#       pkgs.gtk4
-#     ];
-#     configureFlags = oldAttrs.configureFlags ++ [
-#       "--disable-werror"
-#       "--enable-gtk4"
-#     ];
-#     passthru = oldAttrs.passthru // {
-#       inherit (pkgs) gtk4;
-#     };
-#   });
-# };
-{
-  options.modules.programs.libreoffice = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
-      (if config.modules.system.desktop.kde.enable == true then libreoffice-qt else libreoffice)
-      hunspell
-      hunspellDicts.en-gb-large
-      hunspellDicts.en-us-large
-    ];
-  };
-}
--- a/modules/home-manager/programs/recording.nix
+++ b/modules/home-manager/programs/recording.nix
@ -1,46 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.modules.programs.recording;
-in
-{
-  options.modules.programs.recording = {
-    audio.enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    video.enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = {
-    user.packages =
-      with pkgs;
-      (
-        if cfg.audio.enable then
-          [
-            ardour
-            audacity
-          ]
-        else
-          [ ]
-      )
-      ++ (
-        if cfg.video.enable then
-          [
-            handbrake
-            mkvtoolnix
-            obs-studio
-          ]
-        else
-          [ ]
-      );
-  };
-}
--- a/modules/nixos/services/netbird.nix
+++ b/modules/nixos/services/netbird.nix
@ -1,15 +1,10 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
+{ config, lib, self, ... }:

 let
-  cfg = config.modules.services.netbird;
-in
-{
-  options.modules.services.netbird = {
+  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;
@ -48,9 +43,7 @@ in
          HttpConfig = {
            AuthAudience = "netbird";
          };
-          StoreConfig = {
-            Engine = "sqlite";
-          };
+          StoreConfig = { Engine = "sqlite"; };
          TURNConfig = {
            Secret._secret = config.age.secrets."passwords/services/coturn/static-auth-secret".path;
            TimeBasedCredentials = true;
--- a/modules/nixos/services/tailscale.nix
+++ b/modules/nixos/services/tailscale.nix
@ -1,18 +1,11 @@
-{
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
+{ config, lib, pkgs, self, ... }:

 let
-  cfg = config.modules.services.tailscale;
+  cfg = config.modules.networking.tailscale;
  headscale = "https://headscale.vimium.net";
  hostname = config.networking.hostName;
-in
-{
-  options.modules.services.tailscale = {
+in {
+  options.modules.networking.tailscale = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/nixos/system/wireless.nix
+++ b/modules/nixos/system/wireless.nix
@ -1,24 +1,17 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
+{ config, lib, pkgs, self, ... }:

 with lib;

-let
-  cfg = config.modules.system.wireless;
-in
-{
-  options.modules.system.wireless = {
+let cfg = config.modules.networking.wireless;
+in {
+  options.modules.networking.wireless = {
    enable = mkOption {
      default = false;
      example = true;
      description = mdDoc "Automatically connect to known networks";
    };
    interfaces = mkOption {
-      default = [ ]; # All interfaces
+      default = [ ];  # All interfaces
      example = [ "wlan0" ];
      description = mdDoc "Interfaces for `wpa_supplicant` to bind to";
    };
@ -33,9 +26,9 @@ in
      wireless = {
        enable = true;
        interfaces = cfg.interfaces;
-        secretsFile = config.age.secrets."passwords/networks".path;
+        environmentFile = config.age.secrets."passwords/networks".path;
        networks = {
-          "Apollo 600 Mbps".pskRaw = "ext:PSK_APOLLO";
+          "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
        };
      };
      networkmanager.ensureProfiles.profiles = {
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@ -1,26 +0,0 @@
-{
-  imports = [
-    ./hardware/presonus-studio
-    ./podman.nix
-    ./services/borgmatic.nix
-    ./services/chrony.nix
-    ./services/coturn.nix
-    ./services/gitea.nix
-    ./services/gitea-runner.nix
-    ./services/headscale.nix
-    ./services/home-assistant
-    ./services/mail.nix
-    ./services/matrix.nix
-    ./services/music-assistant.nix
-    ./services/netbird.nix
-    ./services/nginx.nix
-    ./services/photoprism.nix
-    ./services/postgresql.nix
-    ./services/tailscale.nix
-    ./system/desktop/gnome.nix
-    ./system/desktop/hyprland.nix
-    ./system/desktop/kde.nix
-    ./system/desktop/mimeapps.nix
-    ./system/wireless.nix
-  ];
-}
--- a/modules/nixos/services/home-assistant/default.nix
+++ b/modules/nixos/services/home-assistant/default.nix
@ -1,315 +0,0 @@
-{
-  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
-        ];
-
-      customComponents = [
-        pkgs.ui-lovelace-minimalist
-      ];
-
-      customLovelaceModules =
-        with pkgs.home-assistant-custom-lovelace-modules;
-        [
-          bubble-card
-          button-card
-          mushroom
-          sankey-chart
-          universal-remote-card
-          # zigbee2mqtt-networkmap
-        ]
-        ++ [
-          pkgs.hass-browser-mod
-        ];
-    };
-
-    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/nixos/services/home-assistant/floorplan/default.nix
+++ b/modules/nixos/services/home-assistant/floorplan/default.nix
@ -1,100 +0,0 @@
-{
-  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/nixos/services/home-assistant/floorplan/style.css
+++ b/modules/nixos/services/home-assistant/floorplan/style.css
@ -1,27 +0,0 @@
-#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/nixos/services/home-assistant/mqtt.nix
+++ b/modules/nixos/services/home-assistant/mqtt.nix
@ -1,92 +0,0 @@
-{
-  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";
-        };
-        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";
-          adapter = "zstack";
-        };
-        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/nixos/services/matrix.nix
+++ b/modules/nixos/services/matrix.nix
@ -1,248 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-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/nixos/services/music-assistant.nix
+++ b/modules/nixos/services/music-assistant.nix
@ -1,37 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-
-let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    ;
-  cfg = config.modules.services.music-assistant;
-in
-{
-  options.modules.services.music-assistant.enable = mkEnableOption "music-assistant";
-
-  config = mkIf cfg.enable {
-    services = {
-      nginx.virtualHosts."music-assistant.${config.networking.hostName}" = {
-        extraConfig = ''
-          proxy_buffering off;
-        '';
-        locations."/" = {
-          proxyPass = "http://[::1]:8095";
-          proxyWebsockets = true;
-        };
-      };
-      music-assistant = {
-        enable = true;
-        providers = [
-          "hass"
-          "jellyfin"
-        ];
-      };
-    };
-  };
-}
--- a/modules/nixos/services/nginx.nix
+++ b/modules/nixos/services/nginx.nix
@ -1,193 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.modules.services.nginx;
-  nginxErrorPages = ''
-    location @error_pages {
-      rewrite ^.*$ /''${status}.html break;
-
-      root "/var/www/html/errors";
-    }
-  '';
-  nginxEdgeHeaders = ''
-    more_set_headers 'Server: Vimium';
-    more_set_headers 'Access-Control-Allow-Origin: *';
-    add_header Expect-CT max-age=30 always;
-    add_header Referrer-Policy strict-origin-when-cross-origin always;
-    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
-    add_header Vimium-Responding-Instance $hostname;
-    add_header X-XSS-Protection "1; mode=block" always;
-    add_header X-Content-Type-Options nosniff always;
-  '';
-  nginxStrictHeaders = ''
-    add_header X-Frame-Options SAMEORIGIN always;
-    add_header Permissions-Policy "fullscreen=(self), sync-xhr=(self)" always;
-  '';
-  mkRedirect = from: to: {
-    "${from}" = {
-      forceSSL = true;
-      enableACME = true;
-      serverAliases = [ "www.${from}" ];
-      locations."/".return = "301 https://${to}$request_uri";
-      extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
-    };
-  };
-in
-{
-  options.modules.services.nginx = {
-    enable = mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = [
-      80 # HTTP
-      443 # HTTPS
-    ];
-
-    services.nginx = {
-      enable = true;
-      package = pkgs.openresty;
-      recommendedGzipSettings = true;
-      recommendedOptimisation = true;
-      recommendedTlsSettings = true;
-      clientMaxBodySize = "2G";
-      sslProtocols = "TLSv1.2 TLSv1.3";
-      sslCiphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
-      appendHttpConfig = ''
-        error_page 400 @error_pages;
-        error_page 401 @error_pages;
-        error_page 403 @error_pages;
-        error_page 404 @error_pages;
-        error_page 405 @error_pages;
-        error_page 429 @error_pages;
-        error_page 500 @error_pages;
-        error_page 501 @error_pages;
-        error_page 502 @error_pages;
-        error_page 503 @error_pages;
-        error_page 504 @error_pages;
-
-        client_body_buffer_size 16k;
-        client_header_buffer_size 8k;
-      '';
-      appendConfig = ''
-        worker_processes auto;
-        worker_cpu_affinity auto;
-        worker_rlimit_nofile 50000;
-      '';
-      eventsConfig = ''
-        worker_connections 20000;
-        multi_accept off;
-      '';
-      proxyCachePath = {
-        "skycam" = {
-          enable = true;
-          keysZoneName = "skycam_cache";
-          maxSize = "100m";
-        };
-      };
-      virtualHosts =
-        {
-          ## Static sites
-          "jellyfin.vimium.com" = {
-            forceSSL = true;
-            enableACME = true;
-            extraConfig = nginxErrorPages + nginxEdgeHeaders;
-            locations."/" = {
-              proxyPass = "http://localhost:8000";
-              extraConfig = ''
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header Host $host;
-
-                proxy_set_header Range $http_range;
-                proxy_set_header If-Range $http_if_range;
-
-                proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-              '';
-            };
-          };
-          "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;
-            enableACME = true;
-            extraConfig = ''
-              ${nginxErrorPages}
-              more_set_headers 'Server: Vimium';
-            '';
-            locations."/" = {
-              root = "/var/www/pki.vimium.com";
-            };
-          };
-          "suhailhussain.com" = {
-            forceSSL = true;
-            enableACME = true;
-            serverAliases = [ "www.suhailhussain.com" ];
-            extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
-            locations."/" = {
-              root = "/var/www/suhailhussain.com";
-            };
-          };
-          "vimium.com" = {
-            default = true;
-            forceSSL = true;
-            enableACME = true;
-            serverAliases = [ "www.vimium.com" ];
-            extraConfig =
-              nginxErrorPages
-              + nginxEdgeHeaders
-              + nginxStrictHeaders
-              + ''
-                add_header Content-Security-Policy "default-src 'self' https://vimium.com https://www.vimium.com; style-src 'unsafe-inline'; object-src 'none'; upgrade-insecure-requests" always;
-              '';
-            locations."/" = {
-              root = "/var/www/vimium.com";
-            };
-          };
-        }
-        ## Redirects
-        // (mkRedirect "h0lt.com" "jdholt.com")
-        // (mkRedirect "jordanholt.xyz" "jdholt.com")
-        // (mkRedirect "omnimagic.com" "vimium.com")
-        // (mkRedirect "omnimagic.net" "vimium.com")
-        // (mkRedirect "thelostlegend.com" "suhailhussain.com")
-        // (mkRedirect "vimium.co" "vimium.com")
-        // (mkRedirect "vimium.co.uk" "vimium.com")
-        // (mkRedirect "vimium.info" "vimium.com")
-        // (mkRedirect "vimium.net" "vimium.com")
-        // (mkRedirect "vimium.org" "vimium.com")
-        // (mkRedirect "vimium.xyz" "vimium.com");
-    };
-  };
-}
--- a/modules/options.nix
+++ b/modules/options.nix
@ -0,0 +1,82 @@
+{ config, options, lib, self, ... }:
+
+with lib;
+{
+  options = with types; {
+    user = mkOption { type = attrs; default = { }; };
+
+    home = {
+      configFile  = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_CONFIG_HOME"; };
+      dataFile    = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_DATA_HOME"; };
+      file        = mkOption { type = attrs; default = { }; description = "Files to place directly in $HOME"; };
+      packages    = mkOption { type = attrs; default = { }; description = "User-level installed packages"; };
+      programs    = mkOption { type = attrs; default = { }; description = "Programs managed directly from home-manager"; };
+      services    = mkOption { type = attrs; default = { }; description = "Services managed directly from home-manager"; };
+    };
+
+    dconf.settings = mkOption { type = attrs; default = { }; description = "dconf settings to enable"; };
+
+    env = mkOption {
+      type = attrsOf (oneOf [ str path (listOf (either str path)) ]);
+      apply = mapAttrs (n: v:
+        if isList v then
+          concatMapStringsSep ":" (x: toString x) v
+        else
+          (toString v));
+      default = { };
+      description = "";
+    };
+  };
+
+  config = {
+    age.secrets."passwords/users/jordan".file = "${self.inputs.secrets}/passwords/users/jordan.age";
+    user =
+      let user = builtins.getEnv "USER";
+          name = if elem user [ "" "root" ] then "jordan" else user;
+      in {
+        inherit name;
+        isNormalUser = true;
+        extraGroups = [ "networkmanager" "wheel" "lxd" ];
+        description = "Jordan Holt";
+        useDefaultShell = true;
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+        ];
+        hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
+        home = "/home/${name}";
+        group = "users";
+        uid = 1000;
+      };
+
+    home-manager = {
+      useGlobalPkgs = true;
+      useUserPackages = true;
+
+      users.${config.user.name} = {
+        home = {
+          file = mkAliasDefinitions options.home.file;
+          stateVersion = config.system.stateVersion;
+        };
+        programs      = mkAliasDefinitions options.home.programs;
+        services      = mkAliasDefinitions options.home.services;
+        xdg = {
+          enable      = true;
+          configFile  = mkAliasDefinitions options.home.configFile;
+          dataFile    = mkAliasDefinitions options.home.dataFile;
+        };
+        dconf.settings = mkAliasDefinitions options.dconf.settings;
+      };
+
+      sharedModules = [
+        self.inputs.nixvim.homeManagerModules.nixvim
+        self.inputs.plasma-manager.homeManagerModules.plasma-manager
+      ];
+    };
+
+    users.users.${config.user.name} = mkAliasDefinitions options.user;
+
+    environment.extraInit =
+      concatStringsSep "\n"
+        (mapAttrsToList (n: v: "export ${n}=\"${v}\"") config.env);
+  };
+}
--- a/modules/nixos/podman.nix
+++ b/modules/nixos/podman.nix
@ -1,16 +1,10 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
+{ pkgs, lib, config, ... }:

 with lib;

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

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

-let
-  cfg = config.modules.programs.pass;
-in
-{
-  options.modules.programs.pass = {
+let cfg = config.modules.security.pass;
+in {
+  options.modules.security.pass = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/services/borgmatic/default.nix
+++ b/modules/services/borgmatic/default.nix
@ -1,15 +1,9 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
+{ config, lib, self, ... }:

 let
  cfg = config.modules.services.borgmatic;
  hostname = config.networking.hostName;
-in
-{
+in {
  options.modules.services.borgmatic = {
    enable = lib.mkOption {
      default = false;
@ -18,7 +12,7 @@ in
    };
    directories = lib.mkOption {
      type = lib.types.listOf lib.types.str;
-      default = [ ];
+      default = [];
      example = [
        "/home/jordan/Documents"
      ];
@ -41,14 +35,9 @@ in
      settings = {
        source_directories = cfg.directories;
        repositories = [
-          {
-            label = "borgbase";
-            path = cfg.repoPath;
-          }
+          { label = "borgbase"; path = cfg.repoPath; }
        ];
-        encryption_passcommand = "cat ${
-          config.age.secrets."passwords/services/borg/${hostname}-passphrase".path
-        }";
+        encryption_passcommand = "cat ${config.age.secrets."passwords/services/borg/${hostname}-passphrase".path}";
        ssh_command = "ssh -i /etc/ssh/ssh_host_ed25519_key";
        keep_daily = 7;
        keep_weekly = 4;
--- a/modules/services/chrony/default.nix
+++ b/modules/services/chrony/default.nix
@ -1,15 +1,10 @@
-{
-  config,
-  lib,
-  ...
-}:
+{ config, lib, pkgs, ... }:

 with lib;

 let
  cfg = config.modules.services.chrony;
-in
-{
+in {
  options.modules.services.chrony = {
    enable = mkOption {
      default = false;
--- a/modules/services/coturn/default.nix
+++ b/modules/services/coturn/default.nix
@ -1,14 +1,8 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
+{ config, lib, self, ... }:

 let
  cfg = config.modules.services.coturn;
-in
-{
+in {
  options.modules.services.coturn = {
    enable = lib.mkOption {
      default = false;
@ -27,28 +21,24 @@ in
  };

  config = lib.mkIf cfg.enable {
-    networking.firewall =
-      let
-        range =
-          with config.services.coturn;
-          lib.singleton {
-            from = min-port;
-            to = max-port;
-          };
-      in
-      {
-        allowedTCPPorts = [
-          3478 # TURN listener
-          5349 # STUN TLS
-          5350 # STUN TLS alt
-        ];
-        allowedUDPPorts = [
-          3478 # TURN listener
-          5349 # TLS
-          5350 # TLS alt
-        ];
-        allowedUDPPortRanges = range; # TURN peer relays
+    networking.firewall = let
+      range = with config.services.coturn; lib.singleton {
+        from = min-port;
+        to = max-port;
      };
+    in {
+      allowedTCPPorts = [
+        3478  # TURN listener
+        5349  # STUN TLS
+        5350  # STUN TLS alt
+      ];
+      allowedUDPPorts = [
+        3478  # TURN listener
+        5349  # TLS
+        5350  # TLS alt
+      ];
+      allowedUDPPortRanges = range; # TURN peer relays
+    };

    security.acme.certs = {
      "${config.services.coturn.realm}" = {
@ -57,26 +47,19 @@ in
      };
    };

-    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
-          { }
-      );
+    age.secrets = {
+      "passwords/services/coturn/static-auth-secret" = {
+        file = "${self.inputs.secrets}/passwords/services/coturn/static-auth-secret.age";
+        owner = "turnserver";
+        group = "turnserver";
+      };
+    } // (if cfg.matrixIntegration then {
+      "passwords/services/coturn/matrix-turn-config.yml" = {
+        file = "${self.inputs.secrets}/passwords/services/coturn/matrix-turn-config.yml.age";
+        owner = "matrix-synapse";
+        group = "matrix-synapse";
+      };
+    } else {});

    services.coturn = rec {
      enable = true;
--- a/modules/services/gitea-runner/default.nix
+++ b/modules/services/gitea-runner/default.nix
@ -1,10 +1,4 @@
-{
-  pkgs,
-  config,
-  lib,
-  self,
-  ...
-}:
+{ pkgs, config, lib, self, ... }:

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

@ -58,12 +52,7 @@ in
        wantedBy = [ "multi-user.target" ];
        after = [ "podman.service" ];
        requires = [ "podman.service" ];
-        path = [
-          config.virtualisation.podman.package
-          pkgs.gnutar
-          pkgs.shadow
-          pkgs.getent
-        ];
+        path = [ config.virtualisation.podman.package pkgs.gnutar pkgs.shadow pkgs.getent ];
        script = ''
          set -eux -o pipefail
          mkdir -p etc/nix
@ -153,12 +142,7 @@ in
            "~setdomainname"
            "~sethostname"
          ];
-          RestrictAddressFamilies = [
-            "AF_INET"
-            "AF_INET6"
-            "AF_UNIX"
-            "AF_NETLINK"
-          ];
+          RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ];

          # Needs network access
          PrivateNetwork = false;
--- a/modules/services/gitea/default.nix
+++ b/modules/services/gitea/default.nix
@ -1,15 +1,8 @@
-{
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
+{ config, lib, pkgs, self, ... }:

 let
  cfg = config.modules.services.gitea;
-in
-{
+in {
  options.modules.services.gitea = {
    enable = lib.mkEnableOption "gitea";
    domain = lib.mkOption {
@ -23,7 +16,7 @@ in
      users.git = {
        isSystemUser = true;
        useDefaultShell = true;
-        group = "git";
+        group =  "git";
        extraGroups = [ "gitea" ];
        home = config.services.gitea.stateDir;
      };
--- a/modules/services/headscale/default.nix
+++ b/modules/services/headscale/default.nix
@ -1,15 +1,9 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
+{ config, lib, pkgs, ... }:

 let
  cfg = config.modules.services.headscale;
  fqdn = "headscale.vimium.net";
-in
-{
+in {
  options.modules.services.headscale = {
    enable = lib.mkOption {
      default = false;
@ -26,7 +20,7 @@ in
      port = 8080;

      settings = {
-        policy.path = null;
+        acl_policy_path = null;
        ip_prefixes = [
          "100.64.0.0/10"
        ];
@ -34,9 +28,10 @@ in
        derp = {
          auto_update_enable = false;
          update_frequency = "24h";
+          urls = [];
        };
-        dns = {
-          base_domain = "mesh.vimium.net";
+        dns_config = {
+          base_domain = "vimium.net";
          extra_records = [
            {
              name = "grafana.mesh.vimium.net";
@ -50,7 +45,7 @@ in
            }
          ];
          magic_dns = true;
-          nameservers.global = [
+          nameservers = [
            "9.9.9.9"
          ];
        };
--- a/modules/services/immich/default.nix
+++ b/modules/services/immich/default.nix
@ -0,0 +1,54 @@
+{ config, lib, self, ... }:
+
+with lib;
+
+let cfg = config.modules.services.immich;
+in {
+  options.modules.services.immich = {
+    enable = mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.nginx = {
+      virtualHosts = {
+        "gallery.vimium.com" = {
+          forceSSL = true;
+          enableACME = true;
+          locations."/" = {
+            proxyPass = "http://localhost:${toString config.services.immich.port}";
+            extraConfig = ''
+              client_max_body_size 50000M;
+
+              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+              proxy_set_header X-Forwarded-Proto $scheme;
+              proxy_set_header X-Real-IP $remote_addr;
+              proxy_set_header Host $host;
+
+              proxy_buffering off;
+              proxy_redirect off;
+              proxy_http_version 1.1;
+              proxy_set_header Upgrade $http_upgrade;
+              proxy_set_header Connection "upgrade";
+
+              proxy_read_timeout 600s;
+              proxy_send_timeout 600s;
+              send_timeout 600s;
+            '';
+          };
+        };
+      };
+    };
+
+    age.secrets."files/services/immich/envfile" = {
+      file = "${self.inputs.secrets}/files/services/immich/envfile.age";
+    };
+
+    services.immich = {
+      enable = true;
+      secretsFile = config.age.secrets."files/services/immich/envfile".path;
+    };
+  };
+}
--- a/modules/services/mail/default.nix
+++ b/modules/services/mail/default.nix
@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
+{ config, lib, self, ... }:

 let
  cfg = config.modules.services.mail;
@ -19,8 +14,7 @@ let
    "vimium.org"
    "vimium.xyz"
  ];
-in
-{
+in {
  options.modules.services.mail = {
    enable = lib.mkOption {
      default = false;
@ -46,10 +40,7 @@ in

    services.nginx.enable = true;

-    networking.firewall.allowedTCPPorts = [
-      80
-      443
-    ];
+    networking.firewall.allowedTCPPorts = [ 80 443 ];

    mailserver = {
      enable = true;
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@ -0,0 +1,253 @@
+{ 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";
+    };
+    slidingSync = {
+      enable = lib.mkEnableOption "sliding-sync";
+    };
+    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" = {};
+      "org.matrix.msc3575.proxy" = if cfg.slidingSync.enable then {
+        "url" = "https://${matrixSubdomain}";
+      } else { };
+    };
+    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";
+          "~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = lib.mkIf cfg.slidingSync.enable {
+            priority = 100;
+            proxyPass = "http://localhost:8009";
+            extraConfig = ''
+              proxy_set_header X-Forwarded-For $remote_addr;
+            '';
+          };
+        };
+      };
+      "${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;
+        app_service_config_files = (lib.optional cfg.bridges.whatsapp
+          "/var/lib/mautrix-whatsapp/whatsapp-registration.yaml");
+      };
+    };
+    systemd.services.matrix-synapse.serviceConfig.SupplementaryGroups =
+      (lib.optional cfg.bridges.whatsapp
+        config.systemd.services.mautrix-whatsapp.serviceConfig.Group);
+
+    age.secrets = if cfg.slidingSync.enable then {
+      "files/services/matrix/sliding-sync" = {
+        file = "${self.inputs.secrets}/files/services/matrix/sliding-sync.age";
+      };
+    } else {};
+
+    services.matrix-sliding-sync = lib.mkIf cfg.slidingSync.enable {
+      enable = true;
+      environmentFile = config.age.secrets."files/services/matrix/sliding-sync".path;
+      settings = { SYNCV3_SERVER = "https://${matrixSubdomain}"; };
+    };
+
+    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
@ -0,0 +1,182 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.modules.services.nginx;
+  nginxErrorPages = ''
+    location @error_pages {
+      rewrite ^.*$ /''${status}.html break;
+
+      root "/var/www/html/errors";
+    }
+  '';
+  nginxEdgeHeaders = ''
+    more_set_headers 'Server: Vimium';
+    more_set_headers 'Access-Control-Allow-Origin: *';
+    add_header Expect-CT max-age=30 always;
+    add_header Referrer-Policy strict-origin-when-cross-origin always;
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
+    add_header Vimium-Responding-Instance $hostname;
+    add_header X-XSS-Protection "1; mode=block" always;
+    add_header X-Content-Type-Options nosniff always;
+  '';
+  nginxStrictHeaders = ''
+    add_header X-Frame-Options SAMEORIGIN always;
+    add_header Permissions-Policy "fullscreen=(self), sync-xhr=(self)" always;
+  '';
+  mkRedirect = from: to: {
+    "${from}" = {
+      forceSSL = true;
+      enableACME = true;
+      serverAliases = [ "www.${from}" ];
+      locations."/".return = "301 https://${to}$request_uri";
+      extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
+    };
+  };
+in {
+  options.modules.services.nginx = {
+    enable = mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = [
+      80    # HTTP
+      443   # HTTPS
+    ];
+
+    services.nginx = {
+      enable = true;
+      package = pkgs.openresty;
+      recommendedGzipSettings = true;
+      recommendedOptimisation = true;
+      recommendedTlsSettings = true;
+      clientMaxBodySize = "2G";
+      sslProtocols = "TLSv1.2 TLSv1.3";
+      sslCiphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
+      appendHttpConfig = ''
+        error_page 400 @error_pages;
+        error_page 401 @error_pages;
+        error_page 403 @error_pages;
+        error_page 404 @error_pages;
+        error_page 405 @error_pages;
+        error_page 429 @error_pages;
+        error_page 500 @error_pages;
+        error_page 501 @error_pages;
+        error_page 502 @error_pages;
+        error_page 503 @error_pages;
+        error_page 504 @error_pages;
+
+        client_body_buffer_size 16k;
+        client_header_buffer_size 8k;
+      '';
+      appendConfig = ''
+        worker_processes auto;
+        worker_cpu_affinity auto;
+        worker_rlimit_nofile 50000;
+      '';
+      eventsConfig = ''
+        worker_connections 20000;
+        multi_accept off;
+      '';
+      proxyCachePath = {
+        "skycam" = {
+          enable = true;
+          keysZoneName = "skycam_cache";
+          maxSize = "100m";
+        };
+      };
+      virtualHosts = {
+        ## Static sites
+        "jellyfin.vimium.com" = {
+          forceSSL = true;
+          enableACME = true;
+          extraConfig = nginxErrorPages + nginxEdgeHeaders;
+          locations."/" = {
+            proxyPass = "http://localhost:8000";
+            extraConfig = ''
+              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+              proxy_set_header X-Forwarded-Proto $scheme;
+              proxy_set_header X-Real-IP $remote_addr;
+              proxy_set_header Host $host;
+
+              proxy_set_header Range $http_range;
+              proxy_set_header If-Range $http_if_range;
+
+              proxy_http_version 1.1;
+              proxy_set_header Upgrade $http_upgrade;
+              proxy_set_header Connection "upgrade";
+            '';
+          };
+        };
+        "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;
+          enableACME = true;
+          extraConfig = ''
+            ${nginxErrorPages}
+            more_set_headers 'Server: Vimium';
+          '';
+          locations."/" = {
+            root = "/var/www/pki.vimium.com";
+          };
+        };
+        "suhailhussain.com" = {
+          forceSSL = true;
+          enableACME = true;
+          serverAliases = [ "www.suhailhussain.com" ];
+          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
+          locations."/" = {
+            root = "/var/www/suhailhussain.com";
+          };
+        };
+        "vimium.com" = {
+          default = true;
+          forceSSL = true;
+          enableACME = true;
+          serverAliases = [ "www.vimium.com" ];
+          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders + ''
+            add_header Content-Security-Policy "default-src 'self' https://vimium.com https://www.vimium.com; style-src 'unsafe-inline'; object-src 'none'; upgrade-insecure-requests" always;
+          '';
+          locations."/" = {
+            root = "/var/www/vimium.com";
+          };
+        };
+      }
+      ## Redirects
+      // (mkRedirect "h0lt.com" "jdholt.com")
+      // (mkRedirect "jordanholt.xyz" "jdholt.com")
+      // (mkRedirect "omnimagic.com" "vimium.com")
+      // (mkRedirect "omnimagic.net" "vimium.com")
+      // (mkRedirect "thelostlegend.com" "suhailhussain.com")
+      // (mkRedirect "vimium.co" "vimium.com")
+      // (mkRedirect "vimium.co.uk" "vimium.com")
+      // (mkRedirect "vimium.info" "vimium.com")
+      // (mkRedirect "vimium.net" "vimium.com")
+      // (mkRedirect "vimium.org" "vimium.com")
+      // (mkRedirect "vimium.xyz" "vimium.com");
+    };
+  };
+}
--- a/modules/services/photoprism/default.nix
+++ b/modules/services/photoprism/default.nix
@ -1,16 +1,9 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
+{ config, lib, pkgs, self, ... }:

 with lib;

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

-let
-  cfg = config.modules.programs.git;
-in
-{
-  options.modules.programs.git = {
+let cfg = config.modules.shell.git;
+in {
+  options.modules.shell.git = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/programs/git/ignore
+++ b/modules/home-manager/programs/git/ignore
--- a/modules/home-manager/shell/zsh/.zshrc
+++ b/modules/home-manager/shell/zsh/.zshrc
--- a/Show More
+++ b/Show More