feat(kodi): use qt-pinned nixpkgs for jellyfin-media-player

Decouple jellyfin-media-player from main nixpkgs update cycle by sourcing it from pkgs.qt-pinned namespace. This allows the Qt-heavy package to update on its own Renovate schedule, avoiding massive qt5webengine rebuilds when updating other packages. x-xiiep Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-02-08 15:16:49 -08:00
28 changed files with 88 additions and 868 deletions
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -18,90 +18,3 @@ jobs:
        run: nix flake check
        env:
          NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
-
-  build-and-cache:
-    runs-on: ubuntu-latest
-    needs: check
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    steps:
-      - uses: actions/checkout@v6
-
-      - uses: https://git.johnogle.info/johno/gitea-actions/nix-setup@v1
-
-      - name: Setup SSH for cache
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.CACHE_SSH_KEY }}" > ~/.ssh/cache_key
-          chmod 600 ~/.ssh/cache_key
-          ssh-keyscan -H ${{ secrets.CACHE_HOST }} >> ~/.ssh/known_hosts 2>/dev/null || true
-
-      - name: Setup signing key
-        run: |
-          echo "${{ secrets.NIX_SIGNING_KEY }}" > /tmp/signing-key
-          chmod 600 /tmp/signing-key
-
-      - name: Build, sign, and cache all packages
-        run: |
-          PACKAGES=(
-            custom-claude-code
-            custom-app-launcher-server
-            custom-mcrcon-rbw
-            custom-tea-rbw
-            custom-rclone-torbox-setup
-            custom-beads
-            custom-gastown
-            qt-pinned-jellyfin-media-player
-            qt-pinned-stremio
-            nix-deck-kernel
-          )
-
-          FAILED=()
-          SKIPPED=()
-          for pkg in "${PACKAGES[@]}"; do
-            echo "::group::Building $pkg"
-
-            # Check if package is already cached by evaluating its store path and checking the remote
-            OUT_PATH=$(nix eval ".#$pkg.outPath" --raw 2>/dev/null)
-            if [ -n "$OUT_PATH" ] && ssh -i ~/.ssh/cache_key ${{ secrets.CACHE_USER }}@${{ secrets.CACHE_HOST }} \
-                "nix path-info '$OUT_PATH' >/dev/null 2>&1"; then
-              echo "⏭ $pkg already cached ($OUT_PATH), skipping"
-              SKIPPED+=("$pkg")
-              echo "::endgroup::"
-              continue
-            fi
-
-            # --cores 2 limits parallel jobs to reduce RAM pressure on john-endesktop
-            if BUILD_OUTPUT=$(nix build ".#$pkg" --no-link --print-out-paths --cores 2 2>&1); then
-              OUT_PATH=$(echo "$BUILD_OUTPUT" | grep '^/nix/store/' | tail -1)
-              echo "$BUILD_OUTPUT"
-              echo "Store path: $OUT_PATH"
-
-              # Sign the closure
-              nix store sign --key-file /tmp/signing-key -r "$OUT_PATH"
-
-              # Push to cache
-              nix copy --to "ssh-ng://${{ secrets.CACHE_USER }}@${{ secrets.CACHE_HOST }}?ssh-key=$HOME/.ssh/cache_key" "$OUT_PATH"
-
-              # Create GC root to prevent garbage collection
-              OUT_HASH=$(basename "$OUT_PATH" | cut -d'-' -f1)
-              ssh -i ~/.ssh/cache_key ${{ secrets.CACHE_USER }}@${{ secrets.CACHE_HOST }} \
-                "mkdir -p /nix/var/nix/gcroots/ci-cache && ln -sfn $OUT_PATH /nix/var/nix/gcroots/ci-cache/${OUT_HASH}"
-
-              echo "✓ $pkg cached successfully"
-            else
-              echo "✗ $pkg failed to build"
-              FAILED+=("$pkg")
-            fi
-            echo "::endgroup::"
-          done
-
-          if [ ${#SKIPPED[@]} -gt 0 ]; then
-            echo "Skipped (already cached): ${SKIPPED[*]}"
-          fi
-
-          if [ ${#FAILED[@]} -gt 0 ]; then
-            echo "::error::Failed packages: ${FAILED[*]}"
-            exit 1
-          fi
-        env:
-          NIX_CONFIG: "access-tokens = git.johnogle.info=${{ secrets.GITEA_ACCESS_TOKEN }}"
--- a/flake.lock
+++ b/flake.lock
@@ -2,32 +2,34 @@
  "nodes": {
    "beads": {
      "inputs": {
+        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs-unstable"
        ]
      },
      "locked": {
-        "lastModified": 1772587450,
-        "narHash": "sha256-yJ38xi6nRnEZIV5CEgV8xZK1dky0dVMavfFg4J7gkqw=",
+        "lastModified": 1769840331,
+        "narHash": "sha256-Yp0K4JoXX8EcHp1juH4OZ7dcCmkopDu4VvAgZEOxgL8=",
        "owner": "steveyegge",
        "repo": "beads",
-        "rev": "7f41edd9c4350e5c68ebec6f9571e27833f27133",
+        "rev": "93965b4abeed920a4701e03571d1b6bb75810722",
        "type": "github"
      },
      "original": {
        "owner": "steveyegge",
        "repo": "beads",
+        "rev": "93965b4abeed920a4701e03571d1b6bb75810722",
        "type": "github"
      }
    },
    "doomemacs": {
      "flake": false,
      "locked": {
-        "lastModified": 1772615218,
-        "narHash": "sha256-z+3c0AGkrMf1xZ+pq57aVp4Zo4KsqFMIjEVzSZinghc=",
+        "lastModified": 1768984347,
+        "narHash": "sha256-VvC4rgAAaFnYLCdcUoz7dTE3kuBNuHIc+GlXOrPCxpg=",
        "owner": "doomemacs",
        "repo": "doomemacs",
-        "rev": "d23bbe87721c61f4d5a605f2914b32780bb89949",
+        "rev": "57818a6da90fbef39ff80d62fab2cd319496c3b9",
        "type": "github"
      },
      "original": {
@@ -46,11 +48,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772706147,
-        "narHash": "sha256-C0UMYQg3KBU6+L8TLfQ/s60O6/Tiu/JpN8C/WiIH9DU=",
+        "lastModified": 1769848312,
+        "narHash": "sha256-ggBocPd1L4l5MFNV0Fw9aSGZZO4aGzCfgh4e6hQ77RE=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "54af2ae96631311dc4d2686a07e4f472fb36f516",
+        "rev": "be0b4f4f28f69be61e9174807250e3235ee11d50",
        "type": "github"
      },
      "original": {
@@ -78,21 +80,13 @@
      }
    },
    "gastown": {
-      "inputs": {
-        "beads": [
-          "beads"
-        ],
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ]
-      },
+      "flake": false,
      "locked": {
-        "lastModified": 1772724442,
-        "narHash": "sha256-+H/T745sVDJAztpf3k6zz89YNrpCYsGghbO7O3O/IHw=",
+        "lastModified": 1770098007,
+        "narHash": "sha256-CFlN57BXlR5FobTChdE2GgdIGx4xJcFFCk1E5Q98cSQ=",
        "owner": "steveyegge",
        "repo": "gastown",
-        "rev": "112ff2c4bd145de796d20f35d35e583832a72ce1",
+        "rev": "13461161063bf7b2365fe5fd4df88e32c3ba2a28",
        "type": "github"
      },
      "original": {
@@ -128,11 +122,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772633058,
-        "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
+        "lastModified": 1768949235,
+        "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
+        "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
        "type": "github"
      },
      "original": {
@@ -149,11 +143,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772633327,
-        "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=",
+        "lastModified": 1769397130,
+        "narHash": "sha256-TTM4KV9IHwa181X7afBRbhLJIrgynpDjAXJFMUOWfyU=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc",
+        "rev": "c37679d37bdbecf11bbe3c5eb238d89ca4f60641",
        "type": "github"
      },
      "original": {
@@ -171,11 +165,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772517207,
-        "narHash": "sha256-qxHfxqbigqBTn//U4leIS5he22Wp1GS0+zmwGV7Pozs=",
+        "lastModified": 1769273817,
+        "narHash": "sha256-+iyLihi/ynJokMgJZMRXuMuI6DPGUQRajz5ztNCHgnI=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "7ca1501c2d80900b5967baea4d42581f84b388dd",
+        "rev": "98f988ad46e31f9956c5f6874dfb3580a7ff3969",
        "type": "github"
      },
      "original": {
@@ -191,11 +185,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772129556,
-        "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=",
+        "lastModified": 1767634391,
+        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
        "owner": "nix-darwin",
        "repo": "nix-darwin",
-        "rev": "ebec37af18215214173c98cf6356d0aca24a2585",
+        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
        "type": "github"
      },
      "original": {
@@ -213,11 +207,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1772716420,
-        "narHash": "sha256-T3UEKNTGqBl44AQ0+0OIpiWMXeQ8+4QW/akSc4yeL2A=",
+        "lastModified": 1769849328,
+        "narHash": "sha256-BjH1Ge6O8ObN6Z97un2U87pl4POO99Q8RSsgIuTZq8Q=",
        "owner": "marienz",
        "repo": "nix-doom-emacs-unstraightened",
-        "rev": "be3ecb81a85be302e27d46ff32a1e251e444327d",
+        "rev": "fc1d7190c49558cdc6af20d7657075943a500a93",
        "type": "github"
      },
      "original": {
@@ -250,11 +244,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1772598333,
-        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
+        "lastModified": 1769089682,
+        "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
+        "rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
        "type": "github"
      },
      "original": {
@@ -266,11 +260,11 @@
    },
    "nixpkgs-qt": {
      "locked": {
-        "lastModified": 1772598333,
-        "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=",
+        "lastModified": 1770464364,
+        "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239",
+        "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
        "type": "github"
      },
      "original": {
@@ -282,11 +276,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1772624091,
-        "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
+        "lastModified": 1769170682,
+        "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
+        "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
        "type": "github"
      },
      "original": {
@@ -299,11 +293,11 @@
    "perles": {
      "flake": false,
      "locked": {
-        "lastModified": 1772661365,
-        "narHash": "sha256-kMlvIpfGMBkN5D1W0O1fcqUiH3dyobcH0GRRLCX7GGo=",
+        "lastModified": 1769460725,
+        "narHash": "sha256-zM2jw+emxe8+mNyR1ebMWkQiEx8uSmhoqqI0IxXLDgs=",
        "owner": "zjrosen",
        "repo": "perles",
-        "rev": "326ff1938dfe073daab7939762ce2f44c2ee74a1",
+        "rev": "57b20413eea461452b59e13f5a4a367953b1f768",
        "type": "github"
      },
      "original": {
@@ -322,11 +316,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772361940,
-        "narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=",
+        "lastModified": 1767662275,
+        "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "a4b33606111c9c5dcd10009042bb710307174f51",
+        "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
        "type": "github"
      },
      "original": {
@@ -345,11 +339,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772361940,
-        "narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=",
+        "lastModified": 1767662275,
+        "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "a4b33606111c9c5dcd10009042bb710307174f51",
+        "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -46,14 +46,15 @@
    };

    beads = {
-      url = "github:steveyegge/beads";
+      # v0.49.1 has dolt server mode support (gt-1mf.3)
+      # Pinned to 259ddd92 - uses Go 1.24 compatible with nixpkgs
+      url = "github:steveyegge/beads/93965b4abeed920a4701e03571d1b6bb75810722";
      inputs.nixpkgs.follows = "nixpkgs-unstable";
    };

    gastown = {
      url = "github:steveyegge/gastown";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-      inputs.beads.follows = "beads";
+      flake = false;  # No flake.nix upstream yet
    };

    perles = {
@@ -81,10 +82,7 @@
      # Separate nixpkgs for qt5webengine-heavy packages to avoid rebuild churn
      qt-pinned = import inputs.nixpkgs-qt {
        system = prev.stdenv.hostPlatform.system;
-        config = {
-          allowUnfree = true;
-          permittedInsecurePackages = [ "qtwebengine-5.15.19" ];
-        };
+        config.allowUnfree = true;
      };
      custom = prev.callPackage ./packages {};
      # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
@@ -172,7 +170,6 @@
        ./machines/boxy/configuration.nix
        {
          home-manager.users.johno = import ./home/home-media-center.nix;
-          # kodi user: AVR volume control + minimal Plasma config for Bigscreen session
          home-manager.users.kodi = import ./home/home-kodi.nix;
          home-manager.extraSpecialArgs = { inherit system; };
        }
@@ -184,16 +181,7 @@
      modules = nixosModules ++ [
        ./machines/zix790prors/configuration.nix
        {
-          home-manager.users.johno = {
-            imports = [ ./home/home-desktop.nix ];
-            home.roles.i3_sway.extraSwayConfig = {
-              output = {
-                "DP-1" = {
-                  mode = "3440x1440@164.900Hz";
-                };
-              };
-            };
-          };
+          home-manager.users.johno = import ./home/home-desktop.nix;
          home-manager.extraSpecialArgs = { inherit system; };
        }
      ];
@@ -248,48 +236,6 @@
      ];
    };

-    # Packages for CI caching (custom packages, flake inputs, and qt-pinned)
-    packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          config.allowUnfree = true;
-          overlays = [ (mkBaseOverlay {}) ];
-        };
-        pkgsQt = import inputs.nixpkgs-qt {
-          inherit system;
-          config = {
-            allowUnfree = true;
-            permittedInsecurePackages = [ "qtwebengine-5.15.19" ];
-          };
-        };
-        # Version strings for flake input packages
-        beadsRev = builtins.substring 0 8 (inputs.beads.rev or "unknown");
-        gastownRev = builtins.substring 0 8 (inputs.gastown.rev or "unknown");
-      in {
-        "custom-claude-code" = pkgs.custom.claude-code;
-        "custom-app-launcher-server" = pkgs.custom.app-launcher-server;
-        "custom-mcrcon-rbw" = pkgs.custom.mcrcon-rbw;
-        "custom-tea-rbw" = pkgs.custom.tea-rbw;
-        "custom-rclone-torbox-setup" = pkgs.custom.rclone-torbox-setup;
-        "qt-pinned-jellyfin-media-player" = pkgsQt.jellyfin-media-player;
-        "qt-pinned-stremio" = pkgsQt.stremio;
-        # Flake input packages (beads, gastown) - these get version from input rev
-        "custom-beads" = pkgs.callPackage ./packages/beads {
-          inherit (pkgs.unstable) buildGoModule;
-          src = inputs.beads;
-          version = "0.52.0-${beadsRev}";
-        };
-        "custom-gastown" = pkgs.callPackage ./packages/gastown {
-          src = inputs.gastown;
-          version = "unstable-${gastownRev}";
-        };
-      } // (if system == "x86_64-linux" then {
-        # nix-deck kernel from Jovian-NixOS (Steam Deck) - expensive to build
-        "nix-deck-kernel" = self.nixosConfigurations.nix-deck.config.boot.kernelPackages.kernel;
-      } else {})
-    );
-
    # Flake apps
    apps = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ] (system:
      let
--- a/home/roles/development/default.nix
+++ b/home/roles/development/default.nix
@@ -5,18 +5,18 @@ with lib;
 let
  cfg = config.home.roles.development;

-  # Build beads from flake input
+  # Build beads from flake input with corrected vendorHash
+  # The upstream default.nix has stale vendorHash for commits with server mode
  beadsRev = builtins.substring 0 8 (globalInputs.beads.rev or "unknown");
-
-  beadsPackage = pkgs.unstable.buildGoModule {
+  beadsPackage = pkgs.buildGoModule {
    pname = "beads";
-    version = "0.52.0-${beadsRev}";
+    version = "0.49.1-${beadsRev}";
    src = globalInputs.beads;
    subPackages = [ "cmd/bd" ];
    doCheck = false;
-    vendorHash = "sha256-OL6QGf4xSMpEbmU+41pFdO0Rrs3H162T3pdiW9UfWR0=";
-    nativeBuildInputs = [ pkgs.git pkgs.pkg-config ];
-    buildInputs = [ pkgs.icu ];
+    # Regenerated vendorHash for commit 93965b4a (has dolt server mode, Go 1.24)
+    vendorHash = "sha256-gwxGv8y4+1+k0741CnOYcyJPTJ5vTrynqPoO8YS9fbQ=";
+    nativeBuildInputs = [ pkgs.git ];
    meta = with lib; {
      description = "beads (bd) - An issue tracker designed for AI-supervised coding workflows";
      homepage = "https://github.com/steveyegge/beads";
@@ -25,14 +25,14 @@ let
    };
  };

-  # Gastown - multi-agent workspace manager
+  # Gastown - multi-agent workspace manager (no upstream flake.nix yet)
  # Source is tracked via flake input for renovate updates
  gastownRev = builtins.substring 0 8 (globalInputs.gastown.rev or "unknown");
  gastownPackage = pkgs.buildGoModule {
    pname = "gastown";
    version = "unstable-${gastownRev}";
    src = globalInputs.gastown;
-    vendorHash = "sha256-/+ODyndArUF0nJY9r8G5JKhzQckBHFb48A7EBZmoIr0=";
+    vendorHash = "sha256-ripY9vrYgVW8bngAyMLh0LkU/Xx1UUaLgmAA7/EmWQU=";
    subPackages = [ "cmd/gt" ];
    doCheck = false;

@@ -52,7 +52,10 @@ let
      ./gastown-fix-validate-recipient.patch
      # Fix agentBeadToAddress to use title field for hq- prefixed beads
      ./gastown-fix-agent-bead-address-title.patch
-      # town-root-detection fix merged upstream (detectRole removed)
+      # Fix crew/polecat home paths: remove incorrect /rig suffix
+      ./gastown-fix-role-home-paths.patch
+      # Fix town root detection: don't map to Mayor (causes spurious mismatch warnings)
+      ./gastown-fix-town-root-detection.patch
      # Statusline optimization: skip expensive beads queries for detached sessions
      # Reduces Dolt CPU from ~70% to ~20% by caching and early-exit
      ./gastown-statusline-optimization.patch
@@ -69,11 +72,11 @@ let
  # Perles - TUI for beads issue tracking (no upstream flake.nix yet)
  # Source is tracked via flake input for renovate updates
  perlesRev = builtins.substring 0 8 (globalInputs.perles.rev or "unknown");
-  perlesPackage = pkgs.unstable.buildGoModule {
+  perlesPackage = pkgs.buildGoModule {
    pname = "perles";
    version = "unstable-${perlesRev}";
    src = globalInputs.perles;
-    vendorHash = "sha256-A5LE9Cor/DRcJtVpiScSoqDYhJIKyaq0cbK+OGmr4XU=";
+    vendorHash = "sha256-JHERJDzbiqgjWXwRhXVjgDEiDQ3AUXRIONotfPF21B0=";
    doCheck = false;

    ldflags = [
@@ -98,12 +101,6 @@ let
    ref = "main";
  };

-  # Claude Code statusline: shows model, cwd, git branch, and context usage %
-  claudeCodeStatusLineConfig = pkgs.writeText "claude-statusline.json" (builtins.toJSON {
-    type = "command";
-    command = ''input=$(cat); model=$(echo "$input" | jq -r '.model.display_name'); cwd=$(echo "$input" | jq -r '.workspace.current_dir'); if git -C "$cwd" rev-parse --git-dir > /dev/null 2>&1; then branch=$(git -C "$cwd" --no-optional-locks rev-parse --abbrev-ref HEAD 2>/dev/null || echo ""); if [ -n "$branch" ]; then git_info=" on $branch"; else git_info=""; fi; else git_info=""; fi; usage=$(echo "$input" | jq '.context_window.current_usage'); if [ "$usage" != "null" ]; then current=$(echo "$usage" | jq '.input_tokens + .cache_creation_input_tokens + .cache_read_input_tokens'); size=$(echo "$input" | jq '.context_window.context_window_size'); pct=$((current * 100 / size)); context_info=" | ''${pct}% context"; else context_info=""; fi; printf "%s in %s%s%s" "$model" "$cwd" "$git_info" "$context_info"'';
-  });
-
 in
 {
  options.home.roles.development = {
@@ -137,7 +134,6 @@ in

      # Custom packages
      pkgs.custom.tea-rbw
-      pkgs.custom.pi-coding-agent
    ];

    # Install Claude Code humanlayer command and agent plugins
@@ -246,18 +242,6 @@ in
      $DRY_RUN_CMD echo "Claude Code beads integration configured (hooks installed)"
    '';

-    # Configure Claude Code statusline (merge into existing settings.json)
-    home.activation.claudeCodeStatusLine = lib.hm.dag.entryAfter ["writeBoundary" "claudeCodeBeadsSetup"] ''
-      SETTINGS="$HOME/.claude/settings.json"
-      mkdir -p "$HOME/.claude"
-      if [ -f "$SETTINGS" ]; then
-        ${pkgs.jq}/bin/jq --slurpfile sl ${claudeCodeStatusLineConfig} '.statusLine = $sl[0]' "$SETTINGS" > "''${SETTINGS}.tmp" && mv "''${SETTINGS}.tmp" "$SETTINGS"
-      else
-        ${pkgs.jq}/bin/jq -n --slurpfile sl ${claudeCodeStatusLineConfig} '{statusLine: $sl[0]}' > "$SETTINGS"
-      fi
-      $DRY_RUN_CMD echo "Claude Code statusline configured"
-    '';
-
    # Beads timer gate checker (Linux only - uses systemd)
    # Runs every 5 minutes to auto-resolve expired timer gates across all beads projects
    # This enables self-scheduling molecules (watchers, patrols, etc.)
--- a/home/roles/emacs/default.nix
+++ b/home/roles/emacs/default.nix
@@ -8,8 +8,8 @@ let
  doomEmacs = pkgs.fetchFromGitHub {
    owner = "doomemacs";
    repo = "doomemacs";
-    rev = "d23bbe87721c61f4d5a605f2914b32780bb89949";
-    sha256 = "sha256-z+3c0AGkrMf1xZ+pq57aVp4Zo4KsqFMIjEVzSZinghc=";
+    rev = "38d94da67dc84897a4318714dcc48494c016d8c4";
+    sha256 = "sha256-Uc6qONH3jjUVDgW+pPBCGC7mh88ZY05u1y37fQrsxq0=";
  };

  # Shared emacs packages
--- a/home/roles/emacs/doom/config.el
+++ b/home/roles/emacs/doom/config.el
@@ -274,18 +274,6 @@ rbw is unavailable or the entry is not found."
                 (error (format "Error listing directory %s: %s" dirpath (error-message-string err)))))
   :args (list '(:name "dirpath" :type "string" :description "Directory path to list"))))

-(use-package! pi-coding-agent
-  :commands (pi-coding-agent pi-coding-agent-toggle)
-  :init
-  (defalias 'pi 'pi-coding-agent)
-  (map! :leader
-        (:prefix ("o" . "open")
-         :desc "Pi Coding Agent" "p" #'pi-coding-agent))
-  :config
-  ;; Tree-sitter grammars are managed by Nix (treesit-grammars.with-all-grammars),
-  ;; so suppress the auto-install prompt
-  (setq pi-coding-agent-essential-grammar-action 'warn))
-
 (use-package! claude-code-ide
  :commands (claude-code-ide-menu claude-code-ide-open-here)
  :init
--- a/home/roles/emacs/doom/packages.el
+++ b/home/roles/emacs/doom/packages.el
@@ -51,9 +51,6 @@

 (package! org-caldav)

-;; Pin org-msg - upstream doom pin references a force-pushed commit
-(package! org-msg :pin "aa608b399586fb771ad37045a837f8286a0b6124")
-
 ;; Note: Packages with custom recipes must be pinned for nix-doom-emacs-unstraightened
 ;; to build deterministically. Update pins when upgrading packages.

@@ -72,8 +69,3 @@
  :recipe (:type git :repo "https://codeberg.org/ctietze/beads.el.git"
           :files ("lisp/*.el"))
  :pin "f40a6461d3c0fa0969311bbb6a1e30d1bba86c88")
-
-(package! pi-coding-agent
-  :recipe (:host github :repo "dnouri/pi-coding-agent"
-           :files ("*.el"))
-  :pin "8d8158b0a6150ce13d91e561a1223790670acaa7")
--- a/home/wallpapers/default.nix
+++ b/home/wallpapers/default.nix
@@ -2,7 +2,7 @@
 # The currentIndex is incremented by `nix run .#rotate-wallpaper`
 # and gets committed as part of `nix run .#upgrade`
 {
-  currentIndex = 2;  # Index into wallpapers list
+  currentIndex = 1;  # Index into wallpapers list

  wallpapers = [
    {
--- a/machines/boxy/configuration.nix
+++ b/machines/boxy/configuration.nix
@@ -22,11 +22,12 @@ with lib;
      sddm = true;
      wayland = true;
    };
-    plasma-bigscreen = {
+    kodi = {
      enable = true;
      autologin = true;
-      jellyfinScaleFactor = 1.0;
+      wayland = true;
      appLauncherServer.enable = true;
+      jellyfinScaleFactor = 1.0;
    };
    nfs-mounts.enable = true;
    users.enable = true;
@@ -71,3 +72,4 @@ with lib;
  system.stateVersion = "24.05"; # Did you read the comment?

 }
+
--- a/machines/john-endesktop/configuration.nix
+++ b/machines/john-endesktop/configuration.nix
@@ -54,7 +54,6 @@ with lib;
      4000  # nfs callback
      4001  # nlockmgr
      4002  # mountd
-      5000  # harmonia binary cache
      20048 # mountd
    ];
    allowedUDPPorts = [
@@ -149,16 +148,6 @@ with lib;
    };
  };

-  # Harmonia binary cache server
-  # Replaces the broken k8s deployment with native NixOS service
-  services.harmonia = {
-    enable = true;
-    signKeyPaths = [ "/etc/harmonia/signing-key.private" ];
-    settings = {
-      bind = "[::]:5000";
-    };
-  };
-
  # Time zone
  time.timeZone = "America/Los_Angeles"; # Adjust as needed

--- a/machines/nix-book/configuration.nix
+++ b/machines/nix-book/configuration.nix
@@ -38,10 +38,7 @@
      enable = true;
      extraGroups = [ "video" ];
    };
-    virtualisation = {
-      enable = true;
-      waydroid = true;
-    };
+    virtualisation.enable = true;
  };

  # Bootloader.
--- a/packages/beads/default.nix
+++ b/packages/beads/default.nix
@@ -1,26 +0,0 @@
-# Beads package - issue tracker for AI-supervised coding workflows
-# Takes src as argument so it can be called from both overlay and flake packages
-{ lib
-, buildGoModule
-, git
-, pkg-config
-, icu
-, src
-, version ? "unknown"
-}:
-
-buildGoModule {
-  pname = "beads";
-  inherit version src;
-  subPackages = [ "cmd/bd" ];
-  doCheck = false;
-  vendorHash = "sha256-OL6QGf4xSMpEbmU+41pFdO0Rrs3H162T3pdiW9UfWR0=";
-  nativeBuildInputs = [ git pkg-config ];
-  buildInputs = [ icu ];
-  meta = with lib; {
-    description = "beads (bd) - An issue tracker designed for AI-supervised coding workflows";
-    homepage = "https://github.com/steveyegge/beads";
-    license = licenses.mit;
-    mainProgram = "bd";
-  };
-}
--- a/packages/claude-code/default.nix
+++ b/packages/claude-code/default.nix
@@ -6,24 +6,24 @@
 }:

 let
-  version = "2.1.69";
+  version = "2.1.30";

  srcs = {
    aarch64-darwin = {
      url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-arm64/claude";
-      sha256 = "a86e14f44b167c1e8dbf764f76755b92ecf52c097d732a3461fe65b5fb60be05";
+      sha256 = "3ccc14f322b1e8da0cd58afc254fd5100eee066fa14729f30745e67a3f7979f7";
    };
    x86_64-darwin = {
      url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-x64/claude";
-      sha256 = "e5987b4dd502a6542bf86c3c0bcd1d533b774616fc7d49566ce0b2040e6c1374";
+      sha256 = "8a083696006483b8382ec0e47cd8f2e3223f3d2cab1a21c524fa08c082b5600e";
    };
    x86_64-linux = {
      url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-x64/claude";
-      sha256 = "b3bdbd5a3cbf8caafe353022170df77fefa80b00003074d4d27e7da8c59e629a";
+      sha256 = "ada8f1cf9272965d38b10f1adb6cea885e621c83f7e7bb233008c721f43fad54";
    };
    aarch64-linux = {
      url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-arm64/claude";
-      sha256 = "ecc7bbf10513ff122327866eb97212945b73afd7f81e30700375cdf10f50b2a3";
+      sha256 = "45fbf35a1011b06f86170b20beb64c599db0658aac70e2de2410c45d15775596";
    };
  };

--- a/packages/default.nix
+++ b/packages/default.nix
@@ -5,5 +5,4 @@
  claude-code = pkgs.callPackage ./claude-code {};
  mcrcon-rbw = pkgs.callPackage ./mcrcon-rbw {};
  rclone-torbox-setup = pkgs.callPackage ./rclone-torbox-setup {};
-  pi-coding-agent = pkgs.callPackage ./pi-coding-agent {};
 }
--- a/packages/gastown/default.nix
+++ b/packages/gastown/default.nix
@@ -1,38 +0,0 @@
-# Gastown package - multi-agent workspace manager
-# Takes src as argument so it can be called from both overlay and flake packages
-{ lib
-, buildGoModule
-, src
-, version ? "unknown"
-}:
-
-buildGoModule {
-  pname = "gastown";
-  inherit version src;
-  vendorHash = "sha256-/+ODyndArUF0nJY9r8G5JKhzQckBHFb48A7EBZmoIr0=";
-  subPackages = [ "cmd/gt" ];
-  doCheck = false;
-
-  # Must match ldflags from gastown Makefile - BuiltProperly=1 is required
-  # or gt will error with "This binary was built with 'go build' directly"
-  ldflags = [
-    "-X github.com/steveyegge/gastown/internal/cmd.Version=${version}"
-    "-X github.com/steveyegge/gastown/internal/cmd.Commit=${version}"
-    "-X github.com/steveyegge/gastown/internal/cmd.BuildTime=nix-build"
-    "-X github.com/steveyegge/gastown/internal/cmd.BuiltProperly=1"
-  ];
-
-  # Bug fixes not yet merged upstream
-  patches = [
-    ./gastown-fix-validate-recipient.patch
-    ./gastown-fix-agent-bead-address-title.patch
-    ./gastown-statusline-optimization.patch
-  ];
-
-  meta = with lib; {
-    description = "Gas Town - multi-agent workspace manager by Steve Yegge";
-    homepage = "https://github.com/steveyegge/gastown";
-    license = licenses.mit;
-    mainProgram = "gt";
-  };
-}
--- a/packages/gastown/gastown-fix-agent-bead-address-title.patch
+++ b/packages/gastown/gastown-fix-agent-bead-address-title.patch
@@ -1,15 +0,0 @@
-diff --git a/internal/mail/router.go b/internal/mail/router.go
--- a/internal/mail/router.go
-+++ b/internal/mail/router.go
-@@ -315,7 +315,10 @@ func agentBeadToAddress(bead *agentBead) string {
- 		}
-
- 		// For other hq- agents, fall back to description parsing
-		return parseAgentAddressFromDescription(bead.Description)
-+		if bead.Title != "" && strings.Contains(bead.Title, "/") {
-+			return bead.Title
-+		}
-+		return parseAgentAddressFromDescription(bead.Description)
- 	}
-
- 	// Handle gt- prefixed IDs (legacy format)
--- a/packages/gastown/gastown-fix-validate-recipient.patch
+++ b/packages/gastown/gastown-fix-validate-recipient.patch
@@ -1,13 +0,0 @@
-diff --git a/internal/mail/router.go b/internal/mail/router.go
-index b864c069..4b6a045b 100644
--- a/internal/mail/router.go
-+++ b/internal/mail/router.go
-@@ -646,7 +646,7 @@ func (r *Router) validateRecipient(identity string) error {
- 	}
- 
- 	for _, agent := range agents {
-		if agentBeadToAddress(agent) == identity {
-+		if AddressToIdentity(agentBeadToAddress(agent)) == AddressToIdentity(identity) {
- 			return nil // Found matching agent
- 		}
- 	}
--- a/packages/gastown/gastown-statusline-optimization.patch
+++ b/packages/gastown/gastown-statusline-optimization.patch
@@ -1,135 +0,0 @@
-diff --git a/internal/cmd/statusline.go b/internal/cmd/statusline.go
-index 2edf1be8..00253eea 100644
--- a/internal/cmd/statusline.go
-+++ b/internal/cmd/statusline.go
-@@ -6,6 +6,7 @@ import (
- 	"path/filepath"
- 	"sort"
- 	"strings"
-+	"time"
- 
- 	"github.com/spf13/cobra"
- 	"github.com/steveyegge/gastown/internal/beads"
-@@ -14,6 +15,37 @@ import (
- 	"github.com/steveyegge/gastown/internal/tmux"
- 	"github.com/steveyegge/gastown/internal/workspace"
- )
-+// statusLineCacheTTL is how long cached status output remains valid.
-+const statusLineCacheTTL = 10 * time.Second
-+
-+// statusLineCachePath returns the cache file path for a session.
-+func statusLineCachePath(session string) string {
-+	return filepath.Join(os.TempDir(), fmt.Sprintf("gt-status-%s", session))
-+}
-+
-+// getStatusLineCache returns cached status if fresh, empty string otherwise.
-+func getStatusLineCache(session string) string {
-+	path := statusLineCachePath(session)
-+	info, err := os.Stat(path)
-+	if err != nil {
-+		return ""
-+	}
-+	if time.Since(info.ModTime()) > statusLineCacheTTL {
-+		return ""
-+	}
-+	data, err := os.ReadFile(path)
-+	if err != nil {
-+		return ""
-+	}
-+	return string(data)
-+}
-+
-+// setStatusLineCache writes status to cache file.
-+func setStatusLineCache(session, status string) {
-+	path := statusLineCachePath(session)
-+	_ = os.WriteFile(path, []byte(status), 0644)
-+}
-+
- 
- var (
- 	statusLineSession string
-@@ -34,6 +66,19 @@ func init() {
- func runStatusLine(cmd *cobra.Command, args []string) error {
- 	t := tmux.NewTmux()
- 
-+	// Optimization: skip expensive beads queries for detached sessions
-+	if statusLineSession != "" {
-+		if !t.IsSessionAttached(statusLineSession) {
-+			fmt.Print("○ |")
-+			return nil
-+		}
-+		// Check cache for attached sessions too
-+		if cached := getStatusLineCache(statusLineSession); cached != "" {
-+			fmt.Print(cached)
-+			return nil
-+		}
-+	}
-+
- 	// Get session environment
- 	var rigName, polecat, crew, issue, role string
- 
-@@ -150,7 +195,11 @@ func runWorkerStatusLine(t *tmux.Tmux, session, rigName, polecat, crew, issue st
- 
- 	// Output
- 	if len(parts) > 0 {
-		fmt.Print(strings.Join(parts, " | ") + " |")
-+		output := strings.Join(parts, " | ") + " |"
-+		if statusLineSession != "" {
-+			setStatusLineCache(statusLineSession, output)
-+		}
-+		fmt.Print(output)
- 	}
- 
- 	return nil
-@@ -389,7 +438,11 @@ func runMayorStatusLine(t *tmux.Tmux) error {
- 		}
- 	}
- 
-	fmt.Print(strings.Join(parts, " | ") + " |")
-+	output := strings.Join(parts, " | ") + " |"
-+	if statusLineSession != "" {
-+		setStatusLineCache(statusLineSession, output)
-+	}
-+	fmt.Print(output)
- 	return nil
- }
- 
-@@ -458,7 +511,11 @@ func runDeaconStatusLine(t *tmux.Tmux) error {
- 		}
- 	}
- 
-	fmt.Print(strings.Join(parts, " | ") + " |")
-+	output := strings.Join(parts, " | ") + " |"
-+	if statusLineSession != "" {
-+		setStatusLineCache(statusLineSession, output)
-+	}
-+	fmt.Print(output)
- 	return nil
- }
- 
-@@ -526,7 +583,11 @@ func runWitnessStatusLine(t *tmux.Tmux, rigName string) error {
- 		}
- 	}
- 
-	fmt.Print(strings.Join(parts, " | ") + " |")
-+	output := strings.Join(parts, " | ") + " |"
-+	if statusLineSession != "" {
-+		setStatusLineCache(statusLineSession, output)
-+	}
-+	fmt.Print(output)
- 	return nil
- }
- 
-@@ -617,7 +678,11 @@ func runRefineryStatusLine(t *tmux.Tmux, rigName string) error {
- 		}
- 	}
- 
-	fmt.Print(strings.Join(parts, " | ") + " |")
-+	output := strings.Join(parts, " | ") + " |"
-+	if statusLineSession != "" {
-+		setStatusLineCache(statusLineSession, output)
-+	}
-+	fmt.Print(output)
- 	return nil
- }
- 
--- a/packages/pi-coding-agent/default.nix
+++ b/packages/pi-coding-agent/default.nix
@@ -1,79 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, patchelf
-, glibc
-, makeWrapper
-}:
-
-let
-  version = "0.55.4";
-
-  srcs = {
-    aarch64-darwin = {
-      url = "https://github.com/badlogic/pi-mono/releases/download/v${version}/pi-darwin-arm64.tar.gz";
-      sha256 = "0vsav9frvnzskk6p6j60i7klrs3m8lphhyi4c39mv2mvhpm8fkl5";
-    };
-    x86_64-darwin = {
-      url = "https://github.com/badlogic/pi-mono/releases/download/v${version}/pi-darwin-x64.tar.gz";
-      sha256 = "1377rvhsiiww1bbpgv2v46fjm7iz2smmh8g2yhm28kbsq3gwvvr0";
-    };
-    x86_64-linux = {
-      url = "https://github.com/badlogic/pi-mono/releases/download/v${version}/pi-linux-x64.tar.gz";
-      sha256 = "1wnfwnkfq5ffz6wyqyhciv4lz06bpxims0hv0dlhz0f9vliyc1md";
-    };
-    aarch64-linux = {
-      url = "https://github.com/badlogic/pi-mono/releases/download/v${version}/pi-linux-arm64.tar.gz";
-      sha256 = "00fp37hgjl40kc59jfpv189i7np53ymm037hvds6k9y2sz818wjy";
-    };
-  };
-
-  src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-in stdenv.mkDerivation {
-  pname = "pi-coding-agent";
-  inherit version;
-
-  src = fetchurl {
-    inherit (src) url sha256;
-  };
-
-  sourceRoot = "pi";
-
-  # Bun standalone binaries have JS code appended after the ELF sections
-  dontStrip = true;
-  dontPatchELF = true;
-
-  nativeBuildInputs = [ makeWrapper ]
-    ++ lib.optionals stdenv.isLinux [ patchelf ];
-
-  installPhase = ''
-    runHook preInstall
-
-    # Install the full pi directory structure (binary + supporting files)
-    mkdir -p $out/lib/pi-coding-agent
-    cp -r . $out/lib/pi-coding-agent/
-
-    # Create bin wrapper that runs the binary from its lib directory
-    # (pi expects supporting files like themes and wasm relative to itself)
-    mkdir -p $out/bin
-    makeWrapper $out/lib/pi-coding-agent/pi $out/bin/pi
-
-    runHook postInstall
-  '';
-
-  # Manually patch the interpreter for bun standalone binaries on Linux
-  postFixup = lib.optionalString stdenv.isLinux ''
-    interpreter="${glibc}/lib/${if stdenv.hostPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else "ld-linux-x86-64.so.2"}"
-    patchelf --set-interpreter "$interpreter" $out/lib/pi-coding-agent/pi
-  '';
-
-  meta = with lib; {
-    description = "Minimal terminal coding agent with extensible tools and session management";
-    homepage = "https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" "aarch64-linux" ];
-    mainProgram = "pi";
-  };
-}
--- a/renovate.json
+++ b/renovate.json
@@ -87,7 +87,7 @@
        "/gastown/"
      ],
      "schedule": [
-        "before 6am"
+        "before 6am every day"
      ],
      "automerge": false
    },
