Add grafana to library

2024-06-02 18:09:58 +01:00
52 changed files with 527 additions and 1876 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1723293904,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "lastModified": 1716561646,
+        "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
        "type": "github"
      },
      "original": {
@@ -66,11 +66,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1727447169,
-        "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=",
+        "lastModified": 1715699772,
+        "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=",
        "owner": "serokell",
        "repo": "deploy-rs",
-        "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76",
+        "rev": "b3ea6f333f9057b77efd9091119ba67089399ced",
        "type": "github"
      },
      "original": {
@@ -81,17 +81,18 @@
    },
    "devshell": {
      "inputs": {
+        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixvim",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1722113426,
-        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
+        "lastModified": 1713532798,
+        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
+        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
        "type": "github"
      },
      "original": {
@@ -107,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727359191,
-        "narHash": "sha256-5PltTychnExFwzpEnY3WhOywaMV/M6NxYI/y3oXuUtw=",
+        "lastModified": 1717177033,
+        "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "67dc29be3036cc888f0b9d4f0a788ee0f6768700",
+        "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c",
        "type": "github"
      },
      "original": {
@@ -123,11 +124,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1723137499,
-        "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=",
+        "lastModified": 1716813977,
+        "narHash": "sha256-8fabA8OY1n2OcJFbbE03+bMydVANSBrNGo8hkzhXxxU=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70",
+        "rev": "8171c0578feb835ce66d49edba7429f46b7ac3f6",
        "type": "github"
      },
      "original": {
@@ -206,11 +207,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725234343,
-        "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
+        "lastModified": 1715865404,
+        "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
+        "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
        "type": "github"
      },
      "original": {
@@ -219,6 +220,39 @@
        "type": "github"
      }
    },
+    "flake-root": {
+      "locked": {
+        "lastModified": 1713493429,
+        "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
+        "owner": "srid",
+        "repo": "flake-root",
+        "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "flake-root",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "git-hooks": {
      "inputs": {
        "flake-compat": "flake-compat_4",
@@ -233,11 +267,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724857454,
-        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
+        "lastModified": 1716213921,
+        "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
+        "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
        "type": "github"
      },
      "original": {
@@ -313,11 +347,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1716736833,
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
        "type": "github"
      },
      "original": {
@@ -335,36 +369,19 @@
        ]
      },
      "locked": {
-        "lastModified": 1720042825,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "lastModified": 1717052710,
+        "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-24.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
-    "kvlibadwaita": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1710621848,
-        "narHash": "sha256-xBl6zmpqTAH5MIT5iNAdW6kdOcB5MY0Dtrb95hdYpwA=",
-        "owner": "GabePoel",
-        "repo": "KvLibadwaita",
-        "rev": "87c1ef9f44ec48855fd09ddab041007277e30e37",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GabePoel",
-        "repo": "KvLibadwaita",
-        "type": "github"
-      }
-    },
    "nix-darwin": {
      "inputs": {
        "nixpkgs": [
@@ -373,11 +390,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1725189302,
-        "narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=",
+        "lastModified": 1716993688,
+        "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda",
+        "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
        "type": "github"
      },
      "original": {
@@ -388,11 +405,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1727437159,
-        "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=",
+        "lastModified": 1717248095,
+        "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2",
+        "rev": "7b49d3967613d9aacac5b340ef158d493906ba79",
        "type": "github"
      },
      "original": {
@@ -408,20 +425,18 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-24_05": "nixpkgs-24_05",
        "utils": "utils_2"
      },
      "locked": {
-        "lastModified": 1718084203,
-        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
+        "lastModified": 1714720456,
+        "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
        "owner": "simple-nixos-mailserver",
        "repo": "nixos-mailserver",
-        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
+        "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
        "type": "gitlab"
      },
      "original": {
        "owner": "simple-nixos-mailserver",
-        "ref": "nixos-24.05",
        "repo": "nixos-mailserver",
        "type": "gitlab"
      }
@@ -442,28 +457,13 @@
        "type": "github"
      }
    },
-    "nixpkgs-24_05": {
-      "locked": {
-        "lastModified": 1717144377,
-        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.05",
-        "type": "indirect"
-      }
-    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1727122398,
-        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
+        "lastModified": 1716948383,
+        "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
+        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
        "type": "github"
      },
      "original": {
@@ -490,11 +490,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1727264057,
-        "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
+        "lastModified": 1717144377,
+        "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
        "type": "github"
      },
      "original": {
@@ -508,6 +508,7 @@
        "devshell": "devshell",
        "flake-compat": "flake-compat_3",
        "flake-parts": "flake-parts",
+        "flake-root": "flake-root",
        "git-hooks": "git-hooks",
        "home-manager": "home-manager_3",
        "nix-darwin": "nix-darwin",
@@ -517,43 +518,19 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1725350106,
-        "narHash": "sha256-TaMMlI2KPJ3wCyxJk6AShOLhNuTeabHCnvYRkLBlEFs=",
+        "lastModified": 1717274692,
+        "narHash": "sha256-CnMCPxY9GfBAONN3BoWmPc36QV5Sv9uZFKH9VkE5KJI=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "0f2c31e6a57a83ed4e6fa3adc76749620231055d",
+        "rev": "e58380adcddc450eb08c37760a3f282077386d19",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "nixos-24.05",
        "repo": "nixvim",
        "type": "github"
      }
    },
