home-assistant: use default configDir

Flake lock file updates:

• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/cb3173dc5c746fa95bca1f035a7e4d2b588894ac?narHash=sha256-%2BX9KAryvDsIE7lQ0FdfiD1u33nOVgsgufedqspf77N4%3D' (2025-01-19)
  → 'github:NixOS/nixos-hardware/dfad538f751a5aa5d4436d9781ab27a6128ec9d4?narHash=sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4%3D' (2025-01-24)
• Updated input 'nixos-mailserver':
    'gitlab:simple-nixos-mailserver/nixos-mailserver/dc0569066e79ae96184541da6fa28f35a33fbf7b?narHash=sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4%3D' (2024-12-26)
  → 'gitlab:simple-nixos-mailserver/nixos-mailserver/ade37b2765032f83d2d4bd50b6204a40a4c05eb4?narHash=sha256-JBh5%2Bg8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk%3D' (2025-01-18)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566?narHash=sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs%3D' (2025-01-18)
  → 'github:NixOS/nixpkgs/035f8c0853c2977b24ffc4d0a42c74f00b182cd8?narHash=sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I%3D' (2025-01-23)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)
  → 'github:NixOS/nixpkgs/0aa475546ed21629c4f5bbf90e38c846a99ec9e9?narHash=sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ%2BNH28%3D' (2025-01-23)
• Updated input 'pre-commit-hooks':
    'github:cachix/git-hooks.nix/15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f?narHash=sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE%3D' (2025-01-19)
  → 'github:cachix/git-hooks.nix/9364dc02281ce2d37a1f55b6e51f7c0f65a75f17?narHash=sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg%3D' (2025-01-21)

README.md

