defiant/wireguard: deprecate old peers

defiant/dyndns: change domain name
prometheus: add constellation
2025-12-31 20:59:58 +01:00 · 2025-12-31 20:21:01 +01:00 · 2025-12-16 07:48:24 +01:00 · 2025-12-12 20:18:06 +01:00 · 2025-12-08 21:07:41 +01:00 · 2025-12-08 21:05:23 +01:00
57 changed files with 500 additions and 566 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,4 +1,5 @@
 keys:
+  - &bw_recovery age146z3h3flw7spy5thznak8k5jh6yd68k9qrrehg8sdcwmyjv3vd7qvahdur
  - &host_burnham age12cgkgx8xac77q0rwakp6zrfrzp45mhk7wj6t3y8s0xurt3k879usnm66ct
  - &host_challenger age1j43eqpnq5hy6zt3gmdtzdnne2yfvccd832kpt69qavst44leec6sj2l773
  - &host_defiant age128md9emufxu35kgww3a90sw40vvc60f5xul9n9ndvw4lfnj3ndaqq44u64
@@ -11,6 +12,7 @@ creation_rules:
  - path_regex: secrets/[^/]+\.yaml$
    key_groups:
    - age:
+      - *bw_recovery
      - *user_felixalb_sisko
      - *user_felixalb_worf

@@ -19,6 +21,7 @@ creation_rules:
    key_groups:
    - age:
      - *host_burnham
+      - *bw_recovery
      - *user_felixalb_sisko
      - *user_felixalb_worf

@@ -26,6 +29,7 @@ creation_rules:
    key_groups:
    - age:
      - *host_challenger
+      - *bw_recovery
      - *user_felixalb_sisko
      - *user_felixalb_worf

@@ -33,6 +37,7 @@ creation_rules:
    key_groups:
    - age:
      - *host_defiant
+      - *bw_recovery
      - *user_felixalb_sisko
      - *user_felixalb_worf

@@ -40,5 +45,6 @@ creation_rules:
    key_groups:
    - age:
      - *host_morn
+      - *bw_recovery
      - *user_felixalb_sisko
      - *user_felixalb_worf