-    "plasma-manager": {
-      "inputs": {
-        "home-manager": [
-          "home-manager"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1727210241,
-        "narHash": "sha256-lufS6uzSbSrggNCSgubymMQWnQMh7PvQ+lRZ8qH9Uoc=",
-        "owner": "nix-community",
-        "repo": "plasma-manager",
-        "rev": "a02fef2ece8084aff0b41700bb57d24d73574cd1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "plasma-manager",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "agenix": "agenix",
@@ -562,13 +539,11 @@
        "firefox-gnome-theme": "firefox-gnome-theme",
        "gitea-github-theme": "gitea-github-theme",
        "home-manager": "home-manager_2",
-        "kvlibadwaita": "kvlibadwaita",
        "nixos-hardware": "nixos-hardware",
        "nixos-mailserver": "nixos-mailserver",
        "nixpkgs": "nixpkgs_3",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nixvim": "nixvim",
-        "plasma-manager": "plasma-manager",
        "secrets": "secrets",
        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
      }
@@ -576,11 +551,11 @@
    "secrets": {
      "flake": false,
      "locked": {
-        "lastModified": 1724093899,
-        "narHash": "sha256-VohYwTIBq7NEssFibuu+HMXXwuCoLmMOmEwQf7sESSI=",
+        "lastModified": 1717248946,
+        "narHash": "sha256-8dFjsjkTbKClYK5Bg1KKdMx5wrp5AOTLsu3Jv9otoVw=",
        "ref": "refs/heads/master",
-        "rev": "7f5901bb5d6eeaa94d7e1f18f66093be9df014e4",
-        "revCount": 27,
+        "rev": "bff76a71201dda856c91dc5b5bdc3859f53c29f2",
+        "revCount": 20,
        "type": "git",
        "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
      },
@@ -634,14 +609,29 @@
        "type": "github"
      }
    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "thunderbird-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1721874544,
-        "narHash": "sha256-BHW9jlx92CsHY84FT0ce5Vxl0KFheLhNn2vndcIf7no=",
+        "lastModified": 1710774977,
+        "narHash": "sha256-nQBz2PW3YF3+RTflPzDoAcs6vH1PTozESIYUGAwvSdA=",
        "owner": "rafaelmardojai",
        "repo": "thunderbird-gnome-theme",
-        "rev": "628fcccb7788e3e0ad34f67114f563c87ac8c1dc",
+        "rev": "65d5c03fc9172d549a3ea72fd366d544981a002b",
        "type": "github"
      },
      "original": {
@@ -658,11 +648,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1724833132,
-        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
+        "lastModified": 1715940852,
+        "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
+        "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -23,24 +23,15 @@
      url = "git+ssh://git@git.vimium.com/jordan/gitea-github-theme.git?ref=main";
      flake = false;
    };
-    kvlibadwaita = {
-      url = "github:GabePoel/KvLibadwaita";
-      flake = false;
-    };
    nixos-hardware.url = "github:NixOS/nixos-hardware";
    nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    nixvim = {
-      url = "github:nix-community/nixvim/nixos-24.05";
+      url = "github:nix-community/nixvim";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    plasma-manager = {
-      url = "github:nix-community/plasma-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-    };
    secrets = {
      url = "git+ssh://git@git.vimium.com/jordan/nix-secrets.git";
      flake = false;
@@ -51,60 +42,64 @@
    };
  };

-  outputs = inputs @ { self, nixpkgs, ... }:
+  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, agenix, deploy-rs, disko, home-manager, nixos-hardware, nixos-mailserver, secrets, ... }:
    let
-      inherit (nixpkgs) lib;
-
-      domain = "mesh.vimium.net";
-      forEverySystem = lib.getAttrs lib.systems.flakeExposed;
-      forEachSystem = lib.genAttrs [
-        "x86_64-linux"
-        "aarch64-linux"
+      mkPkgsForSystem = system: inputs.nixpkgs;
+      overlays = [
+        agenix.overlays.default
+        (import ./overlays/gnome.nix)
+        (
+          final: prev: {
+            unstable = import inputs.nixpkgs-unstable { system = final.system; };
+            custom = self.packages { system = final.system; };
+          }
+        )
      ];
-      mkDeployNode = hostName: {
-        hostname = "${hostName}.${domain}";
-
-        profiles.system = {
-          user = "root";
-          path = inputs.deploy-rs.lib.${self.nixosConfigurations.${hostName}.config.system.build.toplevel.system}.activate.nixos self.nixosConfigurations.${hostName};
+      commonModules = [
+        agenix.nixosModules.age
+        disko.nixosModules.disko
+        nixos-mailserver.nixosModule
+        home-manager.nixosModule
+        ./modules
+      ];
+      mkNixosSystem = { system, name, extraModules ? [] }:
+        let
+          nixpkgs = mkPkgsForSystem system;
+          lib = (import nixpkgs { inherit overlays system; }).lib;
+        in
+        inputs.nixpkgs.lib.nixosSystem {
+          inherit lib system;
+          specialArgs = { modulesPath = toString (nixpkgs + "/nixos/modules"); inherit inputs; };
+          baseModules = import (nixpkgs + "/nixos/modules/module-list.nix");
+          modules = commonModules ++ [
+            ({ config, ... }:
+              {
+                nixpkgs.pkgs = import nixpkgs {
+                  inherit overlays system;
+                  config.allowUnfree = true;
+                };
+                networking.hostName = name;
+              })
+            ./hosts/${name}
+          ] ++ extraModules;
        };
-      };
    in
    {
-      overlays = lib.packagesFromDirectoryRecursive {
-        callPackage = path: overrides: import path;
-        directory = ./overlays;
+      nixosConfigurations = {
+        atlas = mkNixosSystem { system = "x86_64-linux"; name = "atlas"; };
+        eos = mkNixosSystem { system = "x86_64-linux"; name = "eos"; };
+        helios = mkNixosSystem { system = "x86_64-linux"; name = "helios"; };
+        hypnos = mkNixosSystem { system = "x86_64-linux"; name = "hypnos"; };
+        library = mkNixosSystem { system = "x86_64-linux"; name = "library"; };
+        mail = mkNixosSystem { system = "x86_64-linux"; name = "mail"; };
+        odyssey = mkNixosSystem { system = "x86_64-linux"; name = "odyssey"; };
+        pi = mkNixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
+        vps1 = mkNixosSystem { system = "x86_64-linux"; name = "vps1"; };
      };

-      legacyPackages = forEachSystem (system:
-        lib.packagesFromDirectoryRecursive {
-          callPackage = nixpkgs.legacyPackages.${system}.callPackage;
-          directory = ./pkgs;
-        });
-
-      nixosConfigurations = lib.pipe ./hosts [
-        builtins.readDir
-        (lib.filterAttrs (name: value: value == "directory"))
-        (lib.mapAttrs (name: value:
-          lib.nixosSystem {
-            specialArgs = { inherit self; };
-
-            modules = [
-              {
-                networking = {
-                  inherit domain;
-                  hostName = name;
-                };
-              }
-              ./hosts/${name}
-            ];
-          }))
-      ];
-
      devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
        buildInputs = [
-          inputs.agenix.packages.x86_64-linux.agenix
-          inputs.deploy-rs.packages.x86_64-linux.deploy-rs
+          deploy-rs.packages.x86_64-linux.deploy-rs
        ];
      };

@@ -112,15 +107,35 @@
        magicRollback = true;
        autoRollback = true;
        sshUser = "root";
-        nodes = lib.genAttrs [
-          "mail"
-          # "pi"
-          # "skycam"
-          "vps1"
-        ] mkDeployNode;
+        nodes = {
+          mail = {
+            hostname = "mail.mesh.vimium.net";
+
+            profiles.system = {
+              user = "root";
+              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.mail;
+            };
+          };
+          vps1 = {
+            hostname = "vps1.mesh.vimium.net";
+
+            profiles.system = {
+              user = "root";
+              path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.vps1;
+            };
+          };
+          # pi = {
+          #   hostname = "10.0.1.191";
+          #
+          #   profiles.system = {
+          #     user = "root";
+          #     path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.pi;
+          #   };
+          # };
+        };
      };

-      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) inputs.deploy-rs.lib;
+      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
    };
 }

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

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

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

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

 {
-  imports = [
-    self.inputs.agenix.nixosModules.age
-    self.inputs.home-manager.nixosModule
-    ../modules
-  ];
-
-  nixpkgs.overlays = [
-    self.inputs.agenix.overlays.default
-    (import ../overlays/default.nix)
-    (
-      final: prev: {
-        unstable = import self.inputs.nixpkgs-unstable { system = final.system; };
-      }
-    )
-  ];
-
  time.timeZone = "Europe/London";

  i18n.defaultLocale = "en_GB.UTF-8";
@@ -31,7 +15,7 @@
    LC_TELEPHONE = "en_GB.UTF-8";
    LC_TIME = "en_GB.UTF-8";
  };