@@ -100,7 +100,7 @@
        "/beads/"
      ],
      "schedule": [
-        "before 6am"
+        "before 6am every day"
      ],
      "automerge": false
    }
--- a/roles/common.nix
+++ b/roles/common.nix
@@ -23,13 +23,7 @@
        max-jobs = "auto";
        trusted-users = [ "johno" ];
        substituters = [
-          "http://john-endesktop.oglehome:5000"
        ];
-        trusted-public-keys = [
-          "harmonia.john-endesktop:1iGr4xZrsR7WtXOlPCgFF3LcODYBpu+B3TS54MyBn4M="
-        ];
-        fallback = true;
-        connect-timeout = 5;
      };

      gc = {
--- a/roles/default.nix
+++ b/roles/default.nix
@@ -12,7 +12,6 @@ with lib;
    ./k3s-node
    ./kodi
    ./nfs-mounts
-    ./plasma-bigscreen
    ./nvidia
    ./printing
    ./rclone-mount
--- a/roles/desktop/wayland.nix
+++ b/roles/desktop/wayland.nix
@@ -11,8 +11,9 @@ in
      enable = true;
      wrapperFeatures.gtk = true;
    };
+    programs.light.enable = true;
+
    environment.systemPackages = with pkgs; [
-      brightnessctl
      grim
      slurp
      wl-clipboard
--- a/roles/kodi/default.nix
+++ b/roles/kodi/default.nix
@@ -77,15 +77,14 @@ in
      };

      environment.systemPackages = with pkgs; [
-        firefox
        jellyfinMediaPlayerPkg
        kodiPkg
-        qt-pinned.stremio
        wget
+        firefox
      ] ++ optional cfg.appLauncherServer.enable pkgs.custom.app-launcher-server;

      nixpkgs.config.permittedInsecurePackages = lib.warn