@@ -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>`.
-

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1723293904,
+        "lastModified": 1736955230,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728330715,
+        "lastModified": 1735644329,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735468753,
+        "lastModified": 1737038063,
-        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
+        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
+        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1735511798,
+        "lastModified": 1736899990,
-        "narHash": "sha256-U9WjPisByrvw8Kt6Ufg9kLrvg7uHPsFSyG93GR3I1iE=",
+        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "097c98cb4a7568f6f83a43e37950c08b575dd126",
+        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
         "type": "github"
       },
       "original": {
@@ -182,6 +182,22 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
+    "flake-compat_4": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -190,11 +206,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
+        "lastModified": 1736143030,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -231,18 +247,14 @@
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1734797603,
+        "lastModified": 1737043064,
-        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+        "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+        "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb",
         "type": "github"
       },
       "original": {
@@ -290,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": [
@@ -318,11 +351,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735344290,
+        "lastModified": 1736373539,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
@@ -340,11 +373,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735344290,
+        "lastModified": 1736373539,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
@@ -406,26 +439,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1735218083,
+        "lastModified": 1736820923,
-        "narHash": "sha256-MoUAbmXz9TEr7zlKDRO56DBJHe30+7B5X7nhXm+Vpc8=",
+        "narHash": "sha256-SDuKLOWAh8VJRXlNWQn9QE99bjeEUAAbYXqrKGbsiyk=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "bc03f7818771a75716966ce8c23110b715eff2aa",
+        "rev": "944c2b181792ae7ae6b20c0df3f44879c11706c9",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
+        "ref": "nix-darwin-24.11",
         "repo": "nix-darwin",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1735388221,
+        "lastModified": 1737751639,
-        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
+        "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
+        "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
         "type": "github"
       },
       "original": {
@@ -444,11 +478,11 @@
         "nixpkgs-24_11": "nixpkgs-24_11"
       },
       "locked": {
-        "lastModified": 1735230346,
+        "lastModified": 1737201600,
-        "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
+        "narHash": "sha256-JBh5+g8oQteQdQqbO07dGHBRQo/NGI61JPlTjdfQ1pk=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
+        "rev": "ade37b2765032f83d2d4bd50b6204a40a4c05eb4",
         "type": "gitlab"
       },
       "original": {
@@ -490,11 +524,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1735471104,
+        "lastModified": 1737632463,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
         "type": "github"
       },
       "original": {
@@ -521,11 +555,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1735669367,
+        "lastModified": 1737672001,
-        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
+        "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
+        "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8",
         "type": "github"
       },
       "original": {
@@ -549,11 +583,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735389157,
+        "lastModified": 1737283156,
-        "narHash": "sha256-3co5A7PUEN+Bm7b3/6BxFsmvplg3XYUNR2MzWnheZoE=",
+        "narHash": "sha256-FyHmM6vvz+UxCrPZo/poIaZBZejLHVKkAH4cjtUxZDA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c8fa65c6ac35dba157de0873d645ab398c370123",
+        "rev": "abcbd250b8a2c7aab1f4b2b9e01598ee24b42337",
         "type": "github"
       },
       "original": {
@@ -573,11 +607,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733773348,
+        "lastModified": 1735854821,
-        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
+        "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
+        "rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
         "type": "github"
       },
       "original": {
@@ -596,11 +630,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735049224,
+        "lastModified": 1736549395,
-        "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=",
+        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b",
+        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
         "type": "github"
       },
       "original": {
@@ -609,6 +643,28 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "gitignore": "gitignore_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737465171,
+        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -624,6 +680,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"
       }
@@ -713,11 +770,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735135567,
+        "lastModified": 1737103437,
-        "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
+        "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
+        "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
         "type": "github"
       },
       "original": {

flake.nix

@@ -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,15 +109,46 @@
               }
               ./hosts/${name}
             ];
-          }))
+          }
+        ))
       ];
 
-      devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
+      checks =
-        buildInputs = [
+        builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib
-          inputs.agenix.packages.x86_64-linux.agenix
+        // (forEachSystem (system: {
-          inputs.deploy-rs.packages.x86_64-linux.deploy-rs
+          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;
@@ -119,8 +161,5 @@
           "vps1"
         ] mkDeployNode;
       };
-
-      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
     };
 }
-

hosts/atlas/default.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 
 {
   imports = [
@@ -22,29 +22,22 @@
   users.extraGroups.vboxusers.members = [ "jordan" ];
 
   modules = {
-    desktop = {
+    programs = {
-      apps = {
-        qbittorrent.enable = true;
-        thunderbird.enable = true;
-      };
-      browsers = {
-        firefox.enable = true;
-      };
-      media.graphics = {
-        raster.enable = true;
-        vector.enable = true;
-      };
-      office.libreoffice.enable = true;
-    };
       dev = {
         node.enable = true;
       };
-    editors = {
+      firefox.enable = true;
-      neovim.enable = true;
+      git.enable = true;
-    };
-    security = {
       gpg.enable = true;
+      graphics = {
+        raster.enable = true;
+        vector.enable = true;
+      };
+      libreoffice.enable = true;
+      neovim.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
+      thunderbird.enable = true;
     };
     services = {
       borgmatic = {
@@ -56,7 +49,6 @@
       };
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

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" ];

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: {
-      final: prev: {
       unstable = import self.inputs.nixpkgs-unstable { system = final.system; };
-      }
+    })
-    )
   ];
 
   time.timeZone = "Europe/London";
@@ -65,7 +68,10 @@
         system = "aarch64-linux";
         maxJobs = 6;
         speedFactor = 1;
-        supportedFeatures = [ "big-parallel" "benchmark" ];
+        supportedFeatures = [
+          "big-parallel"
+          "benchmark"
+        ];
       }
     ];
     distributedBuilds = true;

hosts/desktop.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [
@@ -48,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;
+    system.desktop.gnome.enable = true;
-    networking.tailscale.enable = true;
+    services.tailscale.enable = true;
   };
 
   environment.systemPackages = with pkgs; [

hosts/eos/default.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 
 {
   imports = [
@@ -25,24 +25,18 @@
   };
 
   modules = {
-    desktop = {
+    programs = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
-      };
-    };
       dev = {
         node.enable = true;
       };
-    editors = {
+      firefox.enable = true;
-      neovim.enable = true;
+      git.enable = true;
-    };
-    security = {
       gpg.enable = true;
+      neovim.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/eos/hardware-configuration.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
 
 {
   imports = [
@@ -6,7 +11,13 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
+    initrd.availableKernelModules = [
+      "ehci_pci"
+      "ahci"
+      "usb_storage"
+      "sd_mod"
+      "sdhci_pci"
+    ];
     initrd.supportedFilesystems = [ "zfs" ];
     kernel.sysctl = {
       "kernel.nmi_watchdog" = 0;

hosts/helios/default.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 
 {
   imports = [
@@ -22,21 +22,16 @@
   };
 
   modules = {
-    desktop = {
+    programs = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
-      };
-    };
       dev = {
         node.enable = true;
       };
-    editors = {
+      firefox.enable = true;
-      neovim.enable = true;
+      git.enable = true;
-    };
-    security = {
       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;
     };
   };

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" ];

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
-

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 = {
+    programs = {
-      browsers = {
-        firefox.enable = true;
-      };
-      media.recording = {
-        audio.enable = true;
-      };
-    };
       dev = {
         node.enable = true;
       };
-    editors = {
+      firefox.enable = true;
-      neovim.enable = true;
+      git.enable = true;
-    };
-    security = {
       gpg.enable = true;
+      neovim.enable = true;
       pass.enable = true;
+      recording = {
+        audio.enable = true;
+      };
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/hypnos/disko-config.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 {
   disko.devices = {
     disk = {
@@ -123,4 +123,3 @@
     };
   };
 }
-

hosts/hypnos/hardware-configuration.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
   imports = [
@@ -6,12 +12,22 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.availableKernelModules = [
+      "xhci_pci"
+      "ahci"
+      "usbhid"
+      "usb_storage"
+      "sd_mod"
+    ];
     kernel.sysctl = {
       "kernel.nmi_watchdog" = 0;
       "vm.laptop_mode" = 5;
     };
-    kernelModules = [ "applesmc" "kvm-intel" "wl" ];
+    kernelModules = [
+      "applesmc"
+      "kvm-intel"
+      "wl"
+    ];
     extraModulePackages = [
       config.boot.kernelPackages.broadcom_sta
       config.boot.kernelPackages.nvidiaPackages.legacy_470
@@ -38,4 +54,3 @@
     };
   };
 }
-

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`.
-

