Add floorplan config

README.md

@@ -52,3 +52,4 @@ tailscale up --login-server https://headscale.vimium.net
 then visit the URL, SSH onto `vps1` and run `headscale --user mesh nodes register --key <key>`.
 
 The new node can optionally be given a friendly name with `headscale node rename -i <index> <hostname>`.
+

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1736955230,
+        "lastModified": 1723293904,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
+        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
+        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735644329,
+        "lastModified": 1728330715,
-        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
+        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
+        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739614136,
+        "lastModified": 1735468753,
-        "narHash": "sha256-k0UV2AUL9iTYqdAH871ex2MPzfdTKGbqqbY754qu6M8=",
+        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "7dcd5cda34cba135e4851b92bae6deb859af3884",
+        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1739223196,
+        "lastModified": 1735511798,
-        "narHash": "sha256-vAxN2f3rvl5q62gQQjZGVSvF93nAsOxntuFz+e/655w=",
+        "narHash": "sha256-U9WjPisByrvw8Kt6Ufg9kLrvg7uHPsFSyG93GR3I1iE=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "a89108e6272426f4eddd93ba17d0ea101c34fb21",
+        "rev": "097c98cb4a7568f6f83a43e37950c08b575dd126",
         "type": "github"
       },
       "original": {
@@ -170,34 +170,18 @@
     },
     "flake-compat_3": {
       "locked": {
-        "lastModified": 1733328505,
+        "lastModified": 1696426674,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "revCount": 69,
+        "revCount": 57,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
       },
       "original": {
         "type": "tarball",
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
-    "flake-compat_4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -206,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738453229,
+        "lastModified": 1733312601,
-        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
         "type": "github"
       },
       "original": {
@@ -247,14 +231,18 @@
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1737465171,
+        "lastModified": 1734797603,
-        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
         "type": "github"
       },
       "original": {
@@ -302,27 +290,6 @@
         "type": "github"
       }
     },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "pre-commit-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -351,11 +318,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739570999,
+        "lastModified": 1735344290,
-        "narHash": "sha256-eCc0/Q4bPpe4/AS+uzIrHLJcR6BxPQ69q2kD0/Qe6rU=",
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "254d47082e23dbf72fdeca1da6fe1da420f478d8",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
         "type": "github"
       },
       "original": {
@@ -373,11 +340,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
+        "lastModified": 1735344290,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
         "type": "github"
       },
       "original": {
@@ -439,27 +406,26 @@
         ]
       },
       "locked": {
-        "lastModified": 1737421067,
+        "lastModified": 1735218083,
-        "narHash": "sha256-/hgw8fDKDpko0XqOw1e9tX8lS2Hqecg7W/JsONun6Qc=",
+        "narHash": "sha256-MoUAbmXz9TEr7zlKDRO56DBJHe30+7B5X7nhXm+Vpc8=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "cae8d1c4a3bd37be5887203fe3b0c3a860c53a07",
+        "rev": "bc03f7818771a75716966ce8c23110b715eff2aa",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
-        "ref": "nix-darwin-24.11",
         "repo": "nix-darwin",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1738816619,
+        "lastModified": 1735388221,
-        "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
+        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
+        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
         "type": "github"
       },
       "original": {
@@ -478,11 +444,11 @@
         "nixpkgs-24_11": "nixpkgs-24_11"
       },
       "locked": {
-        "lastModified": 1739121270,
+        "lastModified": 1735230346,
-        "narHash": "sha256-EmJhpy9U8sVlepl2QPjG019VfG67HcucsQNItTqW6cA=",
+        "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "8c1c4640b878c692dd3d8055e8cdea0a2bbd8cf3",
+        "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b",
         "type": "gitlab"
       },
       "original": {
@@ -524,11 +490,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1739446958,
+        "lastModified": 1735471104,
-        "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
         "type": "github"
       },
       "original": {
@@ -555,11 +521,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1739484910,
+        "lastModified": 1735669367,
-        "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=",
+        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8",
+        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
         "type": "github"
       },
       "original": {
@@ -583,11 +549,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1739018339,
+        "lastModified": 1735389157,
-        "narHash": "sha256-/J2H70Gsi13nh8vGEV6aBr+e5avFaGOSr2TF4VjnVAk=",
+        "narHash": "sha256-3co5A7PUEN+Bm7b3/6BxFsmvplg3XYUNR2MzWnheZoE=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "9f0cb35c26a7dbc0acce0658f73b08b2198487c6",
+        "rev": "c8fa65c6ac35dba157de0873d645ab398c370123",
         "type": "github"
       },
       "original": {
@@ -607,11 +573,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738508923,
+        "lastModified": 1733773348,
-        "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
+        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
+        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
         "type": "github"
       },
       "original": {
@@ -630,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739557722,
+        "lastModified": 1735049224,
-        "narHash": "sha256-XikzLpPUDYiNyJ4w2SfRShdbSkIgE3btYdxCGInmtc4=",
+        "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "1f3e1f38dedbbb8aad77e184fb54ec518e2d9522",
+        "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b",
         "type": "github"
       },
       "original": {
@@ -643,28 +609,6 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_4",
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737465171,
-        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -680,7 +624,6 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "plasma-manager": "plasma-manager",
-        "pre-commit-hooks": "pre-commit-hooks",
         "secrets": "secrets",
         "thunderbird-gnome-theme": "thunderbird-gnome-theme"
       }
@@ -770,11 +713,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738953846,
+        "lastModified": 1735135567,
-        "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
+        "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
+        "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
         "type": "github"
       },
       "original": {

flake.nix

@@ -41,10 +41,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
-    pre-commit-hooks = {
-      url = "github:cachix/git-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     secrets = {
       url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
       flake = false;
@@ -55,12 +51,12 @@
     };
   };
 
-  outputs =
+  outputs = inputs @ { self, nixpkgs, ... }:
-    inputs@{ self, nixpkgs, ... }:
     let
       inherit (nixpkgs) lib;
 
       domain = "mesh.vimium.net";
+      forEverySystem = lib.getAttrs lib.systems.flakeExposed;
       forEachSystem = lib.genAttrs [
         "x86_64-linux"
         "aarch64-linux"
@@ -70,11 +66,7 @@
 
         profiles.system = {
           user = "root";
-          path =
+          path = inputs.deploy-rs.lib.${self.nixosConfigurations.${hostName}.config.system.build.toplevel.system}.activate.nixos self.nixosConfigurations.${hostName};
-            inputs.deploy-rs.lib.${
-              self.nixosConfigurations.${hostName}.config.system.build.toplevel.system
-            }.activate.nixos
-              self.nixosConfigurations.${hostName};
         };
       };
     in
@@ -84,19 +76,16 @@
         directory = ./overlays;
       };
 
-      legacyPackages = forEachSystem (
+      legacyPackages = forEachSystem (system:
-        system:
         lib.packagesFromDirectoryRecursive {
           callPackage = nixpkgs.legacyPackages.${system}.callPackage;
           directory = ./pkgs;
-        }
+        });
-      );
 
       nixosConfigurations = lib.pipe ./hosts [
         builtins.readDir
         (lib.filterAttrs (name: value: value == "directory"))
-        (lib.mapAttrs (
+        (lib.mapAttrs (name: value:
-          name: value:
           lib.nixosSystem {
             specialArgs = { inherit self; };
 
@@ -109,46 +98,15 @@
               }
               ./hosts/${name}
             ];
-          }
+          }))
-        ))
       ];
 
