Use home-assistant module on pi host

Add home-assistant module
Add ha-floorplan package
2025-01-19 14:38:28 +00:00 · 2025-01-19 14:38:28 +00:00 · 2025-01-19 14:23:38 +00:00 · 2025-01-19 14:22:23 +00:00 · 2025-01-19 13:19:45 +00:00 · 2025-01-19 12:58:39 +00:00
111 changed files with 2824 additions and 1473 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Copyright (C) 2023 by Jordan Holt <jordan@vimium.com>
+Copyright (C) 2025 by Jordan Holt <jordan@vimium.com>

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

 ## Provisioning a new host
 > [nixos-anywhere](https://github.com/nix-community/nixos-anywhere) is the module used
@ -52,4 +52,3 @@ 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": 1722339003,
-        "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
+        "lastModified": 1736955230,
+        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
+        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
        "type": "github"
      },
      "original": {
@ -66,11 +66,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1718194053,
-        "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
+        "lastModified": 1727447169,
+        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
        "owner": "serokell",
        "repo": "deploy-rs",
-        "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
+        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
        "type": "github"
      },
      "original": {
@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722113426,
-        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
+        "lastModified": 1735644329,
+        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
+        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
        "type": "github"
      },
      "original": {
@ -107,11 +107,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723080788,
-        "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=",
+        "lastModified": 1737038063,
+        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed",
+        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
        "type": "github"
      },
      "original": {
@ -123,11 +123,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1723137499,
-        "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
+        "lastModified": 1736899990,
+        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
+        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
        "type": "github"
      },
      "original": {
@ -206,11 +206,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722555600,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "lastModified": 1736143030,
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
        "type": "github"
      },
      "original": {
@ -219,25 +219,42 @@
        "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": "flake-compat_4",
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
        "gitignore": "gitignore",
        "nixpkgs": [
          "nixvim",
          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1722857853,
-        "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=",
+        "lastModified": 1735882644,
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
        "type": "github"
      },
      "original": {
@ -285,6 +302,27 @@
        "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": [
@ -313,16 +351,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1720042825,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "lastModified": 1736373539,
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
        "repo": "home-manager",
        "type": "github"
      }
@ -335,20 +373,48 @@
        ]
      },
      "locked": {
-        "lastModified": 1720042825,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "lastModified": 1736373539,
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
        "repo": "home-manager",
        "type": "github"
      }
    },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729958008,
+        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.0.6",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
    "kvlibadwaita": {
      "flake": false,
      "locked": {
@ -373,11 +439,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722924007,
-        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
+        "lastModified": 1736370755,
+        "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
+        "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
        "type": "github"
      },
      "original": {
@ -388,11 +454,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1723149858,
-        "narHash": "sha256-3u51s7jdhavmEL1ggtd8wqrTH2clTy5yaZmhLvAXTqc=",
+        "lastModified": 1736978406,
+        "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "107bb46eef1f05e86fc485ee8af9b637e5157988",
+        "rev": "b678606690027913f3434dea3864e712b862dde5",
        "type": "github"
      },
      "original": {
@ -408,20 +474,18 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_05": "nixpkgs-24_05",
-        "utils": "utils_2"
+        "nixpkgs-24_11": "nixpkgs-24_11"
      },
      "locked": {
-        "lastModified": 1718084203,
-        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
+        "lastModified": 1735230346,
+        "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
+        "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
        "type": "gitlab"
      },
      "original": {
        "owner": "simple-nixos-mailserver",
-        "ref": "nixos-24.05",
        "repo": "nixos-mailserver",
        "type": "gitlab"
      }
@ -442,28 +506,28 @@
        "type": "github"
      }
    },
-    "nixpkgs-24_05": {
+    "nixpkgs-24_11": {
      "locked": {
-        "lastModified": 1717144377,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
+        "lastModified": 1734083684,
+        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
+        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
        "type": "indirect"
      }
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1722813957,
-        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
+        "lastModified": 1737062831,
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
        "type": "github"
      },
      "original": {
@ -490,16 +554,16 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1722987190,
-        "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=",
+        "lastModified": 1736916166,
+        "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90",
+        "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
        "type": "indirect"
      }
    },
@ -514,23 +578,47 @@
        "nixpkgs": [
          "nixpkgs"
        ],
+        "nuschtosSearch": "nuschtosSearch",
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1722925293,
-        "narHash": "sha256-saXm5dd/e3PMsYTEcp1Qbzifm3KsZtNFkrWjmLhXHGE=",
+        "lastModified": 1737141914,
+        "narHash": "sha256-Lq7PWAD+edeIpZKM7aresrwON+Tdo3OMu1S2YX8AjjM=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "170df9814c3e41d5a4d6e3339e611801b1f02ce2",
+        "rev": "c2ee71c814c9427d4991b9d58d412add9c5a1c56",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
        "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": [
@ -541,11 +629,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1723232379,
-        "narHash": "sha256-F4Y3f9305aHGWKqAd3s2GyNRONdpDBuNuK4TCSdaHz8=",
+        "lastModified": 1736549395,
+        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "22bea90404c5ff6457913a03c1a54a3caa5b1c57",
+        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
        "type": "github"
      },
      "original": {
@ -554,6 +642,28 @@
        "type": "github"
      }
    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737043064,
+        "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "agenix": "agenix",
@ -569,6 +679,7 @@
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nixvim": "nixvim",
        "plasma-manager": "plasma-manager",
+        "pre-commit-hooks": "pre-commit-hooks",
        "secrets": "secrets",
        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
      }
