fix(mu4e): Configure msmtp to preserve email body content

The mu4e msmtp configuration was causing email bodies to be stripped, especially for multipart messages from org-msg. This was due to missing critical msmtp settings. Changes: - Add message-sendmail-f-is-evil to prevent -f flag issues - Add --read-envelope-from to msmtp arguments - Set both send-mail-function and message-send-mail-function Fixes: nixos-configs-9l8
2026-01-13 16:41:30 -08:00
19 changed files with 273 additions and 411 deletions
--- a/.goosehints
+++ b/.goosehints
@@ -9,7 +9,7 @@ Directory Structure:
 ----------------------
 • packages/      - Custom Nix packages leveraged across various configurations.
 • roles/         - Role-based configurations (e.g., kodi, bluetooth) each with its own module (default.nix) for inclusion in machine setups.
-• machines/      - Machine-specific configurations (e.g., nix-book, zix790prors, boxy) including configuration.nix and hardware-configuration.nix tailored for each hardware.
+• machines/      - Machine-specific configurations (e.g., nix-book, z790prors, boxy, wixos) including configuration.nix and hardware-configuration.nix tailored for each hardware.
 • home/          - Home-manager configurations for personal environments and application settings (e.g., home-nix-book.nix, home-z790prors.nix).

 Design Principles:
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -14,7 +14,7 @@ This repository uses `beads` for issue tracking and management. Run `bd quicksta

 ### Flake Structure
 - **flake.nix**: Main entry point defining inputs (nixpkgs, home-manager, plasma-manager, etc.) and outputs for multiple NixOS configurations
- **Machines**: `nix-book`, `boxy`, `zix790prors`, `live-usb`, `johno-macbookpro` (Darwin/macOS)
+- **Machines**: `nix-book`, `boxy`, `wixos` (WSL configuration), `zix790prors`, `live-usb`, `johno-macbookpro` (Darwin/macOS)
 - **Home configurations**: Standalone home-manager configuration for user `johno`

 ### Directory Structure
@@ -78,6 +78,7 @@ The repository also uses a modular home-manager role system for user-space confi
 - **nix-book**: Compact laptop → excludes office/media roles due to SSD space constraints
 - **boxy**: Living room media center → optimized for media consumption, excludes sync/office (shared machine)
 - **zix790prors**: All-purpose workstation → full desktop experience with all roles enabled
+- **wixos**: WSL2 development → full desktop experience, inherits from zix790prors Windows host
 - **live-usb**: Temporary environment → only base + desktop roles, no persistent services
 - **johno-macbookpro**: macOS work laptop → Darwin-specific configuration with development tools

@@ -110,6 +111,7 @@ darwin-rebuild build --flake .#johno-macbookpro
 - `nix-book`: Compact laptop with storage constraints, uses `home/home-laptop-compact.nix`
 - `boxy`: Shared living room media center/gaming desktop with AMD GPU, uses `home/home-media-center.nix`
 - `zix790prors`: Powerful all-purpose workstation (gaming, 3D modeling, development), dual-boots Windows 11 with shared btrfs /games partition, uses `home/home-desktop.nix`
+- `wixos`: WSL2 development environment running in Windows partition of zix790prors, uses `home/home-desktop.nix`
 - `live-usb`: Bootable ISO configuration, uses `home/home-live-usb.nix`
 - `johno-macbookpro`: macOS work laptop, uses `home/home-darwin-work.nix`

--- a/flake.lock
+++ b/flake.lock
@@ -60,6 +60,22 @@
        "type": "github"
      }
    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1765121682,
+        "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
@@ -225,18 +241,38 @@
        "type": "github"
      }
    },
-    "nixpkgs": {
+    "nixos-wsl": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs"
+      },
      "locked": {
-        "lastModified": 1767480499,
-        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
+        "lastModified": 1765841014,
+        "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=",
+        "owner": "nix-community",
+        "repo": "NixOS-WSL",
+        "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
+        "owner": "nix-community",
+        "ref": "main",
+        "repo": "NixOS-WSL",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1765472234,
+        "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -257,6 +293,22 @@
        "type": "github"
      }
    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1767480499,
+        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "plasma-manager": {
      "inputs": {
        "home-manager": [
@@ -312,7 +364,8 @@
        "jovian": "jovian",
        "nix-darwin": "nix-darwin",
        "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
-        "nixpkgs": "nixpkgs",
+        "nixos-wsl": "nixos-wsl",
+        "nixpkgs": "nixpkgs_2",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "plasma-manager": "plasma-manager",
        "plasma-manager-unstable": "plasma-manager-unstable"
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,8 @@
  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-
+    nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
+    
    nix-darwin = {
      url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -54,7 +55,7 @@
    };
  };

-  outputs = { self, nixpkgs, nixpkgs-unstable, ... } @ inputs: let
+  outputs = { self, nixpkgs, nixpkgs-unstable, nixos-wsl, ... } @ inputs: let
    # Shared overlay function to reduce duplication across module sets
    # Parameters:
    #   unstableOverlays: Additional overlays to apply when importing nixpkgs-unstable
@@ -83,7 +84,6 @@
      };
    };

-
    nixosModules = [
      ./roles
      inputs.home-manager.nixosModules.home-manager
@@ -157,10 +157,24 @@
      ];
    };

+    nixosConfigurations.wixos = nixpkgs.lib.nixosSystem rec {
+      system = "x86_64-linux";
+      modules = nixosModules ++ [
+        nixos-wsl.nixosModules.default
+        ./machines/wixos/configuration.nix
+        inputs.home-manager.nixosModules.home-manager
+        {
+          home-manager.users.johno = import ./home/home-desktop.nix;
+          home-manager.extraSpecialArgs = { inherit system; };
+        }
+      ];
+    };
+
    nixosConfigurations.zix790prors = nixpkgs.lib.nixosSystem rec {
      system = "x86_64-linux";
      modules = nixosModules ++ [
        ./machines/zix790prors/configuration.nix
+        inputs.home-manager.nixosModules.home-manager
        {
          home-manager.users.johno = import ./home/home-desktop.nix;
          home-manager.extraSpecialArgs = { inherit system; };
--- a/home/roles/communication/default.nix
+++ b/home/roles/communication/default.nix
@@ -4,7 +4,6 @@ with lib;

 let
  cfg = config.home.roles.communication;
-  isLinux = pkgs.stdenv.isLinux;
 in
 {
  options.home.roles.communication = {
@@ -13,14 +12,14 @@ in

  config = mkIf cfg.enable {
    home.packages = [
-      # For logging back into google chat (cross-platform)
-      globalInputs.google-cookie-retrieval.packages.${system}.default
-    ] ++ optionals isLinux [
-      # Linux-only communication apps (Electron apps don't build on Darwin)
+      # Communication apps
      pkgs.element-desktop
      # Re-enabled in 25.11 after security issues were resolved
      pkgs.fluffychat
      pkgs.nextcloud-talk-desktop
+      
+      # For logging back into google chat
+      globalInputs.google-cookie-retrieval.packages.${system}.default
    ];
  };
 }
--- a/home/roles/desktop/default.nix
+++ b/home/roles/desktop/default.nix
@@ -4,7 +4,6 @@ with lib;

 let
  cfg = config.home.roles.desktop;
-  isLinux = pkgs.stdenv.isLinux;
 in
 {
  options.home.roles.desktop = {
@@ -13,63 +12,61 @@ in

  config = mkIf cfg.enable {
    home.packages = with pkgs; [
-      # Cross-platform desktop applications
+      # Desktop applications
      bitwarden-desktop
-      keepassxc
-      xdg-utils # XDG utilities for opening files/URLs with default applications
-    ] ++ optionals isLinux [
-      # Linux-only desktop applications
      dunst
+      keepassxc
      unstable.ghostty
-
-      # Linux-only desktop utilities
+      
+      # Desktop utilities
      feh # Image viewer and wallpaper setter for X11
      rofi # Application launcher for X11
      solaar # Logitech management software
      waybar
      wofi # Application launcher for Wayland
-
-      # Linux-only system utilities with GUI components
+      xdg-utils # XDG utilities for opening files/URLs with default applications
+      
+      # System utilities with GUI components
      (snapcast.override { pulseaudioSupport = true; })
-
-      # KDE tiling window management (Linux-only)
+      
+      # KDE tiling window management
      kdePackages.krohnkite  # Dynamic tiling extension for KWin 6
-
-      # KDE PIM applications for email, calendar, and contacts (Linux-only)
+      
+      # KDE PIM applications for email, calendar, and contacts
      kdePackages.kmail
      kdePackages.kmail-account-wizard
      kdePackages.kmailtransport
      kdePackages.korganizer
      kdePackages.kaddressbook
      kdePackages.kontact
-
-      # KDE System components needed for proper integration (Linux-only)
+      
+      # KDE System components needed for proper integration
      kdePackages.kded
      kdePackages.systemsettings
      kdePackages.kmenuedit
-
-      # Desktop menu support (Linux-only)
+      
+      # Desktop menu support
      kdePackages.plasma-desktop # Contains applications.menu
-
-      # KDE Online Accounts support (Linux-only)
+      
+      # KDE Online Accounts support
      kdePackages.kaccounts-integration
      kdePackages.kaccounts-providers
      kdePackages.signond
-
-      # KDE Mapping (Linux-only)
+      
+      # KDE Mapping
      kdePackages.marble  # Virtual globe and world atlas
-
-      # KDE Productivity (Linux-only)
+      
+      # KDE Productivity
      kdePackages.kate        # Advanced text editor with syntax highlighting
      kdePackages.okular      # Universal document viewer (PDF, ePub, etc.)
      kdePackages.spectacle   # Screenshot capture utility
      kdePackages.filelight   # Visual disk usage analyzer
-
-      # KDE Multimedia (Linux-only)
+      
+      # KDE Multimedia
      kdePackages.gwenview    # Image viewer and basic editor
      kdePackages.elisa       # Music player
-
-      # KDE System Utilities (Linux-only)
+      
+      # KDE System Utilities  
      kdePackages.ark         # Archive manager (zip, tar, 7z, etc.)
      kdePackages.yakuake     # Drop-down terminal emulator
    ];
@@ -80,66 +77,61 @@ in

    programs.spotify-player.enable = true;

-    # Linux-only: GNOME keyring service
-    services.gnome-keyring = mkIf isLinux {
+    services.gnome-keyring = {
      enable = true;
    };

-    # Linux-only: systemd user services for rbw vault unlock
-    systemd.user.services = mkIf isLinux {
-      # rbw vault unlock on login
-      rbw-unlock-on-login = {
-        Unit = {
-          Description = "Unlock rbw vault at login";
-          After = [ "graphical-session.target" ];
-        };
-        Service = {
-          Type = "oneshot";
-          ExecStart = "${pkgs.rbw}/bin/rbw unlock";
-          Environment = "RBW_AGENT=${pkgs.rbw}/bin/rbw-agent";
-          # KillMode = "process" prevents systemd from killing the rbw-agent daemon
-          # when this oneshot service completes. The agent is spawned by rbw unlock
-          # and needs to persist after the service exits.
-          KillMode = "process";
-        };
-        Install = {
-          WantedBy = [ "graphical-session.target" ];
-        };
+    # rbw vault unlock on login and resume from suspend
+    systemd.user.services.rbw-unlock-on-login = {
+      Unit = {
+        Description = "Unlock rbw vault at login";
+        After = [ "graphical-session.target" ];
      };
-
-      # rbw vault unlock on resume from suspend
-      rbw-unlock-on-resume = {
-        Unit = {
-          Description = "Unlock rbw vault after resume from suspend";
-          After = [ "suspend.target" ];
-        };
-        Service = {
-          Type = "oneshot";
-          ExecStart = "${pkgs.rbw}/bin/rbw unlock";
-          Environment = "RBW_AGENT=${pkgs.rbw}/bin/rbw-agent";
-          # KillMode = "process" prevents systemd from killing the rbw-agent daemon
-          # when this oneshot service completes. The agent is spawned by rbw unlock
-          # and needs to persist after the service exits.
-          KillMode = "process";
-        };
-        Install = {
-          WantedBy = [ "suspend.target" ];
-        };
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.rbw}/bin/rbw unlock";
+        Environment = "RBW_AGENT=${pkgs.rbw}/bin/rbw-agent";
+        # KillMode = "process" prevents systemd from killing the rbw-agent daemon
+        # when this oneshot service completes. The agent is spawned by rbw unlock
+        # and needs to persist after the service exits.
+        KillMode = "process";
+      };
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
      };
    };

-    # Linux-only: KDE environment variables for proper integration
-    home.sessionVariables = mkIf isLinux {
+    systemd.user.services.rbw-unlock-on-resume = {
+      Unit = {
+        Description = "Unlock rbw vault after resume from suspend";
+        After = [ "suspend.target" ];
+      };
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.rbw}/bin/rbw unlock";
+        Environment = "RBW_AGENT=${pkgs.rbw}/bin/rbw-agent";
+        # KillMode = "process" prevents systemd from killing the rbw-agent daemon
+        # when this oneshot service completes. The agent is spawned by rbw unlock
+        # and needs to persist after the service exits.
+        KillMode = "process";
+      };
+      Install = {
+        WantedBy = [ "suspend.target" ];
+      };
+    };
+
+    # KDE environment variables for proper integration
+    home.sessionVariables = {
      QT_QPA_PLATFORMTHEME = "kde";
      KDE_SESSION_VERSION = "6";
    };

    xdg = {
      enable = true;
-
+      
      # Ensure desktop files are made available for discovery
      desktopEntries = {};  # This creates the desktop files directory structure
-
+      
      mimeApps = {
        enable = true;
        associations.added = {
@@ -149,14 +141,13 @@ in
          "x-scheme-handler/https" = "firefox.desktop";
        };
        defaultApplications = {
-          # Web browsers (cross-platform)
+          # Web browsers
          "text/html" = "firefox.desktop";
          "x-scheme-handler/http" = "firefox.desktop";
          "x-scheme-handler/https" = "firefox.desktop";
          "x-scheme-handler/about" = "firefox.desktop";
          "x-scheme-handler/unknown" = "firefox.desktop";
-        } // optionalAttrs isLinux {
-          # Linux-only: KDE application associations
+          
          # Documents
          "application/pdf" = "okular.desktop";
          "text/plain" = "kate.desktop";
@@ -164,7 +155,7 @@ in
          "text/x-c" = "kate.desktop";
          "text/x-python" = "kate.desktop";
          "application/x-shellscript" = "kate.desktop";
-
+          
          # Images
          "image/png" = "gwenview.desktop";
          "image/jpeg" = "gwenview.desktop";
@@ -173,25 +164,25 @@ in
          "image/bmp" = "gwenview.desktop";
          "image/tiff" = "gwenview.desktop";
          "image/webp" = "gwenview.desktop";
-
+          
          # Archives
          "application/zip" = "ark.desktop";
          "application/x-tar" = "ark.desktop";
          "application/x-compressed-tar" = "ark.desktop";
          "application/x-7z-compressed" = "ark.desktop";
          "application/x-rar" = "ark.desktop";
-
+          
          # Audio
          "audio/mpeg" = "elisa.desktop";
          "audio/mp4" = "elisa.desktop";
          "audio/flac" = "elisa.desktop";
          "audio/ogg" = "elisa.desktop";
          "audio/wav" = "elisa.desktop";
-
+          
          # Email
          "message/rfc822" = "kmail.desktop";
          "x-scheme-handler/mailto" = "kmail.desktop";
-
+          
          # Calendar
          "text/calendar" = "korganizer.desktop";
          "application/x-vnd.akonadi.calendar.event" = "korganizer.desktop";
@@ -199,11 +190,9 @@ in
      };
    };

-    # Linux-only: Fix for KDE applications.menu file issue on Plasma 6
+    # Fix for KDE applications.menu file issue on Plasma 6
    # KDE still looks for applications.menu but Plasma 6 renamed it to plasma-applications.menu
-    xdg.configFile."menus/applications.menu" = mkIf isLinux {
-      source = "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";
-    };
+    xdg.configFile."menus/applications.menu".source = "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu";

    # Note: modules must be imported at top-level home config
  };
--- a/home/roles/development/skills/parallel_beads.md
+++ b/home/roles/development/skills/parallel_beads.md
@@ -42,46 +42,7 @@ AskUserQuestion with:
 - options from filtered bd ready output
 ```