-
+  
  console.keyMap = "uk";

  security.sudo.execWheelOnly = true;
@@ -58,17 +42,6 @@
    extraOptions = ''
      experimental-features = nix-command flakes
    '';
-    buildMachines = [
-      {
-        hostName = "10.0.1.79";
-        sshUser = "root";
-        system = "aarch64-linux";
-        maxJobs = 6;
-        speedFactor = 1;
-        supportedFeatures = [ "big-parallel" "benchmark" ];
-      }
-    ];
-    distributedBuilds = true;
    settings = {
      connect-timeout = 5;
      log-lines = 25;
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -1,14 +1,10 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:

 {
  imports = [
    ./common.nix
  ];

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

@@ -63,7 +59,7 @@
    fd
    ffmpeg
    iotop
-    # unstable.nix-du
+    unstable.nix-du
    # unstable.nix-melt
    unstable.nix-tree
    unstable.nix-visualize
--- a/hosts/eos/default.nix
+++ b/hosts/eos/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, lib, pkgs, ... }:

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

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

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

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

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

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

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

-  nixpkgs = {
-    hostPlatform = "x86_64-linux";
-    config = {
-      allowUnfree = true;
-      nvidia.acceptLicense = true;
-    };
-  };
-
  boot.loader = {
    systemd-boot.enable = true;
    efi.canTouchEfiVariables = true;
@@ -23,26 +14,13 @@

  networking.hostId = "cf791898";

-  # nvidia 470 driver doesn't work with Wayland
-  services = {
-    xserver = {
-      displayManager.gdm.wayland = lib.mkForce false;
-      videoDrivers = [ "nvidia" ];
-    };
-    displayManager = {
-      defaultSession = if config.modules.desktop.kde.enable then "plasmax11" else "gnome-xorg";
-      sddm.wayland.enable = lib.mkForce false;
-    };
-  };
-
-  # Workaround for label rendering bug in GTK4 with nvidia 470 driver
-  environment.sessionVariables.GSK_RENDERER = "gl";
-
  modules = {
    desktop = {
      browsers = {
        firefox.enable = true;
      };
+      gnome.enable = lib.mkForce false;
+      kde.enable = true;
      media.recording = {
        audio.enable = true;
      };
--- a/hosts/hypnos/hardware-configuration.nix
+++ b/hosts/hypnos/hardware-configuration.nix
@@ -7,15 +7,14 @@

  boot = {
    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    kernel.sysctl = {
-      "kernel.nmi_watchdog" = 0;
-      "vm.laptop_mode" = 5;
-    };
    kernelModules = [ "applesmc" "kvm-intel" "wl" ];
-    extraModulePackages = [
-      config.boot.kernelPackages.broadcom_sta
-      config.boot.kernelPackages.nvidiaPackages.legacy_470
+    kernelPatches = [
+      {
+        name = "spoof-mac-os-x";
+        patch = ./0001-Add-apple_set_os-EFI-boot-service.patch;
+      }
    ];
+    extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
  };

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

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

--- a/hosts/library/default.nix
+++ b/hosts/library/default.nix
@@ -6,8 +6,6 @@
    ../server.nix
  ];

-  nixpkgs.hostPlatform = "x86_64-linux";
-
  boot = {
    loader.systemd-boot.enable = true;
    loader.efi.canTouchEfiVariables = true;
@@ -15,6 +13,7 @@
  };

  networking = {
+    domain = "mesh.vimium.net";
    hostId = "d24ae953";
    firewall = {
      enable = true;
@@ -45,13 +44,9 @@

  services.grafana = {
    enable = true;
-    settings = {
-      server = {
-        domain = "library.mesh.vimium.net";
-        http_addr = "0.0.0.0";
-        http_port = 3000;
-      };
-    };
+    domain = "library.mesh.vimium.net";
+    port = 3000;
+    addr = "127.0.0.1";
  };

  services.prometheus = {
--- a/hosts/mail/default.nix
+++ b/hosts/mail/default.nix
@@ -1,17 +1,15 @@
-{ config, lib, self, ... }:
+{ config, lib, pkgs, inputs, ... }:

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

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

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

-  nixpkgs = {
-    hostPlatform = "x86_64-linux";
-    config = {
-      allowUnfree = true;
-      nvidia.acceptLicense = true;
-    };
-  };
-
  boot.loader = {
    systemd-boot = {
      enable = true;
@@ -75,7 +67,6 @@
        audio.enable = true;
        video.enable = true;
      };
-      office.libreoffice.enable = true;
    };
    dev = {
      node.enable = true;
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/hosts/odyssey/hardware-configuration.nix
@@ -19,7 +19,6 @@
    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
    nvidia = {
      modesetting.enable = true;
-      package = config.boot.kernelPackages.nvidiaPackages.beta;
      powerManagement.enable = true;
    };
  };
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@@ -1,13 +1,12 @@
-{ config, lib, pkgs, self, ... }:
+{ config, lib, pkgs, inputs, ... }:

 {
  imports = [
-    self.inputs.nixos-hardware.nixosModules.raspberry-pi-4
    ./hardware-configuration.nix
    ../server.nix
  ];

-  nixpkgs.hostPlatform = "aarch64-linux";
+  networking.hostId = "731d1660";

  hardware = {
    raspberry-pi."4" = {
@@ -98,8 +97,6 @@
    ];
  };

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

  security.rtkit.enable = true;
@@ -111,7 +108,7 @@
  };

  age.secrets."files/services/home-assistant/secrets.yaml" = {
-    file = "${self.inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
+    file = "${inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
    path = "${config.services.home-assistant.configDir}/secrets.yaml";
    owner = "hass";
    group = "hass";
@@ -176,7 +173,7 @@
  };

  age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
-    file = "${self.inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
+    file = "${inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
    path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
    owner = "zigbee2mqtt";
    group = "zigbee2mqtt";
--- a/hosts/server.nix
+++ b/hosts/server.nix
@@ -18,13 +18,13 @@
        webroot = "/var/lib/acme/acme-challenge";
      };
    };
-    # auditd.enable = true;
-    # audit = {
-    #   enable = true;
-    #   rules = [
-    #     "-a exit,always -F arch=b64 -S execve"
-    #   ];
-    # };
+    auditd.enable = true;
+    audit = {
+      enable = true;
+      rules = [
+        "-a exit,always -F arch=b64 -S execve"
+      ];
+    };
  };

  systemd = {
--- a/hosts/skycam/README.md
+++ b/hosts/skycam/README.md
@@ -1,29 +0,0 @@
-# Skycam
-
-## Overview
-Raspberry Pi 4-based webcam
-
-## Specs
-* SoC - Broadcom BCM2711
-* CPU - ARM Cortex-A72 @ 1.8 GHz
-* Memory - 8 GB LPDDR4
-
-### Disks
-Device | Partitions _(filesystem, usage)_
--- | ---
-SD card | `/dev/mmcblk0` (ext4, NixOS Root)
-
-### Networks
- DHCP on `10.0.1.0/24` subnet.
- Tailscale on `100.64.0.0/10` subnet. FQDN: `skycam.mesh.vimium.net`.
-
-## Devices and connections
- Camera Module 3 with wide-angle lens
-
-## Building
-To generate a compressed SD card image for Skycam, run:
-`nix build '.#nixosConfigurations.skycam.config.system.build.sdImage'`
-
-Once a card is imaged, the existing SSH host keys should be copied to
-`/etc/ssh` manually to enable secret decryption.
-
--- a/hosts/skycam/default.nix
+++ b/hosts/skycam/default.nix
@@ -1,111 +0,0 @@
-{ config, lib, pkgs, self, ... }:
-
-{
-  imports = [
-    self.inputs.nixos-hardware.nixosModules.raspberry-pi-4
-    ./hardware-configuration.nix
-    ../server.nix
-  ];
-
-  nixpkgs.hostPlatform = "aarch64-linux";
-
-  hardware = {
-    raspberry-pi."4" = {
-      apply-overlays-dtmerge.enable = true;
-      audio.enable = false;
-      xhci.enable = false;
-    };
-    deviceTree = {
-      enable = true;
-      filter = "*rpi-4-*.dtb";
-      # From https://github.com/Electrostasy/dots/blob/3b81723feece67610a252ce754912f6769f0cd34/hosts/phobos/klipper.nix#L43-L65
-      overlays =
-        let
-          mkCompatibleDtsFile = dtbo:
-            let
-              drv = pkgs.runCommand "fix-dts" { nativeBuildInputs = with pkgs; [ dtc gnused ]; } ''
-                mkdir "$out"
-                dtc -I dtb -O dts ${dtbo} | sed -e 's/bcm2835/bcm2711/' > $out/overlay.dts
-              '';
-            in
-              "${drv}/overlay.dts";
-
-          inherit (config.boot.kernelPackages) kernel;
-        in
-          [
-            {
-              name = "imx708.dtbo";
-              dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/imx708.dtbo";
-            }
-            {
-              name = "vc4-kms-v3d-pi4.dtbo";
-              dtsFile = mkCompatibleDtsFile "${kernel}/dtbs/overlays/vc4-kms-v3d-pi4.dtbo";
-            }
-          ];
-    };
-    firmware = with pkgs; [
-      firmwareLinuxNonfree
-    ];
-  };
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660"
-    KERNEL=="vcsm-cma", GROUP="video", MODE="0660"
-    SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660"
-  '';
-
-  nixpkgs.overlays = [
-    (import ./../../overlays/libcamera.nix)
-  ];
-
-  networking = {
-    hostId = "731d1660";
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [ 8080 ];
-      allowedUDPPorts = [ 8080 ];
-    };
-  };
-
-  users.users.root = {
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
-    ];
-  };
-
-  services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
-
-  systemd.services.ustreamer = {
-    enable = true;
-    description = "uStreamer service";
-    unitConfig = {
-      Type = "simple";
-      ConditionPathExists = "/sys/bus/i2c/drivers/imx708/10-001a/video4linux";
-    };
-    serviceConfig = {
-      ExecStart = ''${pkgs.libcamera}/bin/libcamerify ${pkgs.unstable.ustreamer}/bin/ustreamer \
-        --host=0.0.0.0 \
-        --resolution=4608x2592
-      '';
-      DynamicUser = "yes";
-      SupplementaryGroups = [ "video" ];
-      Restart = "always";
-      RestartSec = 10;
-    };
-    wantedBy = [ "network-online.target" ];
-    confinement.mode = "chroot-only";
-  };
-
-  environment.systemPackages = with pkgs; [
-    camera-streamer
-    git
-    neovim
-    libcamera
-    libraspberrypi
-    raspberrypi-eeprom
-    v4l-utils
-    unstable.ustreamer
-  ];
-
-  system.stateVersion = "24.05";
-}
--- a/hosts/skycam/hardware-configuration.nix
+++ b/hosts/skycam/hardware-configuration.nix
@@ -1,33 +0,0 @@
-{ config, lib, modulesPath, ... }:
-
-{
-  imports = [
-    (modulesPath + "/installer/sd-card/sd-image-aarch64.nix")
-  ];
-
-  boot = {
-    kernelModules = [ "bcm2835-v4l2" ];
-    kernelParams = [
-      "cma=512M"
-      "panic=0"
-    ];
-    supportedFilesystems = lib.mkForce [ "f2fs" "vfat" "xfs" ];
-    tmp.cleanOnBoot = false;
-  };
-
-  nixpkgs.overlays = [
-    (final: super: {
-      makeModulesClosure = x:
-        super.makeModulesClosure (x // { allowMissing = true; });
-    })
-  ];
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-      options = [ "noatime" ];
-    };
-  };
-}
-
--- a/hosts/vps1/default.nix
+++ b/hosts/vps1/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, inputs, ... }:

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

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

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

-  security.acme.certs."auth.vimium.com" = {
-    postRun = "systemctl restart kanidm.service";
-    group = "acme";
-  };
-
-  services.kanidm = let
-    baseDomain = "vimium.com";
-    domain = "auth.${baseDomain}";
-    uri = "https://${domain}";
-  in {
-    package = pkgs.unstable.kanidm;
-    enableClient = true;
-    enableServer = true;
-    clientSettings = {
-      inherit uri;
-    };
-    serverSettings = {
-      bindaddress = "[::1]:3013";
-      ldapbindaddress = "[::1]:636";
-      domain = baseDomain;
-      origin = uri;
-      tls_chain = "${config.security.acme.certs.${domain}.directory}/full.pem";
-      tls_key = "${config.security.acme.certs.${domain}.directory}/key.pem";
-    };
-  };
-
-  services.nginx.virtualHosts = {
-    "auth.vimium.com" = {
-      useACMEHost = "auth.vimium.com";
-      forceSSL = true;
-      locations."/" = {
-        proxyPass = "https://[::1]:3013";
-      };
-    };
-  };
-
-  modules = rec {
-    databases.postgresql.enable = true;
+  modules = {
    services = {
      borgmatic = {
        enable = true;
@@ -90,21 +51,10 @@
        ];
        repoPath = "ssh://p91y8oh7@p91y8oh7.repo.borgbase.com/./repo";
      };
-      coturn = {
-        enable = true;
-        realm = "turn.vimium.com";
-        matrixIntegration = true;
-      };
+      coturn.enable = true;
      gitea.enable = true;
      headscale.enable = true;
-      matrix = {
-        enable = true;
-        bridges = {
-          signal = true;
-          whatsapp = true;
-        };
-        usePostgresql = databases.postgresql.enable;
-      };
+      matrix-synapse.enable = true;
      nginx.enable = true;
      photoprism.enable = true;
    };
--- a/modules/databases/postgresql.nix
+++ b/modules/databases/postgresql.nix
@@ -1,40 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-
-let
-  cfg = config.modules.databases.postgresql;
-in {
-  options.modules.databases.postgresql = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.postgresql = {
-      enable = true;
-      initdbArgs = [
-        "--allow-group-access"
-        "--encoding=UTF8"
-        "--locale=C"
-      ];
-      settings = {
-        log_connections = true;
-        log_disconnections = true;
-        log_destination = lib.mkForce "syslog";
-      };
-    };
-
-    services.borgmatic.settings = {
-      postgresql_databases = [
-        {
-          name = "all";
-        }
-      ];
-    };
-  };
-}
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,9 +2,7 @@
  imports = [
    ./options.nix
    ./podman.nix
-    ./databases/postgresql.nix
    ./desktop/gnome.nix
-    ./desktop/forensics.nix
    ./desktop/hyprland.nix
    ./desktop/kde.nix
    ./desktop/mimeapps.nix
@@ -12,7 +10,6 @@
    ./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
@@ -32,7 +29,6 @@
    ./editors/neovim
    ./editors/vscode.nix
    ./hardware/presonus-studio.nix
-    ./networking/netbird.nix
    ./networking/tailscale.nix
    ./networking/wireless.nix
    ./security/gpg.nix
@@ -43,9 +39,8 @@
    ./services/gitea
    ./services/gitea-runner
    ./services/headscale
-    ./services/immich
    ./services/mail
-    ./services/matrix
+    ./services/matrix-synapse
    ./services/nginx
    ./services/photoprism
    ./shell/git
--- a/modules/desktop/apps/thunderbird.nix
+++ b/modules/desktop/apps/thunderbird.nix
@@ -1,4 +1,4 @@
-{ config, lib, self, ... }:
+{ config, lib, pkgs, inputs, ... }:

 let cfg = config.modules.desktop.apps.thunderbird;
 in {
@@ -10,7 +10,7 @@ in {
  };
  
  config = lib.mkIf cfg.enable {
-    home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source = self.inputs.thunderbird-gnome-theme;
+    home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source = inputs.thunderbird-gnome-theme;

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

 let cfg = config.modules.desktop.browsers.firefox;
 in {
@@ -10,7 +10,7 @@ in {
  };

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

    home.programs.firefox = {
      enable = true;
@@ -35,79 +35,23 @@ in {

          ## Preferences
          "browser.ctrlTab.sortByRecentlyUsed" = true;
-          "browser.discovery.enabled" = false;
-          "browser.download.open_pdf_attachments_inline" = true;
-          "browser.menu.showViewImageInfo" = true;
          "browser.newtabpage.enabled" = false;
-          "browser.newtabpage.activity-stream.showSponsored" = false;
-          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
-          "browser.newtabpage.activity-stream.default.sites" = "";
-          "browser.privatebrowsing.forceMediaMemoryCache" = true;
          "browser.search.widget.inNavBar" = true;
          "browser.startup.page" = 3;
          "browser.startup.homepage" = "https://www.vimium.com";
          "browser.toolbars.bookmarks.visibility" = "never";
-          "browser.uitour.enabled" = false;
-          "browser.urlbar.suggest.engines" = false;
-          "browser.urlbar.suggest.calculator" = true;
-          "browser.urlbar.trending.featureGate" = false;
-          "browser.urlbar.unitConversion.enabled" = true;
-          "cookiebanners.service.mode" = 1;
-          "cookiebanners.service.mode.privateBrowsing" = 1;
-          "network.IDN_show_punycode" = true;
-
-          ## Performance
-          "browser.cache.jsbc_compression_level" = 3;
-          "content.notify.interval" = 100000;
-          "dom.enable_web_task_scheduling" = true;
-          "dom.security.sanitizer.enabled" = true;
-          "gfx.canvas.accelerated.cache-items" = 4096;
-          "gfx.canvas.accelerated.cache-size" = 512;
-          "gfx.content.skia-font-cache-size" = 20;
-          "gfx.webrender.all" = true;
-          "gfx.webrender.compositor" = true;
-          "gfx.webrender.enable" = true;
-          "image.mem.decode_bytes_at_a_time" = 32768;
-          "layers.acceleration.force-enabled" = true;
-          "layout.css.grid-template-masonry-value.enabled" = true;
-          "media.ffmpeg.vaapi.enabled" = true;
-          "media.memory_cache_max_size" = 65536;
-          "media.cache_readahead_limit" = 7200;
-          "media.cache_resume_threshold" = 3600;
-          "network.dns.disablePrefetch" = true;
-          "network.dns.disablePrefetchFromHTTPS" = true;
-          "network.dnsCacheExpiration" = 3600;
-          "network.http.max-connections" = 1800;
-          "network.http.max-persistent-connections-per-server" = 10;
-          "network.http.max-urgent-start-excessive-connections-per-host" = 5;
-          "network.http.pacing.requests.enabled" = false;
-          "network.predictor.enabled" = false;
-          "network.prefetch-next" = false;
-          "network.ssl_tokens_cache_capacity" = 10240;
-          "pdfjs.enableScripting" = false;
-          "security.mixed_content.block_display_content" = true;

          ## Experiments
          "app.normandy.enabled" = false;
          "app.normandy.api_url" = "";
          "app.normandy.user_id" = "";
-          "app.shield.optoutstudies.enabled" = false;
-          "browser.shopping.experience2023.active" = false;
-          "browser.shopping.experience2023.enabled" = false;
          "extensions.screenshots.disabled" = true;
          "extensions.screenshots.upload-disabled" = true;
          "experiments.supported" = false;
          "experiments.enabled" = false;
          "experiments.manifest.uri" = "";
          "network.allow-experiments" = false;
-
-          ## Privacy
-          "dom.private-attribution.submission.enabled" = false;
-          # "privacy.resistFingerprinting" = true;
-          "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = false;
-          "privacy.trackingprotection.enabled" = true;
-          "privacy.trackingprotection.pbmode.enabled" = true;
-          "privacy.userContext.enabled" = true;
+          "privacy.trackingprotection.enabled" = false;

          ## Geo
          "geo.enabled" = false;
@@ -154,34 +98,12 @@ in {
          "dom.battery.enabled" = false;
          "dom.vr.enabled" = false;
          "media.navigator.enabled" = false;
-          # "dom.webaudio.enabled" = false;
+          "dom.webaudio.enabled" = false;

          ## Isolation
          "privacy.firstparty.isolate" = true;
          "privacy.firstparty.isolate.restrict_opener_access" = true;

-          ## Telemetry
-          "beacon.enabled" = false;
-          "browser.newtabpage.activity-stream.feeds.telemetry" = false;
-          "browser.newtabpage.activity-stream.telemetry" = false;
-          "browser.send_pings" = false;
-          "datareporting.policy.dataSubmissionEnabled" = false;
-          "datareporting.healthReport.uploadEnabled" = false;
-          "toolkit.coverage.opt-out" = true;
-          "toolkit.coverage.endpoint.base" = "";
-          "toolkit.telemetry.archive.enabled" = false;
-          "toolkit.telemetry.bhrPing.enabled" = false;
-          "toolkit.telemetry.coverage.opt-out" = true;
-          "toolkit.telemetry.enabled" = false;
-          "toolkit.telemetry.firstShutdownPing.enabled" = false;
-          "toolkit.telemetry.hybridContent.enabled" = false;
-          "toolkit.telemetry.newProfilePing.enabled" = false;
-          "toolkit.telemetry.reportingPolicy.firstRun" = false;
-          "toolkit.telemetry.server" = "data:,";
-          "toolkit.telemetry.shutdownPingSender.enabled" = false;
-          "toolkit.telemetry.unified" = false;
-          "toolkit.telemetry.updatePing.enabled" = false;
-
          ## Pocket/Hello
          "loop.enabled" = false;
          "loop.feedback.baseUrl" = "";
@@ -203,10 +125,6 @@ in {
          "browser.pocket.useLocaleList" = false;
          "brwoser.pocket.enabledLocales" = "";

-          ## Plugins
-          "plugin.state.flash" = 0;
-          "plugin.state.java" = 0;
-
          ## Misc
          "browser.selfsupport.url" = "";
        };
--- a/modules/desktop/forensics.nix
+++ b/modules/desktop/forensics.nix
@@ -1,26 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let cfg = config.modules.desktop.forensics;
-in {
-  options.modules.desktop.forensics = {
-    enable = lib.mkOption {
-      default = false;
-      example = true;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    user.packages = with pkgs; [
-      acquire
-      afflib
-      autopsy
-      fatcat
-      foremost
-      hstsparser
-      networkminer
-      sleuthkit
-      testdisk-qt
-      tracee
-    ];
-  };
-}
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, self, ... }:
+{ config, lib, pkgs, ... }:

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

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

    user.packages = with pkgs; [
@@ -218,7 +165,6 @@ in {
      # d-spy
      # drawing
      # fragments
-      gnome.dconf-editor
      gnome.ghex
      # gnome-builder
      gnome-decoder
@@ -228,59 +174,47 @@ in {
      gnome-podcasts
      identity
      mission-center
-      mousam
      newsflash
      # schemes
      shortwave
-      sysprof
-    ] ++ (if config.virtualisation.podman.enable then [
-      pods
-    ] else []);
+    ];

-    environment.systemPackages = with pkgs.unstable; [
+    environment.systemPackages = with pkgs; [
      adw-gtk3
-      kdePackages.qtstyleplugin-kvantum
-      libsForQt5.qtstyleplugin-kvantum
-      morewaita-icon-theme
-      nautilus-python
-      qadwaitadecorations
-      qadwaitadecorations-qt6
-
-      ## Shell extensions
-      gnomeExtensions.appindicator
-      gnomeExtensions.arcmenu
+      gnome.gnome-boxes
+      gnomeExtensions.another-window-session-manager
+      # gnomeExtensions.bifocals
      gnomeExtensions.blur-my-shell
      gnomeExtensions.browser-tabs
      gnomeExtensions.burn-my-windows
-      gnomeExtensions.clipboard-indicator
-      gnomeExtensions.coverflow-alt-tab
-      gnomeExtensions.dash-to-panel
      gnomeExtensions.desktop-cube
-      gnomeExtensions.easyScreenCast
-      gnomeExtensions.espresso
-      gnomeExtensions.fly-pie
-      gnomeExtensions.forge
-      gnomeExtensions.gsconnect
-      gnomeExtensions.gsnap
-      gnomeExtensions.hide-top-bar
+      # gnomeExtensions.desktop-zoom
+      unstable.gnomeExtensions.espresso
+      gnome44Extensions."flypie@schneegans.github.com"
+      # gnomeExtensions.forge
+      # gnomeExtensions.gsnap
+      gnomeExtensions.hue-lights
      gnomeExtensions.just-perfection
-      gnomeExtensions.media-controls
-      gnomeExtensions.mouse-follows-focus
+      # gnomeExtensions.mutter-primary-gpu
      gnomeExtensions.pano
      gnomeExtensions.paperwm
-      gnomeExtensions.pip-on-top
+      # gnomeExtensions.pip-on-top
      gnomeExtensions.rounded-window-corners
      gnomeExtensions.search-light
      gnomeExtensions.smart-auto-move
      gnomeExtensions.space-bar
+      gnomeExtensions.systemd-manager
+      gnomeExtensions.tailscale-status
      gnomeExtensions.tiling-assistant
-      gnomeExtensions.tiling-shell
-      gnomeExtensions.todotxt
+      # gnomeExtensions.todotxt
      gnomeExtensions.vitals
-      gnomeExtensions.window-is-ready-remover
-      gnomeExtensions.worksets
-      gnomeExtensions.workspace-matrix
-    ];
+      # gnomeExtensions.window-is-ready-remover
+      # gnomeExtensions.worksets
+      # gnomeExtensions.workspace-matrix
+      unstable.morewaita-icon-theme
+    ] ++ (if config.virtualisation.podman.enable then [
+      pods
+    ] else []);

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

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

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

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

 with lib;

@@ -19,7 +19,7 @@ in {

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

    networking = {
--- a/modules/options.nix
+++ b/modules/options.nix
@@ -1,4 +1,4 @@
-{ config, options, lib, self, ... }:
+{ config, options, lib, home-manager, inputs, ... }:

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

  config = {
-    age.secrets."passwords/users/jordan".file = "${self.inputs.secrets}/passwords/users/jordan.age";
+    age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";
    user =
      let user = builtins.getEnv "USER";
          name = if elem user [ "" "root" ] then "jordan" else user;
@@ -68,8 +68,7 @@ with lib;
      };

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

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

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

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

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

-    services.postgresql.ensureUsers = [
-      {
-        name = "root";
-        ensureClauses.superuser = true;
-      }
-    ];
-
-    # Add `pg_dumpall` to unit environment
-    systemd.services.borgmatic.path = [ config.services.postgresql.package ];
-
    # Without this override, `cat` is unavailable for `encryption_passcommand`
    systemd.services.borgmatic.confinement.fullUnit = true;
  };
--- a/modules/services/coturn/default.nix
+++ b/modules/services/coturn/default.nix
@@ -1,118 +1,60 @@
-{ config, lib, self, ... }:
+{ config, lib, pkgs, inputs, ... }:
+
+with lib;

 let
  cfg = config.modules.services.coturn;
 in {
  options.modules.services.coturn = {
-    enable = lib.mkOption {
+    enable = mkOption {
      default = false;
      example = true;
    };
-    realm = lib.mkOption {
-      type = lib.types.str;
-      description = "The realm to be used by the TURN server.";
-      example = "turn.vimium.com";
-    };
-    matrixIntegration = lib.mkOption {
-      default = false;
-      description = "Configure the matrix-synapse module to use this TURN server.";
-      example = true;
-    };
  };

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

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

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

-    services.coturn = rec {
+    services.coturn = {
      enable = true;
-      realm = cfg.realm;
+      lt-cred-mech = true;
      use-auth-secret = true;
-      static-auth-secret-file = config.age.secrets."passwords/services/coturn/static-auth-secret".path;
-      cert = "${config.security.acme.certs.${realm}.directory}/full.pem";
-      pkey = "${config.security.acme.certs.${realm}.directory}/key.pem";
-      min-port = 49000;
-      max-port = 50000;
-      no-cli = true;
+      static-auth-secret-file = config.age.secrets."passwords/services/coturn/shared-secret".path;
+      realm = "turn.vimium.com";
+      relay-ips = [
+        "198.244.190.160"
+      ];
      no-tcp-relay = true;
      extraConfig = ''
        cipher-list="HIGH"
+        no-loopback-peers
        no-multicast-peers
-
-        # Ban private CIDR blocks
-        denied-peer-ip=0.0.0.0-0.255.255.255
-        denied-peer-ip=10.0.0.0-10.255.255.255
-        denied-peer-ip=100.64.0.0-100.127.255.255
-        denied-peer-ip=127.0.0.0-127.255.255.255
-        denied-peer-ip=169.254.0.0-169.254.255.255
-        denied-peer-ip=172.16.0.0-172.31.255.255
-        denied-peer-ip=192.0.0.0-192.0.0.255
-        denied-peer-ip=192.0.2.0-192.0.2.255
-        denied-peer-ip=192.88.99.0-192.88.99.255
-        denied-peer-ip=192.168.0.0-192.168.255.255
-        denied-peer-ip=198.18.0.0-198.19.255.255
-        denied-peer-ip=198.51.100.0-198.51.100.255
-        denied-peer-ip=203.0.113.0-203.0.113.255
-        denied-peer-ip=240.0.0.0-255.255.255.255
-        denied-peer-ip=::1
-        denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff
-        denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255
-        denied-peer-ip=100::-100::ffff:ffff:ffff:ffff
-        denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff
-        denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff
-        denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
-        denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff
      '';
-    };
-
-    services.matrix-synapse = lib.mkIf cfg.matrixIntegration {
-      settings = with config.services.coturn; {
-        turn_uris = [
-          "turn:${realm}:3478?transport=udp"
-          "turn:${realm}:3478?transport=tcp"
-        ];
-        turn_user_lifetime = "1h";
-      };
-      extraConfigFiles = [
-        config.age.secrets."passwords/services/coturn/matrix-turn-config.yml".path
-      ];
+      secure-stun = true;
+      cert = "/var/lib/acme/turn.vimium.com/fullchain.pem";
+      pkey = "/var/lib/acme/turn.vimium.com/key.pem";
+      min-port = 49152;
+      max-port = 49999;
    };
  };
 }
--- a/modules/services/gitea-runner/default.nix
+++ b/modules/services/gitea-runner/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, self, ... }:
+{ pkgs, config, lib, inputs, ... }:

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

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

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

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

 let
  cfg = config.modules.services.gitea;
 in {
  options.modules.services.gitea = {
-    enable = lib.mkEnableOption "gitea";
-    domain = lib.mkOption {
-      type = lib.types.string;
-      default = "git.vimium.com";
+    enable = mkOption {
+      default = false;
+      example = true;
    };
  };

-  config = lib.mkIf cfg.enable {
+  config = mkIf cfg.enable {
    users = {
      users.git = {
        isSystemUser = true;
@@ -30,7 +31,7 @@ in {
        };
      };
      virtualHosts = {
-        "${cfg.domain}" = {
+        "git.vimium.com" = {
          forceSSL = true;
          enableACME = true;
          locations."/".proxyPass = "http://gitea";
@@ -40,9 +41,9 @@ in {

    systemd.tmpfiles.rules = [
      "d '${config.services.gitea.customDir}/public/assets/css' 0750 ${config.services.gitea.user} ${config.services.gitea.group} - -"
-      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github.css' - - - - ${self.inputs.gitea-github-theme}/theme-github.css"
-      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-auto.css' - - - - ${self.inputs.gitea-github-theme}/theme-github-auto.css"
-      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-dark.css' - - - - ${self.inputs.gitea-github-theme}/theme-github-dark.css"
+      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github.css' - - - - ${inputs.gitea-github-theme}/theme-github.css"
+      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-auto.css' - - - - ${inputs.gitea-github-theme}/theme-github-auto.css"
+      "L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-dark.css' - - - - ${inputs.gitea-github-theme}/theme-github-dark.css"
    ];

    services.gitea = rec {
@@ -68,15 +69,15 @@ in {
          OFFLINE_MODE = true;
          PROTOCOL = "http+unix";
          SSH_USER = "git";
-          SSH_DOMAIN = "${cfg.domain}";
+          SSH_DOMAIN = "git.vimium.com";
          SSH_PORT = lib.head config.services.openssh.ports;
-          ROOT_URL = "https://${cfg.domain}/";
+          ROOT_URL = "https://git.vimium.com/";
        };
        service.DISABLE_REGISTRATION = true;
        session.COOKIE_SECURE = true;
        log = {
          ROOT_PATH = "${stateDir}/log";
-          "logger.router.MODE" = "";
+          DISABLE_ROUTER_LOG = true;
        };
        ui = {
          THEMES = "gitea,arc-green,github,github-auto,github-dark";
--- a/modules/services/headscale/default.nix
+++ b/modules/services/headscale/default.nix
@@ -1,17 +1,19 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
+
+with lib;

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

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

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

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

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

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

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

 with lib;

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

 with lib;

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

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

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

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