@ -576,11 +687,11 @@
    "secrets": {
      "flake": false,
      "locked": {
-        "lastModified": 1722712220,
-        "narHash": "sha256-gEmbk/DROfVZ+v/BAZHDloHzS0KdqIzxtW7z9g2eH4Y=",
+        "lastModified": 1730732927,
+        "narHash": "sha256-t3MTEgi6O7DMxMjdi3xcTAztLDQmEtqQ+oU+ZbWz2AI=",
        "ref": "refs/heads/master",
-        "rev": "dfe0e95be5ef539bf28602ff47beeea26cc4d1b8",
-        "revCount": 22,
+        "rev": "4ae2ac777c38f60a29384b70c456f41847cdf1b5",
+        "revCount": 28,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
      },
@ -637,11 +748,11 @@
    "thunderbird-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1721874544,
-        "narHash": "sha256-BHW9jlx92CsHY84FT0ce5Vxl0KFheLhNn2vndcIf7no=",
+        "lastModified": 1732643121,
+        "narHash": "sha256-i0Uo5EN45rlGuR85hvPet43zW/thOQTwHypVg9shTHU=",
        "owner": "rafaelmardojai",
        "repo": "thunderbird-gnome-theme",
-        "rev": "628fcccb7788e3e0ad34f67114f563c87ac8c1dc",
+        "rev": "1994e7ec0649053e2a0811973245758d41e33f5f",
        "type": "github"
      },
      "original": {
@ -658,11 +769,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722330636,
-        "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
+        "lastModified": 1736154270,
+        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
+        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
        "type": "github"
      },
      "original": {
@ -688,24 +799,6 @@
        "repo": "flake-utils",
        "type": "github"
      }
-    },
-    "utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -2,7 +2,7 @@
  description = "NixOS system configuration";

  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
    # nixpkgs-master.url = "nixpkgs";
    agenix.url = "github:ryantm/agenix";
@ -12,7 +12,7 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/release-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    firefox-gnome-theme = {
@ -29,11 +29,11 @@
    };
    nixos-hardware.url = "github:NixOS/nixos-hardware";
    nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.05";
+      url = "github:nix-community/nixvim/nixos-24.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    plasma-manager = {
@ -41,6 +41,10 @@
      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;
@ -51,12 +55,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"
@ -66,7 +70,11 @@

        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
@ -76,16 +84,19 @@
        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; };

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

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

      deploy = {
        magicRollback = true;
        autoRollback = true;
        sshUser = "root";
-        nodes = lib.genAttrs [ "mail" "pi" "skycam" "vps1" ] mkDeployNode;
+        nodes = lib.genAttrs [
+          "mail"
+          # "pi"
+          # "skycam"
+          "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,29 +22,22 @@
  users.extraGroups.vboxusers.members = [ "jordan" ];

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

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

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

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

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

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

  nix = {
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
    extraOptions = ''
      experimental-features = nix-command flakes
    '';
@ -65,7 +68,10 @@
        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 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  boot = {
-    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
+    initrd.availableKernelModules = [
+      "ehci_pci"
+      "ahci"
+      "usbhid"
+      "usb_storage"
+      "sd_mod"
+      "sr_mod"
+      "zfs"
+    ];
    initrd.kernelModules = [ ];
    initrd.supportedFilesystems = [ "zfs" ];
    kernelModules = [ "kvm-intel" ];
--- a/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch
+++ b/hosts/hypnos/0001-Add-apple_set_os-EFI-boot-service.patch
@ -99,4 +99,3 @@ index d59b0947f..81158014f 100644
 #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,4 +1,9 @@
-{ config, lib, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:

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

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

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

  boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    kernelModules = [ "applesmc" "kvm-intel" "wl" ];
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "ahci"
+      "usbhid"
+      "usb_storage"
+      "sd_mod"
+    ];
+    kernel.sysctl = {
+      "kernel.nmi_watchdog" = 0;
+      "vm.laptop_mode" = 5;
+    };
+    kernelModules = [
+      "applesmc"
+      "kvm-intel"
+      "wl"
+    ];
    extraModulePackages = [
      config.boot.kernelPackages.broadcom_sta
      config.boot.kernelPackages.nvidiaPackages.legacy_470
@ -25,14 +45,12 @@
      modesetting.enable = true;
      powerManagement.enable = true;
    };
-    opengl = {
+    graphics = {
      enable = true;
      extraPackages = with pkgs; [
        libvdpau-va-gl
      ];
-      driSupport = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
    };
  };
 }
-
--- a/hosts/library/README.md
+++ b/hosts/library/README.md
@ -43,4 +43,3 @@ See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datase
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `library.mesh.vimium.net`.
-
--- a/hosts/library/default.nix
+++ b/hosts/library/default.nix
@ -19,7 +19,7 @@
    firewall = {
      enable = true;
      allowedTCPPorts = [
-        22  # SSH
+        22 # SSH
      ];
    };
  };
@ -71,12 +71,14 @@
    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}"
+            ];
+          }
+        ];
      }
    ];
  };