hosts/library/default.nix

@@ -71,12 +71,14 @@
     scrapeConfigs = [
       {
         job_name = "node";
-        static_configs = [{
+        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";
+      Type = "simple";
-      ExecStart=pkgs.lib.mkForce ''
+      ExecStart = pkgs.lib.mkForce ''
         ${pkgs.openssh}/bin/ssh \
           -NT \
           -o ExitOnForwardFailure=yes \
@@ -101,13 +103,14 @@
           -R localhost:8000:localhost:8000 \
           jellyfin@vps1.mesh.vimium.net
       '';
-      Restart="always";
+      Restart = "always";
-      RestartSec=20;
+      RestartSec = 20;
     };
     wantedBy = [ "default.target" ];
   };
 
-  services.nginx = let
+  services.nginx =
+    let
       proxyConfig = ''
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
@@ -121,7 +124,8 @@
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
       '';
-  in {
+    in
+    {
       enable = true;
       package = pkgs.openresty;
       recommendedGzipSettings = true;
@@ -162,7 +166,10 @@
       vaapiVdpau
     ];
   };
-  users.users.jellyfin.extraGroups = [ "video" "render" ];
+  users.users.jellyfin.extraGroups = [
+    "video"
+    "render"
+  ];
   services.jellyfin = {
     enable = true;
     package = pkgs.unstable.jellyfin;
@@ -172,7 +179,7 @@
 
   modules = {
     podman.enable = true;
-    security = {
+    programs = {
       gpg.enable = true;
     };
     shell = {
@@ -192,4 +199,3 @@
 
   system.stateVersion = "22.11";
 }
-

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;
 }
-

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`.
-

hosts/mail/default.nix

@@ -1,4 +1,8 @@
-{ config, lib, self, ... }:
+{
+  lib,
+  self,
+  ...
+}:
 
 {
   imports = [

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;
 }
-

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,18 +47,17 @@
     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 = {
+    programs = {
-      apps.qbittorrent.enable = true;
+      dev = {
-      browsers = {
+        node.enable = true;
-        firefox.enable = true;
       };
-      gaming = {
       emulators = {
         gamecube.enable = true;
         ps2.enable = true;
@@ -64,30 +66,25 @@
         wii.enable = true;
         xbox.enable = true;
       };
-        lutris.enable = true;
+      firefox.enable = true;
-      };
+      git.enable = true;
-      media.graphics = {
+      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;
     };
   };

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" ];

hosts/pi/default.nix

@@ -1,4 +1,8 @@
-{ config, lib, pkgs, self, ... }:
+{
+  pkgs,
+  self,
+  ...
+}:
 
 {
   imports = [
@@ -109,7 +113,7 @@
   };
 
   modules = {
-    networking = {
+    system = {
       wireless = {
         enable = true;
         interfaces = [ "wlan0" ];
@@ -126,10 +130,12 @@
 
   # Connection to ONKYO HT-R990
   networking.interfaces.end0 = {
-    ipv4.addresses = [{
+    ipv4.addresses = [
+      {
         address = "172.16.0.1";
         prefixLength = 30;
-    }];
+      }
+    ];
   };
 
   environment.systemPackages = with pkgs; [
@@ -140,4 +146,3 @@
 
   system.stateVersion = "22.11";
 }
-

hosts/pi/hardware-configuration.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, modulesPath, ... }:
+{
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
   imports = [
@@ -6,11 +11,14 @@
   ];
 
   boot = {
-    kernelPackages = let
+    kernelPackages =
+      let
         version = "6.1.73";
         tag = "stable_20240124";
         srcHash = "sha256-P4ExzxWqZj+9FZr9U2tmh7rfs/3+iHEv0m74PCoXVuM=";
-      in pkgs.linuxPackagesFor (pkgs.linux_rpi4.override {
+      in
+      pkgs.linuxPackagesFor (
+        pkgs.linux_rpi4.override {
           argsOverride = {
             src = pkgs.fetchFromGitHub {
               owner = "raspberrypi";
@@ -20,7 +28,7 @@
             };
             version = version;
             modDirVersion = version;
-          structuredExtraConfig = {};
+            structuredExtraConfig = { };
             kernelPatches = [
               {
                 name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch";
@@ -38,10 +46,20 @@
               }
             ];
           };
-      });
+        }
+      );
 
     # 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;
   };
 
@@ -49,14 +67,15 @@
   # https://github.com/NixOS/nixpkgs/issues/154163
   nixpkgs.overlays = [
     (final: prev: {
-      makeModulesClosure = x:
+      makeModulesClosure = x: prev.makeModulesClosure (x // { allowMissing = true; });
-        prev.makeModulesClosure (x // { allowMissing = true; });
     })
     (final: prev: {
-      raspberrypifw = let
+      raspberrypifw =
+        let
           version = "1.20240529";
           srcHash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
-        in pkgs.raspberrypifw.override {
+        in
+        pkgs.raspberrypifw.override {
           argsOverride = {
             src = prev.fetchFromGitHub {
               owner = "raspberrypi";
@@ -77,4 +96,3 @@
     };
   };
 }
-

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;
   };

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.
-

hosts/skycam/default.nix

@@ -1,4 +1,10 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:
 
 {
   imports = [
@@ -21,9 +27,18 @@
       # 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 ]; } ''
+              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
                   '';
@@ -83,7 +98,8 @@
       ConditionPathExists = "/sys/bus/i2c/drivers/imx708/10-001a/video4linux";
     };
     serviceConfig = {
-      ExecStart = ''${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
+      ExecStart = ''
+        ${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
                 --host=0.0.0.0 \
                 --resolution=4608x2592
       '';

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:
+      makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
-        super.makeModulesClosure (x // { allowMissing = true; });
     })
   ];
 
@@ -30,4 +37,3 @@
     };
   };
 }
-

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`.
-

hosts/vps1/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
   imports = [
@@ -37,7 +42,10 @@
     groups = {
       jellyfin = { };
     };
-    extraGroups.acme.members = [ "kanidm" "nginx" ];
+    extraGroups.acme.members = [
+      "kanidm"
+      "nginx"
+    ];
   };
 
   services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
@@ -47,11 +55,13 @@
     group = "acme";
   };
 
-  services.kanidm = let
+  services.kanidm =
+    let
       baseDomain = "vimium.com";
       domain = "auth.${baseDomain}";
       uri = "https://${domain}";
-  in {
+    in
+    {
       package = pkgs.unstable.kanidm;
       enableClient = true;
       enableServer = true;
@@ -79,7 +89,6 @@
   };
 
   modules = rec {
-    databases.postgresql.enable = true;
     services = {
       borgmatic = {
         enable = true;
@@ -103,10 +112,11 @@
           signal = true;
           whatsapp = true;
         };
-        usePostgresql = databases.postgresql.enable;
+        usePostgresql = services.postgresql.enable;
       };
       nginx.enable = true;
       photoprism.enable = true;
+      postgresql.enable = true;
     };
   };
 

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 @@
     };
   };
 }