-      checks =
+      devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
-        builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib
-        // (forEachSystem (system: {
-          pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
-            src = ./.;
-            hooks = {
-              check-case-conflicts.enable = true;
-              check-executables-have-shebangs.enable = true;
-              check-merge-conflicts.enable = true;
-              deadnix = {
-                enable = true;
-                settings = {
-                  noLambdaArg = true;
-                };
-              };
-              detect-private-keys.enable = true;
-              end-of-file-fixer.enable = true;
-              fix-byte-order-marker.enable = true;
-              mixed-line-endings.enable = true;
-              nixfmt-rfc-style.enable = true;
-              trim-trailing-whitespace.enable = true;
-            };
-          };
-        }));
-
-      formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
-
-      devShells = forEachSystem (system: {
-        default = nixpkgs.legacyPackages.${system}.mkShell {
-          inherit (self.checks.${system}.pre-commit-check) shellHook;
         buildInputs = [
-            inputs.agenix.packages.${system}.agenix
+          inputs.agenix.packages.x86_64-linux.agenix
-            inputs.deploy-rs.packages.${system}.deploy-rs
+          inputs.deploy-rs.packages.x86_64-linux.deploy-rs
-          ] ++ self.checks.${system}.pre-commit-check.enabledPackages;
+        ];
       };
-      });
 
       deploy = {
         magicRollback = true;
@@ -161,5 +119,8 @@
           "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,22 +22,29 @@
   users.extraGroups.vboxusers.members = [ "jordan" ];
 
   modules = {
-    programs = {
+    desktop = {
-      dev = {
+      apps = {
-        node.enable = true;
+        qbittorrent.enable = true;
+        thunderbird.enable = true;
       };
+      browsers = {
         firefox.enable = true;
-      git.enable = true;
+      };
-      gpg.enable = true;
+      media.graphics = {
-      graphics = {
         raster.enable = true;
         vector.enable = true;
       };
-      libreoffice.enable = true;
+      office.libreoffice.enable = true;
+    };
+    dev = {
+      node.enable = true;
+    };
+    editors = {
       neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
       pass.enable = true;
-      qbittorrent.enable = true;
-      thunderbird.enable = true;
     };
     services = {
       borgmatic = {
@@ -49,6 +56,7 @@
       };
     };
     shell = {
+      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/atlas/hardware-configuration.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [
@@ -11,14 +6,7 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-      "xhci_pci"
-      "ehci_pci"
-      "ahci"
-      "usbhid"
-      "usb_storage"
-      "sd_mod"
-    ];
     initrd.kernelModules = [ ];
     initrd.supportedFilesystems = [ "zfs" ];
     kernelModules = [ "kvm-intel" ];

hosts/common.nix

@@ -1,23 +1,20 @@
-{
+{ config, pkgs, self, ... }:
-  pkgs,
-  self,
-  ...
-}:
 
 {
   imports = [
     self.inputs.agenix.nixosModules.age
     self.inputs.home-manager.nixosModule
-    ../modules/home-manager
+    ../modules
-    ../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";
@@ -68,10 +65,7 @@
         system = "aarch64-linux";
         maxJobs = 6;
         speedFactor = 1;
-        supportedFeatures = [
+        supportedFeatures = [ "big-parallel" "benchmark" ];
-          "big-parallel"
-          "benchmark"
-        ];
       }
     ];
     distributedBuilds = true;

hosts/desktop.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   imports = [
@@ -9,7 +9,7 @@
     (import ../overlays/gnome.nix)
   ];
 
-  services.printing.enable = true;
+  services.printing.enable = false;
   services.openssh.startWhenNeeded = true;
 
   hardware.pulseaudio.enable = false;
@@ -48,19 +48,12 @@
 
   fonts.packages = with pkgs; [
     noto-fonts
-    (nerdfonts.override {
+    (nerdfonts.override { fonts = [ "BigBlueTerminal" "ComicShannsMono" "Terminus" "UbuntuMono" ]; })
-      fonts = [
-        "BigBlueTerminal"
-        "ComicShannsMono"
-        "Terminus"
-        "UbuntuMono"
-      ];
-    })
   ];
 
   modules = {
-    system.desktop.gnome.enable = true;
+    desktop.gnome.enable = true;
-    services.tailscale.enable = true;
+    networking.tailscale.enable = true;
   };
 
   environment.systemPackages = with pkgs; [

hosts/eos/default.nix

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

hosts/eos/hardware-configuration.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [
@@ -11,13 +6,7 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-      "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 @@
-{ pkgs, ... }:
+{ config, ... }:
 
 {
   imports = [
@@ -21,21 +21,22 @@
     networkmanager.enable = true;
   };
 
-  environment.systemPackages = [
-    pkgs.moonlight-qt
-  ];
-
   modules = {
-    programs = {
+    desktop = {
+      apps.qbittorrent.enable = true;
+      browsers = {
+        firefox.enable = true;
+      };
+    };
     dev = {
       node.enable = true;
     };
-      firefox.enable = true;
+    editors = {
-      git.enable = true;
-      gpg.enable = true;
       neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
       pass.enable = true;
-      qbittorrent.enable = true;
     };
     services = {
       borgmatic = {
@@ -47,6 +48,7 @@
       };
     };
     shell = {
+      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/helios/hardware-configuration.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [
@@ -11,15 +6,7 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
-      "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,3 +99,4 @@ 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,10 +1,4 @@
-{
+{ config, lib, self, ... }:
-  config,
-  lib,
-  self,
-  pkgs,
-  ...
-}:
 
 {
   imports = [
@@ -36,7 +30,7 @@
       videoDrivers = [ "nvidia" ];
     };
     displayManager = {
-      defaultSession = if config.modules.system.desktop.kde.enable then "plasmax11" else "gnome-xorg";
+      defaultSession = if config.modules.desktop.kde.enable then "plasmax11" else "gnome-xorg";
       sddm.wayland.enable = lib.mkForce false;
     };
   };
@@ -44,25 +38,27 @@
   # Workaround for label rendering bug in GTK4 with nvidia 470 driver
   environment.sessionVariables.GSK_RENDERER = "gl";
 
-  environment.systemPackages = [
-    pkgs.moonlight-qt
-  ];
-
   modules = {
-    programs = {
+    desktop = {
-      dev = {
+      browsers = {
-        node.enable = true;
-      };
         firefox.enable = true;
-      git.enable = true;
+      };
-      gpg.enable = true;
+      media.recording = {
-      neovim.enable = true;
-      pass.enable = true;
-      recording = {
         audio.enable = true;
       };
     };
+    dev = {
+      node.enable = true;
+    };
+    editors = {
+      neovim.enable = true;
+    };
+    security = {
+      gpg.enable = true;
+      pass.enable = true;
+    };
     shell = {
+      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/hypnos/disko-config.nix

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

hosts/hypnos/hardware-configuration.nix

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

hosts/library/README.md

@@ -43,3 +43,4 @@ See [Graham Christensen's article](https://grahamc.com/blog/nixos-on-zfs/#datase
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `library.mesh.vimium.net`.
+

hosts/library/default.nix

@@ -16,9 +16,6 @@
 
   networking = {
     hostId = "d24ae953";
-    hosts = {
-      "100.64.0.1" = [ "auth.vimium.com" ];
-    };
     firewall = {
       enable = true;
       allowedTCPPorts = [
@@ -74,14 +71,12 @@
     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}"
           ];
-          }
+        }];
-        ];
       }
     ];
   };
@@ -95,8 +90,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 \
@@ -106,14 +101,13 @@
           -R localhost:8000:localhost:8000 \
           jellyfin@vps1.mesh.vimium.net
       '';
-      Restart = "always";
+      Restart="always";
-      RestartSec = 20;
+      RestartSec=20;
     };
     wantedBy = [ "default.target" ];
   };
 
-  services.nginx =
+  services.nginx = let
-    let
     proxyConfig = ''
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
@@ -127,8 +121,7 @@
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
     '';
-    in
+  in {
-    {
     enable = true;
     package = pkgs.openresty;
     recommendedGzipSettings = true;
@@ -169,10 +162,7 @@
       vaapiVdpau
     ];
   };
-  users.users.jellyfin.extraGroups = [
+  users.users.jellyfin.extraGroups = [ "video" "render" ];
-    "video"
-    "render"
-  ];
   services.jellyfin = {
     enable = true;
     package = pkgs.unstable.jellyfin;
@@ -182,7 +172,7 @@
 
   modules = {
     podman.enable = true;
-    programs = {
+    security = {
       gpg.enable = true;
     };
     shell = {
@@ -202,3 +192,4 @@
 
   system.stateVersion = "22.11";
 }
+

hosts/library/hardware-configuration.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [
@@ -11,13 +6,7 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [
+    initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
-      "xhci_pci"
-      "ahci"
-      "nvme"
-      "usb_storage"
-      "sd_mod"
-    ];
     initrd.kernelModules = [ ];
     kernelModules = [ "kvm-amd" ];
     extraModulePackages = [ ];
@@ -76,3 +65,4 @@
 
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
+

hosts/mail/README.md

@@ -15,3 +15,4 @@ NVMe | `/dev/sda1` (ext4, NixOS Root)
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `mail.mesh.vimium.net`.
+

hosts/mail/default.nix

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

hosts/mail/hardware-configuration.nix

@@ -1,7 +1,4 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  modulesPath,
-  ...
-}:
 
 {
   imports = [
@@ -10,12 +7,7 @@
 
   boot = {
     initrd = {
-      availableKernelModules = [
+      availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
-        "ata_piix"
-        "uhci_hcd"
-        "xen_blkfront"
-        "vmw_pvscsi"
-      ];
       kernelModules = [ "nvme" ];
     };
     loader.grub = {
@@ -27,3 +19,4 @@
 
   zramSwap.enable = true;
 }
+

hosts/odyssey/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   imports = [
@@ -26,10 +26,7 @@
   networking = {
     hostId = "c5e68d78";
     networkmanager.enable = true;
-    firewall.trustedInterfaces = [
+    firewall.trustedInterfaces = [ "lxdbr0" "virbr0" ]; # Work around https://github.com/NixOS/nixpkgs/issues/263359
-      "lxdbr0"
-      "virbr0"
-    ]; # Work around https://github.com/NixOS/nixpkgs/issues/263359
   };
 
   virtualisation = {
@@ -47,23 +44,18 @@
     recommendedProxySettings = true;
     virtualHosts = {
       "odyssey.mesh.vimium.net" = {
-        locations."/".proxyPass =
+        locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
-          "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
       };
     };
   };
 
-  services.sunshine = {
-    enable = true;
-    package = pkgs.unstable.sunshine;
-    capSysAdmin = true;
-  };
-
   modules = {
-    programs = {
+    desktop = {
-      dev = {
+      apps.qbittorrent.enable = true;
-        node.enable = true;
+      browsers = {
+        firefox.enable = true;
       };
+      gaming = {
         emulators = {
           gamecube.enable = true;
           ps2.enable = true;
@@ -72,25 +64,30 @@
           wii.enable = true;
           xbox.enable = true;
         };
-      firefox.enable = true;
+        lutris.enable = true;
-      git.enable = true;
+      };
-      gpg.enable = true;
+      media.graphics = {
-      graphics = {
         modeling.enable = true;
         raster.enable = true;
         vector.enable = true;
       };
-      libreoffice.enable = true;
+      media.recording = {
-      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;
@@ -108,6 +105,7 @@
       gitea-runner.enable = true;
     };
     shell = {
+      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/odyssey/hardware-configuration.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [
@@ -12,14 +6,7 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-      "xhci_pci"
-      "ehci_pci"
-      "nvme"
-      "usbhid"
-      "usb_storage"
-      "sd_mod"
-    ];
     initrd.kernelModules = [ ];
     initrd.supportedFilesystems = [ "zfs" ];
     kernelModules = [ "kvm-intel" ];

hosts/pi/default.nix

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

hosts/pi/hardware-configuration.nix

@@ -1,9 +1,4 @@
-{
+{ lib, pkgs, modulesPath, ... }:
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [
@@ -11,14 +6,11 @@
   ];
 
   boot = {
-    kernelPackages =
+    kernelPackages = let
-      let
       version = "6.1.73";
       tag = "stable_20240124";
       srcHash = "sha256-P4ExzxWqZj+9FZr9U2tmh7rfs/3+iHEv0m74PCoXVuM=";
-      in
+      in pkgs.linuxPackagesFor (pkgs.linux_rpi4.override {
-      pkgs.linuxPackagesFor (
-        pkgs.linux_rpi4.override {
         argsOverride = {
           src = pkgs.fetchFromGitHub {
             owner = "raspberrypi";
@@ -28,7 +20,7 @@
           };
           version = version;
           modDirVersion = version;
-            structuredExtraConfig = { };
+          structuredExtraConfig = {};
           kernelPatches = [
             {
               name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch";
@@ -46,20 +38,10 @@
             }
           ];
         };
-        }
+      });
-      );
 
     # Stop ZFS kernel being built
-    supportedFilesystems = lib.mkForce [
+    supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ];
-      "btrfs"
-      "cifs"
-      "f2fs"
-      "jfs"
-      "ntfs"
-      "reiserfs"
-      "vfat"
-      "xfs"
-    ];
     tmp.cleanOnBoot = true;
   };
 
@@ -67,15 +49,14 @@
   # https://github.com/NixOS/nixpkgs/issues/154163
   nixpkgs.overlays = [
     (final: prev: {
-      makeModulesClosure = x: prev.makeModulesClosure (x // { allowMissing = true; });
+      makeModulesClosure = x:
+        prev.makeModulesClosure (x // { allowMissing = true; });
     })
     (final: prev: {
-      raspberrypifw =
+      raspberrypifw = let
-        let
         version = "1.20240529";
         srcHash = "sha256-KsCo7ZG6vKstxRyFljZtbQvnDSqiAPdUza32xTY/tlA=";
-        in
+        in pkgs.raspberrypifw.override {
-        pkgs.raspberrypifw.override {
           argsOverride = {
             src = prev.fetchFromGitHub {
               owner = "raspberrypi";
@@ -96,3 +77,4 @@
     };
   };
 }
+

hosts/server.nix

@@ -1,6 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  ...
-}:
 
 {
   imports = [
@@ -56,7 +54,7 @@
     ];
   };
 
-  modules.services.tailscale = {
+  modules.networking.tailscale = {
     enable = true;
     restrictSSH = false;
   };

hosts/skycam/README.md

@@ -26,3 +26,4 @@ To generate a compressed SD card image for Skycam, run:
 
 Once a card is imaged, the existing SSH host keys should be copied to
 `/etc/ssh` manually to enable secret decryption.
+

hosts/skycam/default.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, self, ... }:
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
 
 {
   imports = [
@@ -27,18 +21,9 @@
       # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
       overlays =
         let
-          mkCompatibleDtsFile =
+          mkCompatibleDtsFile = dtbo:
-            dtbo:
             let
-              drv =
+              drv = pkgs.runCommand "fix-dts" { nativeBuildInputs = with pkgs; [ dtc gnused ]; } ''
-                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
               '';
@@ -98,8 +83,7 @@
       ConditionPathExists = "/sys/bus/i2c/drivers/imx708/10-001a/video4linux";
     };
     serviceConfig = {
-      ExecStart = ''
+      ExecStart = ''${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
-        ${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
         --host=0.0.0.0 \
         --resolution=4608x2592
       '';

hosts/skycam/hardware-configuration.nix

@@ -1,8 +1,4 @@
-{
+{ config, lib, modulesPath, ... }:
-  lib,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [
@@ -15,17 +11,14 @@
       "cma=512M"
       "panic=0"
     ];
-    supportedFilesystems = lib.mkForce [
+    supportedFilesystems = lib.mkForce [ "f2fs" "vfat" "xfs" ];
-      "f2fs"
-      "vfat"
-      "xfs"
-    ];
     tmp.cleanOnBoot = false;
   };
 
   nixpkgs.overlays = [
     (final: super: {
-      makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; });
+      makeModulesClosure = x:
+        super.makeModulesClosure (x // { allowMissing = true; });
     })
   ];
 
@@ -37,3 +30,4 @@
     };
   };
 }
+

hosts/vps1/README.md

@@ -15,3 +15,4 @@ NVMe | `/dev/sda1` (ext4, NixOS Root)
 ### Networks
 - DHCP on `10.0.1.0/24` subnet.
 - Tailscale on `100.64.0.0/10` subnet. FQDN: `vps1.mesh.vimium.net`.
+

hosts/vps1/default.nix

@@ -1,9 +1,4 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 
 {
   imports = [
@@ -42,10 +37,7 @@
     groups = {
       jellyfin = { };
     };
-    extraGroups.acme.members = [
+    extraGroups.acme.members = [ "kanidm" "nginx" ];
-      "kanidm"
-      "nginx"
-    ];
   };
 
   services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
@@ -55,13 +47,11 @@
     group = "acme";
   };
 
-  services.kanidm =
+  services.kanidm = let
-    let
     baseDomain = "vimium.com";
     domain = "auth.${baseDomain}";
     uri = "https://${domain}";
-    in
+  in {
-    {
     package = pkgs.unstable.kanidm;
     enableClient = true;
     enableServer = true;
@@ -69,8 +59,8 @@
       inherit uri;
     };
     serverSettings = {
-        bindaddress = "127.0.0.1:3013";
+      bindaddress = "[::1]:3013";
-        ldapbindaddress = "100.64.0.1:636";
+      ldapbindaddress = "[::1]:636";
       domain = baseDomain;
       origin = uri;
       tls_chain = "${config.security.acme.certs.${domain}.directory}/full.pem";
@@ -83,12 +73,13 @@
       useACMEHost = "auth.vimium.com";
       forceSSL = true;
       locations."/" = {
-        proxyPass = "https://127.0.0.1:3013";
+        proxyPass = "https://[::1]:3013";
       };
     };
   };
 
   modules = rec {
+    databases.postgresql.enable = true;
     services = {
       borgmatic = {
         enable = true;
@@ -112,11 +103,10 @@
           signal = true;
           whatsapp = true;
         };
-        usePostgresql = services.postgresql.enable;
+        usePostgresql = databases.postgresql.enable;
       };
       nginx.enable = true;
       photoprism.enable = true;
-      postgresql.enable = true;
     };
   };
 

hosts/vps1/hardware-configuration.nix

@@ -1,7 +1,4 @@
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  modulesPath,
-  ...
-}:
 
 {
   imports = [
@@ -10,12 +7,7 @@
 
   boot = {
     initrd = {
-      availableKernelModules = [
+      availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
-        "ata_piix"
-        "uhci_hcd"
-        "xen_blkfront"
-        "vmw_pvscsi"
-      ];
       kernelModules = [ "nvme" ];
     };
     loader.grub.device = "/dev/sda";
@@ -31,3 +23,4 @@
     };
   };
 }
+

modules/databases/postgresql.nix

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

modules/default.nix

@@ -0,0 +1,54 @@
+{
+  imports = [
+    ./options.nix
+    ./podman.nix
+    ./databases/postgresql.nix
+    ./desktop/gnome.nix
+    ./desktop/forensics.nix
+    ./desktop/hyprland.nix
+    ./desktop/kde.nix
+    ./desktop/mimeapps.nix
+    ./desktop/apps/qbittorrent.nix
+    ./desktop/apps/slack.nix
+    ./desktop/apps/thunderbird.nix
+    ./desktop/apps/zoom.nix
+    ./desktop/browsers/brave.nix
+    ./desktop/browsers/firefox.nix
+    ./desktop/gaming/emulators.nix
+    ./desktop/gaming/lutris.nix
+    ./desktop/gaming/steam.nix
+    ./desktop/media/graphics.nix
+    ./desktop/media/recording.nix
+    ./desktop/office/libreoffice.nix
+    ./dev/cc.nix
+    ./dev/java.nix
+    ./dev/lua.nix
+    ./dev/node.nix
+    ./dev/python.nix
+    ./dev/rust.nix
+    ./dev/scala.nix
+    ./dev/shell.nix
+    ./dev/zig.nix
+    ./editors/neovim
+    ./editors/vscode.nix
+    ./hardware/presonus-studio.nix
+    ./networking/netbird.nix
+    ./networking/tailscale.nix
+    ./networking/wireless.nix
+    ./security/gpg.nix
+    ./security/pass.nix
+    ./services/borgmatic
+    ./services/chrony
+    ./services/coturn
+    ./services/gitea
+    ./services/gitea-runner
+    ./services/headscale
+    ./services/home-assistant
+    ./services/mail
+    ./services/matrix
+    ./services/nginx
+    ./services/photoprism
+    ./shell/git
+    ./shell/zsh
+  ];
+}

modules/desktop/apps/qbittorrent.nix

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

modules/desktop/apps/slack.nix

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

modules/desktop/apps/thunderbird.nix

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

modules/desktop/apps/zoom.nix

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

modules/desktop/browsers/brave.nix

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

modules/desktop/browsers/firefox.nix

@@ -1,15 +1,8 @@
-{
+{ config, lib, self, ... }:
-  config,
-  lib,
-  self,
-  ...
-}:
 
-let
+let cfg = config.modules.desktop.browsers.firefox;
-  cfg = config.modules.programs.firefox;
+in {
-in
+  options.modules.desktop.browsers.firefox = {
-{
-  options.modules.programs.firefox = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -17,8 +10,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source =
+    home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source = self.inputs.firefox-gnome-theme;
-      self.inputs.firefox-gnome-theme;
 
     home.programs.firefox = {
       enable = true;

modules/desktop/forensics.nix

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

modules/desktop/gaming/emulators.nix

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

modules/desktop/gaming/lutris.nix

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

modules/desktop/gaming/steam.nix

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

modules/desktop/gnome.nix

@@ -1,16 +1,8 @@
-{
+{ config, lib, pkgs, self, ... }:
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
 
-let
+let cfg = config.modules.desktop.gnome;
-  cfg = config.modules.system.desktop.gnome;
+in {
-in
+  options.modules.desktop.gnome = {
-{
-  options.modules.system.desktop.gnome = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -216,15 +208,13 @@ 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 =
+    user.packages = with pkgs; [
-      with pkgs;
-      [
       authenticator
       # bottles
       # bustle
@@ -248,15 +238,9 @@ 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/desktop/hyprland.nix

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

modules/desktop/kde.nix

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

modules/desktop/media/graphics.nix

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

modules/desktop/media/recording.nix

@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.desktop.media.recording;
+in {
+  options.modules.desktop.media.recording = {
+    audio.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    video.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = {
+    user.packages = with pkgs;
+      (if cfg.audio.enable then [
+        ardour
+        audacity
+      ] else []) ++
+      (if cfg.video.enable then [
+        handbrake
+        mkvtoolnix
+        obs-studio
+      ] else []);
+  };
+}

modules/desktop/mimeapps.nix

@@ -1,16 +1,11 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  ...
-}:
 
 let
-  cfg = config.modules.system.desktop.mimeapps;
+  cfg = config.modules.desktop.mimeapps;
   avApp = "io.github.celluloid_player.Celluloid.desktop";
   imageApp = "org.gnome.eog.desktop";
-in
+in {
-{
+  options.modules.desktop.mimeapps = {
-  options.modules.system.desktop.mimeapps = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/desktop/office/libreoffice.nix

@@ -0,0 +1,38 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.modules.desktop.office.libreoffice;
+  # libreoffice-gtk4 = pkgs.libreoffice.override {
+  #   extraMakeWrapperArgs = [
+  #     "--set SAL_USE_VCLPLUGIN gtk4"
+  #   ];
+  #   unwrapped = pkgs.libreoffice-unwrapped.overrideAttrs (oldAttrs: {
+  #     buildInputs = oldAttrs.buildInputs ++ [
+  #       pkgs.gtk4
+  #     ];
+  #     configureFlags = oldAttrs.configureFlags ++ [
+  #       "--disable-werror"
+  #       "--enable-gtk4"
+  #     ];
+  #     passthru = oldAttrs.passthru // {
+  #       inherit (pkgs) gtk4;
+  #     };
+  #   });
+  # };
+in {
+  options.modules.desktop.office.libreoffice = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice)
+      hunspell
+      hunspellDicts.en-gb-large
+      hunspellDicts.en-us-large
+    ];
+  };
+}

modules/dev/cc.nix

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

modules/dev/java.nix

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

modules/dev/lua.nix

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

modules/dev/node.nix

@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.modules.dev.node;
+in {
+  options.modules.dev.node = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    user.packages = with pkgs; [
+      nodejs_latest
+    ];
+  };
+}

modules/dev/python.nix

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

modules/dev/rust.nix

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

modules/dev/scala.nix

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

modules/dev/shell.nix

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

modules/dev/zig.nix

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

modules/editors/neovim/default.nix

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

modules/editors/vscode.nix

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

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

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

modules/hardware/presonus-studio.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 let
   cfg = config.modules.hardware.presonus-studio;
   snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
@@ -18,8 +13,7 @@ let
       "channelmix.upmix-method" = "psd";
     };
   };
-in
+in {
-{
   options.modules.hardware.presonus-studio = {
     enable = lib.mkOption {
       default = false;
@@ -73,23 +67,11 @@ in
                 "capture.props" = {
                   "node.name" = "Genelec_Speakers";
                   "media.class" = "Audio/Sink";
-                  "audio.position" = [
+                  "audio.position" = [ "FL" "FR" "SL" "SR" "LFE" ];
-                    "FL"
-                    "FR"
-                    "SL"
-                    "SR"
-                    "LFE"
-                  ];
                 };
                 "playback.props" = {
                   "node.name" = "playback.Genelec_Speakers";
-                  "audio.position" = [
+                  "audio.position" = [ "AUX0" "AUX1" "AUX3" "AUX4" "AUX5" ];
-                    "AUX0"
-                    "AUX1"
-                    "AUX3"
-                    "AUX4"
-                    "AUX5"
-                  ];
                   "target.object" = "alsa_output.usb-PreSonus_Studio_1824c_SC4E21110775-00.multichannel-output";
                   "stream.dont-remix" = true;
                   "node.passive" = true;
@@ -103,4 +85,4 @@ in
       client-rt."40-upmix" = upmixConfig;
     };
   };
-}
+ } 

modules/hardware/snd-usb-audio.nix

@@ -1,17 +1,8 @@
-{
+{ pkgs, lib, kernel ? pkgs.linuxPackages_latest.kernel }:
-  pkgs,
-  lib,
-  kernel ? pkgs.linuxPackages_latest.kernel,
-}:
 
 pkgs.stdenv.mkDerivation {
   pname = "snd-usb-audio";
-  inherit (kernel)
+  inherit (kernel) src version postPatch nativeBuildInputs;
-    src
-    version
-    postPatch
-    nativeBuildInputs
-    ;
 
   kernel_dev = kernel.dev;
   kernelVersion = kernel.modDirVersion;
@@ -42,3 +33,4 @@ pkgs.stdenv.mkDerivation {
     license = lib.licenses.gpl2;
   };
 }
+

modules/home-manager/default.nix

@@ -1,33 +0,0 @@
-{
-  imports = [
-    ./options.nix
-    ./programs/brave.nix
-    ./programs/dev/cc.nix
-    ./programs/dev/java.nix
-    ./programs/dev/lua.nix
-    ./programs/dev/node.nix
-    ./programs/dev/python.nix
-    ./programs/dev/rust.nix
-    ./programs/dev/scala.nix
-    ./programs/dev/shell.nix
-    ./programs/dev/zig.nix
-    ./programs/emulators.nix
-    ./programs/firefox.nix
-    ./programs/forensics.nix
-    ./programs/git
-    ./programs/gpg.nix
-    ./programs/graphics.nix
-    ./programs/libreoffice.nix
-    ./programs/lutris.nix
-    ./programs/neovim.nix
-    ./programs/pass.nix
-    ./programs/qbittorrent.nix
-    ./programs/recording.nix
-    ./programs/slack.nix
-    ./programs/steam.nix
-    ./programs/thunderbird.nix
-    ./programs/vscode.nix
-    ./programs/zoom.nix
-    ./shell/zsh
-  ];
-}

modules/home-manager/options.nix

@@ -1,137 +0,0 @@
-{
-  config,
-  options,
-  lib,
-  self,
-  ...
-}:
-
-with lib;
-{
-  options = with types; {
-    user = mkOption {
-      type = attrs;
-      default = { };
-    };
-
-    home = {
-      configFile = mkOption {
-        type = attrs;
-        default = { };
-        description = "Files to place in $XDG_CONFIG_HOME";
-      };
-      dataFile = mkOption {
-        type = attrs;
-        default = { };
-        description = "Files to place in $XDG_DATA_HOME";
-      };
-      file = mkOption {
-        type = attrs;
-        default = { };
-        description = "Files to place directly in $HOME";
-      };
-      packages = mkOption {
-        type = attrs;
-        default = { };
-        description = "User-level installed packages";
-      };
-      programs = mkOption {
-        type = attrs;
-        default = { };
-        description = "Programs managed directly from home-manager";
-      };
-      services = mkOption {
-        type = attrs;
-        default = { };
-        description = "Services managed directly from home-manager";
-      };
-    };
-
-    dconf.settings = mkOption {
-      type = attrs;
-      default = { };
-      description = "dconf settings to enable";
-    };
-
-    env = mkOption {
-      type = attrsOf (oneOf [
-        str
-        path
-        (listOf (either str path))
-      ]);
-      apply = mapAttrs (
-        n: v: if isList v then concatMapStringsSep ":" (x: toString x) v else (toString v)
-      );
-      default = { };
-      description = "";
-    };
-  };
-
-  config = {
-    age.secrets."passwords/users/jordan".file = "${self.inputs.secrets}/passwords/users/jordan.age";
-    user =
-      let
-        user = builtins.getEnv "USER";
-        name =
-          if
-            elem user [
-              ""
-              "root"
-            ]
-          then
-            "jordan"
-          else
-            user;
-      in
-      {
-        inherit name;
-        isNormalUser = true;
-        extraGroups = [
-          "audio"
-          "lxd"
-          "networkmanager"
-          "wheel"
-        ];
-        description = "Jordan Holt";
-        useDefaultShell = true;
-        openssh.authorizedKeys.keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
-        ];
-        hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
-        home = "/home/${name}";
-        group = "users";
-        uid = 1000;
-      };
-
-    home-manager = {
-      useGlobalPkgs = true;
-      useUserPackages = true;
-
-      users.${config.user.name} = {
-        home = {
-          file = mkAliasDefinitions options.home.file;
-          stateVersion = config.system.stateVersion;
-        };
-        programs = mkAliasDefinitions options.home.programs;
-        services = mkAliasDefinitions options.home.services;
-        xdg = {
-          enable = true;
-          configFile = mkAliasDefinitions options.home.configFile;
-          dataFile = mkAliasDefinitions options.home.dataFile;
-        };
-        dconf.settings = mkAliasDefinitions options.dconf.settings;
-      };
-
-      sharedModules = [
-        self.inputs.nixvim.homeManagerModules.nixvim
-        self.inputs.plasma-manager.homeManagerModules.plasma-manager
-      ];
-    };
-
-    users.users.${config.user.name} = mkAliasDefinitions options.user;
-
-    environment.extraInit = concatStringsSep "\n" (
-      mapAttrsToList (n: v: "export ${n}=\"${v}\"") config.env
-    );
-  };
-}

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

@@ -1,24 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.modules.programs.dev.node;
-in
-{
-  options.modules.programs.dev.node = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
-      nodejs_22
-    ];
-  };
-}

modules/home-manager/programs/libreoffice.nix

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

modules/home-manager/programs/recording.nix

@@ -1,46 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.modules.programs.recording;
-in
-{
-  options.modules.programs.recording = {
-    audio.enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-    video.enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = {
-    user.packages =
-      with pkgs;
-      (
-        if cfg.audio.enable then
-          [
-            ardour
-            audacity
-          ]
-        else
-          [ ]
-      )
-      ++ (
-        if cfg.video.enable then
-          [
-            handbrake
-            mkvtoolnix
-            obs-studio
-          ]
-        else
-          [ ]
-      );
-  };
-}

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

@@ -1,197 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.modules.shell.zsh;
-in
-{
-  options.modules.shell.zsh = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    users.defaultUserShell = pkgs.zsh;
-
-    home.programs = {
-      zsh = {
-        enable = true;
-        autocd = true;
-        autosuggestion = {
-          enable = true;
-          strategy = [ "completion" ];
-        };
-        defaultKeymap = "viins";
-        dotDir = ".config/zsh";
-        enableCompletion = true;
-        enableVteIntegration = true;
-
-        history = {
-          append = true;
-          extended = true;
-          ignoreAllDups = true;
-          ignoreDups = true;
-          ignoreSpace = true;
-          save = 1000000;
-          size = 1000000;
-        };
-
-        initExtra = ''
-          ## Colors
-          autoload -U colors && colors
-
-          ## Directories
-          setopt AUTO_PUSHD
-          setopt CDABLE_VARS
-          setopt PUSHD_IGNORE_DUPS
-          setopt PUSHD_SILENT
-          setopt PUSHD_TO_HOME
-
-          ## Expansion and globbing
-          setopt EXTENDED_GLOB
-          unsetopt GLOB_DOTS
-          unsetopt NOMATCH
-
-          ## History
-          setopt BANG_HIST
-          setopt HIST_VERIFY
-          setopt INC_APPEND_HISTORY_TIME
-
-          ## I/O
-          setopt INTERACTIVE_COMMENTS
-          setopt MULTIOS
-          unsetopt CLOBBER
-
-          ## Jobs
-          setopt LONG_LIST_JOBS
-          setopt AUTO_RESUME
-          unsetopt BG_NICE
-          unsetopt NOTIFY
-          unsetopt HUP
-          unsetopt CHECK_JOBS
-
-          ## Shell emulation
-          setopt APPEND_CREATE
-
-          ## Prompt
-          PS1="%B%{$fg[magenta]%}%~%{$reset_color%} $%b "
-
-          ## Vi mode
-          export KEYTIMEOUT=1
-
-          ## Zsh line editor
-          unsetopt BEEP
-        '';
-
-        initExtraBeforeCompInit = ''
-          setopt HASH_LIST_ALL
-        '';
-
-        localVariables = {
-          # Prevent zsh-vi-mode overriding other keybinds
-          ZVM_INIT_MODE = "sourcing";
-        };
-
-        plugins = with pkgs; [
-          {
-            name = "zsh-vi-mode";
-            src = zsh-vi-mode;
-            file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
-          }
-          {
-            name = "fast-syntax-highlighting";
-            src = zsh-fast-syntax-highlighting;
-            file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
-          }
-          {
-            name = "jq-zsh-plugin";
-            src = jq-zsh-plugin;
-            file = "share/jq-zsh-plugin/jq.plugin.zsh";
-          }
-          {
-            name = "zsh-autopair";
-            src = zsh-autopair;
-            file = "share/zsh/zsh-autopair/autopair.zsh";
-          }
-          {
-            name = "zsh-forgit";
-            src = zsh-forgit;
-            file = "share/zsh/zsh-forgit/forgit.plugin.zsh";
-          }
-          {
-            name = "zsh-fzf-tab";
-            src = zsh-fzf-tab;
-            file = "share/fzf-tab/fzf-tab.plugin.zsh";
-          }
-          {
-            name = "zsh-nix-shell";
-            src = zsh-nix-shell;
-            file = "share/zsh-nix-shell/nix-shell.plugin.zsh";
-          }
-        ];
-
-        sessionVariables = {
-          MODE_INDICATOR = "";
-          MODE_CURSOR_VIINS = "#b77ee0 blinking bar";
-          MODE_CURSOR_REPLACE = "$MODE_CURSOR_VIINS #ff3334";
-          MODE_CURSOR_VICMD = "#b77ee0 block";
-          MODE_CURSOR_SEARCH = "#e7c547 steady underline";
-          MODE_CURSOR_VISUAL = "$MODE_CURSOR_VICMD steady bar";
-          MODE_CURSOR_VLINE = "$MODE_CURSOR_VISUAL #54ced6";
-          ZVM_LINE_INIT_MODE = "i";
-        };
-
-        shellAliases = {
-          # Verbose file operations
-          cp = "cp -iv";
-          mv = "mv -iv";
-          rm = "rm -v";
-          mkdir = "mkdir -v";
-
-          # Colorize commands
-          ls = "ls -h --color=auto --group-directories-first";
-
-          # Abbreviations
-          e = "$EDITOR";
-          f = "$FILE";
-          g = "git";
-          m = "neomutt";
-          n = "$FILE";
-          v = "$EDITOR";
-        };
-      };
-
-      broot.enable = true;
-
-      direnv = {
-        enable = true;
-        nix-direnv.enable = true;
-      };
-
-      fzf = {
-        enable = true;
-        enableZshIntegration = true;
-        package = pkgs.unstable.fzf;
-      };
-
-      mcfly.enable = true;
-      navi.enable = true;
-      nix-index.enable = true;
-    };
-
-    user.packages = with pkgs; [
-      bat
-      fd
-      jq
-      nix-zsh-completions
-      nnn
-      ripgrep
-    ];
-  };
-}

modules/networking/netbird.nix

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

modules/networking/tailscale.nix

@@ -1,18 +1,11 @@
-{
+{ config, lib, pkgs, self, ... }:
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
 
 let
-  cfg = config.modules.services.tailscale;
+  cfg = config.modules.networking.tailscale;
   headscale = "https://headscale.vimium.net";
   hostname = config.networking.hostName;
-in
+in {
-{
+  options.modules.networking.tailscale = {
-  options.modules.services.tailscale = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/networking/wireless.nix

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

modules/nixos/default.nix

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

modules/nixos/services/matrix.nix

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

modules/nixos/services/music-assistant.nix

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

modules/nixos/services/nginx.nix

@@ -1,193 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.modules.services.nginx;
-  nginxErrorPages = ''
-    location @error_pages {
-      rewrite ^.*$ /''${status}.html break;
-
-      root "/var/www/html/errors";
-    }
-  '';
-  nginxEdgeHeaders = ''
-    more_set_headers 'Server: Vimium';
-    more_set_headers 'Access-Control-Allow-Origin: *';
-    add_header Expect-CT max-age=30 always;
-    add_header Referrer-Policy strict-origin-when-cross-origin always;
-    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
-    add_header Vimium-Responding-Instance $hostname;
-    add_header X-XSS-Protection "1; mode=block" always;
-    add_header X-Content-Type-Options nosniff always;
-  '';
-  nginxStrictHeaders = ''
-    add_header X-Frame-Options SAMEORIGIN always;
-    add_header Permissions-Policy "fullscreen=(self), sync-xhr=(self)" always;
-  '';
-  mkRedirect = from: to: {
-    "${from}" = {
-      forceSSL = true;
-      enableACME = true;
-      serverAliases = [ "www.${from}" ];
-      locations."/".return = "301 https://${to}$request_uri";
-      extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
-    };
-  };
-in
-{
-  options.modules.services.nginx = {
-    enable = mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = [
-      80 # HTTP
-      443 # HTTPS
-    ];
-
-    services.nginx = {
-      enable = true;
-      package = pkgs.openresty;
-      recommendedGzipSettings = true;
-      recommendedOptimisation = true;
-      recommendedTlsSettings = true;
-      clientMaxBodySize = "2G";
-      sslProtocols = "TLSv1.2 TLSv1.3";
-      sslCiphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
-      appendHttpConfig = ''
-        error_page 400 @error_pages;
-        error_page 401 @error_pages;
-        error_page 403 @error_pages;
-        error_page 404 @error_pages;
-        error_page 405 @error_pages;
-        error_page 429 @error_pages;
-        error_page 500 @error_pages;
-        error_page 501 @error_pages;
-        error_page 502 @error_pages;
-        error_page 503 @error_pages;
-        error_page 504 @error_pages;
-
-        client_body_buffer_size 16k;
-        client_header_buffer_size 8k;
-      '';
-      appendConfig = ''
-        worker_processes auto;
-        worker_cpu_affinity auto;
-        worker_rlimit_nofile 50000;
-      '';
-      eventsConfig = ''
-        worker_connections 20000;
-        multi_accept off;
-      '';
-      proxyCachePath = {
-        "skycam" = {
-          enable = true;
-          keysZoneName = "skycam_cache";
-          maxSize = "100m";
-        };
-      };
-      virtualHosts =
-        {
-          ## Static sites
-          "jellyfin.vimium.com" = {
-            forceSSL = true;
-            enableACME = true;
-            extraConfig = nginxErrorPages + nginxEdgeHeaders;
-            locations."/" = {
-              proxyPass = "http://localhost:8000";
-              extraConfig = ''
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header X-Forwarded-Proto $scheme;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header Host $host;
-
-                proxy_set_header Range $http_range;
-                proxy_set_header If-Range $http_if_range;
-
-                proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-              '';
-            };
-          };
-          "jdholt.com" = {
-            forceSSL = true;
-            enableACME = true;
-            serverAliases = [ "www.jdholt.com" ];
-            extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
-            locations."/skycam/snapshot.jpg" = {
-              extraConfig = ''
-                set $backend "skycam.mesh.vimium.net:8080";
-
-                resolver 100.100.100.100;
-
-                proxy_pass http://$backend/snapshot;
-                proxy_cache skycam_cache;
-                proxy_cache_valid any 10s;
-                proxy_ignore_headers Cache-Control Expires Set-Cookie;
-              '';
-            };
-            locations."/".return = "301 https://vimium.com$request_uri";
-          };
-          "pki.vimium.com" = {
-            addSSL = true;
-            forceSSL = false;
-            enableACME = true;
-            extraConfig = ''
-              ${nginxErrorPages}
-              more_set_headers 'Server: Vimium';
-            '';
-            locations."/" = {
-              root = "/var/www/pki.vimium.com";
-            };
-          };
-          "suhailhussain.com" = {
-            forceSSL = true;
-            enableACME = true;
-            serverAliases = [ "www.suhailhussain.com" ];
-            extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
-            locations."/" = {
-              root = "/var/www/suhailhussain.com";
-            };
-          };
-          "vimium.com" = {
-            default = true;
-            forceSSL = true;
-            enableACME = true;
-            serverAliases = [ "www.vimium.com" ];
-            extraConfig =
-              nginxErrorPages
-              + nginxEdgeHeaders
-              + nginxStrictHeaders
-              + ''
-                add_header Content-Security-Policy "default-src 'self' https://vimium.com https://www.vimium.com; style-src 'unsafe-inline'; object-src 'none'; upgrade-insecure-requests" always;
-              '';
-            locations."/" = {
-              root = "/var/www/vimium.com";
-            };
-          };
-        }
-        ## Redirects
-        // (mkRedirect "h0lt.com" "jdholt.com")
-        // (mkRedirect "jordanholt.xyz" "jdholt.com")
-        // (mkRedirect "omnimagic.com" "vimium.com")
-        // (mkRedirect "omnimagic.net" "vimium.com")
-        // (mkRedirect "thelostlegend.com" "suhailhussain.com")
-        // (mkRedirect "vimium.co" "vimium.com")
-        // (mkRedirect "vimium.co.uk" "vimium.com")
-        // (mkRedirect "vimium.info" "vimium.com")
-        // (mkRedirect "vimium.net" "vimium.com")
-        // (mkRedirect "vimium.org" "vimium.com")
-        // (mkRedirect "vimium.xyz" "vimium.com");
-    };
-  };
-}

modules/options.nix

@@ -0,0 +1,82 @@
+{ config, options, lib, self, ... }:
+
+with lib;
+{
+  options = with types; {
+    user = mkOption { type = attrs; default = { }; };
+
+    home = {
+      configFile  = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_CONFIG_HOME"; };
+      dataFile    = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_DATA_HOME"; };
+      file        = mkOption { type = attrs; default = { }; description = "Files to place directly in $HOME"; };
+      packages    = mkOption { type = attrs; default = { }; description = "User-level installed packages"; };
+      programs    = mkOption { type = attrs; default = { }; description = "Programs managed directly from home-manager"; };
+      services    = mkOption { type = attrs; default = { }; description = "Services managed directly from home-manager"; };
+    };
+
+    dconf.settings = mkOption { type = attrs; default = { }; description = "dconf settings to enable"; };
+
+    env = mkOption {
+      type = attrsOf (oneOf [ str path (listOf (either str path)) ]);
+      apply = mapAttrs (n: v:
+        if isList v then
+          concatMapStringsSep ":" (x: toString x) v
+        else
+          (toString v));
+      default = { };
+      description = "";
+    };
+  };
+
+  config = {
+    age.secrets."passwords/users/jordan".file = "${self.inputs.secrets}/passwords/users/jordan.age";
+    user =
+      let user = builtins.getEnv "USER";
+          name = if elem user [ "" "root" ] then "jordan" else user;
+      in {
+        inherit name;
+        isNormalUser = true;
+        extraGroups = [ "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);
+  };
+}

modules/podman.nix

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

modules/security/gpg.nix

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

modules/security/pass.nix

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

modules/services/borgmatic/default.nix

@@ -1,15 +1,9 @@
-{
+{ config, lib, self, ... }:
-  config,
-  lib,
-  self,
-  ...
-}:
 
 let
   cfg = config.modules.services.borgmatic;
   hostname = config.networking.hostName;
-in
+in {
-{
   options.modules.services.borgmatic = {
     enable = lib.mkOption {
       default = false;
@@ -18,7 +12,7 @@ in
     };
     directories = lib.mkOption {
       type = lib.types.listOf lib.types.str;
-      default = [ ];
+      default = [];
       example = [
         "/home/jordan/Documents"
       ];
@@ -41,14 +35,9 @@ in
       settings = {
         source_directories = cfg.directories;
         repositories = [
-          {
+          { label = "borgbase"; path = cfg.repoPath; }
-            label = "borgbase";
-            path = cfg.repoPath;
-          }
         ];
-        encryption_passcommand = "cat ${
+        encryption_passcommand = "cat ${config.age.secrets."passwords/services/borg/${hostname}-passphrase".path}";
-          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/services/chrony/default.nix

@@ -1,15 +1,10 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  ...
-}:
 
 with lib;
 
 let
   cfg = config.modules.services.chrony;
-in
+in {
-{
   options.modules.services.chrony = {
     enable = mkOption {
       default = false;

modules/services/coturn/default.nix

@@ -1,14 +1,8 @@
-{
+{ config, lib, self, ... }:
-  config,
-  lib,
-  self,
-  ...
-}:
 
 let
   cfg = config.modules.services.coturn;
-in
+in {
-{
   options.modules.services.coturn = {
     enable = lib.mkOption {
       default = false;
@@ -27,16 +21,12 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    networking.firewall =
+    networking.firewall = let
-      let
+      range = with config.services.coturn; lib.singleton {
-        range =
-          with config.services.coturn;
-          lib.singleton {
         from = min-port;
         to = max-port;
       };
-      in
+    in {
-      {
       allowedTCPPorts = [
         3478  # TURN listener
         5349  # STUN TLS
@@ -57,26 +47,19 @@ 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/services/gitea-runner/default.nix

@@ -1,10 +1,4 @@
-{
+{ pkgs, config, lib, self, ... }:
-  pkgs,
-  config,
-  lib,
-  self,
-  ...
-}:
 
 # Based on: https://git.clan.lol/clan/clan-infra/src/branch/main/modules/web01/gitea/actions-runner.nix
 
@@ -58,12 +52,7 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "podman.service" ];
         requires = [ "podman.service" ];
-        path = [
+        path = [ config.virtualisation.podman.package pkgs.gnutar pkgs.shadow pkgs.getent ];
-          config.virtualisation.podman.package
-          pkgs.gnutar
-          pkgs.shadow
-          pkgs.getent
-        ];
         script = ''
           set -eux -o pipefail
           mkdir -p etc/nix
@@ -153,12 +142,7 @@ in
             "~setdomainname"
             "~sethostname"
           ];
-          RestrictAddressFamilies = [
+          RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ];
-            "AF_INET"
-            "AF_INET6"
-            "AF_UNIX"
-            "AF_NETLINK"
-          ];
 
           # Needs network access
           PrivateNetwork = false;

modules/services/gitea/default.nix

@@ -1,15 +1,8 @@
-{
+{ config, lib, pkgs, self, ... }:
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
 
 let
   cfg = config.modules.services.gitea;
-in
+in {
-{
   options.modules.services.gitea = {
     enable = lib.mkEnableOption "gitea";
     domain = lib.mkOption {

modules/services/headscale/default.nix

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

modules/services/home-assistant/default.nix

@@ -1,15 +1,8 @@
-{
+{ config, lib, pkgs, self, ... }:
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
 
 let
   cfg = config.modules.services.home-assistant;
-in
+in {
-{
   imports = [
     ./floorplan/default.nix
     ./mqtt.nix
@@ -67,7 +60,12 @@ in
           logs = { };
         };
         lovelace = {
-          mode = "yaml";
+          resources = [
+            {
+              url = "/local/nixos-lovelace-modulels/mushroom.js";
+              type = "module";
+            }
+          ];
         };
         media_player = [ ];
         mobile_app = { };
@@ -83,6 +81,8 @@ in
         zeroconf = { };
       };
 
+      configDir = "/etc/home-assistant";
+
       extraComponents = [
         "air_quality"
         "airly"
@@ -260,40 +260,23 @@ in
         "zone"
       ];
 
-      extraPackages =
+      extraPackages = python3Packages: with python3Packages; [
-        python3Packages: with python3Packages; [
         onkyo-eiscp
         zeroconf
       ];
 
-      customComponents = with pkgs; [
+      customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
-        home-assistant-browser-mod
-      ];
-
-      customLovelaceModules =
-        (with pkgs.home-assistant-custom-lovelace-modules; [
         bubble-card
         button-card
-          card-mod
-          light-entity-card
-          mini-graph-card
-          mini-media-player
         mushroom
         sankey-chart
         universal-remote-card
-        ])
+        # zigbee2mqtt-networkmap
-        ++ (with pkgs; [
+      ];
-          lovelace-auto-entities
-          lovelace-layout-card
-          lovelace-my-cards
-          lovelace-simple-weather-card
-          lovelace-state-switch
-          lovelace-weather-radar-card
-        ]);
-
-      lovelaceConfigWritable = true;
     };
 
+    systemd.services.home-assistant.preStart = lib.mkForce "";
+
     modules.services.borgmatic.directories = [
       config.services.home-assistant.configDir
     ];

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

@@ -1,18 +1,16 @@
-{
+{ 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 = [{
+        url = "/local/nixos-lovelace-modules/floorplan.js";
+        type = "module";
+      }];
       customLovelaceModules = [
-        pkgs.lovelace-floorplan
+        pkgs.ha-floorplan
       ];
     };
 

modules/services/home-assistant/mqtt.nix

@@ -1,28 +1,19 @@
-{
+{ 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" = {
@@ -40,6 +31,8 @@ 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;
@@ -48,22 +41,12 @@ 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 = [
+          ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
-            79
-            1
-            73
-            47
-            250
-            136
-            124
-            222
-          ];
           transmit_power = 20;
         };
         mqtt = {
@@ -79,7 +62,7 @@ in
     ];
 
     services.home-assistant = {
-      config.mqtt = { };
+      config.mqtt = {};
       extraComponents = [
         "mqtt"
         "mqtt_eventstream"

modules/services/mail/default.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, self, ... }:
-  config,
-  lib,
-  self,
-  ...
-}:
 
 let
   cfg = config.modules.services.mail;
@@ -19,8 +14,7 @@ let
     "vimium.org"
     "vimium.xyz"
   ];
-in
+in {
-{
   options.modules.services.mail = {
     enable = lib.mkOption {
       default = false;
@@ -46,10 +40,7 @@ in
 
     services.nginx.enable = true;
 
-    networking.firewall.allowedTCPPorts = [
+    networking.firewall.allowedTCPPorts = [ 80 443 ];
-      80
-      443
-    ];
 
     mailserver = {
       enable = true;

modules/services/matrix/default.nix

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

modules/services/nginx/default.nix

@@ -0,0 +1,182 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.modules.services.nginx;
+  nginxErrorPages = ''
+    location @error_pages {
+      rewrite ^.*$ /''${status}.html break;
+
+      root "/var/www/html/errors";
+    }
+  '';
+  nginxEdgeHeaders = ''
+    more_set_headers 'Server: Vimium';
+    more_set_headers 'Access-Control-Allow-Origin: *';
+    add_header Expect-CT max-age=30 always;
+    add_header Referrer-Policy strict-origin-when-cross-origin always;
+    add_header Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" always;
+    add_header Vimium-Responding-Instance $hostname;
+    add_header X-XSS-Protection "1; mode=block" always;
+    add_header X-Content-Type-Options nosniff always;
+  '';
+  nginxStrictHeaders = ''
+    add_header X-Frame-Options SAMEORIGIN always;
+    add_header Permissions-Policy "fullscreen=(self), sync-xhr=(self)" always;
+  '';
+  mkRedirect = from: to: {
+    "${from}" = {
+      forceSSL = true;
+      enableACME = true;
+      serverAliases = [ "www.${from}" ];
+      locations."/".return = "301 https://${to}$request_uri";
+      extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
+    };
+  };
+in {
+  options.modules.services.nginx = {
+    enable = mkOption {
+      default = false;
+      example = true;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = [
+      80    # HTTP
+      443   # HTTPS
+    ];
+
+    services.nginx = {
+      enable = true;
+      package = pkgs.openresty;
+      recommendedGzipSettings = true;
+      recommendedOptimisation = true;
+      recommendedTlsSettings = true;
+      clientMaxBodySize = "2G";
+      sslProtocols = "TLSv1.2 TLSv1.3";
+      sslCiphers = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
+      appendHttpConfig = ''
+        error_page 400 @error_pages;
+        error_page 401 @error_pages;
+        error_page 403 @error_pages;
+        error_page 404 @error_pages;
+        error_page 405 @error_pages;
+        error_page 429 @error_pages;
+        error_page 500 @error_pages;
+        error_page 501 @error_pages;
+        error_page 502 @error_pages;
+        error_page 503 @error_pages;
+        error_page 504 @error_pages;
+
+        client_body_buffer_size 16k;
+        client_header_buffer_size 8k;
+      '';
+      appendConfig = ''
+        worker_processes auto;
+        worker_cpu_affinity auto;
+        worker_rlimit_nofile 50000;
+      '';
+      eventsConfig = ''
+        worker_connections 20000;
+        multi_accept off;
+      '';
+      proxyCachePath = {
+        "skycam" = {
+          enable = true;
+          keysZoneName = "skycam_cache";
+          maxSize = "100m";
+        };
+      };
+      virtualHosts = {
+        ## Static sites
+        "jellyfin.vimium.com" = {
+          forceSSL = true;
+          enableACME = true;
+          extraConfig = nginxErrorPages + nginxEdgeHeaders;
+          locations."/" = {
+            proxyPass = "http://localhost:8000";
+            extraConfig = ''
+              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+              proxy_set_header X-Forwarded-Proto $scheme;
+              proxy_set_header X-Real-IP $remote_addr;
+              proxy_set_header Host $host;
+
+              proxy_set_header Range $http_range;
+              proxy_set_header If-Range $http_if_range;
+
+              proxy_http_version 1.1;
+              proxy_set_header Upgrade $http_upgrade;
+              proxy_set_header Connection "upgrade";
+            '';
+          };
+        };
+        "jdholt.com" = {
+          forceSSL = true;
+          enableACME = true;
+          serverAliases = [ "www.jdholt.com" ];
+          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
+          locations."/skycam/snapshot.jpg" = {
+            extraConfig = ''
+              set $backend "skycam.mesh.vimium.net:8080";
+
+              resolver 100.100.100.100;
+
+              proxy_pass http://$backend/snapshot;
+              proxy_cache skycam_cache;
+              proxy_cache_valid any 10s;
+              proxy_ignore_headers Cache-Control Expires Set-Cookie;
+            '';
+          };
+          locations."/".return = "301 https://vimium.com$request_uri";
+        };
+        "pki.vimium.com" = {
+          addSSL = true;
+          forceSSL = false;
+          enableACME = true;
+          extraConfig = ''
+            ${nginxErrorPages}
+            more_set_headers 'Server: Vimium';
+          '';
+          locations."/" = {
+            root = "/var/www/pki.vimium.com";
+          };
+        };
+        "suhailhussain.com" = {
+          forceSSL = true;
+          enableACME = true;
+          serverAliases = [ "www.suhailhussain.com" ];
+          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders;
+          locations."/" = {
+            root = "/var/www/suhailhussain.com";
+          };
+        };
+        "vimium.com" = {
+          default = true;
+          forceSSL = true;
+          enableACME = true;
+          serverAliases = [ "www.vimium.com" ];
+          extraConfig = nginxErrorPages + nginxEdgeHeaders + nginxStrictHeaders + ''
+            add_header Content-Security-Policy "default-src 'self' https://vimium.com https://www.vimium.com; style-src 'unsafe-inline'; object-src 'none'; upgrade-insecure-requests" always;
+          '';
+          locations."/" = {
+            root = "/var/www/vimium.com";
+          };
+        };
+      }
+      ## Redirects
+      // (mkRedirect "h0lt.com" "jdholt.com")
+      // (mkRedirect "jordanholt.xyz" "jdholt.com")
+      // (mkRedirect "omnimagic.com" "vimium.com")
+      // (mkRedirect "omnimagic.net" "vimium.com")
+      // (mkRedirect "thelostlegend.com" "suhailhussain.com")
+      // (mkRedirect "vimium.co" "vimium.com")
+      // (mkRedirect "vimium.co.uk" "vimium.com")
+      // (mkRedirect "vimium.info" "vimium.com")
+      // (mkRedirect "vimium.net" "vimium.com")
+      // (mkRedirect "vimium.org" "vimium.com")
+      // (mkRedirect "vimium.xyz" "vimium.com");
+    };
+  };
+}

modules/services/photoprism/default.nix

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

modules/shell/git/default.nix

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

modules/shell/zsh/.zshrc

@@ -0,0 +1,34 @@
+source $ZDOTDIR/config.zsh
+
+if [ ! -d "$ZGEN_DIR" ]; then
+  echo "Installing jandamm/zgenom"
+  git clone https://github.com/jandamm/zgenom "$ZGEN_DIR"
+fi
+source $ZGEN_DIR/zgenom.zsh
+
+zgenom autoupdate
+
+if ! zgenom saved; then
+  echo "Initializing zgenom"
+  rm -f $ZDOTDIR/*.zwc(N) \
+        $XDG_CACHE_HOME/zsh/*(N) \
+        $ZGEN_INIT.zwc
+
+  zgenom load junegunn/fzf shell
+  zgenom load zdharma-continuum/fast-syntax-highlighting
+  zgenom load zsh-users/zsh-completions src
+  zgenom load zsh-users/zsh-history-substring-search
+  zgenom load softmoth/zsh-vim-mode
+
+  zgenom save
+  zgenom compile $ZDOTDIR
+fi
+
+## Bootstrap interactive sessions
+if [[ $TERM != dumb ]]; then
+  autoload -Uz compinit && compinit -u -d $ZSH_CACHE/zcompdump
+
+  source $ZDOTDIR/keybinds.zsh
+  source $ZDOTDIR/completion.zsh
+  source $ZDOTDIR/aliases.zsh
+fi

modules/shell/zsh/aliases.zsh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Verbose file operations
+alias \
+    cp="cp -iv" \
+    mv="mv -iv" \
+    rm="rm -v" \
+    mkdir="mkdir -v"
+
+# Colorize commands
+alias \
+    ls="ls -h --color=auto --group-directories-first"
+
+# Abbreviations
+alias \
+    e="$EDITOR" \
+    f="$FILE" \
+    g="git" \
+    m="neomutt" \
+    n="$FILE" \
+    v="$EDITOR"
+
+# XDG fixes
+alias \
+    mbsync="mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc -a"