-## Phase 2: Worktree Setup
-
-Before launching implementation subagents, create worktrees for all selected beads:
-
-1. **Get repository name**:
-   ```bash
-   REPO_NAME=$(git remote get-url origin | sed 's|.*/||' | sed 's/\.git$//')
-   ```
-
-2. **For each selected bead**, create its worktree:
-   ```bash
-   BEAD_ID="[bead-id]"
-   # Check if worktree already exists
-   if [ -d "$HOME/wt/${REPO_NAME}/${BEAD_ID}" ]; then
-     echo "Worktree already exists: ~/wt/${REPO_NAME}/${BEAD_ID}"
-     # Ask user: remove and recreate, or skip this bead?
-   else
-     git worktree add -b "bead/${BEAD_ID}" "$HOME/wt/${REPO_NAME}/${BEAD_ID}"
-   fi
-   ```
-
-3. **Track created worktrees**:
-   Maintain a list of (bead_id, worktree_path) pairs for use in subagent instructions.
-
-4. **Report status**:
-   ```
-   Created worktrees:
-   - nixos-configs-abc → ~/wt/nixos-configs/nixos-configs-abc (branch: bead/nixos-configs-abc)
-   - nixos-configs-xyz → ~/wt/nixos-configs/nixos-configs-xyz (branch: bead/nixos-configs-xyz)
-
-   Skipped (existing worktree):
-   - nixos-configs-123 → Ask user for resolution
-   ```
-
-**Note**: If a worktree or branch already exists, ask the user before proceeding:
- Remove existing worktree and branch, then recreate
- Skip this bead
- Use existing worktree as-is (risky - branch may have diverged)
-
-## Phase 3: Parallel Implementation
+## Phase 2: Parallel Implementation

 For each selected bead, launch a subagent using the Task tool. All subagents should be launched in parallel (single message with multiple Task tool calls).