--- a/README.md
+++ b/README.md
@@ -37,8 +37,9 @@ Other installed packages and tools are described in the config files (like ./hos
 ## Networking

 - I use *nginx* as a web server and reverse proxy. The configuration is mostly distributed throughout the services that use it ([example](https://git.feal.no/felixalb/nixos-config/src/commit/3a05681d10a6999f73cbef59c3999742b81947a6/hosts/defiant/services/hedgedoc.nix#L98)).
- I recently switched from Tailscale(actually [headscale](https://github.com/juanfont/headscale)) to *WireGuard*, configured [here](./hosts/defiant/services/wireguard.nix) and [here](./hosts/burnham/services/wireguard.nix).
+- A long time ago, I switched from Tailscale(actually [headscale](https://github.com/juanfont/headscale)) to *WireGuard*, configured [here](./hosts/defiant/services/wireguard.nix).
 - PiHole ([source](./hosts/defiant/services/pihole.nix)) run my internal DNS (\*.home.feal.no) and ad blocking.
+- A simple custom DynDNS thing is defined [here](./common/domeneshop-dyndns.nix) and used [here](./hosts/defiant/services/dyndns.nix).

 ## Monitoring

--- a/common/auto-upgrade.nix
+++ b/common/auto-upgrade.nix
@@ -7,7 +7,7 @@
    flags = [
      # Override nixpkgs (only). Notably does not include home-manager, sops or other utility/application flake inputs.
      "--refresh"
-      "--override-input" "nixpkgs" "github:NixOS/nixpkgs/nixos-25.05"
+      "--override-input" "nixpkgs" "github:NixOS/nixpkgs/nixos-25.11"
      "--override-input" "nixpkgs-unstable" "github:nixos/nixpkgs/nixos-unstable"
      "--no-write-lock-file"
    ];
--- a/common/wireguard-peers.nix
+++ b/common/wireguard-peers.nix
@@ -1,10 +1,4 @@
 [
-  { # Sulu
-    publicKey = "j6YVekgGS4nhL5zUiOTeK2BVQkYGlTQaiUpwcqQyfRk=";
-    allowedIPs = [
-      "10.100.0.3/32"
-    ];
-  }
  { # Worf
    publicKey = "kW8SyzCh2tw8GzZV6bPn+IQVNUoUhseNfEm3rHnR1So=";
    allowedIPs = [
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@@ -36,11 +36,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
        "type": "github"
      },
      "original": {
@@ -56,35 +56,36 @@
        ]
      },
      "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1764776959,
+        "narHash": "sha256-d+5CGloq7Lo1u2SkzhF8oiOdUc6Z5emh22nTXUB9CFA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "e1680d594a9281651cbf7d126941a8c8e2396183",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "matrix-synapse-next": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1753216555,
-        "narHash": "sha256-qfgVfgXjVPV7vEER4PVFiGUOUW08GHH71CVXgYW8EVc=",
+        "lastModified": 1765214213,
+        "narHash": "sha256-WSk8CTdIDFFP5VMJj9beve19nPMMdTsWnkCHVXqO/3E=",
        "owner": "dali99",
        "repo": "nixos-matrix-modules",
-        "rev": "099db715d1eba526a464f271b05cead5166fd9a9",
+        "rev": "82959f612ffd523a49c92f84358a9980a851747b",
        "type": "github"
      },
      "original": {
        "owner": "dali99",
-        "ref": "v0.7.1",
        "repo": "nixos-matrix-modules",
        "type": "github"
      }
@@ -92,20 +93,20 @@
    "nix-darwin": {
      "inputs": {
        "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-darwin"
        ]
      },
      "locked": {
-        "lastModified": 1749744770,
-        "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
-        "owner": "lnl7",
+        "lastModified": 1764161084,
+        "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
+        "owner": "nix-darwin",
        "repo": "nix-darwin",
-        "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
+        "rev": "e95de00a471d07435e0527ff4db092c84998698e",
        "type": "github"
      },
      "original": {
-        "owner": "lnl7",
-        "ref": "nix-darwin-25.05",
+        "owner": "nix-darwin",
+        "ref": "nix-darwin-25.11",
        "repo": "nix-darwin",
        "type": "github"
      }
@@ -114,14 +115,16 @@
      "inputs": {
        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1734314370,
-        "narHash": "sha256-9PhjDAAuXP4tuJg+kM1AozKwBFyHHJ8ZqhQD+peqGtg=",
+        "lastModified": 1764813963,
+        "narHash": "sha256-Vs7Mamto+T8r1evk9myHepgHGNJkS2Kr0BF64NIei94=",
        "owner": "Infinidoge",
        "repo": "nix-minecraft",
-        "rev": "616634de04e87b621bc3d495af114c4e9c6ccd36",
+        "rev": "491200d6848402bbab1421cccbc15a46f08c7f78",
        "type": "github"
      },
      "original": {
@@ -132,22 +135,22 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1706098335,
-        "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=",
+        "lastModified": 1764677808,
+        "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a77ab169a83a4175169d78684ddd2e54486ac651",
+        "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
        "type": "github"
      },
      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-23.11",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "nixpkgs-2211": {
      "locked": {
-        "lastModified": 1658083977,
        "narHash": "sha256-yqLXI+viN5+Vx5YpG9gNapKL3/+P6Pkprc36xNdyqSU=",
        "type": "tarball",
        "url": "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"
@@ -157,13 +160,29 @@
        "url": "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"
      }
    },
+    "nixpkgs-darwin": {
+      "locked": {
+        "lastModified": 1764806471,
+        "narHash": "sha256-NsPsz003eWD8wp8vj5BnQzPoDyeQKRUfS2dvan2Y30M=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6707b1809330d0f912f5813963bb29f6f194ee81",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-25.11-darwin",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1760038930,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "lastModified": 1764667669,
+        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "418468ac9527e799809c900eda37cbff999199b6",
        "type": "github"
      },
      "original": {
@@ -173,38 +192,6 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1715266358,
-        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1759994382,
-        "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "extra-config": "extra-config",
@@ -212,8 +199,9 @@
        "matrix-synapse-next": "matrix-synapse-next",
        "nix-darwin": "nix-darwin",
        "nix-minecraft": "nix-minecraft",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
        "nixpkgs-2211": "nixpkgs-2211",
+        "nixpkgs-darwin": "nixpkgs-darwin",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "sops-nix": "sops-nix"
      }
@@ -225,11 +213,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752544651,
-        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
+        "lastModified": 1764483358,
+        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
+        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -2,18 +2,22 @@
  description = "Felixalb System flake";

  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # Remember to update ./common/auto-upgrade.nix
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; # Remember to update ./common/auto-upgrade.nix
+    nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-25.11-darwin";
    nixpkgs-2211.url = "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"; # old nixpgks for e.g. remmina
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";

-    nix-darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.05";
-    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+    nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
+    nix-darwin.inputs.nixpkgs.follows = "nixpkgs-darwin";

-    home-manager.url = "github:nix-community/home-manager/release-25.05";
+    home-manager.url = "github:nix-community/home-manager/release-25.11";
    home-manager.inputs.nixpkgs.follows = "nixpkgs";

-    matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.7.1";
+    matrix-synapse-next.url = "github:dali99/nixos-matrix-modules"; # TODO: Lock to release
+    matrix-synapse-next.inputs.nixpkgs.follows = "nixpkgs";
+
    nix-minecraft.url = "github:Infinidoge/nix-minecraft";
+    nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";

    extra-config.url = "git+file:///home/felixalb/nix-extra-config";

@@ -29,6 +33,7 @@
    , nix-darwin
    , nixpkgs
    , nixpkgs-2211
+    , nixpkgs-darwin
    , nixpkgs-unstable
    , sops-nix
    , extra-config
@@ -52,7 +57,7 @@
    {
      nixosConfigurations = let
        normalSys = name: hostConfig: nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
+          system = "x86_64-linux"; # TODO - Handle
          specialArgs = {
            inherit inputs;
          };
@@ -75,13 +80,6 @@
        };
      in {

-        # Networking / VPN Gateway
-        burnham = normalSys "burnham" {
-          modules = [
-            ./common/domeneshop-dyndns.nix
-          ];
-        };
-
        # Media / storage server
        challenger = normalSys "challenger" {
          modules = [
@@ -101,7 +99,7 @@
        fa-t14-2025 = normalSys "fa-t14-2025" { };

        # Web host
-        malcolm = normalSys "malcolm" { };
+        leonard = normalSys "leonard" { };

        # General application server
        morn = normalSys "morn" { };
--- a/home/base.nix
+++ b/home/base.nix
@@ -32,7 +32,7 @@
  programs.git = {
    enable = true;

-    extraConfig = {
+    settings = {
      pull.rebase = true;
      push.autoSetupRemote = true;
      color.ui = "auto";
--- a/hosts/burnham/configuration.nix
+++ b/hosts/burnham/configuration.nix
@@ -1,40 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports =
-    [
-      ../../base.nix
-      ../../common/metrics-exporters.nix
-      ./hardware-configuration.nix
-
-      # Infrastructure
-      ./services/wireguard.nix
-
-      # Other
-      ./services/dyndns.nix
-      ./services/nginx.nix
-      ./services/thelounge.nix
-  ];
-
-  boot.loader.systemd-boot.enable = lib.mkForce false;
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-
-  networking = {
-    hostName = "burnham";
-    defaultGateway = "192.168.11.1";
-    interfaces.ens18.ipv4 = {
-      addresses = [
-        { address = "192.168.11.109"; prefixLength = 24; }
-      ];
-    };
-    hostId = "8e24f235";
-  };
-
-  sops.defaultSopsFile = ../../secrets/burnham/burnham.yaml;
-
-  environment.variables = { EDITOR = "vim"; };
-
-  system.stateVersion = "23.11";
-}
-
--- a/hosts/burnham/hardware-configuration.nix
+++ b/hosts/burnham/hardware-configuration.nix
@@ -1,30 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/31ff6d37-52d6-43c3-a214-5d38a6c38b0e";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/cce59ee7-7c83-4165-a9b0-f950cd2e3273"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  #networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
-
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
--- a/hosts/burnham/home.nix
+++ b/hosts/burnham/home.nix
@@ -1,12 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  imports = [
-    ./../../home/base.nix
-  ];
-
-  programs = {
-    zsh.shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
-  };
-
-  home.stateVersion = "23.05";
-}
--- a/hosts/burnham/services/dyndns.nix
+++ b/hosts/burnham/services/dyndns.nix
@@ -1,11 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  sops.secrets."domeneshop/netrc" = { };
-
-  services.domeneshop-dyndns = {
-    enable = true;
-    domain = "site2.feal.no";
-    netrcFile = config.sops.secrets."domeneshop/netrc".path;
-  };
-}
--- a/hosts/burnham/services/wireguard.nix
+++ b/hosts/burnham/services/wireguard.nix
@@ -1,38 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  cfg = config.networking.wireguard.interfaces."wg0";
-in {
-  networking = {
-    nat = {
-      enable = true;
-      externalInterface = "ens18";
-      internalInterfaces = [ "wg0" ];
-    };
-    firewall.allowedUDPPorts = [ cfg.listenPort ];
-
-    wireguard.interfaces."wg0" = {
-      ips = [ "10.100.0.2/24" ];
-      listenPort = 51820;
-      privateKeyFile = "/etc/wireguard/burnham.private";
-
-      postSetup = ''
-        ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -d 192.168.11.0/24 -o eth0 -j MASQUERADE
-      '';
-      postShutdown = ''
-        ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -d 192.168.11.0/24 -o eth0 -j MASQUERADE
-      '';
-
-      peers = [
-        { # Defiant
-          publicKey = "8/711GhmN9+NcduHF4JPkfoZPE0qsDLuwhABcPyjNxI=";
-          persistentKeepalive = 120;
-          allowedIPs = [
-            "10.100.0.1/32"
-            "192.168.10.0/24"
-          ];
-          endpoint = "site3.feal.no:51902";
-        }
-      ] ++ (import ../../../common/wireguard-peers.nix);
-    };
-  };
-}
--- a/hosts/challenger/backup.nix
+++ b/hosts/challenger/backup.nix
@@ -33,13 +33,22 @@
      "/var/lib/calibre-server"
    ];

+    # Other system backups (NB: Large!)
+    hostBackups = localJob "hostBackups" [
+      "/tank/backup"
+    ] // {
+      pruneOpts = [ "--keep-monthly 12" ];
+    };
+
    media = localJob "media" [
-      "/tank/media/music"
      "/tank/media/books"
+      "/tank/media/komga"
+      "/tank/media/music"
    ];
    media-remote = cloudJob "media" [
-      "/tank/media/music"
      "/tank/media/books"
+      "/tank/media/komga"
+      "/tank/media/music"
    ] // {
      pruneOpts = [ "--keep-monthly 12" ];
    };
@@ -48,6 +57,7 @@
    nextcloud = localJob "nextcloud" [ "/tank/nextcloud" ];
    nextcloud-remote = cloudJob "nextcloud" [ "/tank/nextcloud" ];

+    # Postgresql databases
    postgres = (localJob "postgres" [ "/var/backup/postgres" ]) // {
      timerConfig.OnCalendar = "05:15"; # 2h after postgresqlBackup
    };
@@ -58,10 +68,11 @@
    # Transmission metadata/config
    transmission = localJob "transmission" [ "/var/lib/transmission" ];

-    # TODO: timemachine, komga
+    # TODO: timemachine
  };

  sops.secrets."restic/calibre" = { };
+  sops.secrets."restic/hostBackups" = { };
  sops.secrets."restic/media" = { };
  sops.secrets."restic/nextcloud" = { };
  sops.secrets."restic/postgres" = { };
--- a/hosts/challenger/configuration.nix
+++ b/hosts/challenger/configuration.nix
@@ -13,8 +13,8 @@
      ./filesystems.nix

      # ./services/archivebox.nix
+      ./services/audiobookshelf.nix
      ./services/calibre.nix
-      # ./services/ersatztv.nix
      ./services/jellyfin.nix
      ./services/komga.nix
      ./services/nextcloud.nix
--- a/hosts/challenger/services/audiobookshelf.nix
+++ b/hosts/challenger/services/audiobookshelf.nix
@@ -0,0 +1,57 @@
+{ config, lib, pkgs, ... }:
+let
+  domain = "audiobooks.home.feal.no";
+  host = "127.0.1.2";
+  port = 5016;
+in {
+  fileSystems = {
+    "/var/lib/audiobookshelf" = {
+      device = "/tank/media/audiobookshelf/config";
+      options = [ "bind" ];
+    };
+  };
+
+  services.audiobookshelf = {
+    enable = true;
+    dataDir = "audiobookshelf";
+    inherit host port;
+  };
+
+  systemd.services.audiobookshelf = {
+    requires = [ "var-lib-audiobookshelf.mount" ];
+    serviceConfig = {
+      # Better safe than sorry :)
+      CapabilityBoundingSet = "";
+      LockPersonality = true;
+      NoNewPrivileges = true;
+      PrivateDevices = true;
+      PrivateMounts = true;
+      PrivateTmp = true;
+      PrivateUsers = true;
+      ProtectClock = true;
+      ProtectHome = true;
+      ProtectHostname = true;
+      ProtectKernelLogs = true;
+      ProtectKernelModules = true;
+      ProtectKernelTunables = true;
+      ProtectProc = "invisible";
+      ProtectSystem = "strict";
+      ReadWritePaths = [
+        "/var/lib/audiobookshelf"
+        "/tank/media/audiobookshelf"
+      ];
+      RemoveIPC = true;
+      RestrictSUIDSGID = true;
+      UMask = "0007";
+      RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6" ];
+      SystemCallArchitectures = "native";
+    };
+  };
+
+  services.nginx.virtualHosts.${domain} = {
+    locations."/" = {
+      proxyPass = "http://${host}:${toString port}";
+      proxyWebsockets = true;
+    };
+  };
+}
--- a/hosts/challenger/services/ersatztv.nix
+++ b/hosts/challenger/services/ersatztv.nix
@@ -1,27 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  domain = "etv.home.feal.no";
-  bind = "127.0.0.1:8409";
-in {
-  virtualisation.oci-containers.containers.ersatztv = {
-    autoStart = true;
-    image = "jasongdove/ersatztv:latest-nvidia";
-    volumes = [
-      "/var/lib/ersatztv:/root/.local/share/ersatztv"
-      "/tank/media/other/ersatztv:/media" # Filler, watermarks, etc.
-    ];
-    ports = [
-      "${bind}:8409"
-    ];
-    environment = {
-      TZ = "Europe/Oslo";
-    };
-    extraOptions = [
-      "--device=/dev/dri"
-    ];
-  };
-
-  services.nginx.virtualHosts.${domain} = {
-    locations."/".proxyPass = "http://${bind}";
-  };
-}
--- a/hosts/challenger/services/nextcloud.nix
+++ b/hosts/challenger/services/nextcloud.nix
@@ -5,7 +5,7 @@ let
 in {
  services.nextcloud = {
    enable = true;
-    package = pkgs.nextcloud31;
+    package = pkgs.nextcloud32;
    inherit hostName;
    home = "/tank/nextcloud";
    https = true;
--- a/hosts/defiant/backup.nix
+++ b/hosts/defiant/backup.nix
@@ -12,14 +12,34 @@
        "--keep-monthly 3"
      ];
    };
+    cloudJob = name: paths: {
+      inherit paths;
+      # "rsyncnet" connection details specified in /root/.ssh/config
+      repository = "sftp://rsyncnet/restic/defiant/${name}";
+      passwordFile = config.sops.secrets."restic/${name}".path;
+      initialize = true;
+      pruneOpts = [
+        # rsync.net keeps daily snapshots
+        "--keep-weekly 4"
+        "--keep-monthly 36"
+      ];
+    };
  in {
    postgres = (localJob "postgres" [ "/tank/backup/postgresql" ]) // {
      timerConfig.OnCalendar = "05:15"; # 2h after postgresqlBackup
    };
+    postgres-remote = (cloudJob "postgres" [ "/tank/backup/postgresql" ]) // {
+      timerConfig.OnCalendar = "05:15"; # 2h after postgresqlBackup
+    };

    gitea = (localJob "gitea" [ "/tank/services/gitea" ]);
+    gitea-remote = (cloudJob "gitea" [ "/tank/services/gitea" ]);
+
    matrix-synapse = (localJob "matrix-synapse" [ "/var/lib/matrix-synapse" ]);
+    matrix-synapse-remote = (cloudJob "matrix-synapse" [ "/var/lib/matrix-synapse" ]);
+
    vaultwarden = (localJob "vaultwarden" [ "/var/lib/bitwarden_rs" ]);
+    vaultwarden-remote = (cloudJob "vaultwarden" [ "/var/lib/bitwarden_rs" ]);
  };

  # TODO: home-assistant, pihole
--- a/hosts/defiant/configuration.nix
+++ b/hosts/defiant/configuration.nix
@@ -18,18 +18,16 @@
      ./services/wireguard.nix

      # Services
-      # ./services/flame.nix
      ./services/gitea.nix
      ./services/hedgedoc.nix
      ./services/home-assistant.nix
      ./services/keycloak.nix
-      # ./services/koillection.nix
      ./services/matrix
      ./services/microbin.nix
      # ./services/minecraft/home.nix
      ./services/monitoring
      # ./services/rtl-tcp.nix
-      ./services/searx.nix
+      # ./services/searx.nix
      ./services/vaultwarden.nix
  ];

--- a/hosts/defiant/services/dyndns.nix
+++ b/hosts/defiant/services/dyndns.nix
@@ -5,7 +5,7 @@

  services.domeneshop-dyndns = {
    enable = true;
-    domain = "site3.feal.no";
+    domain = "site2.feal.no";
    netrcFile = config.sops.secrets."domeneshop/netrc".path;
  };
 }
--- a/hosts/defiant/services/flame.nix
+++ b/hosts/defiant/services/flame.nix
@@ -1,22 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  domain = "flame.home.feal.no";
-  host = "127.0.1.2";
-  port = "5005";
-in {
-  # Flame - Homelab dashboard/linktree
-  virtualisation.oci-containers.containers = {
-    flame = {
-      image = "pawelmalak/flame";
-      ports = [ "${host}:${port}:5005" ];
-      volumes = [
-        "/var/lib/flame/data:/app/data/"
-      ];
-    };
-  };
-
-  services.nginx.virtualHosts."${domain}" = {
-    locations."/".proxyPass = "http://${host}:${port}";
-  };
-}
-
--- a/hosts/defiant/services/koillection.nix
+++ b/hosts/defiant/services/koillection.nix
@@ -1,59 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  domain = "koillection.home.feal.no";
-  port = 5023;
-in {
-  virtualisation.oci-containers.containers = {
-    koillection = {
-      image = "koillection/koillection";
-
-      ports = [
-        "127.0.1.2:${toString port}:80"
-      ];
-
-      environment = {
-        APP_DEBUG = "0";
-        APP_ENV = "prod";
-        HTTPS_ENABLED = "0";
-        UPLOAD_MAX_FILESIZE = "512M";
-        PHP_MEMORY_LIMIT = "512M";
-        PHP_TZ = "Europe/Oslo";
-
-        CORS_ALLOW_ORIGIN = "https?://(localhost|koillection\\.home\\.feal\\.no)(:[0-9]+)?$";
-        JWT_SECRET_KEY = "%kernel.project_dir%/config/jwt/private.pem";
-        JWT_PUBLIC_KEY = "%kernel.project_dir%/config/jwt/public.pem";
-
-        DB_DRIVER = "pdo_pgsql";
-        DB_NAME = "koillection";
-        DB_HOST = "host.docker.internal";
-        DB_USER = "koillection";
-        # DB_PASSWORD = "koillection"; # Set in sops envfile
-        DB_PORT = "5432";
-        DB_VERSION = "16";
-      };
-
-      environmentFiles = [
-        config.sops.secrets."koillection/envfile".path
-      ];
-
-      extraOptions = [
-        "--add-host=host.docker.internal:host-gateway"
-      ];
-    };
-  };
-
-  sops.secrets."koillection/envfile" = { };
-
-  services.postgresql = {
-    ensureDatabases = [ "koillection" ];
-    ensureUsers = [ {
-      name = "koillection";
-      ensureDBOwnership = true;
-    } ];
-  };
-
-  services.nginx.virtualHosts."${domain}" = {
-    locations."/".proxyPass = "http://127.0.1.2:${toString port}";
-  };
-}
-
--- a/hosts/defiant/services/matrix/synapse.nix
+++ b/hosts/defiant/services/matrix/synapse.nix
@@ -84,10 +84,14 @@
          issuer = "https://iam.feal.no/realms/feal.no";
          client_id = "matrix-synapse";
          client_secret_path = config.sops.secrets."matrix/synapse/oidcsecret".path;
-          user_mapping_provicer.config = {
+          user_mapping_provider.config = {
            localpart_template = "{{ user.preferred_username }}";
            display_name_template = "{{ user.name }}";
          };
+          attribute_requirements = [{
+            attribute = "matrix-roles";
+            value = "matrix-user";
+          }];
          backchannel_logout_enabled = true;
          enable_registration = false;
        }
--- a/hosts/defiant/services/monitoring/prometheus.nix
+++ b/hosts/defiant/services/monitoring/prometheus.nix
@@ -17,14 +17,12 @@ in {
        static_configs = [
          {
            targets = [
-              "burnham.home.feal.no:9100"
              "challenger.home.feal.no:9100"
+              "constellation.home.feal.no:9100"
              "defiant.home.feal.no:9100"
-              "edison.home.feal.no:9100"
-              "malcolm.home.feal.no:9100"
-              "mccoy.home.feal.no:9100"
-              "scotty.home.feal.no:9100"
-              "sulu.home.feal.no:9100"
+              "leonard.home.feal.no:9100"
+              "morn.home.feal.no:9100"
+              "sisko.home.feal.no:9100"
            ];
          }
        ];
--- a/hosts/defiant/services/nginx.nix
+++ b/hosts/defiant/services/nginx.nix
@@ -54,6 +54,7 @@ in {
      '';
    } // overrides;
  in {
+    "amalie.mansaker.no" = publicProxy "http://leonard.home.feal.no/" { };
    "cloud.feal.no" = publicProxy "" {
      locations."/" = {
        proxyPass = "http://challenger.home.feal.no";
@@ -62,17 +63,11 @@ in {
        '';
      };
    };
-    "feal.no" = publicProxy "http://mccoy.home.feal.no:8090/" {
-      serverAliases = [ "www.feal.no" ];
-    };
-    "git.feal.no" = publicProxy "http://unix:${gitea.server.HTTP_ADDR}" {
-      default = true;
-    };
+    "feal.no" = publicProxy "http://leonard.home.feal.no/" { serverAliases = [ "www.feal.no" ]; };
+    "git.feal.no" = publicProxy "http://unix:${gitea.server.HTTP_ADDR}" { default = true; };
    "iam.feal.no" = publicProxy "http://${keycloak.http-host}:${toString keycloak.http-port}" { };
    "jf.feal.no" = publicProxy "http://jellyfin.home.feal.no/" { };
-    "kinealbrigtsen.no" = publicProxy "http://192.168.11.106:80/" {
-      serverAliases = [ "www.kinealbrigtsen.no" ];
-    };
-    "wiki.wackattack.eu" = publicProxy "http://192.168.11.108:80/" { };
+    "kinealbrigtsen.no" = publicProxy "http://leonard.home.feal.no/" { serverAliases = [ "www.kinealbrigtsen.no" ]; };
+    "wiki.wackattack.eu" = publicProxy "http://leonard.home.feal.no/" { };
  };
 }
--- a/hosts/defiant/services/wireguard.nix
+++ b/hosts/defiant/services/wireguard.nix
@@ -22,17 +22,7 @@ in {
        ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -d 192.168.10.0/24 -o eth0 -j MASQUERADE
      '';

-      peers = [
-        { # Burnham
-          publicKey = "JcfyrMoZmnbibVLaIKuGSARAX2alFv4kwLbJaLBNbzo=";
-          persistentKeepalive = 60;
-          allowedIPs = [
-            "10.100.0.2/32"
-            "192.168.11.0/24"
-          ];
-          #endpoint = "site2.feal.no:51902";
-        }
-      ] ++ (import ../../../common/wireguard-peers.nix);
+      peers = (import ../../../common/wireguard-peers.nix);
    };
  };
 }
