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

.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:

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`
 

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,
+        "lastModified": 1765841014,
-        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
+        "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=",
-        "owner": "nixos",
+        "owner": "nix-community",
-        "repo": "nixpkgs",
+        "repo": "NixOS-WSL",
-        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
+        "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "nix-community",
-        "ref": "nixos-25.11",
+        "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"

flake.nix

@@ -4,6 +4,7 @@
   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";
@@ -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; };

home/roles/development/skills/parallel_beads.md

@@ -42,46 +42,7 @@ AskUserQuestion with:
 - options from filtered bd ready output
 ```
 
-## Phase 2: Worktree Setup
+## Phase 2: Parallel Implementation
-
-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
 
 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)
+2. **Review the bead requirements**:
-
-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**:
    - 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
 

home/roles/emacs/doom/config.el

@@ -225,11 +225,16 @@
         mu4e-headers-time-format "%H:%M")
 
   ;; Sending mail via msmtp
-  (setq message-send-mail-function 'message-send-mail-with-sendmail
+  ;; NOTE: message-sendmail-f-is-evil and --read-envelope-from are required
-        sendmail-program (executable-find "msmtp")
+  ;; to prevent msmtp from stripping the email body when processing headers.
-        message-sendmail-envelope-from 'header
+  ;; Without these, multipart messages (especially from org-msg) may arrive
-        mail-envelope-from 'header
+  ;; with empty bodies.
-        mail-specify-envelope-from t))
+  (setq sendmail-program (executable-find "msmtp")
+        send-mail-function #'message-send-mail-with-sendmail
+        message-send-mail-function #'message-send-mail-with-sendmail
+        message-sendmail-f-is-evil t
+        message-sendmail-extra-arguments '("--read-envelope-from")
+        message-sendmail-envelope-from 'header))
 
 ;; Whenever you reconfigure a package, make sure to wrap your config in an
 ;; `after!' block, otherwise Doom's defaults may override your settings. E.g.

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?
+}