-

modules/default.nix

@@ -1,54 +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/netbird.nix
-    ./networking/tailscale.nix
-    ./networking/wireless.nix
-    ./security/gpg.nix
-    ./security/pass.nix
-    ./services/borgmatic
-    ./services/chrony
-    ./services/coturn
-    ./services/gitea
-    ./services/gitea-runner
-    ./services/headscale
-    ./services/home-assistant
-    ./services/mail
-    ./services/matrix
-    ./services/nginx
-    ./services/photoprism
-    ./shell/git
-    ./shell/zsh
-  ];
-}

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 []);
-  };
-}

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
-    ];
-  };
-}

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
+  ];
+}

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
+    );
+  };
+}

modules/home-manager/programs/brave.nix

@@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
-let cfg = config.modules.desktop.browsers.brave;
+let
-in {
+  cfg = config.modules.programs.brave;
-  options.modules.desktop.browsers.brave = {
+in
+{
+  options.modules.programs.brave = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/cc.nix

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

modules/home-manager/programs/dev/java.nix

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

modules/home-manager/programs/dev/lua.nix

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

modules/home-manager/programs/dev/node.nix

@@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
-let cfg = config.modules.dev.node;
+let
-in {
+  cfg = config.modules.programs.dev.node;
-  options.modules.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
     ];
   };
 }

modules/home-manager/programs/dev/python.nix

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

modules/home-manager/programs/dev/rust.nix

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

modules/home-manager/programs/dev/scala.nix

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

modules/home-manager/programs/dev/shell.nix

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

modules/home-manager/programs/dev/zig.nix

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

modules/home-manager/programs/emulators.nix

@@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
-let cfg = config.modules.desktop.gaming.emulators;
+let
-in {
+  cfg = config.modules.programs.emulators;
-  options.modules.desktop.gaming.emulators = {
+in
+{
+  options.modules.programs.emulators = {
     ds.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 ||
+      (lib.mkIf (cfg.gba.enable || cfg.gb.enable || cfg.snes.enable) higan)
-             cfg.gb.enable  ||
-             cfg.snes.enable)
-        higan)
       (lib.mkIf cfg.switch.enable yuzuPackages.mainline)
-      (lib.mkIf (cfg.wii.enable ||
+      (lib.mkIf (cfg.wii.enable || cfg.gamecube.enable) dolphin-emu)
-             cfg.gamecube.enable)
-        dolphin-emu)
       (lib.mkIf cfg.xbox.enable unstable.xemu)
     ];
   };

modules/home-manager/programs/firefox.nix

@@ -1,8 +1,15 @@
-{ config, lib, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:
 
-let cfg = config.modules.desktop.browsers.firefox;
+let
-in {
+  cfg = config.modules.programs.firefox;
-  options.modules.desktop.browsers.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;

modules/home-manager/programs/forensics.nix

@@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
-let cfg = config.modules.desktop.forensics;
+let
-in {
+  cfg = config.modules.programs.forensics;
-  options.modules.desktop.forensics = {
+in
+{
+  options.modules.programs.forensics = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/git/default.nix

@@ -1,8 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  ...
+}:
 
-let cfg = config.modules.shell.git;
+let
-in {
+  cfg = config.modules.programs.git;
-  options.modules.shell.git = {
+in
+{
+  options.modules.programs.git = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/gpg.nix

@@ -1,8 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  ...
+}:
 
-let cfg = config.modules.security.gpg;
+let
-in {
+  cfg = config.modules.programs.gpg;
-  options.modules.security.gpg = {
+in
+{
+  options.modules.programs.gpg = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/graphics.nix

@@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
-let cfg = config.modules.desktop.media.graphics;
+let
-in {
+  cfg = config.modules.programs.graphics;
-  options.modules.desktop.media.graphics = {
+in
+{
+  options.modules.programs.graphics = {
     modeling.enable = lib.mkOption {
       default = false;
       example = true;

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
+    ];
+  };
+}

modules/home-manager/programs/lutris.nix

@@ -1,8 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
-let cfg = config.modules.desktop.gaming.lutris;
+let
-in {
+  cfg = config.modules.programs.lutris;
-  options.modules.desktop.gaming.lutris = {
+in
+{
+  options.modules.programs.lutris = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/neovim.nix

@@ -1,9 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  ...
+}:
 
 let
-  cfg = config.modules.editors.neovim;
+  cfg = config.modules.programs.neovim;
-in {
+in
-  options.modules.editors.neovim = {
+{
+  options.modules.programs.neovim = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/pass.nix

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

modules/home-manager/programs/qbittorrent.nix

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

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
+          [ ]
+      );
+  };
+}

modules/home-manager/programs/slack.nix

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

modules/home-manager/programs/steam.nix

@@ -1,8 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  ...
+}:
 
-let cfg = config.modules.desktop.gaming.steam;
+let
-in {
+  cfg = config.modules.programs.steam;
-  options.modules.desktop.gaming.steam = {
+in
+{
+  options.modules.programs.steam = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/thunderbird.nix

@@ -1,8 +1,15 @@
-{ config, lib, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:
 
-let cfg = config.modules.desktop.apps.thunderbird;
+let
-in {
+  cfg = config.modules.programs.thunderbird;
-  options.modules.desktop.apps.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;

modules/home-manager/programs/vscode.nix

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

modules/home-manager/programs/zoom.nix

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

modules/home-manager/shell/zsh/default.nix

@@ -1,7 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
-let cfg = config.modules.shell.zsh;
+let
-in {
+  cfg = config.modules.shell.zsh;
+in
+{
   options.modules.shell.zsh = {
     enable = lib.mkOption {
       default = false;

modules/nixos/default.nix

@@ -0,0 +1,26 @@
+{
+  imports = [
+    ./hardware/presonus-studio
+    ./podman.nix
+    ./services/borgmatic.nix
+    ./services/chrony.nix
+    ./services/coturn.nix
+    ./services/gitea.nix
+    ./services/gitea-runner.nix
+    ./services/headscale.nix
+    ./services/home-assistant
+    ./services/mail.nix
+    ./services/matrix.nix
+    ./services/music-assistant.nix
+    ./services/netbird.nix
+    ./services/nginx.nix
+    ./services/photoprism.nix
+    ./services/postgresql.nix
+    ./services/tailscale.nix
+    ./system/desktop/gnome.nix
+    ./system/desktop/hyprland.nix
+    ./system/desktop/kde.nix
+    ./system/desktop/mimeapps.nix
+    ./system/wireless.nix
+  ];
+}

modules/nixos/hardware/presonus-studio/0001-Update-device-ID-for-PreSonus-1824c.patch

@@ -68,4 +68,3 @@ index ab2b938502eb..b86832edaaa0 100644
 
 --
 2.42.0
-

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;
     };
   };
- } 
+}

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;
   };
 }
-

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;

modules/nixos/services/borgmatic.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;

modules/nixos/services/chrony.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;

modules/nixos/services/coturn.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,12 +27,16 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
-    networking.firewall = let
+    networking.firewall =
-      range = with config.services.coturn; lib.singleton {
+      let
+        range =
+          with config.services.coturn;
+          lib.singleton {
             from = min-port;
             to = max-port;
           };
-    in {
+      in
+      {
         allowedTCPPorts = [
           3478 # TURN listener
           5349 # STUN TLS
@@ -47,19 +57,26 @@ in {
       };
     };
 
-    age.secrets = {
+    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 {
+      }
+      // (
+        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 {});
+          }
+        else
+          { }
+      );
 
     services.coturn = rec {
       enable = true;

modules/nixos/services/gitea-runner.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;

modules/nixos/services/gitea.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 {

modules/nixos/services/headscale.nix

@@ -1,9 +1,15 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   cfg = config.modules.services.headscale;
   fqdn = "headscale.vimium.net";
-in {
+in
+{
   options.modules.services.headscale = {
     enable = lib.mkOption {
       default = false;

modules/nixos/services/home-assistant/default.nix

@@ -1,8 +1,15 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:
 
 let
   cfg = config.modules.services.home-assistant;
-in {
+in
+{
   imports = [
     ./floorplan/default.nix
     ./mqtt.nix
@@ -81,8 +88,6 @@ in {
         zeroconf = { };
       };
 
-      configDir = "/etc/home-assistant";
-
       extraComponents = [
         "air_quality"
         "airly"
@@ -260,11 +265,17 @@ in {
         "zone"
       ];
 
-      extraPackages = python3Packages: with python3Packages; [
+      extraPackages =
+        python3Packages: with python3Packages; [
           onkyo-eiscp
           zeroconf
         ];
 
+      customComponents = with pkgs; [
+        hass-browser-mod
+        ui-lovelace-minimalist
+      ];
+
       customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
         bubble-card
         button-card
@@ -275,8 +286,6 @@ in {
       ];
     };
 
-    systemd.services.home-assistant.preStart = lib.mkForce "";
-
     modules.services.borgmatic.directories = [
       config.services.home-assistant.configDir
     ];

modules/nixos/services/home-assistant/floorplan/default.nix

@@ -1,14 +1,22 @@
-{ config, lib, pkgs, ... }: 
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   cfg = config.modules.services.home-assistant;
-in {
+in
+{
   config = lib.mkIf cfg.enable {
     services.home-assistant = {
-      config.lovelace.resources = [{
+      config.lovelace.resources = [
+        {
           url = "/local/nixos-lovelace-modules/floorplan.js";
           type = "module";
-      }];
+        }
+      ];
       customLovelaceModules = [
         pkgs.ha-floorplan
       ];

modules/nixos/services/home-assistant/mqtt.nix

@@ -1,19 +1,28 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:
 
 let
   cfg = config.modules.services.home-assistant;
-in {
+in
+{
   config = lib.mkIf cfg.enable {
     services.mosquitto = {
       enable = true;
-      listeners = [{
+      listeners = [
+        {
           acl = [ "pattern readwrite #" ];
           omitPasswordAuth = true;
           port = 1883;
           settings = {
             allow_anonymous = true;
           };
-      }];
+        }
+      ];
     };
 
     age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
@@ -31,8 +40,6 @@ in {
         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;
@@ -41,12 +48,22 @@ in {
         };
         serial = {
           port = "/dev/serial/by-id/usb-Silicon_Labs_Sonoff_Zigbee_3.0_USB_Dongle_Plus_0001-if00-port0";
+          adapter = "zstack";
         };
         advanced = {
           channel = 20;
           network_key = "!secret.yaml network_key";
           pan_id = 13001;
-          ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
+          ext_pan_id = [
+            79
+            1
+            73
+            47
+            250
+            136
+            124
+            222
+          ];
           transmit_power = 20;
         };
         mqtt = {
@@ -62,7 +79,7 @@ in {
     ];
 
     services.home-assistant = {
-      config.mqtt = {};
+      config.mqtt = { };
       extraComponents = [
         "mqtt"
         "mqtt_eventstream"

modules/nixos/services/mail.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;

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";
+      };
+    };
+}

modules/nixos/services/music-assistant.nix

@@ -0,0 +1,37 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    ;
+  cfg = config.modules.services.music-assistant;
+in
+{
+  options.modules.services.music-assistant.enable = mkEnableOption "music-assistant";
+
+  config = mkIf cfg.enable {
+    services = {
+      nginx.virtualHosts."music-assistant.${config.networking.hostName}" = {
+        extraConfig = ''
+          proxy_buffering off;
+        '';
+        locations."/" = {
+          proxyPass = "http://[::1]:8095";
+          proxyWebsockets = true;
+        };
+      };
+      music-assistant = {
+        enable = true;
+        providers = [
+          "hass"
+          "jellyfin"
+        ];
+      };
+    };
+  };
+}

modules/nixos/services/netbird.nix

@@ -1,10 +1,15 @@
-{ config, lib, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:
 
 let
-  cfg = config.modules.networking.netbird;
+  cfg = config.modules.services.netbird;
-  hostname = config.networking.hostName;
+in
-in {
+{
-  options.modules.networking.netbird = {
+  options.modules.services.netbird = {
     enable = lib.mkEnableOption "netbird";
     coordinatorDomain = lib.mkOption {
       type = lib.types.str;
@@ -43,7 +48,9 @@ in {
           HttpConfig = {
             AuthAudience = "netbird";
           };
-          StoreConfig = { Engine = "sqlite"; };
+          StoreConfig = {
+            Engine = "sqlite";
+          };
           TURNConfig = {
             Secret._secret = config.age.secrets."passwords/services/coturn/static-auth-secret".path;
             TimeBasedCredentials = true;

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");
+    };
+  };
+}

modules/nixos/services/photoprism.nix

@@ -1,9 +1,16 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:
 
 with lib;
 
-let cfg = config.modules.services.photoprism;
+let
-in {
+  cfg = config.modules.services.photoprism;
+in
+{
   options.modules.services.photoprism = {
     enable = mkOption {
       default = false;

modules/nixos/services/postgresql.nix

@@ -5,9 +5,10 @@
 }:
 
 let
-  cfg = config.modules.databases.postgresql;
+  cfg = config.modules.services.postgresql;
-in {
+in
-  options.modules.databases.postgresql = {
+{
+  options.modules.services.postgresql = {
     enable = lib.mkOption {
       default = false;
       example = true;

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 {
+in
-  options.modules.networking.tailscale = {
+{
+  options.modules.services.tailscale = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/desktop/gnome.nix

@@ -1,8 +1,16 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}:
 
-let cfg = config.modules.desktop.gnome;
+let
-in {
+  cfg = config.modules.system.desktop.gnome;
-  options.modules.desktop.gnome = {
+in
+{
+  options.modules.system.desktop.gnome = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -208,13 +216,15 @@ 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; [
+    user.packages =
+      with pkgs;
+      [
         authenticator
         # bottles
         # bustle
@@ -238,9 +248,15 @@ in {
         # schemes
         shortwave
         sysprof
-    ] ++ (if config.virtualisation.podman.enable then [
+      ]
+      ++ (
+        if config.virtualisation.podman.enable then
+          [
             pods
-    ] else []);
+          ]
+        else
+          [ ]
+      );
 
     environment.systemPackages = with pkgs.unstable; [
       adw-gtk3

modules/nixos/system/desktop/hyprland.nix

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

modules/nixos/system/desktop/kde.nix

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

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 {
+in
-  options.modules.desktop.mimeapps = {
+{
+  options.modules.system.desktop.mimeapps = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/wireless.nix

@@ -1,10 +1,17 @@
-{ config, lib, pkgs, self, ... }:
+{
+  config,
+  lib,
+  self,
+  ...
+}:
 
 with lib;
 
-let cfg = config.modules.networking.wireless;
+let
-in {
+  cfg = config.modules.system.wireless;
-  options.modules.networking.wireless = {
+in
+{
+  options.modules.system.wireless = {
     enable = mkOption {
       default = false;
       example = true;

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 = [ "audio" "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);
-  };
-}