-        "Allowing insecure package qtwebengine-5.15.19 as a jellyfin-media-player/stremio dependency. These are pinned to nixpkgs-qt to avoid rebuilds - update that input separately when you have time."
+        "Allowing insecure package qtwebengine-5.15.19 as a jellyfin-media-player dependency. Remove this once jellyfin is updated to use qt6"
        [
          "qtwebengine-5.15.19"
        ];
--- a/roles/plasma-bigscreen/default.nix
+++ b/roles/plasma-bigscreen/default.nix
@@ -1,134 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.roles.plasma-bigscreen;
-
-  # Plasma Bigscreen package — not yet in nixpkgs, built from upstream master.
-  # TODO: Replace with pkgs.kdePackages.plasma-bigscreen once available.
-  plasma-bigscreen = pkgs.kdePackages.callPackage ./package.nix {};
-
-  jellyfinMediaPlayerPkg =
-    if cfg.jellyfinScaleFactor != null
-    then pkgs.symlinkJoin {
-      name = "jellyfin-media-player-scaled";
-      paths = [ pkgs.qt-pinned.jellyfin-media-player ];
-      nativeBuildInputs = [ pkgs.makeWrapper ];
-      postBuild = ''
-        mkdir -p $out/bin
-        rm -f $out/bin/jellyfin-desktop
-        makeWrapper ${pkgs.qt-pinned.jellyfin-media-player}/bin/jellyfin-desktop $out/bin/jellyfin-desktop \
-          --add-flags "--tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
-
-        # Update .desktop file to include scale factor and TV mode arguments
-        mkdir -p $out/share/applications
-        rm -f $out/share/applications/org.jellyfin.JellyfinDesktop.desktop
-        substitute ${pkgs.qt-pinned.jellyfin-media-player}/share/applications/org.jellyfin.JellyfinDesktop.desktop \
-          $out/share/applications/org.jellyfin.JellyfinDesktop.desktop \
-          --replace-fail "Exec=jellyfin-desktop" "Exec=jellyfin-desktop --tv --scale-factor ${toString cfg.jellyfinScaleFactor}"
-      '';
-    }
-    else pkgs.qt-pinned.jellyfin-media-player;
-in
-{
-  options.roles.plasma-bigscreen = {
-    enable = mkEnableOption "Plasma Bigscreen TV interface";
-
-    autologin = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Auto-login to Plasma Bigscreen session";
-    };
-
-    user = mkOption {
-      type = types.str;
-      default = "kodi";
-      description = "User account for the Bigscreen session";
-    };
-
-    jellyfinScaleFactor = mkOption {
-      type = types.nullOr types.float;
-      default = null;
-      description = "Scale factor for Jellyfin Media Player UI (e.g., 1.0 for 100% scaling)";
-    };
-
-    appLauncherServer = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable HTTP app launcher server for remote control";
-      };
-      port = mkOption {
-        type = types.int;
-        default = 8081;
-        description = "Port for the app launcher HTTP server";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Create the bigscreen user
-    users.extraUsers.${cfg.user} = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" "networkmanager" "audio" "video" ];
-    };
-
-    # Plasma Bigscreen is a Plasma 6 shell — needs Plasma 6 desktop manager
-    services.desktopManager.plasma6.enable = true;
-
-    # Register the bigscreen session with the display manager
-    services.displayManager = {
-      sessionPackages = [ plasma-bigscreen ];
-    } // optionalAttrs cfg.autologin {
-      autoLogin.enable = true;
-      autoLogin.user = cfg.user;
-      defaultSession = "plasma-bigscreen-wayland";
-    };
-    xdg.portal.configPackages = [ plasma-bigscreen ];
-
-    # Fix homescreen not being focused after quitting app or on boot
-    # xwaylandvideobridge can interfere with focus; exclude if present
-    environment.plasma6.excludePackages =
-      lib.optional (pkgs.kdePackages ? xwaylandvideobridge) pkgs.kdePackages.xwaylandvideobridge;
-
-    # Firewall for remote control
-    networking.firewall = {
-      allowedTCPPorts = optional cfg.appLauncherServer.enable cfg.appLauncherServer.port;
-    };
-
-    environment.systemPackages = with pkgs; [
-      plasma-bigscreen
-      firefox
-      jellyfinMediaPlayerPkg
-      qt-pinned.stremio
-      wget
-    ] ++ optional cfg.appLauncherServer.enable pkgs.custom.app-launcher-server;
-
-    nixpkgs.config.permittedInsecurePackages = lib.warn
-      "Allowing insecure package qtwebengine-5.15.19 as a jellyfin-media-player/stremio dependency."
-      [
-        "qtwebengine-5.15.19"
-      ];
-
-    programs.kdeconnect.enable = true;
-
-    systemd.user.services = mkIf cfg.appLauncherServer.enable {
-      app-launcher-server = {
-        description = "HTTP App Launcher Server";
-        wantedBy = [ "graphical-session.target" ];
-        after = [ "graphical-session.target" ];
-        serviceConfig = {
-          Type = "simple";
-          ExecStart = "${pkgs.custom.app-launcher-server}/bin/app-launcher-server ${toString cfg.appLauncherServer.port}";
-          Restart = "always";
-          RestartSec = "5s";
-          Environment = [
-            "PATH=${pkgs.firefox}/bin:/run/current-system/sw/bin"
-          ];
-        };
-      };
-    };
-
-  };
-}
--- a/roles/plasma-bigscreen/package.nix
+++ b/roles/plasma-bigscreen/package.nix
@@ -1,131 +0,0 @@
-# Plasma Bigscreen — TV interface for Plasma 6
-# Not yet released or packaged in nixpkgs; built from upstream master.
-#
-# TODO: Remove this file once plasma-bigscreen lands in nixpkgs.
-#   Tracking issue: https://github.com/NixOS/nixpkgs/issues/428077
-#   Draft nixpkgs PR: https://github.com/NixOS/nixpkgs/pull/428353
-#   When available, switch to pkgs.kdePackages.plasma-bigscreen.
-#
-# Upstream: https://invent.kde.org/plasma/plasma-bigscreen
-{
-  mkKdeDerivation,
-  lib,
-  fetchFromGitLab,
-  pkg-config,
-  # KDE Frameworks 6
-  ki18n,
-  kdeclarative,
-  kcmutils,
-  knotifications,
-  kio,
-  kwayland,
-  kwindowsystem,
-  ksvg,
-  kiconthemes,
-  kglobalaccel,
-  kdbusaddons,
-  # KDE Plasma 6
-  plasma-workspace,
-  plasma-nano,
-  plasma-nm,
-  plasma-activities,
-  plasma-activities-stats,
-  milou,
-  libkscreen,
-  kdeconnect-kde,
-  # Qt 6
-  qtdeclarative, # needed for Qt6::QmlPrivate — see QCoro workaround in postPatch
-  qtmultimedia,
-  qtwebengine,
-  # Other
-  bluez-qt,
-  qcoro,
-  plasma-wayland-protocols,
-  wayland,
-  sdl3,
-}:
-
-mkKdeDerivation {
-  pname = "plasma-bigscreen";
-  version = "unstable-2026-03-07";
-
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "plasma";
-    repo = "plasma-bigscreen";
-    rev = "bd143fea7e386bac1652b8150a3ed3d5ef7cf93c";
-    hash = "sha256-y439IX7e0+XqxqFj/4+P5le0hA7DiwA+smDsD0UH/fI=";
-  };
-
-  extraNativeBuildInputs = [
-    pkg-config
-  ];
-
-  extraBuildInputs = [
-    # KDE Frameworks
-    ki18n
-    kdeclarative
-    kcmutils
-    knotifications
-    kio
-    kwayland
-    kwindowsystem
-    ksvg
-    kiconthemes
-    kglobalaccel
-    kdbusaddons
-    # Plasma
-    plasma-workspace
-    plasma-nano
-    plasma-nm
-    plasma-activities
-    plasma-activities-stats
-    milou
-    libkscreen
-    kdeconnect-kde
-    # Qt — qtdeclarative is needed for Qt6::QmlPrivate (see postPatch)
-    qtdeclarative
-    qtmultimedia
-    qtwebengine
-    # Other
-    bluez-qt
-    qcoro
-    plasma-wayland-protocols
-    wayland
-    sdl3
-  ];
-
-  postPatch = ''
-    substituteInPlace bin/plasma-bigscreen-wayland.in \
-      --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec"
-
-    # WORKAROUND: Plasma version numbers must match; we're building an
-    # unreleased package against a stable Plasma release. Remove once
-    # bigscreen is part of the Plasma release cycle.
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'set(PROJECT_VERSION "6.5.80")' 'set(PROJECT_VERSION "${plasma-workspace.version}")'
-
-    # WORKAROUND: QCoro6Qml's cmake config links against Qt6::QmlPrivate but
-    # doesn't call find_package to import the target. This is arguably a QCoro
-    # packaging bug in nixpkgs (it should propagate qtdeclarative). Remove
-    # once QCoro or the nixpkgs plasma-bigscreen package is fixed upstream.
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'find_package(QCoro6' 'find_package(Qt6 ''${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS QmlPrivate)
-find_package(QCoro6'
-  '';
-
-  preFixup = ''
-    wrapQtApp $out/bin/plasma-bigscreen-wayland
-  '';
-
-  passthru.providedSessions = [
-    "plasma-bigscreen-wayland"
-  ];
-
-  meta = {
-    description = "Plasma shell for TVs (Plasma Bigscreen)";
-    homepage = "https://plasma-bigscreen.org";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
-  };
-}
--- a/roles/virtualisation/default.nix
+++ b/roles/virtualisation/default.nix
@@ -13,11 +13,6 @@ in
      default = [ "johno" ];
      description = "List of users to add to the docker group";
    };
-    waydroid = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable waydroid support";
-    };
  };

  config = mkIf cfg.enable
@@ -26,6 +21,5 @@ in
      programs.virt-manager.enable = true;
      virtualisation.docker.enable = true;
      users.extraGroups.docker.members = cfg.dockerUsers;
-      virtualisation.waydroid.enable = cfg.waydroid;
    };
 }
--- a/scripts/rotate-wallpaper.sh
+++ b/scripts/rotate-wallpaper.sh