@ -90,8 +92,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 \
@ -101,78 +103,83 @@
          -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.opengl = {
+  hardware.graphics = {
    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;
-    security = {
+    programs = {
      gpg.enable = true;
    };
    shell = {
@ -192,4 +199,3 @@

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

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

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

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

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

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

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

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

  virtualisation = {
@ -44,50 +47,44 @@
    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 = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.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;
+      emulators = {
+        gamecube.enable = true;
+        ps2.enable = true;
+        ps3.enable = true;
+        psp.enable = true;
+        wii.enable = true;
+        xbox.enable = true;
      };
-      media.graphics = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      graphics = {
        modeling.enable = true;
        raster.enable = true;
        vector.enable = true;
      };
-      media.recording = {
+      libreoffice.enable = true;
+      lutris.enable = true;
+      pass.enable = true;
+      neovim.enable = true;
+      qbittorrent.enable = true;
+      recording = {
        audio.enable = true;
        video.enable = true;
      };
-      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;
@ -105,7 +102,6 @@
      gitea-runner.enable = true;
    };
    shell = {
-      git.enable = true;
      zsh.enable = true;
    };
  };
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/hosts/odyssey/hardware-configuration.nix
@ -1,4 +1,10 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:

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

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

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

  networking.hostId = "731d1660";

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

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

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

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

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

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

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

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

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

-  modules.networking.tailscale = {
+  modules.services.tailscale = {
    enable = true;
    restrictSSH = false;
  };
--- a/hosts/skycam/README.md
+++ b/hosts/skycam/README.md
@ -26,4 +26,3 @@ 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,4 +1,10 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:

 {
  imports = [
@ -21,27 +27,36 @@
      # 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
@ -83,9 +98,10 @@
      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,4 +1,8 @@
-{ config, lib, modulesPath, ... }:
+{
+  lib,
+  modulesPath,
+  ...
+}:

 {
  imports = [
@ -11,14 +15,17 @@
      "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; });
    })
  ];

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

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

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

+  security.acme.certs."auth.vimium.com" = {
+    postRun = "systemctl restart kanidm.service";
+    group = "acme";
+  };
+
+  services.kanidm =
+    let
+      baseDomain = "vimium.com";
+      domain = "auth.${baseDomain}";
+      uri = "https://${domain}";
+    in
+    {
+      package = pkgs.unstable.kanidm;
+      enableClient = true;
+      enableServer = true;
+      clientSettings = {
+        inherit uri;
+      };
+      serverSettings = {
+        bindaddress = "[::1]:3013";
+        ldapbindaddress = "[::1]:636";
+        domain = baseDomain;
+        origin = uri;
+        tls_chain = "${config.security.acme.certs.${domain}.directory}/full.pem";
+        tls_key = "${config.security.acme.certs.${domain}.directory}/key.pem";
+      };
+    };
+
+  services.nginx.virtualHosts = {
+    "auth.vimium.com" = {
+      useACMEHost = "auth.vimium.com";
+      forceSSL = true;
+      locations."/" = {
+        proxyPass = "https://[::1]:3013";
+      };
+    };
+  };
+
  modules = rec {
-    databases.postgresql.enable = true;
    services = {
      borgmatic = {
        enable = true;
@ -66,10 +112,11 @@
          signal = true;
          whatsapp = true;
        };
-        usePostgresql = databases.postgresql.enable;
+        usePostgresql = services.postgresql.enable;
      };
      nginx.enable = true;
      photoprism.enable = true;
+      postgresql.enable = true;
    };
  };

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

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

  boot = {
    initrd = {
-      availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
+      availableKernelModules = [
+        "ata_piix"
+        "uhci_hcd"
+        "xen_blkfront"
+        "vmw_pvscsi"
+      ];
      kernelModules = [ "nvme" ];
    };
    loader.grub.device = "/dev/sda";
@ -23,4 +31,3 @@
    };
  };
 }
-
--- a/modules/default.nix
+++ b/modules/default.nix
@ -1,52 +0,0 @@
-{
-  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/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/mail
-    ./services/matrix
-    ./services/nginx
-    ./services/photoprism
-    ./shell/git
-    ./shell/zsh
-  ];
-}
--- a/modules/desktop/media/recording.nix
+++ b/modules/desktop/media/recording.nix
@ -1,28 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.modules.desktop.media.recording;
-in {
-  options.modules.desktop.media.recording = {
-    audio.enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    video.enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = {
-    user.packages = with pkgs;
-      (if cfg.audio.enable then [
-        ardour
-        audacity
-      ] else []) ++
-      (if cfg.video.enable then [
-        handbrake
-        mkvtoolnix
-        obs-studio
-      ] else []);
-  };
-}
--- a/modules/desktop/office/libreoffice.nix
+++ b/modules/desktop/office/libreoffice.nix
@ -1,38 +0,0 @@
-{ 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/default.nix
+++ b/modules/home-manager/default.nix
@ -0,0 +1,33 @@
+{
+  imports = [
+    ./options.nix
+    ./programs/brave.nix
+    ./programs/dev/cc.nix
+    ./programs/dev/java.nix
+    ./programs/dev/lua.nix
+    ./programs/dev/node.nix
+    ./programs/dev/python.nix
+    ./programs/dev/rust.nix
+    ./programs/dev/scala.nix
+    ./programs/dev/shell.nix
+    ./programs/dev/zig.nix
+    ./programs/emulators.nix
+    ./programs/firefox.nix
+    ./programs/forensics.nix
+    ./programs/git
+    ./programs/gpg.nix
+    ./programs/graphics.nix
+    ./programs/libreoffice.nix
+    ./programs/lutris.nix
+    ./programs/neovim.nix
+    ./programs/pass.nix
+    ./programs/qbittorrent.nix
+    ./programs/recording.nix
+    ./programs/slack.nix
+    ./programs/steam.nix
+    ./programs/thunderbird.nix
+    ./programs/vscode.nix
+    ./programs/zoom.nix
+    ./shell/zsh
+  ];
+}
--- a/modules/home-manager/options.nix
+++ b/modules/home-manager/options.nix
@ -0,0 +1,137 @@
+{
+  config,
+  options,
+  lib,
+  self,
+  ...
+}:
+
+with lib;
+{
+  options = with types; {
+    user = mkOption {
+      type = attrs;
+      default = { };
+    };
+
+    home = {
+      configFile = mkOption {
+        type = attrs;
+        default = { };
+        description = "Files to place in $XDG_CONFIG_HOME";
+      };
+      dataFile = mkOption {
+        type = attrs;
+        default = { };
+        description = "Files to place in $XDG_DATA_HOME";
+      };
+      file = mkOption {
+        type = attrs;
+        default = { };
+        description = "Files to place directly in $HOME";
+      };
+      packages = mkOption {
+        type = attrs;
+        default = { };
+        description = "User-level installed packages";
+      };
+      programs = mkOption {
+        type = attrs;
+        default = { };
+        description = "Programs managed directly from home-manager";
+      };
+      services = mkOption {
+        type = attrs;
+        default = { };
+        description = "Services managed directly from home-manager";
+      };
+    };
+
+    dconf.settings = mkOption {
+      type = attrs;
+      default = { };
+      description = "dconf settings to enable";
+    };
+
+    env = mkOption {
+      type = attrsOf (oneOf [
+        str
+        path
+        (listOf (either str path))
+      ]);
+      apply = mapAttrs (
+        n: v: if isList v then concatMapStringsSep ":" (x: toString x) v else (toString v)
+      );
+      default = { };
+      description = "";
+    };
+  };
+
+  config = {
+    age.secrets."passwords/users/jordan".file = "${self.inputs.secrets}/passwords/users/jordan.age";
+    user =
+      let
+        user = builtins.getEnv "USER";
+        name =
+          if
+            elem user [
+              ""
+              "root"
+            ]
+          then
+            "jordan"
+          else
+            user;
+      in
+      {
+        inherit name;
+        isNormalUser = true;
+        extraGroups = [
+          "audio"
+          "lxd"
+          "networkmanager"
+          "wheel"
+        ];
+        description = "Jordan Holt";
+        useDefaultShell = true;
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
+        ];
+        hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
+        home = "/home/${name}";
+        group = "users";
+        uid = 1000;
+      };
+
+    home-manager = {
+      useGlobalPkgs = true;
+      useUserPackages = true;
+
+      users.${config.user.name} = {
+        home = {
+          file = mkAliasDefinitions options.home.file;
+          stateVersion = config.system.stateVersion;
+        };
+        programs = mkAliasDefinitions options.home.programs;
+        services = mkAliasDefinitions options.home.services;
+        xdg = {
+          enable = true;
+          configFile = mkAliasDefinitions options.home.configFile;
+          dataFile = mkAliasDefinitions options.home.dataFile;
+        };
+        dconf.settings = mkAliasDefinitions options.dconf.settings;
+      };
+
+      sharedModules = [
+        self.inputs.nixvim.homeManagerModules.nixvim
+        self.inputs.plasma-manager.homeManagerModules.plasma-manager
+      ];
+    };
+
+    users.users.${config.user.name} = mkAliasDefinitions options.user;
+
+    environment.extraInit = concatStringsSep "\n" (
+      mapAttrsToList (n: v: "export ${n}=\"${v}\"") config.env
+    );
+  };
+}
--- a/modules/home-manager/programs/brave.nix
+++ b/modules/home-manager/programs/brave.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

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

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

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

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

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

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

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

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

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

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

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

-let cfg = config.modules.desktop.gaming.emulators;
-in {
-  options.modules.desktop.gaming.emulators = {
-    ds.enable       = lib.mkOption {
+let
+  cfg = config.modules.programs.emulators;
+in
+{
+  options.modules.programs.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;
    };
@ -19,35 +26,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;
    };
@ -60,14 +67,9 @@ 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/firefox.nix
+++ b/modules/home-manager/programs/firefox.nix
@ -1,8 +1,15 @@
-{ config, lib, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:

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

  config = lib.mkIf cfg.enable {
-    home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source = 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,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

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

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

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

-let cfg = config.modules.desktop.media.graphics;
-in {
-  options.modules.desktop.media.graphics = {
+let
+  cfg = config.modules.programs.graphics;
+in
+{
+  options.modules.programs.graphics = {
    modeling.enable = lib.mkOption {
      default = false;
      example = true;
    };
-    raster.enable   = lib.mkOption {
+    raster.enable = lib.mkOption {
      default = false;
      example = true;
    };
-    vector.enable   = lib.mkOption {
+    vector.enable = lib.mkOption {
      default = false;
      example = true;
    };
--- a/modules/home-manager/programs/libreoffice.nix
+++ b/modules/home-manager/programs/libreoffice.nix
@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.modules.programs.libreoffice;
+in
+# libreoffice-gtk4 = pkgs.libreoffice.override {
+#   extraMakeWrapperArgs = [
+#     "--set SAL_USE_VCLPLUGIN gtk4"
+#   ];
+#   unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: {
+#     buildInputs = oldAttrs.buildInputs ++ [
+#       pkgs.gtk4
+#     ];
+#     configureFlags = oldAttrs.configureFlags ++ [
+#       "--disable-werror"
+#       "--enable-gtk4"
+#     ];
+#     passthru = oldAttrs.passthru // {
+#       inherit (pkgs) gtk4;
+#     };
+#   });
+# };
+{
+  options.modules.programs.libreoffice = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      (if config.modules.system.desktop.kde.enable == true then libreoffice-qt else libreoffice)
+      hunspell
+      hunspellDicts.en-gb-large
+      hunspellDicts.en-us-large
+    ];
+  };
+}
--- a/modules/home-manager/programs/lutris.nix
+++ b/modules/home-manager/programs/lutris.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

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

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

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

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

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

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

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

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

      plugins.undotree.enable = true;

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

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

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

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

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

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

  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/vscode.nix
+++ b/modules/home-manager/programs/vscode.nix
@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

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

-let cfg = config.modules.desktop.apps.zoom;
-in {
-  options.modules.desktop.apps.zoom = {
+let
+  cfg = config.modules.programs.zoom;
+in
+{
+  options.modules.programs.zoom = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/home-manager/shell/zsh/.zshrc
+++ b/modules/home-manager/shell/zsh/.zshrc
--- a/modules/home-manager/shell/zsh/aliases.zsh
+++ b/modules/home-manager/shell/zsh/aliases.zsh
--- a/modules/home-manager/shell/zsh/completion.zsh
+++ b/modules/home-manager/shell/zsh/completion.zsh
--- a/modules/home-manager/shell/zsh/config.zsh
+++ b/modules/home-manager/shell/zsh/config.zsh
--- a/modules/home-manager/shell/zsh/default.nix
+++ b/modules/home-manager/shell/zsh/default.nix
@ -1,7 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

-let cfg = config.modules.shell.zsh;
-in {
+let
+  cfg = config.modules.shell.zsh;
+in
+{
  options.modules.shell.zsh = {
    enable = lib.mkOption {
      default = false;
@ -30,9 +37,9 @@ in {
    ];

    env = {
-      ZDOTDIR   = "$XDG_CONFIG_HOME/zsh";
+      ZDOTDIR = "$XDG_CONFIG_HOME/zsh";
      ZSH_CACHE = "$XDG_CACHE_HOME/zsh";
-      ZGEN_DIR  = "$XDG_DATA_HOME/zgenom";
+      ZGEN_DIR = "$XDG_DATA_HOME/zgenom";
    };

    home.configFile = {
--- a/modules/home-manager/shell/zsh/keybinds.zsh
+++ b/modules/home-manager/shell/zsh/keybinds.zsh
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@ -0,0 +1,25 @@
+{
+  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/netbird.nix
+    ./services/nginx.nix
+    ./services/photoprism.nix
+    ./services/postgresql.nix
+    ./services/tailscale.nix
+    ./system/desktop/gnome.nix
+    ./system/desktop/hyprland.nix
+    ./system/desktop/kde.nix
+    ./system/desktop/mimeapps.nix
+    ./system/wireless.nix
+  ];
+}
--- a/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch
+++ b/modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch
@ -68,4 +68,3 @@ index ab2b938502eb..b86832edaaa0 100644

 --
 2.42.0
-
--- a/modules/nixos/hardware/presonus-studio/default.nix
+++ b/modules/nixos/hardware/presonus-studio/default.nix
@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
  cfg = config.modules.hardware.presonus-studio;
  snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
@ -13,7 +18,8 @@ let
      "channelmix.upmix-method" = "psd";
    };
  };
-in {
+in
+{
  options.modules.hardware.presonus-studio = {
    enable = lib.mkOption {
      default = false;
@ -67,11 +73,23 @@ 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;
@ -85,4 +103,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,8 +1,17 @@
-{ pkgs, lib, kernel ? pkgs.linuxPackages_latest.kernel }:
+{
+  pkgs,
+  lib,
+  kernel ? pkgs.linuxPackages_latest.kernel,
+}:

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

  kernel_dev = kernel.dev;
  kernelVersion = kernel.modDirVersion;
@ -33,4 +42,3 @@ pkgs.stdenv.mkDerivation {
    license = lib.licenses.gpl2;
  };
 }
-
--- a/modules/nixos/podman.nix
+++ b/modules/nixos/podman.nix
@ -1,10 +1,16 @@
-{ pkgs, lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:

 with lib;

 let
  cfg = config.modules.podman;
-in {
+in
+{
  options.modules.podman = {
    enable = mkOption {
      default = false;
--- a/modules/services/borgmatic/default.nix
+++ b/modules/services/borgmatic/default.nix
@ -1,9 +1,15 @@
-{ 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;
@ -12,7 +18,7 @@ in {
    };
    directories = lib.mkOption {
      type = lib.types.listOf lib.types.str;
-      default = [];
+      default = [ ];
      example = [
        "/home/jordan/Documents"
      ];
@ -35,9 +41,14 @@ 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,10 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  ...
+}:

 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,8 +1,14 @@
-{ config, lib, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:

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

  config = lib.mkIf cfg.enable {
-    networking.firewall = let
-      range = with config.services.coturn; lib.singleton {
-        from = min-port;
-        to = max-port;
+    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
      };
-    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}" = {
@ -47,19 +57,26 @@ 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,4 +1,10 @@
-{ 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

@ -52,7 +58,12 @@ 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
@ -142,7 +153,12 @@ 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,8 +1,15 @@
-{ 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 {
@ -16,7 +23,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,19 +1,23 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

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

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

    services.headscale = {
@ -22,12 +26,17 @@ in {
      port = 8080;

      settings = {
+        policy.path = null;
        ip_prefixes = [
          "100.64.0.0/10"
        ];
        server_url = "https://${fqdn}";
-        dns_config = {
-          base_domain = "vimium.net";
+        derp = {
+          auto_update_enable = false;
+          update_frequency = "24h";
+        };
+        dns = {
+          base_domain = "mesh.vimium.net";
          extra_records = [
            {
              name = "grafana.mesh.vimium.net";
@ -40,6 +49,10 @@ in {
              value = "100.64.0.7";
            }
          ];
+          magic_dns = true;
+          nameservers.global = [
+            "9.9.9.9"
+          ];
        };
        logtail.enabled = false;
      };
--- a/modules/nixos/services/home-assistant/default.nix
+++ b/modules/nixos/services/home-assistant/default.nix
@ -0,0 +1,306 @@
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:
+
+let
+  cfg = config.modules.services.home-assistant;
+in
+{
+  imports = [
+    ./floorplan/default.nix
+    ./mqtt.nix
+  ];
+
+  options.modules.services.home-assistant.enable = lib.mkEnableOption "home-assistant";
+
+  config = lib.mkIf cfg.enable {
+
+    age.secrets."files/services/home-assistant/secrets.yaml" = {
+      file = "${self.inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
+      path = "${config.services.home-assistant.configDir}/secrets.yaml";
+      owner = "hass";
+      group = "hass";
+    };
+
+    services.home-assistant = {
+      enable = true;
+
+      config = {
+        automation = "!include automations.yaml";
+        backup = { };
+        binary_sensor = [ ];
+        default_config = { };
+        http = {
+          server_host = "::1";
+          trusted_proxies = [ "::1" ];
+          use_x_forwarded_for = true;
+        };
+        ffmpeg = { };
+        homeassistant = {
+          name = "Home";
+          latitude = "!secret latitude";
+          longitude = "!secret longitude";
+          country = "GB";
+          temperature_unit = "C";
+          time_zone = config.time.timeZone;
+          unit_system = "metric";
+          auth_providers = [
+            {
+              type = "trusted_networks";
+              trusted_networks = [
+                "100.64.0.0/10"
+                "127.0.0.1"
+              ];
+              allow_bypass_login = true;
+            }
+            {
+              type = "homeassistant";
+            }
+          ];
+        };
+        logger = {
+          default = "info";
+          logs = { };
+        };
+        lovelace = {
+          resources = [
+            {
+              url = "/local/nixos-lovelace-modulels/mushroom.js";
+              type = "module";
+            }
+          ];
+        };
+        media_player = [ ];
+        mobile_app = { };
+        onkyo = { };
+        open_meteo = { };
+        recorder = {
+          purge_keep_days = 365;
+        };
+        scene = "!include scenes.yaml";
+        script = "!include scripts.yaml";
+        sensor = [ ];
+        system_health = { };
+        zeroconf = { };
+      };
+
+      configDir = "/etc/home-assistant";
+
+      extraComponents = [
+        "air_quality"
+        "airly"
+        "alert"
+        "api"
+        "application_credentials"
+        "asuswrt"
+        "auth"
+        "automation"
+        "bayesian"
+        "binary_sensor"
+        # "blackbird"
+        "blueprint"
+        "bluetooth_adapters"
+        "bluetooth_le_tracker"
+        "button"
+        "calendar"
+        "camera"
+        "cast"
+        "cert_expiry"
+        "climate"
+        "co2signal"
+        "color_extractor"
+        "command_line"
+        "compensation"
+        "configurator"
+        "counter"
+        "cover"
+        "cpuspeed"
+        "default_config"
+        "demo"
+        "derivative"
+        "device_automation"
+        "device_sun_light_trigger"
+        "device_tracker"
+        "dlna_dmr"
+        "dlna_dms"
+        "dnsip"
+        "esphome"
+        "fail2ban"
+        "fan"
+        "feedreader"
+        "ffmpeg"
+        "file"
+        "file_upload"
+        "filesize"
+        "folder"
+        "folder_watcher"
+        "forecast_solar"
+        "frontend"
+        "gdacs"
+        "generic"
+        "generic_hygrostat"
+        "generic_thermostat"
+        "geo_json_events"
+        "geo_location"
+        "geo_rss_events"
+        "github"
+        "group"
+        "hardware"
+        "hdmi_cec"
+        "history_stats"
+        "homeassistant"
+        "homekit"
+        "homekit_controller"
+        "html5"
+        "http"
+        "humidifier"
+        "icloud"
+        "image_processing"
+        "input_boolean"
+        "input_button"
+        "input_datetime"
+        "input_number"
+        "input_select"
+        "input_text"
+        "integration"
+        "ios"
+        "jellyfin"
+        "light"
+        "local_calendar"
+        "local_file"
+        "local_ip"
+        "local_todo"
+        "lock"
+        "logentries"
+        "logger"
+        "lovelace"
+        "manual"
+        "manual_mqtt"
+        "matter"
+        "media_player"
+        "min_max"
+        "mjpeg"
+        "modern_forms"
+        "mold_indicator"
+        "moon"
+        "mysensors"
+        "network"
+        "nmap_tracker"
+        "notify"
+        "number"
+        "onboarding"
+        "onkyo"
+        "panel_custom"
+        "persistent_notification"
+        "person"
+        "ping"
+        "plant"
+        "prometheus"
+        "proximity"
+        "push"
+        "proximity"
+        "python_script"
+        "radio_browser"
+        "random"
+        "recorder"
+        "remote"
+        "repairs"
+        "rest"
+        "rest_command"
+        "rss_feed_template"
+        "scene"
+        "schedule"
+        "scrape"
+        "script"
+        "search"
+        "season"
+        "select"
+        "sense"
+        "sensor"
+        "sensorpush"
+        "shell_command"
+        "shopping_list"
+        "siren"
+        "smtp"
+        "snmp"
+        "sql"
+        "statistics"
+        "sun"
+        "switch"
+        "switch_as_x"
+        "system_health"
+        "system_log"
+        "systemmonitor"
+        "tag"
+        "tailscale"
+        "tcp"
+        "template"
+        "text"
+        "thread"
+        "threshold"
+        "time_date"
+        "timer"
+        "tod"
+        "todo"
+        "tomorrowio"
+        "trend"
+        "universal"
+        "upb"
+        "update"
+        "upnp"
+        "uptime"
+        "utility_meter"
+        "vacuum"
+        "vlc"
+        "vlc_telnet"
+        "wake_on_lan"
+        "water_heater"
+        "weather"
+        "websocket_api"
+        "wled"
+        "workday"
+        "worldclock"
+        "zone"
+      ];
+
+      extraPackages =
+        python3Packages: with python3Packages; [
+          onkyo-eiscp
+          zeroconf
+        ];
+
+      customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
+        bubble-card
+        button-card
+        mushroom
+        sankey-chart
+        universal-remote-card
+        # zigbee2mqtt-networkmap
+      ];
+    };
+
+    systemd.services.home-assistant.preStart = lib.mkForce "";
+
+    modules.services.borgmatic.directories = [
+      config.services.home-assistant.configDir
+    ];
+
+    services.nginx = {
+      enable = true;
+      virtualHosts."home.mesh.vimium.net" = {
+        forceSSL = false;
+        extraConfig = ''
+          proxy_buffering off;
+        '';
+        locations."/" = {
+          proxyPass = "http://[::1]:8123";
+          proxyWebsockets = true;
+        };
+      };
+    };
+  };
+}
--- a/modules/nixos/services/home-assistant/floorplan/default.nix
+++ b/modules/nixos/services/home-assistant/floorplan/default.nix
@ -0,0 +1,100 @@
+{
+  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
@ -0,0 +1,27 @@
+#floorplan {
+  padding: 10px;
+}
+
+svg, svg * {
+  vector-effect: non-scaling-stroke !important;
+  pointer-events: all !important;
+}
+
+path[id*="area."].light-on {
+  opacity: 0 !important;
+}
+
+path[id*="area."] {
+  opacity: 0.5 !important;
+  transition: opacity .25s;
+  -moz-transition: opacity .25s;
+  -webkit-transition: opacity .25s;
+}
+
+svg tspan {
+  fill: var(--primary-text-color);
+}
+
+.static-temp, .static-temp tspan {
+  fill: #ffffff;
+}
--- a/modules/nixos/services/home-assistant/mqtt.nix
+++ b/modules/nixos/services/home-assistant/mqtt.nix
@ -0,0 +1,93 @@
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:
+
+let
+  cfg = config.modules.services.home-assistant;
+in
+{
+  config = lib.mkIf cfg.enable {
+    services.mosquitto = {
+      enable = true;
+      listeners = [
+        {
+          acl = [ "pattern readwrite #" ];
+          omitPasswordAuth = true;
+          port = 1883;
+          settings = {
+            allow_anonymous = true;
+          };
+        }
+      ];
+    };
+
+    age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
+      file = "${self.inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
+      path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
+      owner = "zigbee2mqtt";
+      group = "zigbee2mqtt";
+    };
+
+    services.zigbee2mqtt = {
+      package = pkgs.unstable.zigbee2mqtt;
+      enable = true;
+      dataDir = "/var/lib/zigbee2mqtt";
+      settings = {
+        homeassistant = lib.optionalAttrs config.services.home-assistant.enable {
+          discovery_topic = "homeassistant";
+          status_topic = "hass/status";
+          legacy_entity_attributes = true;
+          legacy_triggers = true;
+        };
+        availability = true;
+        frontend = true;
+        device_options = {
+          retain = true;
+        };
+        serial = {
+          port = "/dev/serial/by-id/usb-Silicon_Labs_Sonoff_Zigbee_3.0_USB_Dongle_Plus_0001-if00-port0";
+        };
+        advanced = {
+          channel = 20;
+          network_key = "!secret.yaml network_key";
+          pan_id = 13001;
+          ext_pan_id = [
+            79
+            1
+            73
+            47
+            250
+            136
+            124
+            222
+          ];
+          transmit_power = 20;
+        };
+        mqtt = {
+          version = 5;
+          server = "mqtt://localhost:1883";
+        };
+      };
+    };
+
+    modules.services.borgmatic.directories = [
+      config.services.mosquitto.dataDir
+      config.services.zigbee2mqtt.dataDir
+    ];
+
+    services.home-assistant = {
+      config.mqtt = { };
+      extraComponents = [
+        "mqtt"
+        "mqtt_eventstream"
+        "mqtt_json"
+        "mqtt_room"
+        "mqtt_statestream"
+      ];
+    };
+  };
+}
--- a/modules/services/mail/default.nix
+++ b/modules/services/mail/default.nix
@ -1,4 +1,9 @@
-{ config, lib, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:

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

    services.nginx.enable = true;

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

    mailserver = {
      enable = true;
--- a/modules/nixos/services/matrix.nix
+++ b/modules/nixos/services/matrix.nix
@ -0,0 +1,248 @@
+{
+  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/netbird.nix
+++ b/modules/nixos/services/netbird.nix
@ -0,0 +1,77 @@
+{
+  config,
+  lib,
+  self,
+  ...
+}:
+
+let
+  cfg = config.modules.services.netbird;
+in
+{
+  options.modules.services.netbird = {
+    enable = lib.mkEnableOption "netbird";
+    coordinatorDomain = lib.mkOption {
+      type = lib.types.str;
+      default = "netbird.vimium.net";
+    };
+    meshDomain = lib.mkOption {
+      type = lib.types.str;
+      default = "mesh.vimium.net";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    age.secrets."passwords/services/netbird/data-store-encryption-key" = {
+      file = "${self.inputs.secrets}/passwords/services/netbird/data-store-encryption-key.age";
+    };
+
+    services.netbird = {
+      enable = true;
+    };
+
+    services.netbird.server = {
+      domain = cfg.coordinatorDomain;
+      enable = true;
+      enableNginx = true;
+      dashboard.settings = {
+        AUTH_AUTHORITY = "https://auth.vimium.com/oauth2/openid/netbird";
+      };
+      management = rec {
+        disableAnonymousMetrics = true;
+        dnsDomain = cfg.meshDomain;
+        oidcConfigEndpoint = "https://auth.vimium.com/oauth2/openid/netbird/.well-known/openid-configuration";
+        settings = {
+          DataStoreEncryptionKey = {
+            _secret = config.age.secrets."passwords/services/netbird/data-store-encryption-key".path;
+          };
+          HttpConfig = {
+            AuthAudience = "netbird";
+          };
+          StoreConfig = {
+            Engine = "sqlite";
+          };
+          TURNConfig = {
+            Secret._secret = config.age.secrets."passwords/services/coturn/static-auth-secret".path;
+            TimeBasedCredentials = true;
+          };
+          PKCEAuthorizationFlow.ProviderConfig = {
+            AuthorizationEndpoint = "https://auth.vimium.com/ui/oauth2";
+            TokenEndpoint = "https://auth.vimium.com/oauth2/token";
+          };
+        };
+        singleAccountModeDomain = dnsDomain;
+        turnDomain = config.services.coturn.realm;
+        turnPort = config.services.coturn.listening-port;
+      };
+    };
+
+    systemd.services.netbird-signal.serviceConfig.RestartSec = "60";
+    systemd.services.netbird-management.serviceConfig.RestartSec = "60";
+
+    services.nginx.virtualHosts."netbird.vimium.net" = {
+      enableACME = true;
+      forceSSL = true;
+    };
+  };
+}
--- a/modules/nixos/services/nginx.nix
+++ b/modules/nixos/services/nginx.nix
@ -0,0 +1,193 @@
+{
+  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,9 +1,16 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  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/nixos/services/postgresql.nix
+++ b/modules/nixos/services/postgresql.nix
@ -5,9 +5,10 @@
 }:

 let
-  cfg = config.modules.databases.postgresql;
-in {
-  options.modules.databases.postgresql = {
+  cfg = config.modules.services.postgresql;
+in
+{
+  options.modules.services.postgresql = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/nixos/services/tailscale.nix
+++ b/modules/nixos/services/tailscale.nix
@ -1,11 +1,18 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:

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

-let cfg = config.modules.desktop.gnome;
-in {
-  options.modules.desktop.gnome = {
+let
+  cfg = config.modules.system.desktop.gnome;
+in
+{
+  options.modules.system.desktop.gnome = {
    enable = lib.mkOption {
      default = false;
      example = true;
@ -24,6 +32,11 @@ 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";
@ -61,6 +74,11 @@ 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"
@ -77,7 +95,6 @@ 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"
@ -89,14 +106,13 @@ 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"
@ -110,6 +126,7 @@ in {
        favorite-apps = [
          "firefox.desktop"
          "org.gnome.Nautilus.desktop"
+          "org.gnome.Ptyxis.desktop"
        ];
      };
      "org/gnome/shell/extensions/blur-my-shell/panel" = {
@ -183,11 +200,6 @@ 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;
@ -204,38 +216,47 @@ 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
-      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 []);
+    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
+          [ ]
+      );

    environment.systemPackages = with pkgs.unstable; [
      adw-gtk3
@ -250,7 +271,6 @@ in {
      gnomeExtensions.appindicator
      gnomeExtensions.arcmenu
      gnomeExtensions.blur-my-shell
-      gnomeExtensions.browser-tabs
      gnomeExtensions.burn-my-windows
      gnomeExtensions.clipboard-indicator
      gnomeExtensions.coverflow-alt-tab
@ -266,10 +286,9 @@ in {
      gnomeExtensions.just-perfection
      gnomeExtensions.media-controls
      gnomeExtensions.mouse-follows-focus
-      gnomeExtensions.pano
+      # gnomeExtensions.pano (disabled due to: https://github.com/NixOS/nixpkgs/issues/369438)
      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,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:

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

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

 let
-  cfg = config.modules.desktop.mimeapps;
+  cfg = config.modules.system.desktop.mimeapps;
  avApp = "io.github.celluloid_player.Celluloid.desktop";
  imageApp = "org.gnome.eog.desktop";
-in {
-  options.modules.desktop.mimeapps = {
+in
+{
+  options.modules.system.desktop.mimeapps = {
    enable = lib.mkOption {
      default = false;
      example = true;
--- a/modules/nixos/system/wireless.nix
+++ b/modules/nixos/system/wireless.nix
@ -1,17 +1,24 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:

 with lib;

-let cfg = config.modules.networking.wireless;
-in {
-  options.modules.networking.wireless = {
+let
+  cfg = config.modules.system.wireless;
+in
+{
+  options.modules.system.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";
    };
@ -26,9 +33,9 @@ in {
      wireless = {
        enable = true;
        interfaces = cfg.interfaces;
-        environmentFile = config.age.secrets."passwords/networks".path;
+        secretsFile = config.age.secrets."passwords/networks".path;
        networks = {
-          "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
+          "Apollo 600 Mbps".pskRaw = "ext:PSK_APOLLO";
        };
      };
      networkmanager.ensureProfiles.profiles = {
--- a/modules/options.nix
+++ b/modules/options.nix
@ -1,82 +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 = [ "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/Show More
+++ b/Show More