@@ -92,43 +53,16 @@ Each implementation subagent should receive these instructions:
 ```
 Work on bead [BEAD_ID]: [BEAD_TITLE]

-Worktree path: [WORKTREE_PATH]
+1. **Create worktree**:
+   - Branch name: `bead/[BEAD_ID]`
+   - Worktree path: `~/wt/[REPO_NAME]/[BEAD_ID]`
+   - Command: `git worktree add -b bead/[BEAD_ID] ~/wt/[REPO_NAME]/[BEAD_ID]`

-## CRITICAL: Branch Verification (MUST DO FIRST)
-
-1. **Navigate to worktree**:
-   ```bash
-   cd [WORKTREE_PATH]
-   ```
-
-2. **Verify branch** (MANDATORY before ANY modifications):
-   ```bash
-   CURRENT_BRANCH=$(git branch --show-current)
-   echo "Current branch: $CURRENT_BRANCH"
-   pwd
-   ```
-
-   **ABORT CONDITIONS** - If ANY of these are true, STOP IMMEDIATELY:
-   - Branch is `main` or `master`
-   - Branch does not match `bead/[BEAD_ID]`
-
-   If you detect any abort condition:
-   ```
-   ABORTING: Branch verification failed.
-   Expected branch: bead/[BEAD_ID]
-   Actual branch: [CURRENT_BRANCH]
-   Working directory: [pwd output]
-
-   DO NOT PROCEED. Report this error to the orchestrator.
-   ```
-
-## After Verification Passes
-
-3. **Review the bead requirements**:
+2. **Review the bead requirements**:
   - Run `bd show [BEAD_ID]` to understand the acceptance criteria
   - Note any external issue references (GitHub issues, Linear tickets, etc.)

-4. **Extract validation criteria**:
+3. **Extract validation criteria**:
   - Check for a plan: `thoughts/beads-[BEAD_ID]/plan.md`
   - If plan exists:
     - Read the plan and find the "Automated Verification" section
@@ -140,12 +74,12 @@ Worktree path: [WORKTREE_PATH]
     - Check if `package.json` exists → try `npm test`
     - If none found, note "No validation criteria found"

-5. **Implement the changes**:
+4. **Implement the changes**:
   - Work in the worktree directory
   - Complete all acceptance criteria listed in the bead

   After implementation, run validation:
-   - Execute each validation command from step 4
+   - Execute each validation command from step 3
   - Track results in this format:
     ```
     VALIDATION_RESULTS:
@@ -157,12 +91,12 @@ Worktree path: [WORKTREE_PATH]
     - Continue with PR creation (don't block)
     - Document failures in bead notes: `bd update [BEAD_ID] --notes="Validation failures: [list]"`

-6. **Commit and push**:
+5. **Commit and push**:
   - Stage all changes: `git add -A`
   - Create a descriptive commit message
   - Push the branch: `git push -u origin bead/[BEAD_ID]`

-7. **Create a PR**:
+6. **Create a PR**:
   - Detect hosting provider from origin URL: `git remote get-url origin`
   - If URL contains `github.com`, use `gh`; otherwise use `tea` (Gitea/Forgejo)
   - PR title: "[BEAD_ID] [BEAD_TITLE]"
@@ -222,13 +156,13 @@ Worktree path: [WORKTREE_PATH]
     | nix flake check | SKIP | command not found |"
     ```

-8. **Update bead status**:
+7. **Update bead status**:
   - Mark the bead as "in_review": `bd update [BEAD_ID] --status=in_review`
   - Add the PR URL to the bead notes: `bd update [BEAD_ID] --notes="$(bd show [BEAD_ID] --json | jq -r '.notes')

 PR: [PR_URL]"`

-9. **Report results**:
+8. **Report results**:
   - Return:
     - PR URL
     - Bead ID
@@ -241,24 +175,15 @@ PR: [PR_URL]"`

 ### Launching Subagents

-For each bead, substitute into the template:
- `[BEAD_ID]` - the bead ID
- `[BEAD_TITLE]` - the bead title
- `[WORKTREE_PATH]` - the worktree path created in Phase 2
-
 Use `subagent_type: "general-purpose"` for implementation subagents. Launch all selected beads' subagents in a single message for parallel execution:

 ```
 <Task calls for each selected bead - all in one message>
 ```

-**Important**: The worktree paths were created in Phase 2. Use the exact paths that were created, e.g.:
- `~/wt/nixos-configs/nixos-configs-abc`
- `~/wt/nixos-configs/nixos-configs-xyz`
-
 Collect results from all subagents before proceeding.

-## Phase 4: Parallel Review
+## Phase 3: Parallel Review

 After all implementation subagents complete, launch review subagents for each PR.

@@ -293,7 +218,7 @@ Review PR for bead [BEAD_ID]

 Launch all review subagents in parallel.

-## Phase 5: Cleanup and Summary
+## Phase 4: Cleanup and Summary

 After reviews complete:

@@ -339,21 +264,9 @@ Example output:

 ## Error Handling

- **Worktree creation failures** (Phase 2):
-  - If `git worktree add` fails (branch exists, path exists), prompt user:
-    - Remove existing and retry
-    - Skip this bead
-    - Use existing (with warning about potential divergence)
-  - Do NOT proceed to subagent launch until worktree is confirmed
-
- **Branch verification failures** (subagent reports):
-  - If subagent reports it's on `main` or `master`, do NOT retry
-  - Mark bead as failed with reason "Branch verification failed"
-  - Continue with other beads but flag this as a critical issue
-  - Investigation required: the worktree may have been corrupted or not created properly
-
 - **Subagent failures**: If a subagent fails or times out, note it in the summary but continue with other beads
 - **PR creation failures**: Report the error but continue with reviews of successful PRs
+- **Worktree conflicts**: If a worktree already exists, ask the user if they want to remove it or skip that bead

 ## Resource Limits

--- a/home/roles/development/skills/reconcile_beads.md
+++ b/home/roles/development/skills/reconcile_beads.md
@@ -4,13 +4,12 @@ description: Reconcile beads with merged PRs and close completed beads

 # Reconcile Beads Workflow

-This skill reconciles beads that are in `in_review` status with their corresponding PRs. If a PR has been merged, the bead is closed and any linked Gitea issue is also closed.
+This skill reconciles beads that are in `in_review` status with their corresponding PRs. If a PR has been merged, the bead is closed.

 ## Prerequisites

 - Custom status `in_review` must be configured: `bd config set status.custom "in_review"`
 - Beads in `in_review` status should have a PR URL in their notes
- `tea` CLI must be configured for closing Gitea issues

 ## Workflow

@@ -53,34 +52,6 @@ If the PR is merged:
 bd close [BEAD_ID] --reason="PR merged: [PR_URL]"
 ```

-### Step 3.1: Close corresponding Gitea issue (if any)
-
-After closing a bead, check if it has a linked Gitea issue:
-
-1. **Check for Gitea issue URL in bead notes**:
-   Look for the pattern `Gitea issue: <URL>` in the notes. Extract the URL.
-
-2. **Extract issue number from URL**:
-   ```bash
-   # Example: https://git.johnogle.info/johno/nixos-configs/issues/16 -> 16
-   echo "$GITEA_URL" | grep -oP '/issues/\K\d+'
-   ```
-
-3. **Close the Gitea issue**:
-   ```bash
-   tea issues close [ISSUE_NUMBER]
-   ```
-
-4. **Handle errors gracefully**:
-   - If issue is already closed: Log warning, continue
-   - If issue not found: Log warning, continue
-   - If `tea` fails: Log error, continue with other beads
-
-   Example warning output:
-   ```
-   Warning: Could not close Gitea issue #16: issue already closed
-   ```
-
 ### Step 4: Report summary

 Present results:
@@ -89,17 +60,10 @@ Present results:
 ## Beads Reconciliation Summary

 ### Closed (PR Merged)
-| Bead | PR | Gitea Issue | Title |
-|------|-----|-------------|-------|
-| beads-abc | #123 | #16 closed | Feature X |
-| beads-xyz | #456 | (none) | Bug fix Y |
-
-### Gitea Issues Closed
-| Issue | Bead | Status |
-|-------|------|--------|
-| #16 | beads-abc | Closed successfully |
-| #17 | beads-def | Already closed (skipped) |
-| #99 | beads-ghi | Error: issue not found |
+| Bead | PR | Title |
+|------|-----|-------|
+| beads-abc | #123 | Feature X |
+| beads-xyz | #456 | Bug fix Y |

 ### Still in Review
 | Bead | PR | Status | Title |
@@ -116,14 +80,9 @@ Present results:
 - **Missing PR URL**: Skip the bead and report it
 - **PR not found**: Report the error but continue with other beads
 - **API errors**: Report and continue
- **Gitea issue already closed**: Log warning, continue (not an error)
- **Gitea issue not found**: Log warning, continue (issue may have been deleted)
- **No Gitea issue linked**: Normal case, no action needed
- **tea command fails**: Log error with output, continue with other beads

 ## Notes

 - This skill complements `/parallel_beads` which sets beads to `in_review` status
 - Run this skill periodically or after merging PRs to keep beads in sync
 - Beads with closed (but not merged) PRs are not automatically closed - they may need rework
- Gitea issues are only closed for beads that have a `Gitea issue: <URL>` in their notes
--- a/home/roles/email/default.nix
+++ b/home/roles/email/default.nix
@@ -4,7 +4,6 @@ with lib;

 let
  cfg = config.home.roles.email;
-  isLinux = pkgs.stdenv.isLinux;
 in
 {
  options.home.roles.email = {
@@ -90,38 +89,34 @@ in
      account default : proton
    '';

-    # Linux-only: Systemd service for mail sync (Darwin uses launchd instead)
-    systemd.user.services = mkIf isLinux {
-      mbsync = {
-        Unit = {
-          Description = "Mailbox synchronization service";
-          After = [ "network-online.target" ];
-          Wants = [ "network-online.target" ];
-        };
-        Service = {
-          Type = "oneshot";
-          ExecStart = "${pkgs.bash}/bin/bash -c 'mkdir -p ~/Mail && ${pkgs.isync}/bin/mbsync -a && (${pkgs.mu}/bin/mu info >/dev/null 2>&1 || ${pkgs.mu}/bin/mu init --maildir ~/Mail --personal-address=john@ogle.fyi) && ${pkgs.mu}/bin/mu index'";
-          Environment = "PATH=${pkgs.rbw}/bin:${pkgs.coreutils}/bin";
-          StandardOutput = "journal";
-          StandardError = "journal";
-        };
+    # Systemd service for mail sync
+    systemd.user.services.mbsync = {
+      Unit = {
+        Description = "Mailbox synchronization service";
+        After = [ "network-online.target" ];
+        Wants = [ "network-online.target" ];
+      };
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.bash}/bin/bash -c 'mkdir -p ~/Mail && ${pkgs.isync}/bin/mbsync -a && (${pkgs.mu}/bin/mu info >/dev/null 2>&1 || ${pkgs.mu}/bin/mu init --maildir ~/Mail --personal-address=john@ogle.fyi) && ${pkgs.mu}/bin/mu index'";
+        Environment = "PATH=${pkgs.rbw}/bin:${pkgs.coreutils}/bin";
+        StandardOutput = "journal";
+        StandardError = "journal";
      };
    };

-    # Linux-only: Systemd timer for automatic sync
-    systemd.user.timers = mkIf isLinux {
-      mbsync = {
-        Unit = {
-          Description = "Mailbox synchronization timer";
-        };
-        Timer = {
-          OnBootSec = "2min";
-          OnUnitActiveSec = "5min";
-          Unit = "mbsync.service";
-        };
-        Install = {
-          WantedBy = [ "timers.target" ];
-        };
+    # Systemd timer for automatic sync
+    systemd.user.timers.mbsync = {
+      Unit = {
+        Description = "Mailbox synchronization timer";
+      };
+      Timer = {
+        OnBootSec = "2min";
+        OnUnitActiveSec = "5min";
+        Unit = "mbsync.service";
+      };
+      Install = {
+        WantedBy = [ "timers.target" ];
      };
    };
  };
--- a/home/roles/kdeconnect/default.nix
+++ b/home/roles/kdeconnect/default.nix
@@ -4,15 +4,13 @@ with lib;

 let
  cfg = config.home.roles.kdeconnect;
-  isLinux = pkgs.stdenv.isLinux;
 in
 {
  options.home.roles.kdeconnect = {
    enable = mkEnableOption "Enable KDE Connect for device integration";
  };

-  # KDE Connect services are Linux-only (requires D-Bus and systemd)
-  config = mkIf (cfg.enable && isLinux) {
+  config = mkIf cfg.enable {
    services.kdeconnect = {
      enable = true;
      indicator = true;
--- a/home/roles/sync/default.nix
+++ b/home/roles/sync/default.nix
@@ -4,7 +4,6 @@ with lib;

 let
  cfg = config.home.roles.sync;
-  isLinux = pkgs.stdenv.isLinux;
 in
 {
  options.home.roles.sync = {
@@ -12,10 +11,9 @@ in
  };

  config = mkIf cfg.enable {
-    # Linux-only: syncthingtray requires system tray support
-    home.packages = optionals isLinux (with pkgs; [
+    home.packages = with pkgs; [
      syncthingtray
-    ]);
+    ];

    services.syncthing = {
      enable = true;
--- a/machines/wixos/configuration.nix
+++ b/machines/wixos/configuration.nix
@@ -0,0 +1,56 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+# NixOS-WSL specific options are documented on the NixOS-WSL repository:
+# https://github.com/nix-community/NixOS-WSL
+
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+  ];
+
+  roles = {
+    audio.enable = true;
+    desktop = {
+      enable = true;
+      wayland = true;
+    };
+    nvidia = {
+      enable = true;
+      package = "latest";
+      graphics.extraPackages = with pkgs; [
+        mesa
+        libvdpau-va-gl
+        libva-vdpau-driver
+      ];
+    };
+    users.enable = true;
+  };
+
+  networking.hostName = "wixos";
+
+  wsl.enable = true;
+  wsl.defaultUser = "johno";
+  wsl.startMenuLaunchers = true;
+  wsl.useWindowsDriver = true;
+  wsl.wslConf.network.hostname = "wixos";
+  wsl.wslConf.user.default = "johno";
+
+  # WSL-specific environment variables for graphics
+  environment.sessionVariables = {
+    LD_LIBRARY_PATH = [
+      "/usr/lib/wsl/lib"
+      "/run/opengl-driver/lib"
+    ];
+  };
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It's perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.05"; # Did you read the comment?
+}
--- a/roles/audio/default.nix
+++ b/roles/audio/default.nix
@@ -21,8 +21,6 @@ in

      services.pipewire = {
        enable = true;
-        alsa.enable = true;
-        alsa.support32Bit = true;
        pulse.enable = true;
      };

--- a/roles/nfs-mounts/default.nix
+++ b/roles/nfs-mounts/default.nix
@@ -8,21 +8,6 @@ in
 {
  options.roles.nfs-mounts = {
    enable = mkEnableOption "Enable default NFS mounts";
-    server = mkOption {
-      type = types.str;
-      default = "10.0.0.43";
-      description = "IP address or hostname of the NFS server";
-    };
-    remotePath = mkOption {
-      type = types.str;
-      default = "/media";
-      description = "Remote path to mount from the NFS server";
-    };
-    mountPoint = mkOption {
-      type = types.str;
-      default = "/media";
-      description = "Local mount point for the NFS share";
-    };
    # TODO: implement requireMount
    requireMount = mkOption {
      type = types.bool;
@@ -33,8 +18,8 @@ in

  config = mkIf cfg.enable
    {
-      fileSystems.${cfg.mountPoint} = {
-        device = "${cfg.server}:${cfg.remotePath}";
+      fileSystems."/media" = {
+        device = "10.0.0.43:/media";
        fsType = "nfs";
        options = [
          "defaults"
--- a/roles/printing/default.nix
+++ b/roles/printing/default.nix
@@ -8,21 +8,6 @@ in
 {
  options.roles.printing = {
    enable = mkEnableOption "Enable default printing setup";
-    printerName = mkOption {
-      type = types.str;
-      default = "MFC-L8900CDW_series";
-      description = "Name for the default printer";
-    };
-    printerUri = mkOption {
-      type = types.str;
-      default = "ipp://brother.oglehome/ipp/print";
-      description = "Device URI for the default printer (e.g., ipp://hostname/ipp/print)";
-    };
-    printerModel = mkOption {
-      type = types.str;
-      default = "everywhere";
-      description = "PPD model for the printer (use 'everywhere' for driverless IPP)";
-    };
  };

  config = mkIf cfg.enable
@@ -36,11 +21,11 @@ in
      };

      hardware.printers.ensurePrinters = [{
-        name = cfg.printerName;
-        deviceUri = cfg.printerUri;
-        model = cfg.printerModel;
+        name = "MFC-L8900CDW_series";
+        deviceUri = "ipp://brother.oglehome/ipp/print";
+        model = "everywhere";
      }];
-      hardware.printers.ensureDefaultPrinter = cfg.printerName;
+      hardware.printers.ensureDefaultPrinter = "MFC-L8900CDW_series";

      # Fix ensure-printers service to wait for network availability
      systemd.services.ensure-printers = {
--- a/roles/virtualisation/default.nix
+++ b/roles/virtualisation/default.nix
@@ -8,11 +8,6 @@ in
 {
  options.roles.virtualisation = {
    enable = mkEnableOption "Enable virtualisation";
-    dockerUsers = mkOption {
-      type = types.listOf types.str;
-      default = [ "johno" ];
-      description = "List of users to add to the docker group";
-    };
  };

  config = mkIf cfg.enable
@@ -20,6 +15,6 @@ in
      virtualisation.libvirtd.enable = true;
      programs.virt-manager.enable = true;
      virtualisation.docker.enable = true;
-      users.extraGroups.docker.members = cfg.dockerUsers;
+      users.extraGroups.docker.members = [ "johno" ];
    };
 }
--- a/scripts/rotate-wallpaper.sh
+++ b/scripts/rotate-wallpaper.sh
@@ -1,30 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail

-# Parse arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --help|-h)
-            echo "Usage: $0 [OPTIONS]"
-            echo ""
-            echo "Rotate to the next wallpaper in the configured list."
-            echo ""
-            echo "This script increments the currentIndex in home/wallpapers/default.nix,"
-            echo "cycling through available wallpapers. Rebuild your system to apply"
-            echo "the new wallpaper."
-            echo ""
-            echo "Options:"
-            echo "  --help, -h    Show this help message"
-            exit 0
-            ;;
-        *)
-            echo "Unknown option: $1"
-            echo "Use --help for usage information"
-            exit 1
-            ;;
-    esac
-done
-
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
--- a/scripts/update-doomemacs.sh
+++ b/scripts/update-doomemacs.sh
@@ -1,30 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail

-# Parse arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --help|-h)
-            echo "Usage: $0 [OPTIONS]"
-            echo ""
-            echo "Update Doom Emacs to the latest commit from the doomemacs repository."
-            echo ""
-            echo "This script fetches the latest commit SHA from the default branch,"
-            echo "updates the rev and sha256 in home/roles/emacs/default.nix, and"
-            echo "prepares the configuration for a system rebuild."
-            echo ""
-            echo "Options:"
-            echo "  --help, -h    Show this help message"
-            exit 0
-            ;;
-        *)
-            echo "Unknown option: $1"
-            echo "Use --help for usage information"
-            exit 1
-            ;;
-    esac
-done
-
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -1,35 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail

-# Parse arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --help|-h)
-            echo "Usage: $0 [OPTIONS]"
-            echo ""
-            echo "Perform a major upgrade of the NixOS configuration."
-            echo ""
-            echo "This script runs the following steps:"
-            echo "  1. Update all flake inputs (nix flake update)"
-            echo "  2. Update Doom Emacs to the latest commit"
-            echo "  3. Update Claude Code to the latest version"
-            echo "  4. Rotate to the next wallpaper"
-            echo ""
-            echo "After completion, review changes with 'git diff' and rebuild"
-            echo "your system with 'sudo nixos-rebuild switch --flake .'"
-            echo ""
-            echo "Options:"
-            echo "  --help, -h    Show this help message"
-            exit 0
-            ;;
-        *)
-            echo "Unknown option: $1"
-            echo "Use --help for usage information"
-            exit 1
-            ;;
-    esac
-done
-
 # Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'