--- a/hosts/fa-t14-2025/desktop.nix
+++ b/hosts/fa-t14-2025/desktop.nix
@@ -29,7 +29,7 @@
    fontDir.enable = true;
    packages = with pkgs; [
      noto-fonts
-      noto-fonts-emoji
+      noto-fonts-color-emoji
      noto-fonts-cjk-sans
      font-awesome
      fira-code
--- a/hosts/fa-t14-2025/home.nix
+++ b/hosts/fa-t14-2025/home.nix
@@ -44,7 +44,6 @@ in {
    hyprlock
    hyprpaper
    hyprshot
-    hyprswitch
    nautilus
    rofi-rbw-wayland
    swaynotificationcenter
--- a/hosts/leonard/configuration.nix
+++ b/hosts/leonard/configuration.nix
@@ -0,0 +1,53 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports =
+    [
+      ../../base.nix
+      ../../common/metrics-exporters.nix
+      ../../common/auto-upgrade.nix
+      ./hardware-configuration.nix
+
+      ./services/mysql.nix
+      ./services/nginx.nix
+      ./services/postgresql.nix
+
+      ./services/wiki-wackattack-eu.nix
+      ./services/www-feal-no
+      ./services/www-kinealbrigtsen-no.nix
+      ./services/www-amalie-mansaker-no
+  ];
+
+  boot.loader.systemd-boot.enable = lib.mkForce false;
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "/dev/sda";
+
+
+  networking = {
+    hostName = "leonard";
+    defaultGateway = "192.168.10.1";
+    interfaces.ens18.ipv4 = {
+      addresses = [
+        { address = "192.168.10.207"; prefixLength = 24; }
+      ];
+    };
+    hostId = "b99c12d1";
+
+    # Prepend the following output rules to disallow talking to other devices on LAN
+    firewall.extraCommands = lib.strings.concatLines ([
+      "iptables -F OUTPUT"
+    ] ++ (map (addr: "iptables -A OUTPUT -p udp --dport 53 -d ${addr} -j nixos-fw-accept") config.networking.nameservers) ++ [ # Exception for DNS
+      "iptables -A OUTPUT -p tcp --dport 3100 -d 192.168.10.175 -j nixos-fw-accept" # Exception for loki logging
+      "iptables -A OUTPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT"
+      "iptables -A OUTPUT -d 192.168.10.0/24 -j nixos-fw-refuse"
+      "iptables -A OUTPUT -d 192.168.11.0/24 -j nixos-fw-refuse"
+    ]);
+  };
+
+  sops.defaultSopsFile = ../../secrets/leonard/leonard.yaml;
+
+  environment.variables = { EDITOR = "vim"; };
+
+  system.stateVersion = "25.05";
+}
+
--- a/hosts/leonard/hardware-configuration.nix
+++ b/hosts/leonard/hardware-configuration.nix
@@ -1,6 +1,3 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:

 {
@@ -14,17 +11,14 @@
  boot.extraModulePackages = [ ];

  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/7240554f-d9d9-457a-91d5-c70c09d96595";
+    { device = "/dev/disk/by-uuid/4a70c1d5-9d72-4581-8f75-733b91c10669";
      fsType = "ext4";
    };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/88C2-BAC8";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  swapDevices = [ ]; # TODO

-  swapDevices = [ ];
+  networking.useDHCP = lib.mkDefault false;
+  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
--- a/hosts/leonard/home.nix
+++ b/hosts/leonard/home.nix
@@ -8,5 +8,5 @@
    zsh.shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
  };

-  home.stateVersion = "24.05";
+  home.stateVersion = "25.05";
 }
--- a/hosts/leonard/services/mysql.nix
+++ b/hosts/leonard/services/mysql.nix
--- a/hosts/leonard/services/nginx.nix
+++ b/hosts/leonard/services/nginx.nix
--- a/hosts/leonard/services/postgresql.nix
+++ b/hosts/leonard/services/postgresql.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, lib, ... }:
+{
+  services.postgresql = {
+    enable = true;
+    enableTCPIP = false;
+    authentication = pkgs.lib.mkOverride 10 ''
+      #type database  DBuser  auth-method
+      local all       all     trust
+    '';
+  };
+
+  services.postgresqlBackup = {
+    enable = true;
+    location = "/backup/postgresql/";
+    startAt = "*-*-* 03:15:00";
+    backupAll = true;
+  };
+
+  environment.systemPackages = [ config.services.postgresql.package ];
+}
--- a/hosts/leonard/services/wiki-wackattack-eu.nix
+++ b/hosts/leonard/services/wiki-wackattack-eu.nix
@@ -0,0 +1,38 @@
+{ config, ... }:
+let
+  bindIP = "127.0.1.2";
+  port = 5051;
+  cfg = config.services.wiki-js;
+in {
+  # sops.secrets."wikijs/envfile" = {
+  #   restartUnits = [ "wiki-js.service" ];
+  # };
+
+  services.wiki-js = {
+    enable = true;
+    # environmentFile = config.sops.secrets."wikijs/envfile".path;
+    settings = {
+      inherit bindIP port;
+      db = {
+        type = "postgres";
+        host = "/run/postgresql";
+        db = "wiki-js";
+        user = "wiki-js";
+      };
+    };
+  };
+
+  services.postgresql = {
+    ensureDatabases = [ "wiki-js" ];
+    ensureUsers = [{
+      name = "wiki-js";
+      ensureDBOwnership = true;
+    }];
+  };
+
+  services.nginx.virtualHosts."wiki.wackattack.eu" = {
+    locations."/" = {
+      proxyPass = "http://${bindIP}:${toString port}";
+    };
+  };
+}
--- a/hosts/leonard/services/www-amalie-mansaker-no/default.nix
+++ b/hosts/leonard/services/www-amalie-mansaker-no/default.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, lib, ... }:
+
+{
+  services.nginx.virtualHosts."amalie.mansaker.no" = let
+    siteContent = pkgs.callPackage ./site.nix { };
+  in {
+    locations = {
+      "/".root = siteContent;
+    };
+  };
+}
--- a/hosts/leonard/services/www-amalie-mansaker-no/site.nix
+++ b/hosts/leonard/services/www-amalie-mansaker-no/site.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, hugo }:
+stdenv.mkDerivation {
+  name = "www-amalie-mansaker-no";
+
+  src = fetchgit {
+    url = "https://git.feal.no/amalieem/amalie.mansaker.no.git";
+    fetchSubmodules = true;
+
+    rev = "15142c93da33414a0be49384a03b704ad95e31be";
+    hash = "sha256-oq5NC11UDYjYKToPsEXovCiIBD5adamVwi3scOFzpHM=";
+  };
+
+  nativeBuildInputs = [ hugo ];
+  buildPhase = ''
+    cp -r $src/* .
+    ${hugo}/bin/hugo
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -r public/* $out/
+    runHook postInstall
+  '';
+}
+
--- a/hosts/leonard/services/www-feal-no/default.nix
+++ b/hosts/leonard/services/www-feal-no/default.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, lib, ... }:
+
+{
+  services.nginx.virtualHosts."feal.no" = {
+    default = true;
+
+    serverAliases = [
+      "www.feal.no"
+    ];
+
+    locations = {
+      # TODO: Reinstate actual website
+      "/".return = "302 https://git.feal.no/";
+
+      "^~ /.well-known/" = {
+        alias = (toString ./well-known) + "/";
+      };
+
+      "/cc/" = {
+        alias = "${pkgs.cyberchef}/share/cyberchef/";
+        index = "index.html";
+      };
+      "= /cc".return = "302 /cc/";
+    };
+  };
+}
--- a/hosts/leonard/services/www-feal-no/well-known/matrix/client
+++ b/hosts/leonard/services/www-feal-no/well-known/matrix/client
@@ -0,0 +1,5 @@
+{
+	"m.homeserver": {
+		"base_url": "https://matrix.feal.no:443"
+	}
+}
--- a/hosts/leonard/services/www-feal-no/well-known/matrix/server
+++ b/hosts/leonard/services/www-feal-no/well-known/matrix/server
@@ -0,0 +1 @@
+{"m.server": "matrix.feal.no:443"}
--- a/hosts/leonard/services/www-kinealbrigtsen-no.nix
+++ b/hosts/leonard/services/www-kinealbrigtsen-no.nix
--- a/hosts/malcolm/configuration.nix
+++ b/hosts/malcolm/configuration.nix
@@ -1,49 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-
-    ../../base.nix
-    ../../common/auto-upgrade.nix
-    ../../common/metrics-exporters.nix
-
-    ./services/mysql.nix
-    ./services/nginx.nix
-    ./services/www-ctf-feal-no.nix
-    ./services/www-kinealbrigtsen-no.nix
-  ];
-
-  networking = {
-    hostName = "malcolm";
-    bridges.br0.interfaces = [ "ens18" ];
-    interfaces.br0.useDHCP = false;
-    interfaces.br0.ipv4.addresses = [
-      { address = "192.168.11.106"; prefixLength = 24; }
-    ];
-
-    hostId = "620c42d0";
-    defaultGateway = "192.168.11.1";
-
-    # Prepend the following output rules to disallow talking to other devices on LAN
-    firewall.extraCommands = lib.strings.concatLines ([
-      "iptables -F OUTPUT"
-    ] ++ (map (addr: "iptables -A OUTPUT -p udp --dport 53 -d ${addr} -j nixos-fw-accept") config.networking.nameservers) ++ [ # Exception for DNS
-      "iptables -A OUTPUT -p tcp --dport 3100 -d 192.168.10.175 -j nixos-fw-accept" # Exception for loki logging
-      "iptables -A OUTPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT"
-      "iptables -A OUTPUT -d 192.168.10.0/24 -j nixos-fw-refuse"
-      "iptables -A OUTPUT -d 192.168.11.0/24 -j nixos-fw-refuse"
-    ]);
-  };
-
-  # virtualisation.oci-containers.backend = "docker";
-  # systemd.services.docker.postStart = lib.concatMapStringsSep "\n" (rule: "${pkgs.iptables}/bin/iptables ${rule}") ([
-  #   "-F DOCKER-USER"
-  # ] ++ (map (addr: "-A DOCKER-USER -p udp --dport 53 -d ${addr} -j RETURN") config.networking.nameservers) ++ [
-  #   "-A DOCKER-USER -d 192.168.10.0/24 -j REJECT"
-  #   "-A DOCKER-USER -d 192.168.11.0/24 -j REJECT"
-  #   "-A DOCKER-USER -j RETURN"
-  # ]);
-
-  system.stateVersion = "24.05";
-}
--- a/hosts/malcolm/services/nginx.nix
+++ b/hosts/malcolm/services/nginx.nix
@@ -1,17 +0,0 @@
-{ config, values, ... }:
-{
-  services.nginx = {
-    enable = true;
-
-    clientMaxBodySize = "100m";
-
-    recommendedProxySettings = true;
-    recommendedTlsSettings = true;
-    recommendedGzipSettings = true;
-    recommendedOptimisation = true;
-
-    virtualHosts."kinealbrigtsen.no".default = true;
-  };
-
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
-}
--- a/hosts/malcolm/services/www-ctf-feal-no.nix
+++ b/hosts/malcolm/services/www-ctf-feal-no.nix
@@ -1,14 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  services.nginx.virtualHosts."ctf.feal.no" = {
-    locations = {
-      "/".return = "302 https://www.feal.no/";
-      "/cc/" = {
-        alias = "${pkgs.cyberchef}/share/cyberchef/";
-        index = "index.html";
-      };
-      "= /cc".return = "302 /cc/";
-    };
-  };
-}
--- a/hosts/morn/configuration.nix
+++ b/hosts/morn/configuration.nix
@@ -8,9 +8,11 @@
      ../../common/auto-upgrade.nix
      ./hardware-configuration.nix

+      ./services/nginx.nix
+
      ./services/glance
      ./services/miniflux.nix
-      ./services/nginx.nix
+      ./services/thelounge.nix
  ];

  networking = {
--- a/hosts/morn/services/miniflux.nix
+++ b/hosts/morn/services/miniflux.nix
@@ -9,7 +9,7 @@ in {
    enable = true;
    adminCredentialsFile = config.sops.secrets."miniflux/env".path;
    config = {
-      CREATE_ADMIN = "1";
+      CREATE_ADMIN = true;

      LISTEN_ADDR = listen_addr;
      BASE_URL = "http://${domain}";
--- a/hosts/burnham/services/thelounge.nix
+++ b/hosts/burnham/services/thelounge.nix
--- a/hosts/sisko/configuration.nix
+++ b/hosts/sisko/configuration.nix
@@ -39,7 +39,6 @@
  programs = {
    alvr = {
      enable = true;
-      package = pkgs.unstable.alvr;
      openFirewall = true;
    };

--- a/hosts/sisko/desktop.nix
+++ b/hosts/sisko/desktop.nix
@@ -34,7 +34,7 @@
      nerd-fonts.hack
      noto-fonts
      noto-fonts-cjk-sans
-      noto-fonts-emoji
+      noto-fonts-color-emoji
    ];
  };

--- a/hosts/sisko/home.nix
+++ b/hosts/sisko/home.nix
@@ -16,7 +16,6 @@
    emacs-gtk
    feishin
    gqrx
-    jellyfin-media-player
    kitty
    libreoffice
    lutris
@@ -34,7 +33,7 @@
    swayimg
    thunderbird
    tor-browser
-    unstable.bolt-launcher
+    bolt-launcher

    exiftool
    ghidra
@@ -49,7 +48,6 @@
    hyprlock
    hyprpaper
    hyprshot
-    hyprswitch
    nautilus
    networkmanager
    rofi-rbw-wayland
@@ -105,7 +103,6 @@
    rofi = {
      enable = true;
      theme = "iggy";
-      package = pkgs.rofi-wayland;
    };
    zsh = {
      shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
--- a/hosts/worf/configuration.nix
+++ b/hosts/worf/configuration.nix
@@ -111,13 +111,6 @@
    };


-    # firewall settings
-    alf = {
-      # 0 = disabled 1 = enabled 2 = blocks all connections except for essential services
-      globalstate = 1;
-      loggingenabled = 0;
-    };
-
    # dock settings
    dock = {
      autohide = true;
@@ -133,12 +126,16 @@
    };
  };

+  # firewall settings
+  networking.applicationFirewall = {
+    enable = true;
+    blockAllIncoming = true;
+  };
+
  system.keyboard = {
    enableKeyMapping = true;
    remapCapsLockToControl = true;
  };

-  # nix.package = pkgs.nix;
-
  system.stateVersion = 5;
 }
--- a/hosts/worf/home.nix
+++ b/hosts/worf/home.nix
@@ -20,12 +20,13 @@
    gnutar
    iterm2
    mosh
+    mpv
    nix-index
    nodejs
    prismlauncher
    restic
    snicat
-    spotify
+    # spotify # TODO - broken in 25.11
    tldr
    w3m
    zellij
@@ -60,7 +61,7 @@
        apps = pkgs.buildEnv {
          name = "home-manager-applications";
          paths = config.home.packages;
-          pathsToLink = "/Applications";
+          pathsToLink = [ "/Applications" ] ;
        };
      in
      lib.hm.dag.entryAfter [ "writeBoundary" ] ''
--- a/hosts/worf/yabai.nix
+++ b/hosts/worf/yabai.nix
@@ -5,7 +5,6 @@ let
 in {
  services.yabai = {
    enable = true;
-    package = pkgs.unstable.yabai;
    enableScriptingAddition = true;

    config = {
--- a/secrets/burnham/burnham.yaml
+++ b/secrets/burnham/burnham.yaml
@@ -1,40 +1,44 @@
 domeneshop:
    netrc: ENC[AES256_GCM,data:iN9TEMRQpEUbq5kQRXKNG1pFr2rtQtCBXuK1w/7Wn6FAiWkGmCu8GIjPSDnMkZ4+l3kxJhNSix3AzIQwp6oayV1hIoFTWgz/OHKrq2TtQIFy5gs0u0Ump2tmQZFP3GgxSEagfp+c6MbQkjCh0t/PKiPE5MRJJnOJ4/0D,iv:Ta7T5lnQQpMwO+zYgFE9izs78+gtleolk6l7DDnrMoo=,tag:UXeoR+tW5t4DMazb26FsHw==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
    age:
        - recipient: age12cgkgx8xac77q0rwakp6zrfrzp45mhk7wj6t3y8s0xurt3k879usnm66ct
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLSGdKelVWY29UbXQvZzdv
-            RmM3cnhUUzNDVXowcHEzWjYxalFRcUdqckhrCldQRDJEOFNBOUtYSG44QUwxQkdv
-            N1Iwa0J3Zys1Mi9BS0Jwc3VxcEpEQjQKLS0tIEhLZE9JNyswT0dhdmlJWEkyblpZ
-            RCs1ejl0NXJNcEpXRDlCa3VYZkpSWU0KHO1KGqLZ6FRUNCi7sK+YpbeSTCYfnCOc
-            ruNPNxW7/WPRzsL3xnqGLtiFUm9x36j4apTHcTxns5xtsLPlBx1QBA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArTkptaHV0QVRIR3l2MmhG
+            OE4rTitWMDQxaFVmVW9YNDdNSDNFZFRUYVhjClhQNVNSN1daMGJTcGxhN3NDM2lm
+            RmFQL0t1MWwycWRjNGZ2RjAxWTQrWkEKLS0tIG1VREFJWE9SZjdFamN5bzB3R2hK
+            bEZpNXh4SENwMHcxYWZRajFCc3BGMDQKXzZCHsdK5cDWf6NszonfMcZBTI1z0fvn
+            wod71wiDaJV9pO8Za+9aKrE7V3SnKnO1F7Vjz8SjEYtNPd5wNV6vaQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age146z3h3flw7spy5thznak8k5jh6yd68k9qrrehg8sdcwmyjv3vd7qvahdur
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0Qm8weVQxQXd5RTlGVk1w
+            NHoraisrUElKMUMvVFZkckF3U2llQVNScUdZCmRwWjlXT2MzUmFrb3l4UDQxOEta
+            QmtXM2NCbmRVN3hlVkkvZHgyb0xvWVEKLS0tIFdla25GcndNTGN0U0djSmZHaFZr
+            YXI2aGJzZkZvZ1FHY3d2WnZHSVZrc1kK1qJN+uLLwMQteaHILB68PXIqhh4fPCZn
+            V+NrCUKyCkxAWdr10oXnswdaqwEpwlsm/ZzingrWN6cVIFC2DiYArQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1phc4fkt25n4wtzg88sg3fhvmy6tv8pguyxp5c9js83ae3z374adsxfpqkl
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBZkMzOFlZaDN5a3pIclYw
-            dlphY1NYb2JBaVBvL1dlYW1GNlNRTlIxL2lRCmlVUXlSeXBYeTAzY1J0V1JONVNF
-            UlQ0WVpYVXd2MkM0aXY2YkJIRkJWdDQKLS0tIDJ3cnNYdG1XYk4zR0RWMmZqd1BN
-            bGd2NXBEM25OUkZ3SzYrUEROTEYzQ3cK7zPaaoJwQ8SBMM8MKFhMMq2WB3R7E7lh
-            VxksH4/6+5FAg0skiZi2dzUhJ0qqL5C5AR+vPW4qJIWWo34Gv45CQg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQWmEvb2dZRFJEczl4YlVP
+            YnNFdWYvZitzLzNaR1NHK0lhYktoR3QwNWlvCnZ6QjZDNWU3aDJpZm5DYVBvSEpB
+            akVTTCtoZTlMVGNnN2o5ODZFY3pXa0EKLS0tIFpLRENwb2hXR2RCYk96UTF3cnFQ
+            UXczQWdMcnZuaUxyUFMxYTd0UHVrTGcKW4b7Bdr1gFZDSQtW3WAy1c1LRJhZijSM
+            wcLl4SHtiaLKwtulOaH5jx6T2pbbMRztDK9LJ/7qc/hVT80kFNgrGA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nj7ju6f3jfvzw4c0sxywthjmztwp7rwqceun8xw2tlfrt7qymatser4vqf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2OVlIUUpsTDVWOXFXSGts
-            SExkSEFRa1E0YzhiYnkxclZzQTk1bXA1M0RrCm54V1pzblhDbnV5RncwSVJXQ1VC
-            UGhORXl2a0w0OER2YUdnYUFJN2RKcTQKLS0tIDB4MWVGbmhvakVSMEl5NndrWHpi
-            TFprZS8zckJJOEhqQVhUc0RXNGdhRFUKHxGMfEUJA2sN7Lw1YrV2s0hx3iwKrpKq
-            oV6X4CYZ92w2tPqgRrZ59DNXNEdVR7U/dEy2Ta+5jIA+cnnKu48BFw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRb0lNdW5ITXN4a2RSRjdp
+            ZHl2dzI4bjZGQUhEYzZiUkV6QTloU0xOQUZVCk5YMmVObW1vL0lQKzhCaktoMk0y
+            OUtrTTBRTzlqaEhKOEdxZy80QnRoUDQKLS0tIGR6NHlkQzRDMXpQdDc5eEpkSEpL
+            OXFLenpUNUhyek5ZRm0wUWFnaGNxeDgKw3TZWAA7rc2gRv74NVXrdDbQrBBah4ZH
+            4bS5+2kXdE+UINw9OZtuDYeXWr1NWP707R+JFuyKRSrFOUk0913y0Q==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2024-09-08T00:11:46Z"
    mac: ENC[AES256_GCM,data:/LgohCkIf5CSHdKVsBWzVbTwul7+HtFeG5a+qA9gjhTzdBaV985IeVPB0Vithmwu+h7BgsL3AGy2EADxGy7UtyhB7+UbcdDoPxHOFtiqv0Rjp4mNMirwjHcMSk42DWMw6+Wgfdy0FZlRkz4pOutZ2bRgehpQP2IYqlm8pjs9TiE=,iv:21wgEwUVRZvqW7uNjeANK8MJLbzy6LOb+iBXcHsp/H4=,tag:lV2qPE6gMNQsS1zom54sgg==,type:str]
-    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1
--- a/secrets/challenger/challenger.yaml
+++ b/secrets/challenger/challenger.yaml
@@ -4,41 +4,51 @@ nextcloud:
    adminpass: ENC[AES256_GCM,data:DL5SnyPPUxiVjfIHZ/ZYJi2pNu6x,iv:/bThFVYgHsN3Yr2EJf0+YWhAVIei9ENaHfAH1ADC5Ws=,tag:bNp+2trtwFNYOqruvqPRGw==,type:str]
    secretsjson: ENC[AES256_GCM,data:xmdwWBe8LWsSEI64KhSeXbA1B0ahfoGwNmgl33JWteF4AakdI73zfbdIhUBqqlqfbL0uCGlqCiOyRA02h8197mk=,iv:ncKz9ObwoFoVjT0qMzBJ0BqVBNx0ScdMRl82ZNQp4FI=,tag:6S8fqHhvE/gaknxsb+q3Jg==,type:str]
 restic:
-    transmission: ENC[AES256_GCM,data:UUf8/WV7Q7vbs05lEeqflcSj0uH9abilFF1daATyrwU=,iv:WQZ7hGRQ3/3t34aO7K5Az1AOZtR6qG4p1CqZTdsEqZA=,tag:2ELh2bYVi1sgW66FbSnVHg==,type:str]
-    postgres: ENC[AES256_GCM,data:AZv28LIbGC2oAKjbU1H4gaCZF28utJJFXlKNO/BkL0U=,iv:xOJCIoFGtnEqV80rmiBBMa3dMZnPjaDIce+MAZkGZdo=,tag:dLTwE004KGfP3z9EoMVCCw==,type:str]
-    nextcloud: ENC[AES256_GCM,data:O7qT07ns9FodnZu63cPwBqHGslfMIafFvyPPrTrYEdk=,iv:fJ7A5gLThuVumnteL1P82Gq1EtiSAPGXoCZgzJKqVQs=,tag:Hp/kI3TeZQCaM+gP1W1i7w==,type:str]
    calibre: ENC[AES256_GCM,data:wAvhB303cUm0rJKwQ31pd8lYHJSlOzBW8BiCygF3JC8=,iv:kUFEiP8sTcaiAIW4QZ7ZfA4aqjJsIIA5mq+gVzgryaU=,tag:STHLWF+T4XeQIDSt4F63Lw==,type:str]
+    hostBackups: ENC[AES256_GCM,data:lUK1oi+efynRbweO7sg6ayr3LI3G4aXyx5s4n+rtw3A=,iv:oPZLmCXh2G0xnFrmOokx8yixbRSwlmz5NY1s9pJGDgs=,tag:imKUkCfPGeOjRh6reODG7g==,type:str]
    media: ENC[AES256_GCM,data:JwIX2r/ebE+LMS49s1xqbRjA8yfMRDEAnln5eN57L4o=,iv:zqxeEv7ogujMqBPZnRF7STDjVlKqMa1rGLjMY5iusgU=,tag:O9PofkyovSYH7qlX6r97DQ==,type:str]
+    nextcloud: ENC[AES256_GCM,data:O7qT07ns9FodnZu63cPwBqHGslfMIafFvyPPrTrYEdk=,iv:fJ7A5gLThuVumnteL1P82Gq1EtiSAPGXoCZgzJKqVQs=,tag:Hp/kI3TeZQCaM+gP1W1i7w==,type:str]
+    postgres: ENC[AES256_GCM,data:AZv28LIbGC2oAKjbU1H4gaCZF28utJJFXlKNO/BkL0U=,iv:xOJCIoFGtnEqV80rmiBBMa3dMZnPjaDIce+MAZkGZdo=,tag:dLTwE004KGfP3z9EoMVCCw==,type:str]
+    transmission: ENC[AES256_GCM,data:UUf8/WV7Q7vbs05lEeqflcSj0uH9abilFF1daATyrwU=,iv:WQZ7hGRQ3/3t34aO7K5Az1AOZtR6qG4p1CqZTdsEqZA=,tag:2ELh2bYVi1sgW66FbSnVHg==,type:str]
 sops:
    age:
        - recipient: age1j43eqpnq5hy6zt3gmdtzdnne2yfvccd832kpt69qavst44leec6sj2l773
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxK2JPa1lKejhtTWl6QWdC
-            VE1hRWpZRW84Sm56TEZVejVEVE9oamFRejM4Ci9tTTFhTVRUUEVybmYvVzNldDZ2
-            eCtDSURVQVpkblJ3T0VSR3NZSzZZV3cKLS0tIHVncTVEMlhGSHU0RFNkWGJNUWwx
-            TmhsZ2VMSkNCdFU4MDZtb1hQU1dhYjgKjZRvO8LCey5cBwNYUra1ZHq/gwcvT9yl
-            2VsJa5ayEycFjyC9lcS6D+A5VrlKLHwc3r++QWx0Ab2GNfj6VOvoXA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIOFI2QUZFNHVIcVM0QzRP
+            V2o3cmJGcUVPakYzdmNrMzBvRFJtTWdZczJRClpETzVMdUlaQ2NmdndYMFkvbCtw
+            eThKOG1nZ1pyQVhZRHVaTllId2lqZ00KLS0tIDdDYmkzOUZacE5KRjIvT1pqRjBy
+            bVh2Sm9jbnUzMnRiamJUTHdDd1d3SlUK3CZ4aIkXcz3HG/Wyo901H7pMtG9g/3PX
+            +Ug+1oZaUovfb9isYcKX7KeTY8sF0G2VeFCunHwjR6K0FyW8CY0eWg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age146z3h3flw7spy5thznak8k5jh6yd68k9qrrehg8sdcwmyjv3vd7qvahdur
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVQzVuYWhoSEIrR2twR0tE
+            Ri9acHErS3dlZUYxWGRWeE5VeitvRk1mZHdBCjh2SEtQZ3pMNzFzamQ2MjJZaWpF
+            ZVNvOHNnYkZ1aFFtb2ovdWJQK1A3dVEKLS0tIFdoVzZURDlFTk5wUGlzK24wZ255
+            VTlybXUyeHlqakdaRW9vcFpIRGNvVzQKmp8mEAdoaNPYyqVMj0VLnibEXTaYOWRC
+            see+8vrIjQRVePvHbb4jMzH4/pqQ2BEnbh4p5MVDsYd2Od/tfjaLhA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1phc4fkt25n4wtzg88sg3fhvmy6tv8pguyxp5c9js83ae3z374adsxfpqkl
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoRTV4SzJ5VHdjckRmM0pT
-            eXZiQmxWZFZJZllWVkJ3VytmM2ZQZURoTXdzCkFTTFhoTkhPeUlyenV1R01yTld3
-            RCthTjlpR3Z2R00wNGlzSHBUVFhCaEkKLS0tIERYa0g4TEJKTG9pNEgzbzgwbXFj
-            TlpiT0N3VTFscHh0dVA4Q0NTb3p1Q0kKdRNi6JfIXqw/CmQtFBXtwphR9SiL/0Hd
-            RMDMVDeGRoJHhlK6ml1/NLk8ygar1fwWzg5Ff/2xL40ZL9AsoLsFGA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJVUtLS2hpVUtwM3FiTDZl
+            cmY3cWV3MXJ0ODJzRkFnVExESmkwY3lRWHc0CnhKVWR5YThaRnljbitsWWh2am43
+            S3NpakVld3VqNlNxUi9lcDZvWDlDTkkKLS0tIEhpL0xOK2I3SEhHeGtDL0ErcVlz
+            WlpUZWV2MmJORWpNQ3hoSzlRWnNOVmMKbFX/mlFp2uMoRcdptQvV36D2yoDK9u5m
+            6fcg6rcXa3BLVSQa81dhSFUrWZtWeW1pLV27k3iF3/zJ6FtL826Qvw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nj7ju6f3jfvzw4c0sxywthjmztwp7rwqceun8xw2tlfrt7qymatser4vqf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnSGJPS2VPOGxQR0tWSWgr
-            bm84dTNITFlzdWdRNDJzQTRqRTk2aTI2a2k4CnBLdTJLTStvaFBKaWk1NkZBdzBK
-            T0o4UDBJVHRQVStOQXpsRldhQU9jREEKLS0tIFRPc3hPaEkwN0JBcG4ySUkxZHUr
-            QUFVam5VSkxLVmhsdU02eWtoWmdoeG8KXnixIU8SaD1DCe9Z1doBdwGs1sqv5k8W
-            WLNGcfKXW4sMU712nYSz05SVl99sCJSzUMJFEQWjdVAaR9TRO6Qz8w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJZGdsbUttSG80RFpyRmkv
+            T1lFc2hJTXlGdlFBdHFxZEZ1eUhjT3RmazMwCmo5em56eG9rRmhkSkIyeGRsbEhz
+            OW5rVjlERWlNYndySVlHWFVtUk0xb1kKLS0tIDl5NnY2QnA3TEtvK2VsWG0zRk1X
+            aXkxd2s2WUV0WnV6TGFodXhyNmN1eE0KfOnhI4/4rS5cD+UXuGV4AyZm32LoUw5O
+            PVdfXxuksQl5jQ7BJv4cyBe7F/cb+Knd8F37T/5OqxEbtm3bBUfmyw==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-07-30T21:51:23Z"
-    mac: ENC[AES256_GCM,data:oVHx7fjXjqBVVPSP6Ei7BnOuRieaIpJNjTKbeP2tU7PDB7quhngEgb7K07dJvpAz7MB7dIkLx5e5oL408zy4xMHBHdTst4Qbzpieh0FmJ9LfueQs37IO2OaVL7HcWf4cTF1sV4o2CldGQoL/724s9kOB1wDGVz9/KDGCR/X2gSI=,iv:UP1k9GJ3oRqzNZxwEosaeIrncpE0Om4tI1YqLvLvweI=,tag:Ys/nMJ28Y3IbySiKj/qqHw==,type:str]
+    lastmodified: "2025-10-18T21:43:12Z"
+    mac: ENC[AES256_GCM,data:Bt5CrMY2Etl3iSZRVl58PN1ogYpLn3eXhuVCB0j4MKMphyLVJP1qxiQimpa5wriycJKqwBwvCDzJ7pLTxpHDOZaG6R3YfNYPEZlLAIiyOjZvF1ZBTbnF7cFp0thDuzPoFlEHeTFmY6Pe5GwXmSeUFo4ijghvbsFQ5IYXfWNoYz0=,iv:NCwLoI9g7poYbCME0/fUOZegMNOhc3ZvGpAhYoVeLMc=,tag:fiops2KveC/u3Nrmrftk/Q==,type:str]
    unencrypted_suffix: _unencrypted
-    version: 3.10.2
+    version: 3.11.0
--- a/secrets/defiant/defiant.yaml
+++ b/secrets/defiant/defiant.yaml
@@ -18,45 +18,47 @@ restic:
    vaultwarden: ENC[AES256_GCM,data:tZKf1jeQPBASruDP67NrVfwFoAZ20whQIHf1SWIQz0s=,iv:kyfqvEf/DiAGHAU99HVGri15kluewijkSPOCGKjxIaQ=,tag:tmDQPH2IjjUV5wLegXXybg==,type:str]
 keycloak:
    postgres: ENC[AES256_GCM,data:OYvpSyBAQfAJg4/syz1r,iv:Ge6m63YPl+gJPepIRmBz747bXqUo65MHQaRn1S/8m2I=,tag:18bFwYtmcslXlgflfYqM8w==,type:str]
-koillection:
-    envfile: ENC[AES256_GCM,data:3wq6xiULzELDxtDsBfPbKrnEsAEoG9oQREyaEoe0AVpJziVMrhEQruLCl1F/,iv:IscSmKD8nwQ2HmNnC+54rZrWMimdYPLCArmt/ToTdNM=,tag:J3QYTUtJhpn+R8hpqkA9zg==,type:str]
 searx:
    envfile: ENC[AES256_GCM,data:BlLVb7C2z/kFxULQnNsGucFZg/R57i0GGMZ6PUhkG1fmYGdY0q31948Z1NoMMaEcwQEdOX6Z8+m96o/RjRTt7K3V+n5+cI1OX9pfoTBwDcJ7/w==,iv:MM+t38IZFdzCXM4jG7jH0uZZP8Zs8kyH8Xe3bPiVmUM=,tag:0ezofl1dDXm1o974f2wRrw==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
    age:
        - recipient: age128md9emufxu35kgww3a90sw40vvc60f5xul9n9ndvw4lfnj3ndaqq44u64
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3YUtSSkNIRlV3ek44bzFq
-            OEtjM3FiWEVjeDV4YWFHcVpHTXhzejdISUNjCnU3RFl4bWdLd0JHYWZOS2drck14
-            WG1HM3JjcCt4V3hJRE5vYkxINjI3NzAKLS0tIFlTRjRQU245YlpPbk9OVVBoTTNy
-            MWNsNVphclByb2lYWWJ6aFRnVFd1czQKMNHrQtWQy6cqXyb0wJBYYoULfZjAV+vn
-            9Qz2t6qF+klTxY25TkDFBF+Jcmojn1rfTeT4/c39bE3spf/XgBYw7Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxSS82bDZyaTJ4WldUd29U
+            akY5Z2ZaeDJldHFQUXlRbUdSeTFRR3VCYjJJCkZ1UXZreG51Yi8xMGh5N0I1ZVhE
+            WVpHbjdCRmMvNHZGN1VQdXdQdllxOFkKLS0tIFowdzk4d0RkYXJrdUFGTjF3bGJE
+            NFdGMkwxbVMrb0NjZXUwVUpRWXl6REEKWLriQM+2Fp64v3r1HJQu5gKR+SY+qa40
+            0lI7gsQj01WMpTb8sja2K5QN7cQOauMQUU6ceVQtzY4LMDLTxDz92g==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age146z3h3flw7spy5thznak8k5jh6yd68k9qrrehg8sdcwmyjv3vd7qvahdur
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxR0liazVRR0JaUW03TG5T
+            MVR4UzM3V3ZTbVRkYzdFTFNWdmhIVFBKK2t3CmRmNmF6WjZoZUt6WkpwMUVla2FF
+            OHBYdkFaWHI0bzRyUVhmN2dzdlJuYXMKLS0tIFNOUEUydXNRR252QzJKOUJhMU1D
+            RXdlMG1Lc00yaDY4b1N3SU1NdkIzN0kKaRGpGQUcq45DHuyb+6WQ+tMuDikt+Bra
+            pEwiB3gXODDyRw+vB3NPoOvno6QGzt4tqPFgx3qEUT37tESrOZXOhQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1phc4fkt25n4wtzg88sg3fhvmy6tv8pguyxp5c9js83ae3z374adsxfpqkl
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBESExuSFl2SUJYTzIvbEp4
-            a00rNGo4VnpvVkl5cit4NnBqQTA2TW1sL2k4ClMrUFNMS1QzY2NQVlR6Vk1oZE5L
-            SGdaWThMZ2FKYVZyRWl6YzZrMXRoRUUKLS0tIDRBNUZMRW9Jb0h1bXZ2WTBmU3NU
-            dDNUWVVaSHBRTHg3MGJNSlpBeVBPS1EKPwtufnjNTMVqDJlthcFEmdmdLpwiLLrT
-            o+68EGQDTZtzzZunfMHEecl8lOylgIdoVDU4J8Q2TOPaI7mUBd1B3A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArQnFVc3VwTDNDbW0rQkJX
+            UVFZaXVGR2d3SklqWUQyWHVCZlFOckQ1czBFCmNSQ2ZkVENmZ2RpY2MydmorWDFD
+            WGs1K3NIZUxDZVROVUx3Vm85QlRLRzQKLS0tIDNXd1E5WkpUMVpXYml1Z0svQk0z
+            RVpCUDVSclNTdEVWOU5UbGdhclo1K1kKbSECXCnCxsAJUcbz1/64FBtkVGRA6oWO
+            qL0g67gyIV5ycd0s9f8sz+r54zxwdQXiJ1BFyewGPZD4CzepeM6SBA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nj7ju6f3jfvzw4c0sxywthjmztwp7rwqceun8xw2tlfrt7qymatser4vqf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlR0ZOakd0bkxCSG4zbkFJ
-            ejZ1ZEkxODRBckpLV3p0eVNFa3JHYkhHcVZZCk11RjlmL2pqLzNNL1Q0bHhmK0Jy
-            YkpIdlN2KzdGaFlTdlNCNVRJZmZ4ZHMKLS0tIHR4UzFsNUcyVytxY0FPYVhSZmpn
-            VVpkM0dwMnRwMlZhbGRWaE1tRVZLbWMKhDnvP1GLD6LqXJ4PnQFF8TsVzVAeAvQ7
-            W2QzaoZGysaO06NMqJg1039RVJ7Tm7ZdEfqZLavYxk/tS4Wt3EGr4A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsU0VRUDhqZjJhSkl5dk41
+            U292RXNOUlUvcjhwM09zZlpOejhiWFg1WjJVCmFlSzJWb0dhQk45U3dBY0dOS0F6
+            OFBrNlFNNG9rZDJLajVaaVA3c0lkNGMKLS0tIGc0blBuMzRMbmdxU2VTc1pNenlY
+            ZVp5RHU2U1ppakJCMFozWUNGSXhvNkkKDVPJGjPDaX+n3v27PBdMyk9kuzXnRIop
+            h5XGRkJHTC4emo8zgKpBfByEb2fkBSL3k2ffZbVYtxrpupVBmT1Uqw==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-12-31T11:50:02Z"
-    mac: ENC[AES256_GCM,data:skTdbNg8f9c0YiSzv8v9j5duCqcd2sR/tmomeZz8iWM9FQHHs9EO/SMjGQBWIlYjIJS5Pv9g6/yI5WT8L3D/vK+Ajih32397X6noqSjTFv7yfJCaQh8NxNOC6Q8RRyPT5mNjB76HQb6IxHnQYg74zi5CUjMLXwsCAIOBJvcFyiE=,iv:wZtw3DN+g/2zjDpLGkwHLFnsZQ4zQY3oifOFWhsPTE4=,tag:aDeTeCxl7I132jhRrtpVMg==,type:str]
-    pgp: []
+    lastmodified: "2025-11-14T22:36:00Z"
+    mac: ENC[AES256_GCM,data:H//LCiMw1wE7IDFvKf/QEhOlAjx83R4bxGCE9g4lG0dg2V9LD2bWOq2FVGUrMxw350Rj8CFIWaS5ZolGOvUetbDiQTlqayXi7OArGKBkJphoAdr2rskGYVULmB90a4wp1Fq9oIW2ZjbeURQkwybGJzBTCXFRNWp1VcY1STxzlR8=,iv:DWNLKAcscWIUZ9n46I3dssCM7416oGdsY/mPy1YzrJA=,tag:Q03jAMKSDJw5HmFb9i3Hxg==,type:str]
    unencrypted_suffix: _unencrypted
-    version: 3.9.2
+    version: 3.11.0
--- a/secrets/morn/morn.yaml
+++ b/secrets/morn/morn.yaml
@@ -5,29 +5,38 @@ sops:
        - recipient: age14ar8q5454khxxf5ur2nxwk533nzycz2lh3635qwz35wh8yq0jpqskj2ksx
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvMzBkNUlHM1NENVA1aDcz
-            MnVvbWZWNnB2SVVUeElJNGdFYjNycmRGd2lvCldvL1pwcjZqQklSZ2pINC9Hd1RJ
-            RnJHcHUrRVpBeHhER1hhQUsyZTRmaHcKLS0tIHB1ZzlvdE9CMFI5ZGl1cVA3Q3d2
-            dm9WS1hkV1VidFFUdUxKMkpFZ050d2sKySDZkjDii9zc2Im3uT0kaTILvB6Ya6/B
-            DC7NMt1E0UFz8HYNdJ+Go2icNWSyJeilBisTPaLQkMxfgHfNVwdAZw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNVnNjRlZCdkZFZnN3dkcv
+            UmF4Zi9SZzM2bi9IRWJIMHlHOGVTMmx2dm5VCkdGc015dXlDVUV5d0NnQlRCNXlQ
+            N2lsYkR5N2E5RUprdlBHNitNQmpSK0kKLS0tIEJYSzZ3M1lBY3QremY0Y0dLd05Z
+            V0xJQWRJbkpOQ00wa3ZHOXZxdFN2UDAKrFMAg+Di9aF4TEqDlPgsAi1635CfRIIg
+            ryyL44l38QPz5CBhh7JPbl7g54l8/jksPOOF0DCmglRnsL+2obur5Q==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age146z3h3flw7spy5thznak8k5jh6yd68k9qrrehg8sdcwmyjv3vd7qvahdur
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGbDUxL2xaaVNaK2FadHVK
+            ODZNY2tlOVVuZFlkQUVsZzlqaER2ZXFIK0c0CkR5eVdGM3laS0JkeDdYQzh5VW84
+            Q1NVclJyeEhabUhId3NWdnB0aDVZQzQKLS0tIGlsTVdFOHV5eUgyeVNrUXRCNXRO
+            TWw2aC91ZmJieHhma1NndGJDTktSUFEKZBn9zXNmtx768QUENvAero8KJqK9CA4F
+            DESvmF2ewLSes0bHVsDNTMdchr+TH29jSzHvDbvP50r0v393JhXu7A==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1phc4fkt25n4wtzg88sg3fhvmy6tv8pguyxp5c9js83ae3z374adsxfpqkl
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLZjdVcmFIUDdLTjhqVnV4
-            UHRUUTg0Ni9JTUx6bnh5emltTHhDSlozdFRZCllhZTVjZWRjVzhLanRuYzVpWWw5
-            SEtiNlBhRmVRK1FYaHg2SW9MNWNpczQKLS0tIEVGeTM5TGI2SGttdEhPOXgxRXNU
-            dWxKOXN4d2VUNG9YZGNPZW9jc1l2T1UKxeEn1BTTkxNK5gmyg/AkN0XUIA5+7bsh
-            G4mbFMw8Ypaiyq+Gc5qP+GgMbTX7lu/UXyFSeW6DToIVjaxk94uyAA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOMXVUV3NOUXZXaWtNdmFx
+            MzRDZE9PSU5GTlNyTnNYdWdKa1R3UjJvSDBFCjFLd2QwdVJPakt5aGF6OHViQm1l
+            S2pabnRPVUxFNmtsQWJETU1TVHV1SHcKLS0tIDZrUmlQbGtxWjV5bTE5bzk1ditP
+            VTZONVdCR29YYUxNUmlJNmJhZS9yQ1EKXD9V8ExQ3Pi1FafzQpq+P88V5/ZG0Tkc
+            uZSngEfhkd4r4wqUozwYvKR2cMKo6v7tvYTU8D4KevIx11QtSylGcQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nj7ju6f3jfvzw4c0sxywthjmztwp7rwqceun8xw2tlfrt7qymatser4vqf
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBneDQ0SGcrbDUwK211WVBs
-            QXZneEVkK0drQkNMOHAxR1k4cVIzUHhaZmt3Cm5CaHdubFFSbjNNRnhBYmQ3b01s
-            ODRoNHdBQ1dmTzBaWFJZS0pxNnRCTzAKLS0tIDE4c2xtQk1PRGg0NkFKT3Z5ZHJ2
-            Sy94cTA1d280YUZpUy8xd2F4RG56elkK90ZHB/0UlmwnzJTv9R01xx+MRTsJMIqJ
-            1wc8f8sng/g8kKbmUv0z9hXkOyrShfI4ZRiwoi2JXvwdDTArgz00Hg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAveWM1VGVNYjdaTWFPUFBO
+            Q0J4bFlaSE5SallBdFRTZUF1VU9uQVI0TGpZCnE1L08rMm9WNVhyREtDaHc5N1o2
+            ZmxwSHdiK2tla3B0d3djRzBzMjZZNTAKLS0tIHRnOG1hRFc2SFFDZUs3SjhVM1Bm
+            bEt2SktTaU1xY2NNSnR3N0VldlFiV2MKmmAeQab5dehY8FpXcusXf9KVFqS4M67Y
+            ITX0N8pASmDxevvNOBl0cTJ5WCg/22/22Yq8hXuUvnqBZqA0P05Wpw==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2025-07-06T21:55:46Z"
    mac: ENC[AES256_GCM,data:GQ6c/T5eEXmN/exfzi7YJx8GIpN9hAPL1obJ/RSs2UEOhPKhzp5wrsUYAVMmowMDMswjJ995GhonWcMoBfw2tXymBeZ4lcutqtu3i8awTRAV3VrdXmk2Hvi2Kv6bNYh+rZtKKU5a9rAmZAENBomjOM8C/u7ykWG2Iqk46bc/UuM=,iv:hoaYUguhuECsDjYQQ9tHugoIiBvjP8PlQV4+IjgnfSQ=,tag:u+W7P8MzYOx8/OD7K/Lh7w==,type:str]
Author	SHA1	Message	Date
Felix Albrigtsen	0ffb502f68	defiant/wireguard: deprecate old peers	2025-12-31 20:59:58 +01:00
Felix Albrigtsen	27596cfcee	defiant/dyndns: change domain name	2025-12-31 20:21:01 +01:00
Felix Albrigtsen	ec9811bf31	prometheus: add constellation	2025-12-16 07:48:24 +01:00
Felix Albrigtsen	7c9efc9638	leonard: update amalie-mansaker-no	2025-12-12 20:18:06 +01:00
Felix Albrigtsen	ad36469dd2	Merge pull request 'nixos-25.11' (#6 ) from nixos-25.11 into main Reviewed-on: #6	2025-12-08 21:07:41 +01:00
Felix Albrigtsen	bd05773d1a	auto-upgrade: point back to the main branch	2025-12-08 21:05:23 +01:00
Felix Albrigtsen	77cdedf958	defiant: update to nixos 25.11	2025-12-08 20:59:46 +01:00
Felix Albrigtsen	b4b8fa2309	worf: fix 25.11. Clean flake.	2025-12-04 17:22:33 +01:00
Felix Albrigtsen	aca430fb18	challenger/audiobookshelf: fix mount order	2025-12-02 19:38:08 +01:00
Felix Albrigtsen	8aa123303c	challenger: update to nixos 25.11. Update to nextcloud 32	2025-12-02 00:14:36 +01:00
Felix Albrigtsen	f7ce8585b5	burnham: remove host	2025-12-01 23:22:05 +01:00
Felix Albrigtsen	1af2ea3552	malcolm: remove host (superceded by leonard)	2025-12-01 23:17:25 +01:00
Felix Albrigtsen	d9b62f7c0a	sisko: Update to nixos 25.11	2025-12-01 00:24:11 +01:00
Felix Albrigtsen	774bd0c0d8	morn: update to 25.11	2025-12-01 00:02:06 +01:00
Felix Albrigtsen	9c0ea93934	flake: update to 25.11. Breaks worf/darwin.	2025-11-30 23:54:27 +01:00
Felix Albrigtsen	520a96878b	leonard: Add amalie-mansaker-no	2025-11-23 18:56:03 +01:00
Felix Albrigtsen	9eed01bb4a	defiant: enable cloud backups	2025-11-17 21:30:04 +01:00
Felix Albrigtsen	f5cc555c1b	challenger: cleanup, remove ersatztv	2025-11-14 23:49:56 +01:00
Felix Albrigtsen	b4ca418a34	defiant: cleanup, remove flame, remove koillection	2025-11-14 23:38:46 +01:00
Felix Albrigtsen	261b19f7c3	challenger: add audiobookshelf	2025-11-13 23:12:05 +01:00
Felix Albrigtsen	c0e19e7c21	morn: add thelounge	2025-11-06 22:05:31 +01:00
Felix Albrigtsen	c601ed7d39	flake: update	2025-11-03 20:17:40 +01:00
Felix Albrigtsen	4b922cd23d	defiant/nginx: wiki-wackattac-eu has moved to leonard	2025-11-02 15:06:10 +01:00
Felix Albrigtsen	68950a4507	leonard: Add wiki-wackattack-eu	2025-11-02 15:05:43 +01:00
Felix Albrigtsen	0c08f92444	defiant/matrix-synapse: Fix oidc provider mapping typo	2025-11-02 12:23:19 +01:00
Felix Albrigtsen	f4630467f6	defiant/matrix-synapse: require matrix-user role in keycloak	2025-11-01 19:50:55 +01:00
Felix Albrigtsen	ee4bb0ee2d	defiant/monitoring: update prometheus target list	2025-10-19 00:36:51 +02:00
Felix Albrigtsen	410e673673	sops: add recovery key	2025-10-18 23:59:13 +02:00
Felix Albrigtsen	492bd530d3	challenger/backup: add hostBackups	2025-10-18 23:46:32 +02:00
Felix Albrigtsen	14483e95e7	defiant/nginx: Move www.feal.no and www.kinealbrigtsen.no to leonard	2025-10-18 22:33:08 +02:00
Felix Albrigtsen	483f30229f	leonard: add www-feal-no. add www-kinealbrigtsen-no. configure outgoing firewall	2025-10-18 22:25:05 +02:00
Felix Albrigtsen	49a3c0211e	leonard: init host	2025-10-17 21:02:28 +02:00
Felix Albrigtsen	b1fed06b7d	worf: add mpv	2025-10-17 19:39:04 +02:00