Add Steam Deck (nix-deck) configuration with Jovian-NixOS and remote building

- Add Jovian-NixOS integration for Steam Deck hardware support - Create nix-deck machine configuration with SteamOS role - Add jovian-compat.nix for NixOS 25.05 compatibility (remove in 25.11+) - Create remote-build role for distributed builds - Configure zix790prors as build host - Configure nix-book and nix-deck to use remote builder with fallback - Add comprehensive setup documentation 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-17 15:42:33 -08:00
44 changed files with 859 additions and 1901 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 result
-thoughts
--- a/STEAM_DECK_JOVIAN_SETUP.md
+++ b/STEAM_DECK_JOVIAN_SETUP.md
@@ -0,0 +1,280 @@
+# Steam Deck (nix-deck) Jovian-NixOS Setup Guide
+
+This document describes the setup for installing and maintaining NixOS with Jovian-NixOS on a Steam Deck.
+
+## Overview
+
+The `nix-deck` configuration provides:
+- **Jovian-NixOS integration** for Steam Deck hardware support
+- **Remote building** using `zix790prors` as the build host
+- **SteamOS role** for easy Steam Deck UI configuration
+- **Compatibility shim** for using Jovian on NixOS 25.05 stable
+
+## Architecture
+
+### Remote Building
+
+The setup uses distributed builds to avoid slow compilation on the Steam Deck:
+
+- **Build Host**: `zix790prors` (powerful desktop)
+  - Runs as a dedicated `nix-builder` user (not root)
+  - Accepts SSH connections from client machines
+  - Performs all heavy compilation work
+
+- **Build Clients**: `nix-book` and `nix-deck`
+  - Automatically offload builds to `zix790prors`
+  - Fall back to local building if remote builder is unavailable
+  - Steam Deck heavily prefers remote (speedFactor=4)
+
+### Jovian-NixOS Integration
+
+- **Jovian module**: Provides Steam Deck hardware support, drivers, and Steam UI
+- **Compatibility layer**: `roles/jovian-compat.nix` provides `services.logind.settings` for NixOS 25.05
+  - **IMPORTANT**: Remove this when upgrading to NixOS 25.11+
+  - An assertion will fail the build if used on 25.11+
+
+- **SteamOS role**: `roles.desktop.steamos` abstracts Jovian configuration
+  ```nix
+  roles.desktop.steamos = {
+    enable = true;
+    autoStart = false;  # Set to true to boot directly to Steam UI
+    desktopSession = "plasmawayland";
+  };
+  ```
+
+## Initial Installation
+
+### Prerequisites
+
+1. Steam Deck in recovery mode or booted to a live Linux environment
+2. SSH access enabled on the Steam Deck
+3. SSH key set up for passwordless authentication
+
+### Option 1: Using nixos-anywhere (Initial Install Only)
+
+```bash
+# From your main machine
+nix run github:nix-community/nixos-anywhere -- \
+  --flake .#nix-deck \
+  root@<steam-deck-ip>
+```
+
+**Note**: This is only for the initial install. For updates, see below.
+
+### Option 2: Manual Installation
+
+1. Boot Steam Deck from NixOS installer USB
+2. Partition and format the disk
+3. Mount filesystems
+4. Clone this repository
+5. Generate hardware config:
+   ```bash
+   nixos-generate-config --show-hardware-config > /tmp/hw.nix
+   ```
+6. Copy the hardware config content to `machines/nix-deck/hardware-configuration.nix`
+7. Keep the `jovian.devices.steamdeck` settings in the file
+8. Install:
+   ```bash
+   nixos-install --flake .#nix-deck
+   ```
+
+## Updates and Rebuilds
+
+### Method 1: Remote Build and Deploy (Recommended)
+
+Build on your main machine, deploy to Steam Deck:
+
+```bash
+# From nix-book or zix790prors
+nixos-rebuild switch \
+  --flake .#nix-deck \
+  --target-host root@nix-deck \
+  --build-host localhost
+```
+
+### Method 2: On-Device Rebuild (Uses Remote Builder)
+
+The Steam Deck is configured to automatically use `zix790prors` as a remote builder:
+
+```bash
+# SSH into the Steam Deck
+ssh root@nix-deck
+
+# This will automatically build on zix790prors
+nixos-rebuild switch --flake /path/to/nixos-configs#nix-deck
+```
+
+The build will automatically happen on `zix790prors` and be deployed locally.
+
+## Remote Builder Setup
+
+### On the Build Host (zix790prors)
+
+The configuration creates a `nix-builder` user that client machines connect to:
+
+```nix
+roles.remote-build.enableBuilder = true;
+```
+
+### On Client Machines (nix-book, nix-deck)
+
+Configure the remote builder:
+
+```nix
+roles.remote-build.builders = [{
+  hostName = "zix790prors";
+  maxJobs = 16;
+  speedFactor = 4;  # Higher = prefer remote more
+}];
+```
+
+### SSH Key Setup
+
+1. Generate SSH key on the builder host for the `nix-builder` user:
+   ```bash
+   sudo -u nix-builder ssh-keygen -t ed25519 -f /var/lib/nix-builder/.ssh/id_ed25519
+   ```
+
+2. Copy the public key to client machines:
+   ```bash
+   # Add to /var/lib/nix-builder/.ssh/authorized_keys on zix790prors
+   ```
+
+3. On client machines, ensure you can connect:
+   ```bash
+   ssh nix-builder@zix790prors
+   ```
+
+## Configuration Files
+
+### Key Files Created/Modified
+
+- `flake.nix` - Added Jovian input and nix-deck configuration
+- `roles/jovian-compat.nix` - Compatibility shim (remove in 25.11+)
+- `roles/desktop/steamos.nix` - SteamOS/Jovian role abstraction
+- `roles/remote-build/default.nix` - Remote builder role
+- `machines/nix-deck/configuration.nix` - Steam Deck system config
+- `machines/nix-deck/hardware-configuration.nix` - Hardware config (placeholder)
+
+### Example Configuration
+
+```nix
+# machines/nix-deck/configuration.nix
+{
+  roles = {
+    desktop = {
+      enable = true;
+      wayland = true;
+      gaming.enable = true;
+      kde = true;
+      sddm = true;
+      steamos = {
+        enable = true;
+        autoStart = false;  # or true to boot to Steam UI
+        desktopSession = "plasmawayland";
+      };
+    };
+    remote-build.builders = [{
+      hostName = "zix790prors";
+      maxJobs = 16;
+      speedFactor = 4;
+    }];
+  };
+}
+```
+
+## Jovian Features
+
+### Enabled by Default
+
+- Steam Deck hardware support (`jovian.devices.steamdeck.enable`)
+- Steam UI (`jovian.steam.enable`)
+- Decky Loader plugin system (`jovian.decky-loader.enable`)
+
+### Optional Features
+
+Set in the hardware-configuration.nix:
+
+```nix
+jovian.devices.steamdeck = {
+  enable = true;
+  autoUpdate = false;  # Auto-update BIOS/controller firmware
+};
+```
+
+### Manual Firmware Updates
+
+```bash
+# BIOS update
+sudo jupiter-biosupdate
+
+# Controller update
+sudo jupiter-controller-update
+
+# Docking station (connect via USB-C first)
+jupiter-dock-updater
+```
+
+## Troubleshooting
+
+### Remote Builds Not Working
+
+1. Check SSH connectivity:
+   ```bash
+   ssh nix-builder@zix790prors
+   ```
+
+2. Verify builder is trusted:
+   ```bash
+   # On zix790prors
+   nix show-config | grep trusted-users
+   ```
+
+3. Check build logs:
+   ```bash
+   journalctl -u nix-daemon -f
+   ```
+
+### Jovian Not Working
+
+1. Ensure you're on NixOS 25.05 or the compatibility layer is removed for 25.11+
+2. Check Jovian is imported in flake.nix
+3. Verify hardware config has `jovian.devices.steamdeck.enable = true`
+
+### Compatibility Layer Issues
+
+If you see an error about `jovian-compat.nix` being incompatible:
+
+1. You're running NixOS 25.11 or later
+2. Remove `./roles/jovian-compat.nix` from `flake.nix`
+3. Jovian should work natively on 25.11+
+
+## Future Upgrades
+
+### Upgrading to NixOS 25.11
+
+1. Update `nixpkgs` input in flake.nix to 25.11
+2. Remove `./roles/jovian-compat.nix` from flake.nix imports
+3. The assertion in jovian-compat.nix will prevent accidental use
+4. Test the build
+5. Deploy
+
+### Switching to Unstable
+
+If you need Jovian to follow unstable nixpkgs:
+
+1. Edit `flake.nix`:
+   ```nix
+   jovian = {
+     url = "github:Jovian-Experiments/Jovian-NixOS";
+     inputs.nixpkgs.follows = "nixpkgs-unstable";
+   };
+   ```
+
+2. This only affects Jovian packages, not your base system
+
+## Additional Resources
+
+- [Jovian-NixOS Documentation](https://jovian-experiments.github.io/Jovian-NixOS/)
+- [Jovian Steam Deck Guide](https://jovian-experiments.github.io/Jovian-NixOS/devices/valve-steam-deck/)
+- [NixOS Remote Builds](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds.html)
--- a/flake.lock
+++ b/flake.lock
@@ -43,37 +43,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1764866045,
-        "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
+        "lastModified": 1758463745,
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager-unstable": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1764872372,
-        "narHash": "sha256-uZuXRz9CzeCHsRbc2MQvKomwoX6GcFC5BUMEk3ouSFU=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "05a56dbf24f195c62286e3273a2671d3b4904b00",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
+        "ref": "release-25.05",
        "repo": "home-manager",
        "type": "github"
      }
@@ -82,15 +61,15 @@
      "inputs": {
        "nix-github-actions": "nix-github-actions",
        "nixpkgs": [
-          "nixpkgs-unstable"
+          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1764746434,
-        "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=",
+        "lastModified": 1763223001,
+        "narHash": "sha256-Hi6XxTJJjKsDrO+D0fYXS88ehCYzQkZlp9qxX1zoM1s=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "b4c0b604148adacf119b89824ed26df8926ce42c",
+        "rev": "68a1bcc019378272e601558719f82005a80ddab0",
        "type": "github"
      },
      "original": {
@@ -106,16 +85,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1764161084,
-        "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
+        "lastModified": 1759509947,
+        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
        "owner": "nix-darwin",
        "repo": "nix-darwin",
-        "rev": "e95de00a471d07435e0527ff4db092c84998698e",
+        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
        "type": "github"
      },
      "original": {
        "owner": "nix-darwin",
-        "ref": "nix-darwin-25.11",
+        "ref": "nix-darwin-25.05",
        "repo": "nix-darwin",
        "type": "github"
      }
@@ -148,11 +127,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1764730608,
-        "narHash": "sha256-FxKIa3OCSRVC23qrk7VT68vExUcmSruJ8OobVlSWOxc=",
+        "lastModified": 1762251193,
+        "narHash": "sha256-CmSddz8e2kM+ITbYutluhKZyXXwI9Sg2lf7XXSvc8oY=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "10124c58674360765adcb38c9a8b081fb72904e4",
+        "rev": "e001844d4553aef268f97b32d3a825b6370eed91",
        "type": "github"
      },
      "original": {
@@ -164,11 +143,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "lastModified": 1761907660,
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
        "type": "github"
      },
      "original": {
@@ -180,11 +159,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1764667669,
-        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
+        "lastModified": 1762596750,
+        "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "418468ac9527e799809c900eda37cbff999199b6",
+        "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
        "type": "github"
      },
      "original": {
@@ -196,16 +175,16 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1764677808,
-        "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
+        "lastModified": 1762498405,
+        "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
+        "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-25.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@@ -220,34 +199,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763909441,
-        "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
+        "lastModified": 1762784320,
+        "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "plasma-manager",
-        "type": "github"
-      }
-    },
-    "plasma-manager-unstable": {
-      "inputs": {
-        "home-manager": [
-          "home-manager-unstable"
-        ],
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763909441,
-        "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
-        "owner": "nix-community",
-        "repo": "plasma-manager",
-        "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4",
+        "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321",
        "type": "github"
      },
      "original": {
@@ -260,14 +216,12 @@
      "inputs": {
        "google-cookie-retrieval": "google-cookie-retrieval",
        "home-manager": "home-manager",
-        "home-manager-unstable": "home-manager-unstable",
        "jovian": "jovian",
        "nix-darwin": "nix-darwin",
        "nixos-wsl": "nixos-wsl",
        "nixpkgs": "nixpkgs_2",
        "nixpkgs-unstable": "nixpkgs-unstable",
-        "plasma-manager": "plasma-manager",
-        "plasma-manager-unstable": "plasma-manager-unstable"
+        "plasma-manager": "plasma-manager"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@@ -2,37 +2,26 @@
  description = "A very basic flake";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
    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";
+      url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

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

-    home-manager-unstable = {
-      url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
-
    plasma-manager = {
      url = "github:nix-community/plasma-manager";
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.home-manager.follows = "home-manager";
    };

-    plasma-manager-unstable = {
-      url = "github:nix-community/plasma-manager";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-      inputs.home-manager.follows = "home-manager-unstable";
-    };
-
    google-cookie-retrieval = {
      url = "git+https://git.johnogle.info/johno/google-cookie-retrieval.git";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -40,7 +29,7 @@

    jovian = {
      url = "github:Jovian-Experiments/Jovian-NixOS";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
    };
  };

@@ -49,33 +38,7 @@
      ./roles
    ] ++ [
      inputs.home-manager.nixosModules.home-manager
-      {
-        nixpkgs.overlays = [
-          (final: prev: {
-            unstable = import nixpkgs-unstable {
-              system = prev.system;
-              config.allowUnfree = true;
-            };
-            custom = prev.callPackage ./packages {};
-            # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
-            bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
-          })
-        ];
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.sharedModules = [
-          inputs.plasma-manager.homeModules.plasma-manager
-        ];
-        home-manager.extraSpecialArgs = {
-          globalInputs = inputs;
-        };
-      }
-    ];
-    # Modules for unstable-based systems (like nix-deck)
-    nixosModulesUnstable = [
-      ./roles
-    ] ++ [
-      inputs.home-manager-unstable.nixosModules.home-manager
+      ./roles/jovian-compat.nix  # Compatibility shim for Jovian on stable NixOS
      inputs.jovian.nixosModules.jovian
      {
        nixpkgs.overlays = [
@@ -85,14 +48,12 @@
              config.allowUnfree = true;
            };
            custom = prev.callPackage ./packages {};
-            # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
-            bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
          })
        ];
        home-manager.useGlobalPkgs = true;
        home-manager.useUserPackages = true;
        home-manager.sharedModules = [
-          inputs.plasma-manager-unstable.homeModules.plasma-manager
+          inputs.plasma-manager.homeModules.plasma-manager
        ];
        home-manager.extraSpecialArgs = {
          globalInputs = inputs;
@@ -109,17 +70,8 @@
            unstable = import nixpkgs-unstable {
              system = prev.system;
              config.allowUnfree = true;
-              overlays = [
-                # Override claude-code in unstable to use our custom GCS-based build
-                # (needed for corporate networks that block npm registry)
-                (ufinal: uprev: {
-                  claude-code = prev.custom.claude-code or (prev.callPackage ./packages {}).claude-code;
-                })
-              ];
            };
            custom = prev.callPackage ./packages {};
-            # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
-            bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
          })
        ];
        home-manager.useGlobalPkgs = true;
@@ -139,7 +91,7 @@
          home-manager.users.johno = {
            imports = [ ./home/home-laptop-compact.nix ];
            # Machine-specific overrides
-            home.roles.i3_sway.extraSwayConfig = {
+            home.i3_sway.extraSwayConfig = {
              output.eDP-1.scale = "1.75";
            };
          };
@@ -197,10 +149,10 @@
      ];
    };

-    # Steam Deck configuration (using unstable for better Jovian compatibility)
-    nixosConfigurations.nix-deck = nixpkgs-unstable.lib.nixosSystem rec {
+    # Steam Deck configuration
+    nixosConfigurations.nix-deck = nixpkgs.lib.nixosSystem rec {
      system = "x86_64-linux";
-      modules = nixosModulesUnstable ++ [
+      modules = nixosModules ++ [
        ./machines/nix-deck/configuration.nix
        {
          home-manager.users.johno = import ./home/home-desktop.nix;
--- a/home/home-darwin-work.nix
+++ b/home/home-darwin-work.nix
@@ -1,5 +1,8 @@
 { config, lib, pkgs, globalInputs, system, ... }:

+let
+  leader = "cmd"; # Change this to experiment with different leader keys (e.g., "cmd", "ctrl")
+in
 {
  # Home Manager configuration for Darwin work laptop
  # Corporate-friendly setup with essential development tools
@@ -10,11 +13,39 @@

  # System packages
  home.packages = with pkgs; [
-    google-cloud-sdk
+    autoraise
  ];

  # Note: ghostty installed via Homebrew (managed outside of nix)

+  # Auto-start autoraise on login
+  launchd.agents.autoraise = {
+    enable = true;
+    config = {
+      ProgramArguments = [
+        "${pkgs.autoraise}/bin/AutoRaise"
+        "-pollMillis" "50"
+        "-delay" "2"
+        "-focusDelay" "2"
+      ];
+      RunAtLoad = true;
+      KeepAlive = true;
+    };
+  };
+
+  # Auto-start aerospace on login
+  # NOTE: In 25.11+, this can be simplified to `programs.aerospace.launchd.enable = true`
+  launchd.agents.aerospace = {
+    enable = true;
+    config = {
+      Program = "${pkgs.aerospace}/Applications/AeroSpace.app/Contents/MacOS/AeroSpace";
+      RunAtLoad = true;
+      KeepAlive = true;
+      StandardOutPath = "/tmp/aerospace.log";
+      StandardErrorPath = "/tmp/aerospace.err.log";
+    };
+  };
+
  # Override Darwin-incompatible settings from base role
  programs.rbw.settings.pinentry = lib.mkForce pkgs.pinentry_mac;

@@ -96,28 +127,107 @@

  home.shell.enableShellIntegration = true;

+  # TODO: Move this to its own role and/or module
+  programs.aerospace = {
+    enable = true;
+    userSettings.mode.main.binding = {
+      "${leader}-slash" = "layout tiles horizontal vertical";
+      "${leader}-comma" = "layout accordion horizontal vertical";
+      "${leader}-shift-q" = "close";
+      "${leader}-shift-f" = "fullscreen";
+      "${leader}-h" = "focus left";
+      "${leader}-j" = "focus down";
+      "${leader}-k" = "focus up";
+      "${leader}-l" = "focus right";
+      "${leader}-shift-h" = "move left";
+      "${leader}-shift-j" = "move down";
+      "${leader}-shift-k" = "move up";
+      "${leader}-shift-l" = "move right";
+      "${leader}-minus" = "resize smart -50";
+      "${leader}-equal" = "resize smart +50";
+      "${leader}-1" = "workspace 1";
+      "${leader}-2" = "workspace 2";
+      "${leader}-3" = "workspace 3";
+      "${leader}-4" = "workspace 4";
+      "${leader}-5" = "workspace 5";
+      "${leader}-6" = "workspace 6";
+      "${leader}-7" = "workspace 7";
+      "${leader}-8" = "workspace 8";
+      "${leader}-9" = "workspace 9";
+      "${leader}-0" = "workspace 10";
+      "${leader}-shift-1" = "move-node-to-workspace 1";
+      "${leader}-shift-2" = "move-node-to-workspace 2";
+      "${leader}-shift-3" = "move-node-to-workspace 3";
+      "${leader}-shift-4" = "move-node-to-workspace 4";
+      "${leader}-shift-5" = "move-node-to-workspace 5";
+      "${leader}-shift-6" = "move-node-to-workspace 6";
+      "${leader}-shift-7" = "move-node-to-workspace 7";
+      "${leader}-shift-8" = "move-node-to-workspace 8";
+      "${leader}-shift-9" = "move-node-to-workspace 9";
+      "${leader}-shift-0" = "move-node-to-workspace 10";
+      "${leader}-tab" = "workspace-back-and-forth";
+      "${leader}-shift-tab" = "move-workspace-to-monitor --wrap-around next";
+
+      "${leader}-enter" = ''
+        exec-and-forget osascript <<'APPLESCRIPT'
+        tell application "Ghostty"
+            activate
+            tell application "System Events"
+                keystroke "n" using {command down}
+            end tell
+        end tell
+        APPLESCRIPT
+      '';
+
+      "${leader}-shift-enter" = ''
+        exec-and-forget osascript <<'APPLESCRIPT'
+        tell application "Google Chrome"
+            set newWindow to make new window
+            activate
+            tell newWindow to set index to 1
+        end tell
+        APPLESCRIPT
+      '';
+
+      "${leader}-shift-e" = "exec-and-forget zsh --login -c \"emacsclient -c -n\"";
+
+      # Service mode: Deliberate aerospace window management
+      "${leader}-i" = "mode service";
+
+      # Passthrough mode: Temporarily disable aerospace to use macOS shortcuts
+      # Press Cmd-P, then use any macOS shortcut (like Cmd-K in Slack), then press Cmd-P again to exit
+      "${leader}-p" = "mode passthrough";
+    };
+
+    # Service mode: For deliberate aerospace window management operations
+    userSettings.mode.service.binding = {
+      esc = ["reload-config" "mode main"];
+      r = ["flatten-workspace-tree" "mode main"]; # reset layout
+      f = ["layout floating tiling" "mode main"]; # Toggle between floating and tiling layout
+      backspace = ["close-all-windows-but-current" "mode main"];
+
+      "${leader}-shift-h" = ["join-with left" "mode main"];
+      "${leader}-shift-j" = ["join-with down" "mode main"];
+      "${leader}-shift-k" = ["join-with up" "mode main"];
+      "${leader}-shift-l" = ["join-with right" "mode main"];
+    };
+
+    # Passthrough mode: All shortcuts pass through to macOS
+    # This mode has minimal bindings - just ways to exit back to main mode
+    userSettings.mode.passthrough.binding = {
+      esc = "mode main";
+      "${leader}-p" = "mode main";  # Toggle back with same key (Cmd-P)
+    };
+  };
+
  home.roles = {
    base.enable = true;
-    development = {
-      enable = true;
-      allowArbitraryClaudeCodeModelSelection = true;
-    };
-    tmux.enable = true;
-    emacs.enable = true;
-    aerospace = {
-      enable = true;
-      leader = "cmd";
-      ctrlShortcuts.enable = true;
-      sketchybar.enable = true;
-      # Optional: Add per-machine userSettings overrides
-      # userSettings = {
-      #   mode.main.binding."${leader}-custom" = "custom-command";
-      # };
-    };
  };

  imports = [
    ./roles
-    ./roles/base-darwin
+    ./modules/emacs
+    ./modules/kubectl
+    ./modules/tmux
  ];
 }
--- a/home/home-desktop.nix
+++ b/home/home-desktop.nix
@@ -16,11 +16,6 @@
    communication.enable = true;
    sync.enable = true;
    kdeconnect.enable = true;
-    kubectl.enable = true;
-    tmux.enable = true;
-    plasma-manager.enable = true;
-    emacs.enable = true;
-    i3_sway.enable = true;
  };

  targets.genericLinux.enable = true;
@@ -29,6 +24,10 @@

  imports = [
    ./roles
-    ./roles/base-linux
+    ./modules/emacs
+    ./modules/i3+sway
+    ./modules/kubectl
+    ./modules/plasma-manager
+    ./modules/tmux
  ];
 }
--- a/home/home-laptop-compact.nix
+++ b/home/home-laptop-compact.nix
@@ -17,19 +17,7 @@
    kdeconnect.enable = true;
    media.enable = true;
    sync.enable = true;
-    kubectl.enable = true;
-    tmux.enable = true;
-    plasma-manager.enable = true;
-    emacs.enable = true;
-    i3_sway.enable = true;
-
-    # Launcher wrappers for excluded/optional packages
-    launchers = {
-      enable = true;
-      packages = [
-        "libreoffice"
-      ];
-    };
+    # office.enable = false;  # Excluded for storage constraints
  };

  targets.genericLinux.enable = true;
@@ -38,6 +26,11 @@

  imports = [
    ./roles
-    ./roles/base-linux
+    ./modules/emacs
+    ./modules/i3+sway
+    ./modules/kubectl
+    ./modules/plasma-manager
+    ./modules/tmux
  ];
+
 }
--- a/home/home-live-usb.nix
+++ b/home/home-live-usb.nix
@@ -12,10 +12,6 @@
  home.roles = {
    base.enable = true;
    desktop.enable = true;
-    tmux.enable = true;
-    plasma-manager.enable = true;
-    emacs.enable = true;
-    i3_sway.enable = true;
    # development.enable = false;  # Not needed for live USB
    # communication.enable = false; # Not needed for live USB  
    # office.enable = false;       # Not needed for live USB
@@ -30,7 +26,11 @@

  imports = [
    ./roles
-    ./roles/base-linux
+    ./modules/emacs
+    ./modules/i3+sway
+    ./modules/kubectl
+    ./modules/plasma-manager
+    ./modules/tmux
  ];

  # Live USB specific overrides can go here if needed
--- a/home/home-media-center.nix
+++ b/home/home-media-center.nix
@@ -16,10 +16,6 @@
    communication.enable = true;
    kdeconnect.enable = true;
    development.enable = true;
-    tmux.enable = true;
-    plasma-manager.enable = true;
-    emacs.enable = true;
-    i3_sway.enable = true;
    # office.enable = false;    # Not needed for media center
    # sync.enable = false;      # Shared machine, no personal file sync
  };
@@ -30,7 +26,11 @@

  imports = [
    ./roles
-    ./roles/base-linux
+    ./modules/emacs
+    ./modules/i3+sway
+    ./modules/kubectl
+    ./modules/plasma-manager
+    ./modules/tmux
  ];

  # Media center specific overrides can go here if needed
--- a/home/modules/emacs/default.nix
+++ b/home/modules/emacs/default.nix
@@ -3,8 +3,6 @@
 with lib;

 let
-  cfg = config.home.roles.emacs;
-
  doomEmacs = pkgs.fetchFromGitHub {
    owner = "doomemacs";
    repo = "doomemacs";
@@ -25,17 +23,14 @@ let
    else pkgs.emacs.pkgs.withPackages emacsPackages;
 in
 {
-  options.home.roles.emacs = {
-    enable = mkEnableOption "Doom Emacs with vterm and tree-sitter support";
-  };
-
-  config = mkIf cfg.enable {
+  config = {
    home.packages = [
      pkgs.emacs-all-the-icons-fonts
      pkgs.fira-code
      pkgs.fontconfig
      pkgs.graphviz
      pkgs.isort
+      #pkgs.libvterm # native vterm library
      pkgs.nerd-fonts.fira-code
      pkgs.nerd-fonts.droid-sans-mono
      pkgs.nil # nix lsp language server
@@ -71,7 +66,7 @@ in
    home.activation.doomConfig = lib.hm.dag.entryAfter ["writeBoundary"] ''
      # Always remove and recreate the symlink to ensure it points to the source directory
      rm -rf "${config.xdg.configHome}/doom"
-      ln -sf "${config.home.homeDirectory}/nixos-configs/home/roles/emacs/doom" "${config.xdg.configHome}/doom"
+      ln -sf "${config.home.homeDirectory}/nixos-configs/home/modules/emacs/doom" "${config.xdg.configHome}/doom"
    '';
  };
 }
--- a/home/modules/emacs/doom/config.el
+++ b/home/modules/emacs/doom/config.el
--- a/home/modules/emacs/doom/init.el
+++ b/home/modules/emacs/doom/init.el
--- a/home/modules/emacs/doom/packages.el
+++ b/home/modules/emacs/doom/packages.el
--- a/home/modules/i3+sway/default.nix
+++ b/home/modules/i3+sway/default.nix
@@ -3,7 +3,7 @@
 with lib;

 let
-  cfg = config.home.roles.i3_sway;
+  cfg = config.home.i3_sway;

  shared_config = recursiveUpdate rec {
    modifier = "Mod4";
@@ -14,9 +14,6 @@ let
      "${shared_config.modifier}+Return" = "exec ${terminal}";
      "${shared_config.modifier}+Shift+q" = "kill";

-      "${shared_config.modifier}+a" = "focus parent";
-      "${shared_config.modifier}+Shift+a" = "focus child";
-
      "${shared_config.modifier}+h" = "focus left";
      "${shared_config.modifier}+j" = "focus down";
      "${shared_config.modifier}+k" = "focus up";
@@ -48,6 +45,8 @@ let
      "${shared_config.modifier}+Shift+space" = "floating toggle";
      "${shared_config.modifier}+space" = "focus mode_toggle";

+      "${shared_config.modifier}+a" = "focus parent";
+
      "${shared_config.modifier}+Shift+minus" = "move scratchpad";
      "${shared_config.modifier}+minus" = "scratchpad show";

@@ -88,172 +87,30 @@ let

      "${shared_config.modifier}+r" = "mode resize";

-      "XF86MonBrightnessUp" = "exec ddcutil setvcp 10 + 5";
-      "XF86MonBrightnessDown" = "exec ddcutil setvcp 10 - 5";
+      "XF86MonBrightnessUp" = "exec brightnessctl s +5%";
+      "XF86MonBrightnessDown" = "exec brightnessctl s 5%-";
    };
  } cfg.extraSharedConfig;
 in {
-  options.home.roles.i3_sway = {
-    enable = mkEnableOption "i3 and Sway tiling window managers with waybar and rofi";
-
+  options.home.i3_sway = {
    extraSharedConfig = mkOption {
-      type = types.attrs;
      default = {};
-      description = "Extra configuration shared between i3 and sway";
    };
-
    extraI3Config = mkOption {
-      type = types.attrs;
      default = {};
-      description = "Extra i3-specific configuration";
    };
-
    extraSwayConfig = mkOption {
-      type = types.attrs;
      default = {};
-      description = "Extra sway-specific configuration";
    };
  };

-  config = mkIf cfg.enable {
-    # i3blocks configuration file
-    home.file.".config/i3blocks/config".text = ''
-      # i3blocks config - replicating waybar setup
-      separator_block_width=15
-      markup=pango
-
-      [disk]
-      command=df -h / | awk 'NR==2 {print "💾 " $5}'
-      interval=30
-      separator=true
-
-      [cpu]
-      command=top -bn1 | grep "Cpu(s)" | sed "s/.*, *\([0-9.]*\)%* id.*/\1/" | awk '{print "🧠 " int(100 - $1) "%"}'
-      interval=2
-      separator=true
-
-      [memory]
-      command=free | awk 'NR==2 {printf "🐏 %.0f%%\n", $3*100/$2}'
-      interval=5
-      separator=true
-
-      [pulseaudio]
-      command=${pkgs.writeShellScript "i3blocks-pulseaudio" ''
-        volume=$(pactl get-sink-volume @DEFAULT_SINK@ | grep -Po '\d+%' | head -1)
-        muted=$(pactl get-sink-mute @DEFAULT_SINK@ | grep -o 'yes')
-        if [ "$muted" = "yes" ]; then
-          echo "🔇"
-        else
-          vol_num=''${volume%\%}
-          if [ $vol_num -le 33 ]; then
-            echo "🔈 $volume"
-          elif [ $vol_num -le 66 ]; then
-            echo "🔉 $volume"
-          else
-            echo "🔊 $volume"
-          fi
-        fi
-      ''}
-      interval=1
-      signal=10
-      separator=true
-
-      [backlight]
-      command=${pkgs.writeShellScript "i3blocks-backlight" ''
-        if command -v ddcutil &>/dev/null; then
-          # Handle mouse scroll events
-          case $BLOCK_BUTTON in
-            4) ddcutil setvcp 10 + 5 ;;  # Scroll up - increase brightness
-            5) ddcutil setvcp 10 - 5 ;;  # Scroll down - decrease brightness
-          esac
-
-          # Display current brightness
-          brightness=$(ddcutil getvcp 10 2>/dev/null | grep -oP 'current value =\s*\K\d+')
-          if [ -n "$brightness" ]; then
-            echo "☀️ $brightness%"
-          fi
-        fi
-      ''}
-      interval=5
-      separator=true
-
-      [network]
-      command=${pkgs.writeShellScript "i3blocks-network" ''
-        if iwgetid -r &>/dev/null; then
-          ssid=$(iwgetid -r)
-          signal=$(grep "^\s*w" /proc/net/wireless | awk '{print int($3 * 100 / 70)}')
-          echo "📶 $ssid ($signal%)"
-        else
-          ip=$(ip -4 addr show | grep -oP '(?<=inet\s)\d+(\.\d+){3}' | grep -v '127.0.0.1' | head -1)
-          if [ -n "$ip" ]; then
-            echo "🔌 $ip"
-          else
-            echo "❌"
-          fi
-        fi
-      ''}
-      interval=5
-      separator=true
-
-      [battery]
-      command=${pkgs.writeShellScript "i3blocks-battery" ''
-        if [ -d /sys/class/power_supply/BAT0 ]; then
-          capacity=$(cat /sys/class/power_supply/BAT0/capacity)
-          status=$(cat /sys/class/power_supply/BAT0/status)
-
-          if [ "$status" = "Charging" ]; then
-            echo "⚡ $capacity%"
-          else
-            echo "🔋 $capacity%"
-          fi
-        fi
-      ''}
-      interval=10
-      separator=true
-
-      [time]
-      command=date '+%Y-%m-%d %H:%M'
-      interval=1
-      separator=false
-    '';
-
+  config = {
    xsession.windowManager.i3 = let
      base_i3_config = recursiveUpdate shared_config {
        bars = [{
          position = "bottom";
-          statusCommand = "${pkgs.i3blocks}/bin/i3blocks";
+          statusCommand = "${pkgs.i3status}/bin/i3status";
          trayOutput = "primary";  # Enable system tray on primary output
-          fonts = {
-            names = [ "Fira Code" "monospace" ];
-            size = 11.0;
-          };
-          colors = {
-            background = "#000000";
-            statusline = "#ffffff";
-            separator = "#666666";
-
-            # Workspace button colors (matching waybar)
-            focusedWorkspace = {
-              border = "#285577";
-              background = "#285577";
-              text = "#ffffff";
-            };
-            activeWorkspace = {
-              border = "#5f676a";
-              background = "#5f676a";
-              text = "#ffffff";
-            };
-            inactiveWorkspace = {
-              border = "#222222";
-              background = "#222222";
-              text = "#888888";
-            };
-            urgentWorkspace = {
-              border = "#900000";
-              background = "#900000";
-              text = "#ffffff";
-            };
-          };
        }];
        keybindings = shared_config.keybindings // {
          "${shared_config.modifier}+d" = "exec rofi -show drun";
@@ -317,23 +174,15 @@ in {
            bg = "${../../wallpapers/metroid-samus-returns-kz-3440x1440.jpg} fill";
          };
        };
-        startup = [
-          # Launch waybar status bar
-          {
-            command = "waybar";
-            always = false;
-          }
-        ];
      };
    in {
      enable = true;
-      extraOptions = [ "--unsupported-gpu" ];
      config = recursiveUpdate base_sway_config cfg.extraSwayConfig;
    };

    programs.waybar = {
      enable = true;
-      systemd.enable = false;  # Don't auto-start via systemd - only launch in sway
+      systemd.enable = true;
      settings = {
        mainBar = {
          layer = "top";
@@ -431,7 +280,7 @@ in {

        #workspaces button {
          padding: 0 8px;
-          background-color: #333333;
+          background-color: transparent;
          color: #ffffff;
          border: none;
        }
@@ -466,5 +315,7 @@ in {
        sidebar-mode = true;
      };
    };
+
+    programs.i3status.enable = true;
  };
 }
--- a/home/modules/kubectl/default.nix
+++ b/home/modules/kubectl/default.nix
@@ -1,13 +1,13 @@
-{ config, lib, pkgs, globalInputs, system, ... }:
+{ config, lib, pkgs, ... }:

 with lib;

 let
-  cfg = config.home.roles.kubectl;
+  cfg = config.programs.kubectl-secure;
 in
 {
-  options.home.roles.kubectl = {
-    enable = mkEnableOption "management tools for the homelab k3s oglenet cluster with secure Bitwarden integration";
+  options.programs.kubectl-secure = {
+    enable = mkEnableOption "secure kubectl configuration with Bitwarden integration";
  };

  config = mkIf cfg.enable {
@@ -172,6 +172,12 @@ in
        
        echo "✓ Loaded kubectl context: $context (session: $$)"
        echo "  Config location: $KUBECONFIG"
+        
+        # Optional: Set timeout cleanup
+        if [[ ${toString cfg.sessionTimeout} -gt 0 ]]; then
+          (sleep ${toString cfg.sessionTimeout}; kube-clear 2>/dev/null) &
+          export KUBECTL_TIMEOUT_PID=$!
+        fi
      }
      
      kube-list() {
--- a/home/modules/plasma-manager/default.nix
+++ b/home/modules/plasma-manager/default.nix
@@ -0,0 +1,178 @@
+{ config, lib, pkgs, ... }:
+
+
+# The current KDE config can be output with the command:
+# nix run github:nix-community/plasma-manager
+#
+# Plasma-manager options documentation
+# https://nix-community.github.io/plasma-manager/options.xhtml
+#
+# TODO: (ambitious) Add Kmail support to plasma-manager
+{
+  programs.plasma = {
+    enable = true;
+    overrideConfig = true;
+
+    hotkeys.commands."launch-ghostty" = {
+      name = "Launch Ghostty";
+      key = "Meta+Return";
+      command = "ghostty";
+    };
+
+    shortcuts = {
+      kmix = {
+        "decrease_microphone_volume" = "Microphone Volume Down";
+        "decrease_volume" = "Volume Down";
+        "decrease_volume_small" = "Shift+Volume Down";
+        "increase_microphone_volume" = "Microphone Volume Up";
+        "increase_volume" = "Volume Up";
+        "increase_volume_small" = "Shift+Volume Up";
+        "mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
+        "mute" = "Volume Mute";
+      };
+
+      mediacontrol = {
+        "mediavolumedown" = "none,,Media volume down";
+        "mediavolumeup" = "none,,Media volume up";
+        "nextmedia" = "Media Next";
+        "pausemedia" = "Media Pause";
+        "playmedia" = "none,,Play media playback";
+        "playpausemedia" = "Media Play";
+        "previousmedia" = "Media Previous";
+        "stopmedia" = "Media Stop";
+      };
+
+      ksmserver = {
+        "Lock Session" = ["Meta+Ctrl+Q" "Screensaver" "Screensaver,Lock Session"];
+      };
+
+      kwin = {
+        "Window Close" = "Meta+Shift+Q";
+        "Kill Window" = "Meta+Ctrl+Esc";
+        "Window Operations Menu" = "Alt+F3";
+        "Window Resize" = "Meta+R,,Resize Window";
+
+        "Overview" = "Meta+Ctrl+W";
+        "Grid View" = "Meta+G";
+        "Edit Tiles" = "Meta+T";
+
+        "Activate Window Demanding Attention" = "Meta+Ctrl+A";
+
+        "Show Desktop" = "Meta+Ctrl+D";
+
+        "Walk Through Windows" = "Alt+Tab";
+        "Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
+        "Walk Through Windows of Current Application" = "Alt+`";
+        "Walk Through Windows of Current Application (Reverse)" = "Alt+~";
+
+        "Window Quick Tile Bottom" = "Meta+Down";
+        "Window Quick Tile Left" = "Meta+Left";
+        "Window Quick Tile Right" = "Meta+Right";
+        "Window Quick Tile Top" = "Meta+Up";
+
+        "Switch to Desktop 1" = "Meta+1";
+        "Switch to Desktop 2" = "Meta+2";
+        "Switch to Desktop 3" = "Meta+3";
+        "Switch to Desktop 4" = "Meta+4";
+        "Switch to Desktop 5" = "Meta+5";
+        "Switch to Desktop 6" = "Meta+6";
+        "Switch to Desktop 7" = "Meta+7";
+        "Switch to Desktop 8" = "Meta+8";
+        "Switch to Desktop 9" = "Meta+9";
+        "Switch to Desktop 10" = "Meta+0";
+        
+        "Window to Desktop 1" = "Meta+!";    # Meta+Shift+1
+        "Window to Desktop 2" = "Meta+@";    # Meta+Shift+2
+        "Window to Desktop 3" = "Meta+#";    # Meta+Shift+3
+        "Window to Desktop 4" = "Meta+$";    # Meta+Shift+4
+        "Window to Desktop 5" = "Meta+%";    # Meta+Shift+5
+        "Window to Desktop 6" = "Meta+^";    # Meta+Shift+6
+        "Window to Desktop 7" = "Meta+&";    # Meta+Shift+7
+        "Window to Desktop 8" = "Meta+*";    # Meta+Shift+8
+        "Window to Desktop 9" = "Meta+(";    # Meta+Shift+9
+        "Window to Desktop 10" = "Meta+)";   # Meta+Shift+0
+
+        "view_actual_size" = "Meta+Ctrl+=";
+        "view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"];
+        "view_zoom_out" = "Meta+-";
+      };
+      "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down";
+      "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down";
+      "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down";
+      "org_kde_powerdevil"."Hibernate" = "Hibernate";
+      "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up";
+      "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up";
+      "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up";
+      "org_kde_powerdevil"."PowerDown" = "Power Down";
+      "org_kde_powerdevil"."PowerOff" = "Power Off";
+      "org_kde_powerdevil"."Sleep" = "Sleep";
+      "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off";
+      "org_kde_powerdevil"."Turn Off Screen" = [ ];
+      "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"];
+
+      plasmashell = {
+        "activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"];
+        "activate task manager entry 1" = "none,,";
+        "activate task manager entry 2" = "none,,";
+        "activate task manager entry 3" = "none,,";
+        "activate task manager entry 4" = "none,,";
+        "activate task manager entry 5" = "none,,";
+        "activate task manager entry 6" = "none,,";
+        "activate task manager entry 7" = "none,,";
+        "activate task manager entry 8" = "none,,";
+        "activate task manager entry 9" = "none,,";
+        "activate task manager entry 10" = "none,,";
+        "show activity switcher" = "none,,";
+      };
+    };
+
+    configFile = {
+      kwinrc.Desktops.Number = {
+        value = 10;
+        immutable = true;
+      };
+      
+      # Enable KWin tiling features
+      kwinrc.Tiling = {
+        # Enable tiling functionality  
+        "padding" = 4;
+      };
+      
+      # Enable krohnkite plugin automatically
+      kwinrc.Plugins = {
+        krohnkiteEnabled = true;
+      };
+      
+      kwinrc.Effect-overview = {
+        # Configure overview effect for better tiling workflow
+        BorderActivate = 9;  # Top-left corner activation
+      };
+
+      kcminputrc.Libinput = {
+        AccelerationProfile = "adaptive";
+        PointerAcceleration = 0.5;
+      };
+
+      kcminputrc.Mouse = {
+        X11LibInputXAccelProfileFlat = false;
+        XLbInptAccelProfileFlat = false;
+      };
+
+      kdeglobals.KDE.LookAndFeelPackage = "org.kde.breezedark.desktop";
+
+      # Focus follows mouse configuration
+      kwinrc.Windows = {
+        FocusPolicy = "FocusFollowsMouse";
+        AutoRaise = true;  # Set to true if you want windows to auto-raise on focus
+        AutoRaiseInterval = 750;  # Delay in ms before auto-raise (if enabled)
+        DelayFocusInterval = 0;  # Delay in ms before focus follows mouse
+      };
+
+      # Desktop wallpaper configuration
+      plasma-localerc.Formats.LANG = "en_US.UTF-8";
+      
+      # Set wallpaper for all desktops
+      plasmarc.Wallpapers.usersWallpapers = "${../../wallpapers/metroid-samus-returns-kz-3440x1440.jpg}";
+    };
+  };
+}
--- a/home/modules/tmux/default.nix
+++ b/home/modules/tmux/default.nix
@@ -0,0 +1,52 @@
+{ config, lib, pkgs, ... }:
+
+let
+  tokyo-night = pkgs.tmuxPlugins.mkTmuxPlugin {
+    pluginName = "tokyo-night";
+    rtpFilePath = "tokyo-night.tmux";
+    version = "1.6.1";
+    src = pkgs.fetchFromGitHub {
+      owner = "janoamaral";
+      repo = "tokyo-night-tmux";
+      rev = "d610ced20d5f602a7995854931440e4a1e0ab780";
+      sha256 = "sha256-17vEgkL7C51p/l5gpT9dkOy0bY9n8l0/LV51mR1k+V8=";
+    };
+  };
+in
+{
+  programs.tmux.enable = true;
+  programs.tmux.terminal = "tmux-direct";
+  programs.tmux.keyMode = "vi";
+  programs.tmux.escapeTime = 0;
+  programs.tmux.mouse = true;
+  programs.tmux.newSession = true;
+  programs.tmux.historyLimit = 50000;
+  programs.tmux.clock24 = true;
+  programs.tmux.baseIndex = 1;
+  programs.tmux.prefix = "M-\\\\";
+
+  programs.tmux.plugins = with pkgs; [
+    tmuxPlugins.cpu
+    tmuxPlugins.battery
+    tmuxPlugins.better-mouse-mode
+    tmuxPlugins.net-speed
+    tmuxPlugins.online-status
+    tmuxPlugins.pain-control
+    tmuxPlugins.tilish
+    tmuxPlugins.yank
+
+    {
+      plugin = tmuxPlugins.resurrect;
+      extraConfig = "set -g @resurrect-strategy-nvim 'session'";
+    }
+    {
+      plugin = tmuxPlugins.continuum;
+      extraConfig = ''
+        set -g @continuum-restore 'on'
+        set -g @continuum-save-interval '15' # minutes
+      '';
+    }
+
+    tokyo-night
+  ];
+}
--- a/home/roles/aerospace/default.nix
+++ b/home/roles/aerospace/default.nix
@@ -1,716 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.home.roles.aerospace;
-in
-{
-  options.home.roles.aerospace = {
-    enable = mkEnableOption "AeroSpace tiling window manager for macOS";
-
-    leader = mkOption {
-      type = types.str;
-      default = "cmd";
-      description = "Leader key for aerospace shortcuts (e.g., 'cmd', 'ctrl', 'alt')";
-      example = "ctrl";
-    };
-
-    launchd.enable = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Whether to enable launchd agent for auto-starting aerospace";
-    };
-
-    userSettings = mkOption {
-      type = types.attrs;
-      default = {};
-      description = ''
-        Additional aerospace configuration settings to merge with defaults.
-        Use this to override or extend the default configuration on a per-machine basis.
-      '';
-      example = literalExpression ''
-        {
-          mode.main.binding."''${leader}-custom" = "custom-command";
-        }
-      '';
-    };
-
-    autoraise = {
-      enable = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Whether to enable autoraise (auto-focus window on hover)";
-      };
-
-      pollMillis = mkOption {
-        type = types.int;
-        default = 50;
-        description = "Polling interval in milliseconds";
-      };
-
-      delay = mkOption {
-        type = types.int;
-        default = 2;
-        description = "Delay before raising window";
-      };
-
-      focusDelay = mkOption {
-        type = types.int;
-        default = 2;
-        description = "Delay before focusing window";
-      };
-    };
-
-    enableSpansDisplays = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Configure macOS Spaces to span displays (required for aerospace multi-monitor support).
-        Sets com.apple.spaces.spans-displays to true.
-
-        NOTE: This was previously set at the system level in modules/aerospace.nix,
-        but has been moved to home-manager for better modularity.
-      '';
-    };
-
-    ctrlShortcuts = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Remap common macOS Cmd shortcuts to Ctrl equivalents for all operations.
-          This makes macOS behave more like Linux.
-
-          Shortcuts remapped globally:
-          - Ctrl+N: New Window
-          - Ctrl+T: New Tab
-          - Ctrl+W: Close Tab
-          - Ctrl+S: Save / Save As
-          - Ctrl+O: Open
-          - Ctrl+F: Find
-          - Ctrl+H: Find and Replace
-          - Ctrl+P: Print
-          - Ctrl+C/V/X: Copy/Paste/Cut
-          - Ctrl+Z: Undo
-
-          NOTE: Terminal emulators like Ghostty require per-app overrides (configured separately)
-          to preserve Ctrl+C as SIGINT instead of Copy.
-        '';
-      };
-    };
-
-    sketchybar = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to enable SketchyBar status bar";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Only apply on Darwin systems
-    assertions = [
-      {
-        assertion = pkgs.stdenv.isDarwin;
-        message = "Aerospace role is only supported on macOS (Darwin) systems";
-      }
-    ];
-
-    # Configure macOS preferences via targets.darwin.defaults
-    targets.darwin.defaults = mkMerge [
-      # Spaces span displays (required for multi-monitor aerospace)
-      (mkIf cfg.enableSpansDisplays {
-        "com.apple.spaces" = {
-          spans-displays = true;
-        };
-      })
-
-      # Ctrl shortcuts to make macOS behave more like Linux
-      (mkIf cfg.ctrlShortcuts.enable {
-        NSGlobalDomain.NSUserKeyEquivalents = {
-          # Window/Tab operations
-          "New Window" = "^n";
-          "New Tab" = "^t";
-          "Close Tab" = "^w";
-          # File operations
-          "Save" = "^s";
-          "Save As…" = "^$s";  # Ctrl+Shift+S
-          "Open" = "^o";
-          "Open…" = "^o";
-          # Find operations
-          "Find" = "^f";
-          "Find…" = "^f";
-          "Find and Replace" = "^h";
-          "Find and Replace…" = "^h";
-          # Print
-          "Print" = "^p";
-          "Print…" = "^p";
-          # Clipboard operations
-          "Copy" = "^c";
-          "Paste" = "^v";
-          "Cut" = "^x";
-          # Undo/Redo
-          "Undo" = "^z";
-          "Redo" = "^$z";  # Ctrl+Shift+Z
-        };
-      })
-
-      # Ghostty-specific overrides to preserve terminal behavior
-      # Remap clipboard operations back to Cmd (macOS default) so Ctrl+C remains SIGINT
-      (mkIf cfg.ctrlShortcuts.enable {
-        "com.mitchellh.ghostty".NSUserKeyEquivalents = {
-          # Remap back to Cmd for clipboard operations
-          "Copy" = "@c";    # Cmd+C
-          "Paste" = "@v";   # Cmd+V
-          "Cut" = "@x";     # Cmd+X
-          "Undo" = "@z";    # Cmd+Z
-          "Redo" = "@$z";   # Cmd+Shift+Z
-        };
-      })
-    ];
-
-    # Install aerospace package and optional tools if enabled
-    home.packages = [ pkgs.aerospace ]
-      ++ optionals cfg.autoraise.enable [ pkgs.autoraise ]
-      ++ optionals cfg.sketchybar.enable [ pkgs.sketchybar pkgs.sketchybar-app-font ];
-
-    # Enable and configure aerospace
-    programs.aerospace.enable = true;
-    programs.aerospace.launchd.enable = cfg.launchd.enable;
-    programs.aerospace.userSettings = mkMerge [
-      # Default configuration with leader key substitution
-      {
-        # Disable normalizations for i3-like behavior
-        enable-normalization-flatten-containers = false;
-        enable-normalization-opposite-orientation-for-nested-containers = false;
-
-        mode.main.binding = {
-          "${cfg.leader}-w" = "layout accordion horizontal";  # tabbed
-          "${cfg.leader}-s" = "layout accordion vertical";    # stacking
-          "${cfg.leader}-e" = "layout tiles horizontal vertical";  # tiles, toggles orientation
-          "${cfg.leader}-shift-q" = "close";
-          "${cfg.leader}-shift-f" = "fullscreen";
-          "${cfg.leader}-h" = "focus left";
-          "${cfg.leader}-j" = "focus down";
-          "${cfg.leader}-k" = "focus up";
-          "${cfg.leader}-l" = "focus right";
-          "${cfg.leader}-shift-h" = "move left";
-          "${cfg.leader}-shift-j" = "move down";
-          "${cfg.leader}-shift-k" = "move up";
-          "${cfg.leader}-shift-l" = "move right";
-          "${cfg.leader}-r" = "mode resize";
-          "${cfg.leader}-1" = "workspace 1";
-          "${cfg.leader}-2" = "workspace 2";
-          "${cfg.leader}-3" = "workspace 3";
-          "${cfg.leader}-4" = "workspace 4";
-          "${cfg.leader}-5" = "workspace 5";
-          "${cfg.leader}-6" = "workspace 6";
-          "${cfg.leader}-7" = "workspace 7";
-          "${cfg.leader}-8" = "workspace 8";
-          "${cfg.leader}-9" = "workspace 9";
-          "${cfg.leader}-0" = "workspace 10";
-          "${cfg.leader}-shift-1" = "move-node-to-workspace 1";
-          "${cfg.leader}-shift-2" = "move-node-to-workspace 2";
-          "${cfg.leader}-shift-3" = "move-node-to-workspace 3";
-          "${cfg.leader}-shift-4" = "move-node-to-workspace 4";
-          "${cfg.leader}-shift-5" = "move-node-to-workspace 5";
-          "${cfg.leader}-shift-6" = "move-node-to-workspace 6";
-          "${cfg.leader}-shift-7" = "move-node-to-workspace 7";
-          "${cfg.leader}-shift-8" = "move-node-to-workspace 8";
-          "${cfg.leader}-shift-9" = "move-node-to-workspace 9";
-          "${cfg.leader}-shift-0" = "move-node-to-workspace 10";
-          "${cfg.leader}-tab" = "workspace-back-and-forth";
-          "${cfg.leader}-shift-tab" = "move-workspace-to-monitor --wrap-around next";
-
-          "${cfg.leader}-enter" = ''
-            exec-and-forget osascript <<'APPLESCRIPT'
-            tell application "Ghostty"
-                activate
-                tell application "System Events"
-                    keystroke "n" using {command down}
-                end tell
-            end tell
-            APPLESCRIPT
-          '';
-
-          "${cfg.leader}-shift-enter" = ''
-            exec-and-forget osascript <<'APPLESCRIPT'
-            tell application "Google Chrome"
-                set newWindow to make new window
-                activate
-                tell newWindow to set index to 1
-            end tell
-            APPLESCRIPT
-          '';
-
-          "${cfg.leader}-shift-e" = "exec-and-forget zsh --login -c \"emacsclient -c -n\"";
-
-          # Service mode: Deliberate aerospace window management
-          "${cfg.leader}-i" = "mode service";
-
-          # Passthrough mode: Temporarily disable aerospace to use macOS shortcuts
-          "${cfg.leader}-p" = "mode passthrough";
-        };
-
-        # Resize mode: For window resizing operations
-        mode.resize.binding = {
-          h = "resize width -50";
-          j = "resize height +50";
-          k = "resize height -50";
-          l = "resize width +50";
-
-          minus = "resize smart -50";
-          equal = "resize smart +50";
-
-          esc = "mode main";
-          enter = "mode main";
-        };
-
-        # Service mode: For deliberate aerospace window management operations
-        mode.service.binding = {
-          esc = ["reload-config" "mode main"];
-          r = ["flatten-workspace-tree" "mode main"]; # reset layout
-          f = ["layout floating tiling" "mode main"]; # Toggle between floating and tiling layout
-          backspace = ["close-all-windows-but-current" "mode main"];
-
-          "${cfg.leader}-shift-h" = ["join-with left" "mode main"];
-          "${cfg.leader}-shift-j" = ["join-with down" "mode main"];
-          "${cfg.leader}-shift-k" = ["join-with up" "mode main"];
-          "${cfg.leader}-shift-l" = ["join-with right" "mode main"];
-        };
-
-        # Passthrough mode: All shortcuts pass through to macOS
-        mode.passthrough.binding = {
-          esc = "mode main";
-          "${cfg.leader}-p" = "mode main";
-        };
-
-        # SketchyBar integration - notify bar of workspace changes
-        exec-on-workspace-change = mkIf cfg.sketchybar.enable [
-          "/bin/bash" "-c"
-          "${pkgs.sketchybar}/bin/sketchybar --trigger aerospace_workspace_change FOCUSED=$AEROSPACE_FOCUSED_WORKSPACE PREV=$AEROSPACE_PREV_WORKSPACE"
-        ];
-      }
-      # Gaps configuration - prevent windows from overlapping SketchyBar
-      (mkIf cfg.sketchybar.enable {
-        gaps = {
-          outer = {
-            top = 0;
-            bottom = 40;
-            left = 0;
-            right = 0;
-          };
-        };
-      })
-      cfg.userSettings
-    ];
-
-    # Launchd agent for autoraise
-    launchd.agents.autoraise = mkIf cfg.autoraise.enable {
-      enable = true;
-      config = {
-        ProgramArguments = [
-          "${pkgs.autoraise}/bin/AutoRaise"
-          "-pollMillis" (toString cfg.autoraise.pollMillis)
-          "-delay" (toString cfg.autoraise.delay)
-          "-focusDelay" (toString cfg.autoraise.focusDelay)
-        ];
-        RunAtLoad = true;
-        KeepAlive = true;
-      };
-    };
-
-    # SketchyBar configuration
-    home.file.".config/sketchybar/sketchybarrc" = mkIf cfg.sketchybar.enable {
-      executable = true;
-      onChange = "${pkgs.sketchybar}/bin/sketchybar --reload";
-      text = ''
-        #!/bin/bash
-
-        # Plugin directory
-        PLUGIN_DIR="$HOME/.config/sketchybar/plugins"
-
-        # Colors - i3/sway theme with exact color matching
-        # Focused window/workspace color from i3/sway
-        FOCUSED=0xff285577
-
-        # Background colors matching i3blocks bar
-        BAR_BG=0xcc000000          # Semi-transparent black
-        ITEM_BG=0xff333333         # Dark gray for inactive items
-
-        # Text colors
-        TEXT=0xffffffff            # White text
-        GRAY=0xff888888            # Muted text for inactive items
-
-        # Accent colors for warnings
-        WARNING=0xffff9900
-        CRITICAL=0xff900000
-
-        # Configure the bar appearance
-        ${pkgs.sketchybar}/bin/sketchybar --bar \
-            position=bottom \
-            height=32 \
-            color=$BAR_BG \
-            border_width=0 \
-            corner_radius=0 \
-            padding_left=10 \
-            padding_right=10
-
-        # Set default properties for all items
-        # Using monospace font to match waybar's Fira Code styling
-        ${pkgs.sketchybar}/bin/sketchybar --default \
-            updates=when_shown \
-            icon.font="SF Mono:Regular:13.0" \
-            icon.color=$TEXT \
-            icon.padding_left=4 \
-            icon.padding_right=4 \
-            label.font="SF Mono:Regular:13.0" \
-            label.color=$TEXT \
-            label.padding_left=4 \
-            label.padding_right=4 \
-            padding_left=4 \
-            padding_right=4 \
-            background.corner_radius=5 \
-            background.height=24
-
-        # Register aerospace workspace change event
-        ${pkgs.sketchybar}/bin/sketchybar --add event aerospace_workspace_change
-
-        # Create workspace indicators for workspaces 1-10
-        for sid in 1 2 3 4 5 6 7 8 9 10; do
-            # Display "0" for workspace 10
-            if [ "$sid" = "10" ]; then
-                display="0"
-            else
-                display="$sid"
-            fi
-
-            ${pkgs.sketchybar}/bin/sketchybar --add item space.$sid left \
-                --subscribe space.$sid aerospace_workspace_change \
-                --set space.$sid \
-                    update_freq=2 \
-                    width=32 \
-                    background.color=$ITEM_BG \
-                    background.corner_radius=5 \
-                    background.height=20 \
-                    background.drawing=on \
-                    icon="$display" \
-                    icon.padding_left=13 \
-                    icon.padding_right=11 \
-                    icon.align=center \
-                    label.drawing=off \
-                    click_script="${pkgs.aerospace}/bin/aerospace workspace $sid" \
-                    script="$PLUGIN_DIR/aerospace.sh $sid"
-        done
-
-        # Separator after workspaces
-        ${pkgs.sketchybar}/bin/sketchybar --add item separator_left left \
-            --set separator_left \
-                icon="" \
-                label="" \
-                background.drawing=off \
-                padding_left=10 \
-                padding_right=10
-
-        # System monitoring modules (right side)
-        # Note: Items added to 'right' appear in reverse order (last added = leftmost)
-        # Adding in reverse to get: disk | cpu | memory | battery | volume | calendar
-        ${pkgs.sketchybar}/bin/sketchybar --add item calendar right \
-                   --set calendar \
-                       icon="📅" \
-                       update_freq=30 \
-                       background.color=$ITEM_BG \
-                       background.drawing=on \
-                       script="$PLUGIN_DIR/calendar.sh"
-
-        ${pkgs.sketchybar}/bin/sketchybar --add item separator_media right \
-            --set separator_media \
-                icon="|" \
-                label="" \
-                background.drawing=off \
-                padding_left=5 \
-                padding_right=5
-
-        ${pkgs.sketchybar}/bin/sketchybar --add item volume right \
-                   --set volume \
-                       background.color=$ITEM_BG \
-                       background.drawing=on \
-                       script="$PLUGIN_DIR/volume.sh" \
-                   --subscribe volume volume_change
-
-        ${pkgs.sketchybar}/bin/sketchybar --add item battery right \
-                   --set battery \
-                       update_freq=120 \
-                       background.color=$ITEM_BG \
-                       background.drawing=on \
-                       script="$PLUGIN_DIR/battery.sh" \
-                   --subscribe battery system_woke power_source_change
-
-        ${pkgs.sketchybar}/bin/sketchybar --add item separator_sys right \
-            --set separator_sys \
-                icon="|" \
-                label="" \
-                background.drawing=off \
-                padding_left=5 \
-                padding_right=5
-
-        ${pkgs.sketchybar}/bin/sketchybar --add item memory right \
-                   --set memory \
-                       update_freq=5 \
-                       icon="🐏" \
-                       background.color=$ITEM_BG \
-                       background.drawing=on \
-                       script="$PLUGIN_DIR/memory.sh"
-
-        ${pkgs.sketchybar}/bin/sketchybar --add item cpu right \
-                   --set cpu \
-                       update_freq=2 \
-                       icon="🧠" \
-                       background.color=$ITEM_BG \
-                       background.drawing=on \
-                       script="$PLUGIN_DIR/cpu.sh"
-
-        ${pkgs.sketchybar}/bin/sketchybar --add item disk right \
-                   --set disk \
-                       update_freq=60 \
-                       icon="💾" \
-                       background.color=$ITEM_BG \
-                       background.drawing=on \
-                       script="$PLUGIN_DIR/disk.sh"
-
-        # Menu bar extras / system tray items (rightmost)
-        # Note: Requires Screen Recording permission for SketchyBar in System Settings
-        # Use 'sketchybar --query default_menu_items' to discover available items
-
-        # Bluetooth
-        ${pkgs.sketchybar}/bin/sketchybar --add alias "Control Center,Bluetooth" right \
-            --set "Control Center,Bluetooth" \
-                alias.update_freq=1 \
-                padding_left=0 \
-                padding_right=0
-
-        # WiFi
-        ${pkgs.sketchybar}/bin/sketchybar --add alias "Control Center,WiFi" right \
-            --set "Control Center,WiFi" \
-                alias.update_freq=1 \
-                padding_left=0 \
-                padding_right=0
-
-        # Add other menu bar apps as discovered
-        # Common examples:
-        # - Cloudflare WARP: --add alias "Cloudflare WARP,Item-0" right
-        # - Notion Calendar: --add alias "Notion Calendar,Item-0" right
-        # Run 'sketchybar --query default_menu_items' to find exact names
-
-        # Update the bar
-        ${pkgs.sketchybar}/bin/sketchybar --update
-      '';
-    };
-
-    # SketchyBar aerospace workspace plugin
-    home.file.".config/sketchybar/plugins/aerospace.sh" = mkIf cfg.sketchybar.enable {
-      executable = true;
-      text = ''
-        #!/bin/bash
-
-        # Colors
-        FOCUSED_COLOR=0xff285577
-        ITEM_BG=0xff333333
-        TEXT=0xffffffff
-        GRAY=0xff555555
-
-        # Get the currently focused workspace directly from aerospace
-        # Trim whitespace to ensure clean comparison
-        FOCUSED=$(${pkgs.aerospace}/bin/aerospace list-workspaces --focused | tr -d ' \n\r')
-
-        # Get list of empty workspaces
-        EMPTY_WORKSPACES=$(${pkgs.aerospace}/bin/aerospace list-workspaces --monitor all --empty)
-
-        # Clean up the workspace number parameter
-        WORKSPACE_NUM=$(echo "$1" | tr -d ' \n\r')
-
-        # Check if workspace has windows (is NOT empty)
-        IS_EMPTY=false
-        if echo "$EMPTY_WORKSPACES" | grep -q "^$WORKSPACE_NUM$"; then
-            IS_EMPTY=true
-        fi
-
-        # Check if this workspace is focused
-        IS_FOCUSED=false
-        if [ "$WORKSPACE_NUM" = "$FOCUSED" ]; then
-            IS_FOCUSED=true
-        fi
-
-        # Determine visibility and styling
-        # Always show focused workspace (even if empty) with fixed width
-        # Hide non-focused empty workspaces by setting width to 0 (collapsed)
-        # Show non-focused non-empty workspaces with fixed width and inactive styling
-
-        if [ "$IS_FOCUSED" = "true" ]; then
-            # Focused workspace - always show with focused styling
-            ${pkgs.sketchybar}/bin/sketchybar --set space.$WORKSPACE_NUM \
-                drawing=on \
-                width=32 \
-                icon.padding_left=13 \
-                icon.padding_right=11 \
-                icon.align=center \
-                background.color=$FOCUSED_COLOR \
-                background.drawing=on \
-                icon.color=$TEXT
-        elif [ "$IS_EMPTY" = "true" ]; then
-            # Empty workspace (not focused) - hide by turning off drawing
-            ${pkgs.sketchybar}/bin/sketchybar --set space.$WORKSPACE_NUM \
-                drawing=off
-        else
-            # Non-empty workspace (not focused) - show with inactive styling
-            ${pkgs.sketchybar}/bin/sketchybar --set space.$WORKSPACE_NUM \
-                drawing=on \
-                width=32 \
-                icon.padding_left=13 \
-                icon.padding_right=11 \
-                icon.align=center \
-                background.color=$ITEM_BG \
-                background.drawing=on \
-                icon.color=$GRAY
-        fi
-      '';
-    };
-
-    # SketchyBar CPU monitoring plugin
-    home.file.".config/sketchybar/plugins/cpu.sh" = mkIf cfg.sketchybar.enable {
-      executable = true;
-      text = ''
-        #!/bin/bash
-
-        CORE_COUNT=$(sysctl -n machdep.cpu.thread_count)
-        CPU_INFO=$(ps -eo pcpu,user)
-        CPU_SYS=$(echo "$CPU_INFO" | grep -v $(whoami) | sed "s/[^ 0-9\.]//g" | awk "{sum+=\$1} END {print sum/(100.0 * $CORE_COUNT)}")
-        CPU_USER=$(echo "$CPU_INFO" | grep $(whoami) | sed "s/[^ 0-9\.]//g" | awk "{sum+=\$1} END {print sum/(100.0 * $CORE_COUNT)}")
-        CPU_PERCENT="$(echo "$CPU_SYS $CPU_USER" | awk '{printf "%.0f\n", ($1 + $2)*100}')"
-
-        ${pkgs.sketchybar}/bin/sketchybar --set $NAME label="$CPU_PERCENT%"
-      '';
-    };
-
-    # SketchyBar memory monitoring plugin
-    home.file.".config/sketchybar/plugins/memory.sh" = mkIf cfg.sketchybar.enable {
-      executable = true;
-      text = ''
-        #!/bin/bash
-
-        MEMORY_STATS=$(vm_stat)
-        PAGES_FREE=$(echo "$MEMORY_STATS" | grep "Pages free" | awk '{print $3}' | tr -d '.')
-        PAGES_ACTIVE=$(echo "$MEMORY_STATS" | grep "Pages active" | awk '{print $3}' | tr -d '.')
-        PAGES_INACTIVE=$(echo "$MEMORY_STATS" | grep "Pages inactive" | awk '{print $3}' | tr -d '.')
-        PAGES_WIRED=$(echo "$MEMORY_STATS" | grep "Pages wired down" | awk '{print $4}' | tr -d '.')
-        PAGES_COMPRESSED=$(echo "$MEMORY_STATS" | grep "Pages stored in compressor" | awk '{print $5}' | tr -d '.')
-
-        TOTAL_PAGES=$((PAGES_FREE + PAGES_ACTIVE + PAGES_INACTIVE + PAGES_WIRED + PAGES_COMPRESSED))
-        USED_PAGES=$((PAGES_ACTIVE + PAGES_INACTIVE + PAGES_WIRED + PAGES_COMPRESSED))
-        MEMORY_PERCENT=$((USED_PAGES * 100 / TOTAL_PAGES))
-
-        ${pkgs.sketchybar}/bin/sketchybar --set $NAME label="$MEMORY_PERCENT%"
-      '';
-    };
-
-    # SketchyBar disk monitoring plugin
-    home.file.".config/sketchybar/plugins/disk.sh" = mkIf cfg.sketchybar.enable {
-      executable = true;
-      text = ''
-        #!/bin/bash
-
-        DISK_USAGE=$(df -H / | grep -v Filesystem | awk '{print $5}')
-
-        ${pkgs.sketchybar}/bin/sketchybar --set $NAME label="$DISK_USAGE"
-      '';
-    };
-
-    # SketchyBar battery monitoring plugin
-    home.file.".config/sketchybar/plugins/battery.sh" = mkIf cfg.sketchybar.enable {
-      executable = true;
-      text = ''
-        #!/bin/bash
-
-        PERCENTAGE=$(pmset -g batt | grep -Eo "\d+%" | cut -d% -f1)
-        CHARGING=$(pmset -g batt | grep 'AC Power')
-
-        if [ "$PERCENTAGE" = "" ]; then
-            exit 0
-        fi
-
-        # Select icon based on battery level
-        case ''${PERCENTAGE} in
-            9[0-9]|100) ICON="🔋"
-            ;;
-            [6-8][0-9]) ICON="🔋"
-            ;;
-            [3-5][0-9]) ICON="🔋"
-            ;;
-            [1-2][0-9]) ICON="🔋"
-            ;;
-            *) ICON="🪫"
-        esac
-
-        # Show charging icon if connected to power
-        if [[ $CHARGING != "" ]]; then
-            ICON="⚡"
-        fi
-
-        ${pkgs.sketchybar}/bin/sketchybar --set $NAME icon="$ICON" label="''${PERCENTAGE}%"
-      '';
-    };
-
-    # SketchyBar volume monitoring plugin
-    home.file.".config/sketchybar/plugins/volume.sh" = mkIf cfg.sketchybar.enable {
-      executable = true;
-      text = ''
-        #!/bin/bash
-
-        if [ "$SENDER" = "volume_change" ]; then
-            VOLUME=$(osascript -e "output volume of (get volume settings)")
-            MUTED=$(osascript -e "output muted of (get volume settings)")
-
-            if [ "$MUTED" = "true" ]; then
-                ICON="🔇"
-                LABEL=""
-            else
-                case $VOLUME in
-                    [6-9][0-9]|100) ICON="🔊"
-                    ;;
-                    [3-5][0-9]) ICON="🔉"
-                    ;;
-                    *) ICON="🔈"
-                esac
-                LABEL="$VOLUME%"
-            fi
-
-            ${pkgs.sketchybar}/bin/sketchybar --set $NAME icon="$ICON" label="$LABEL"
-        fi
-      '';
-    };
-
-    # SketchyBar calendar/clock plugin
-    home.file.".config/sketchybar/plugins/calendar.sh" = mkIf cfg.sketchybar.enable {
-      executable = true;
-      text = ''
-        #!/bin/bash
-
-        ${pkgs.sketchybar}/bin/sketchybar --set $NAME label="$(date '+%Y-%m-%d %H:%M')"
-      '';
-    };
-
-    # Launchd agent for auto-starting sketchybar
-    launchd.agents.sketchybar = mkIf cfg.sketchybar.enable {
-      enable = true;
-      config = {
-        ProgramArguments = [ "${pkgs.sketchybar}/bin/sketchybar" ];
-        RunAtLoad = true;
-        KeepAlive = true;
-        StandardOutPath = "/tmp/sketchybar.log";
-        StandardErrorPath = "/tmp/sketchybar.err.log";
-      };
-    };
-  };
-}
--- a/home/roles/base-darwin/default.nix
+++ b/home/roles/base-darwin/default.nix
@@ -1,7 +0,0 @@
-{
-  # Base imports for Darwin home configurations
-  # Includes Darwin-specific roles that only work on macOS
-  imports = [
-    ../aerospace
-  ];
-}
--- a/home/roles/base-linux/default.nix
+++ b/home/roles/base-linux/default.nix
@@ -1,8 +0,0 @@
-{
-  # Base imports for Linux home configurations
-  # Includes Linux-specific roles that require Linux-only home-manager modules
-  imports = [
-    ../plasma-manager
-    ../i3+sway
-  ];
-}
--- a/home/roles/communication/default.nix
+++ b/home/roles/communication/default.nix
@@ -14,8 +14,7 @@ in
    home.packages = [
      # Communication apps
      pkgs.element-desktop
-      # Re-enabled in 25.11 after security issues were resolved
-      pkgs.fluffychat
+      #pkgs.fluffychat #marked insecure as of nixos 25.05
      pkgs.nextcloud-talk-desktop
      
      # For logging back into google chat
--- a/home/roles/default.nix
+++ b/home/roles/default.nix
@@ -1,7 +1,4 @@
 {
-  # Shared roles that work across all platforms (Linux, Darwin, etc.)
-  # Platform-specific roles are imported via base-linux or base-darwin
-  # in each home configuration file
  imports = [
    ./base
    ./communication
@@ -9,12 +6,8 @@
    ./development
    ./gaming
    ./kdeconnect
-    ./kubectl
-    ./launchers
    ./media
    ./office
    ./sync
-    ./tmux
-    ./emacs
  ];
 }
--- a/home/roles/desktop/default.nix
+++ b/home/roles/desktop/default.nix
@@ -13,7 +13,7 @@ in
  config = mkIf cfg.enable {
    home.packages = with pkgs; [
      # Desktop applications
-      bitwarden-desktop
+      bitwarden
      dunst
      keepassxc
      unstable.ghostty
--- a/home/roles/development/default.nix
+++ b/home/roles/development/default.nix
@@ -4,90 +4,22 @@ with lib;

 let
  cfg = config.home.roles.development;
-
-  # Fetch the claude-plugins repository
-  # Update the rev to get newer versions of the commands
-  claudePluginsRepo = builtins.fetchGit {
-    url = "https://github.com/jeffh/claude-plugins.git";
-    # To update: change this to the latest commit hash
-    # You can find the latest commit at: https://github.com/jeffh/claude-plugins/commits/main
-    rev = "5e3e4d937162185b6d78c62022cbfd1c8ad42c4c";
-    ref = "main";
-  };
 in
 {
  options.home.roles.development = {
    enable = mkEnableOption "Enable development tools and utilities";
-
-    allowArbitraryClaudeCodeModelSelection = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to preserve model specifications in Claude Code humanlayer commands and agents.
-
-        When false (default), the model: line is stripped from frontmatter, allowing Claude Code
-        to use its default model selection.
-
-        When true, the model: specifications from the source files are preserved, allowing
-        commands to specify opus/sonnet/haiku explicitly.
-      '';
-    };
  };

  config = mkIf cfg.enable {
    home.packages = [
      pkgs.unstable.claude-code
-      pkgs.unstable.claude-code-router
-      pkgs.unstable.codex
+      pkgs.codex

      # Custom packages
      pkgs.custom.tea-rbw
    ];

-    # Install Claude Code humanlayer command and agent plugins
-    home.activation.claudeCodeCommands = lib.hm.dag.entryAfter ["writeBoundary"] ''
-      # Clean up old plugin-installed commands and agents to avoid duplicates
-      rm -f ~/.claude/commands/humanlayer:* 2>/dev/null || true
-      rm -f ~/.claude/agents/humanlayer:* 2>/dev/null || true
-
-      # Create directories if they don't exist
-      mkdir -p ~/.claude/commands
-      mkdir -p ~/.claude/agents
-
-      # Copy all humanlayer command files and remove model specifications
-      for file in ${claudePluginsRepo}/humanlayer/commands/*.md; do
-        if [ -f "$file" ]; then
-          filename=$(basename "$file" .md)
-          dest="$HOME/.claude/commands/humanlayer:''${filename}.md"
-
-          # Copy file and conditionally remove the "model:" line from frontmatter
-          ${if cfg.allowArbitraryClaudeCodeModelSelection
-            then "cp \"$file\" \"$dest\""
-            else "${pkgs.gnused}/bin/sed '/^model:/d' \"$file\" > \"$dest\""
-          }
-        fi
-      done
-
-      # Copy all humanlayer agent files and remove model specifications
-      for file in ${claudePluginsRepo}/humanlayer/agents/*.md; do
-        if [ -f "$file" ]; then
-          filename=$(basename "$file" .md)
-          dest="$HOME/.claude/agents/humanlayer:''${filename}.md"
-
-          # Copy file and conditionally remove the "model:" line from frontmatter
-          ${if cfg.allowArbitraryClaudeCodeModelSelection
-            then "cp \"$file\" \"$dest\""
-            else "${pkgs.gnused}/bin/sed '/^model:/d' \"$file\" > \"$dest\""
-          }
-        fi
-      done
-
-      $DRY_RUN_CMD echo "Claude Code humanlayer commands and agents installed successfully${
-        if cfg.allowArbitraryClaudeCodeModelSelection
-        then " (model specifications preserved)"
-        else " (model selection removed)"
-      }"
-    '';
+    programs.kubectl-secure.enable = true;

    # Note: modules must be imported at top-level home config
  };
--- a/home/roles/launchers/default.nix
+++ b/home/roles/launchers/default.nix
@@ -1,36 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.home.roles.launchers;
-
-  # Generate a wrapper script for a package
-  makeLauncher = packageName: pkgs.writeShellScriptBin packageName ''
-    exec env NIXPKGS_ALLOW_UNFREE=1 ${pkgs.nix}/bin/nix run --impure nixpkgs#${packageName} -- "$@"
-  '';
-
-  # Generate all launcher scripts from the package list
-  launcherPackages = map makeLauncher cfg.packages;
-in
-{
-  options.home.roles.launchers = {
-    enable = mkEnableOption "wrapper launchers for excluded packages";
-
-    packages = mkOption {
-      type = types.listOf types.str;
-      default = [];
-      example = [ "steam" "libreoffice" "lutris" ];
-      description = ''
-        List of package names to create launcher wrappers for.
-        Each wrapper will run: NIXPKGS_ALLOW_UNFREE=1 nix run --impure nixpkgs#<package>
-
-        This is useful for occasionally running packages without permanently installing them.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = launcherPackages;
-  };
-}
--- a/home/roles/plasma-manager/default.nix
+++ b/home/roles/plasma-manager/default.nix
@@ -1,188 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.home.roles.plasma-manager;
-in
-{
-  options.home.roles.plasma-manager = {
-    enable = mkEnableOption "KDE Plasma desktop environment configuration";
-  };
-
-  config = mkIf cfg.enable {
-    # The current KDE config can be output with the command:
-    # nix run github:nix-community/plasma-manager
-    #
-    # Plasma-manager options documentation
-    # https://nix-community.github.io/plasma-manager/options.xhtml
-    #
-    # TODO: (ambitious) Add Kmail support to plasma-manager
-    programs.plasma = {
-      enable = true;
-      overrideConfig = true;
-
-      hotkeys.commands."launch-ghostty" = {
-        name = "Launch Ghostty";
-        key = "Meta+Return";
-        command = "ghostty";
-      };
-
-      shortcuts = {
-        kmix = {
-          "decrease_microphone_volume" = "Microphone Volume Down";
-          "decrease_volume" = "Volume Down";
-          "decrease_volume_small" = "Shift+Volume Down";
-          "increase_microphone_volume" = "Microphone Volume Up";
-          "increase_volume" = "Volume Up";
-          "increase_volume_small" = "Shift+Volume Up";
-          "mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
-          "mute" = "Volume Mute";
-        };
-
-        mediacontrol = {
-          "mediavolumedown" = "none,,Media volume down";
-          "mediavolumeup" = "none,,Media volume up";
-          "nextmedia" = "Media Next";
-          "pausemedia" = "Media Pause";
-          "playmedia" = "none,,Play media playback";
-          "playpausemedia" = "Media Play";
-          "previousmedia" = "Media Previous";
-          "stopmedia" = "Media Stop";
-        };
-
-        ksmserver = {
-          "Lock Session" = ["Meta+Ctrl+Q" "Screensaver" "Screensaver,Lock Session"];
-        };
-
-        kwin = {
-          "Window Close" = "Meta+Shift+Q";
-          "Kill Window" = "Meta+Ctrl+Esc";
-          "Window Operations Menu" = "Alt+F3";
-          "Window Resize" = "Meta+R,,Resize Window";
-
-          "Overview" = "Meta+Ctrl+W";
-          "Grid View" = "Meta+G";
-          "Edit Tiles" = "Meta+T";
-
-          "Activate Window Demanding Attention" = "Meta+Ctrl+A";
-
-          "Show Desktop" = "Meta+Ctrl+D";
-
-          "Walk Through Windows" = "Alt+Tab";
-          "Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
-          "Walk Through Windows of Current Application" = "Alt+`";
-          "Walk Through Windows of Current Application (Reverse)" = "Alt+~";
-
-          "Window Quick Tile Bottom" = "Meta+Down";
-          "Window Quick Tile Left" = "Meta+Left";
-          "Window Quick Tile Right" = "Meta+Right";
-          "Window Quick Tile Top" = "Meta+Up";
-
-          "Switch to Desktop 1" = "Meta+1";
-          "Switch to Desktop 2" = "Meta+2";
-          "Switch to Desktop 3" = "Meta+3";
-          "Switch to Desktop 4" = "Meta+4";
-          "Switch to Desktop 5" = "Meta+5";
-          "Switch to Desktop 6" = "Meta+6";
-          "Switch to Desktop 7" = "Meta+7";
-          "Switch to Desktop 8" = "Meta+8";
-          "Switch to Desktop 9" = "Meta+9";
-          "Switch to Desktop 10" = "Meta+0";
-
-          "Window to Desktop 1" = "Meta+!";    # Meta+Shift+1
-          "Window to Desktop 2" = "Meta+@";    # Meta+Shift+2
-          "Window to Desktop 3" = "Meta+#";    # Meta+Shift+3
-          "Window to Desktop 4" = "Meta+$";    # Meta+Shift+4
-          "Window to Desktop 5" = "Meta+%";    # Meta+Shift+5
-          "Window to Desktop 6" = "Meta+^";    # Meta+Shift+6
-          "Window to Desktop 7" = "Meta+&";    # Meta+Shift+7
-          "Window to Desktop 8" = "Meta+*";    # Meta+Shift+8
-          "Window to Desktop 9" = "Meta+(";    # Meta+Shift+9
-          "Window to Desktop 10" = "Meta+)";   # Meta+Shift+0
-
-          "view_actual_size" = "Meta+Ctrl+=";
-          "view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"];
-          "view_zoom_out" = "Meta+-";
-        };
-        "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down";
-        "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down";
-        "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down";
-        "org_kde_powerdevil"."Hibernate" = "Hibernate";
-        "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up";
-        "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up";
-        "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up";
-        "org_kde_powerdevil"."PowerDown" = "Power Down";
-        "org_kde_powerdevil"."PowerOff" = "Power Off";
-        "org_kde_powerdevil"."Sleep" = "Sleep";
-        "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off";
-        "org_kde_powerdevil"."Turn Off Screen" = [ ];
-        "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"];
-
-        plasmashell = {
-          "activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"];
-          "activate task manager entry 1" = "none,,";
-          "activate task manager entry 2" = "none,,";
-          "activate task manager entry 3" = "none,,";
-          "activate task manager entry 4" = "none,,";
-          "activate task manager entry 5" = "none,,";
-          "activate task manager entry 6" = "none,,";
-          "activate task manager entry 7" = "none,,";
-          "activate task manager entry 8" = "none,,";
-          "activate task manager entry 9" = "none,,";
-          "activate task manager entry 10" = "none,,";
-          "show activity switcher" = "none,,";
-        };
-      };
-
-      configFile = {
-        kwinrc.Desktops.Number = {
-          value = 10;
-          immutable = true;
-        };
-
-        # Enable KWin tiling features
-        kwinrc.Tiling = {
-          # Enable tiling functionality
-          "padding" = 4;
-        };
-
-        # Enable krohnkite plugin automatically
-        kwinrc.Plugins = {
-          krohnkiteEnabled = true;
-        };
-
-        kwinrc.Effect-overview = {
-          # Configure overview effect for better tiling workflow
-          BorderActivate = 9;  # Top-left corner activation
-        };
-
-        kcminputrc.Libinput = {
-          AccelerationProfile = "adaptive";
-          PointerAcceleration = 0.5;
-        };
-
-        kcminputrc.Mouse = {
-          X11LibInputXAccelProfileFlat = false;
-          XLbInptAccelProfileFlat = false;
-        };
-
-        kdeglobals.KDE.LookAndFeelPackage = "org.kde.breezedark.desktop";
-
-        # Focus follows mouse configuration
-        kwinrc.Windows = {
-          FocusPolicy = "FocusFollowsMouse";
-          AutoRaise = true;  # Set to true if you want windows to auto-raise on focus
-          AutoRaiseInterval = 750;  # Delay in ms before auto-raise (if enabled)
-          DelayFocusInterval = 0;  # Delay in ms before focus follows mouse
-        };
-
-        # Desktop wallpaper configuration
-        plasma-localerc.Formats.LANG = "en_US.UTF-8";
-
-        # Set wallpaper for all desktops
-        plasmarc.Wallpapers.usersWallpapers = "${../../wallpapers/metroid-samus-returns-kz-3440x1440.jpg}";
-      };
-    };
-  };
-}
--- a/home/roles/tmux/default.nix
+++ b/home/roles/tmux/default.nix
@@ -1,62 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.home.roles.tmux;
-
-  tokyo-night = pkgs.tmuxPlugins.mkTmuxPlugin {
-    pluginName = "tokyo-night";
-    rtpFilePath = "tokyo-night.tmux";
-    version = "1.6.1";
-    src = pkgs.fetchFromGitHub {
-      owner = "janoamaral";
-      repo = "tokyo-night-tmux";
-      rev = "d610ced20d5f602a7995854931440e4a1e0ab780";
-      sha256 = "sha256-17vEgkL7C51p/l5gpT9dkOy0bY9n8l0/LV51mR1k+V8=";
-    };
-  };
-in
-{
-  options.home.roles.tmux = {
-    enable = mkEnableOption "tmux terminal multiplexer with Tokyo Night theme";
-  };
-
-  config = mkIf cfg.enable {
-    programs.tmux.enable = true;
-    programs.tmux.terminal = "tmux-direct";
-    programs.tmux.keyMode = "vi";
-    programs.tmux.escapeTime = 0;
-    programs.tmux.mouse = true;
-    programs.tmux.newSession = true;
-    programs.tmux.historyLimit = 50000;
-    programs.tmux.clock24 = true;
-    programs.tmux.baseIndex = 1;
-    programs.tmux.prefix = "M-\\\\";
-
-    programs.tmux.plugins = with pkgs; [
-      tmuxPlugins.cpu
-      tmuxPlugins.battery
-      tmuxPlugins.better-mouse-mode
-      tmuxPlugins.net-speed
-      tmuxPlugins.online-status
-      tmuxPlugins.pain-control
-      tmuxPlugins.tilish
-      tmuxPlugins.yank
-
-      {
-        plugin = tmuxPlugins.resurrect;
-        extraConfig = "set -g @resurrect-strategy-nvim 'session'";
-      }
-      {
-        plugin = tmuxPlugins.continuum;
-        extraConfig = ''
-          set -g @continuum-restore 'on'
-          set -g @continuum-save-interval '15' # minutes
-        '';
-      }
-
-      tokyo-night
-    ];
-  };
-}
--- a/machines/boxy/configuration.nix
+++ b/machines/boxy/configuration.nix
@@ -39,7 +39,12 @@ with lib;
  services.xserver.videoDrivers = [ "amdgpu" ];
  hardware.graphics.enable = true;
  hardware.graphics.enable32Bit = true;
-  # RADV (AMD's Vulkan driver) is now enabled by default, amdvlk was removed
+  hardware.graphics.extraPackages = with pkgs; [
+    amdvlk
+  ];
+  hardware.graphics.extraPackages32 = with pkgs; [
+    driversi686Linux.amdvlk
+  ];

  # This option defines the first version of NixOS you have installed on this particular machine,
  # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
--- a/machines/nix-book/configuration.nix
+++ b/machines/nix-book/configuration.nix
@@ -15,7 +15,7 @@
    desktop = {
      enable = true;
      wayland = true;
-      gaming.enable = true;
+      gaming.enable = false;
      kde = true;
      sddm = true;
    };
--- a/machines/nix-deck/configuration.nix
+++ b/machines/nix-deck/configuration.nix
@@ -2,7 +2,6 @@
 {
  imports = [
    ./hardware-configuration.nix
-    ../../roles/desktop/steamos.nix
  ];

  roles = {
@@ -13,10 +12,11 @@
      wayland = true;
      gaming.enable = true;
      kde = true;
+      sddm = true;
      steamos = {
        enable = true;
-        autoStart = true;
-        desktopSession = "plasma";
+        autoStart = false;
+        desktopSession = "plasmawayland";
      };
    };
    remote-build.builders = [{
--- a/machines/nix-deck/hardware-configuration.nix
+++ b/machines/nix-deck/hardware-configuration.nix
@@ -1,35 +1,26 @@
-# Hardware configuration for Steam Deck (nix-deck)
-# Generated from nixos-generate-config on 2025-11-17
+# This is a placeholder hardware configuration for the Steam Deck.
+# Run `nixos-generate-config --show-hardware-config` on the actual device
+# to generate the real hardware configuration, then merge the jovian settings below.

 { config, lib, pkgs, modulesPath, ... }:

 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports = [ ];

-  # Steam Deck specific hardware configuration (Jovian)
+  # Steam Deck specific hardware configuration
  jovian.devices.steamdeck = {
    enable = true;
    autoUpdate = false;  # Set to true if you want automatic firmware updates
  };

-  # Kernel modules detected by nixos-generate-config
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "usb_storage"
-    "uas"
-    "usbhid"
-    "sd_mod"
-    "sdhci_pci"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+  # TODO: Replace this with actual hardware configuration from the Steam Deck
+  # Run `nixos-generate-config --show-hardware-config` on the device and merge it here
+
+  # Minimal placeholder configuration to allow flake to build
+  boot.initrd.availableKernelModules = [ ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];

-  # IMPORTANT: Update these filesystem configurations based on your actual partition layout
-  # The configuration below is a placeholder - adjust according to how you partitioned the disk
  fileSystems."/" = {
    device = "/dev/disk/by-label/nixos";
    fsType = "ext4";
@@ -40,12 +31,7 @@
    fsType = "vfat";
  };

-  swapDevices = [{
-    device = "/swapfile";
-    size = 8192;  # 8GB swap file
-  }];
+  swapDevices = [ ];

-  # AMD CPU microcode updates
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/machines/wixos/configuration.nix
+++ b/machines/wixos/configuration.nix
@@ -36,7 +36,7 @@
    extraPackages = with pkgs; [
      mesa
      libvdpau-va-gl
-      libva-vdpau-driver
+      vaapiVdpau
    ];
  };
  environment.sessionVariables = {
--- a/machines/zix790prors/configuration.nix
+++ b/machines/zix790prors/configuration.nix
@@ -19,6 +19,7 @@ with lib;
      enable = true;
      gaming = {
        enable = true;
+        emulation = true;
      };
      kde = true;
      sddm = true;
@@ -58,9 +59,18 @@ with lib;
  '';

  hardware.nvidia = {
+    # Modesetting is required.
    modesetting.enable = true;
+    
+    # Enable the Nvidia settings menu,
+    # accessible via `nvidia-settings`.
    nvidiaSettings = true;
+    
+    # Optionally, you may need to select the appropriate driver version for your specific GPU.
    package = pkgs.linuxPackages.nvidiaPackages.stable;
+    
+    # Use open source kernel modules (recommended for RTX/GTX 16xx and newer)
+    # Set to false if you have an older GPU
    open = true;
    
    # For gaming performance
--- a/packages/claude-code/README.md
+++ b/packages/claude-code/README.md
@@ -1,116 +0,0 @@
-# claude-cli
-
-Custom Nix package for Claude Code CLI.
-
-## Why This Package Exists
-
-The official `claude-code` package in nixpkgs tries to fetch from npm registry, which is blocked by Block's corporate security (Cloudflare Teams dependency confusion protection). This custom package fetches directly from Anthropic's Google Cloud Storage distribution, bypassing the npm registry entirely.
-
-## Updating to a New Version
-
-### Automated Update (Recommended)
-
-Run the update script to automatically fetch and update to the latest version:
-
-```bash
-cd packages/claude-cli
-./update.sh
-```
-
-The script will:
- Fetch the latest version from Homebrew cask
- Update version and all SHA256 hashes in default.nix
- Show you what changed
-
-For a dry-run to see what would change:
-
-```bash
-./update.sh --dry-run
-```
-
-After the script completes, follow the "Test the Build" steps below.
-
-### Manual Update
-
-If you prefer to update manually, or if the automated script fails:
-
-#### 1. Find the Latest Version and Hashes
-
-Check the Homebrew cask formula for the latest version info:
-
-```bash
-curl -s "https://raw.githubusercontent.com/Homebrew/homebrew-cask/HEAD/Casks/c/claude-code.rb" | head -50
-```
-
-This will show:
- The latest `version` number
- SHA256 hashes for all platforms (`arm64`, `x86_64`, `x86_64_linux`, `arm64_linux`)
-
-#### 2. Update default.nix
-
-Edit `default.nix` and update:
-
-1. The `version` variable (line 9):
-   ```nix
-   version = "2.0.51";  # Update this
-   ```
-
-2. All four platform sha256 hashes in the `srcs` attribute set (lines 11-27):
-   ```nix
-   aarch64-darwin = {
-     sha256 = "...";  # Update from Homebrew cask "arm:" value
-   };
-   x86_64-darwin = {
-     sha256 = "...";  # Update from Homebrew cask "x86_64:" value
-   };
-   x86_64-linux = {
-     sha256 = "...";  # Update from Homebrew cask "x86_64_linux:" value
-   };
-   aarch64-linux = {
-     sha256 = "...";  # Update from Homebrew cask "arm64_linux:" value
-   };
-   ```
-
-#### 3. Test the Build
-
-Before committing, test that the package builds successfully:
-
-```bash
-NIXPKGS_ALLOW_UNFREE=1 nix-build -E 'with import <nixpkgs> { config.allowUnfree = true; }; callPackage ./packages/claude-cli {}'
-```
-
-Verify the version:
-
-```bash
-./result/bin/claude --version
-```
-
-Clean up the test build:
-
-```bash
-rm result
-```
-
-#### 4. Deploy
-
-Commit your changes and rebuild:
-
-```bash
-git add packages/claude-cli/
-git commit -m "claude-cli: Update to version X.Y.Z"
-darwin-rebuild switch --flake .#blkfv4yf49kt7
-```
-
-## Alternative: Automated Hash Fetching
-
-If you prefer to fetch hashes automatically, you can use `nix-prefetch-url`:
-
-```bash
-# For macOS ARM64 (your current platform)
-nix-prefetch-url "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/VERSION/darwin-arm64/claude"
-
-# For other platforms, replace VERSION and adjust the platform string:
-# darwin-x64, linux-x64, linux-arm64
-```
-
-This will download the file and output the SHA256 hash.
--- a/packages/claude-code/default.nix
+++ b/packages/claude-code/default.nix
@@ -1,60 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, autoPatchelfHook
-}:
-
-let
-  version = "2.0.53";
-
-  srcs = {
-    aarch64-darwin = {
-      url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-arm64/claude";
-      sha256 = "28c3ad73a20f3ae7ab23efa24d45a9791ccbe071284f1622d4e5e2b89c4a15b7";
-    };
-    x86_64-darwin = {
-      url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/darwin-x64/claude";
-      sha256 = "a27f7b75a51514658640432a0afec8be130673eb7dbecc9a4d742527dd85d29a";
-    };
-    x86_64-linux = {
-      url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-x64/claude";
-      sha256 = "9c4cc19e207fb6bf7ea140a1580d5ed0dd0a481af471f23614d5a140a4abf1c6";
-    };
-    aarch64-linux = {
-      url = "https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/${version}/linux-arm64/claude";
-      sha256 = "a5d4044034f3b63c38379bc2dd4067a4dd3c8ec48965ba8e66e3623774a93b72";
-    };
-  };
-
-  src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-in stdenv.mkDerivation {
-  pname = "claude-code";
-  inherit version;
-
-  src = fetchurl {
-    inherit (src) url sha256;
-  };
-
-  dontUnpack = true;
-  dontBuild = true;
-
-  nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 $src $out/bin/claude
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Terminal-based AI coding assistant from Anthropic";
-    homepage = "https://www.anthropic.com/claude-code";
-    license = licenses.unfree;
-    maintainers = [ ];
-    platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" "aarch64-linux" ];
-    mainProgram = "claude";
-  };
-}
--- a/packages/claude-code/npm.nix
+++ b/packages/claude-code/npm.nix
@@ -1,34 +0,0 @@
-{ lib
-, buildNpmPackage
-, fetchurl
-, nodejs_18
-}:
-
-buildNpmPackage {
-  pname = "claude-cli";
-  version = "0.2.65";
-  
-  src = fetchurl {
-    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.65.tgz";
-    sha256 = "0wwaqq7k9p5aw4vqhfpdgf3da09x64q55wibqaprk6kjvn130i92";
-  };
-  
-  npmDepsHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; # Will be updated after first build
-  
-  nodejs = nodejs_18;
-  
-  # Don't run npm audit or other network operations during build
-  npmConfigHook = ''
-    npm config set audit false
-    npm config set fund false
-  '';
-  
-  meta = with lib; {
-    description = "Terminal-based AI coding assistant from Anthropic (npm distribution)";
-    homepage = "https://www.anthropic.com/claude-code";
-    license = licenses.unfree;
-    maintainers = [ ];
-    platforms = platforms.all;
-    mainProgram = "claude";
-  };
-}
--- a/packages/claude-code/update.sh
+++ b/packages/claude-code/update.sh
@@ -1,132 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-DRY_RUN=false
-
-# Parse arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --dry-run|-n)
-            DRY_RUN=true
-            shift
-            ;;
-        --help|-h)
-            echo "Usage: $0 [OPTIONS]"
-            echo ""
-            echo "Options:"
-            echo "  --dry-run, -n    Show what would be updated without making changes"
-            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'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-CASK_URL="https://raw.githubusercontent.com/Homebrew/homebrew-cask/HEAD/Casks/c/claude-code.rb"
-NIX_FILE="$(dirname "$0")/default.nix"
-
-echo "Fetching latest claude-code version from Homebrew cask..."
-
-# Fetch the cask file
-CASK_CONTENT=$(curl -fsSL "$CASK_URL")
-
-# Extract version (format: version "X.Y.Z")
-NEW_VERSION=$(echo "$CASK_CONTENT" | grep -m1 'version' | sed -E 's/.*version "([^"]+)".*/\1/')
-
-# Extract SHA256 hashes (be specific to match sha256 lines only)
-SHA_ARM=$(echo "$CASK_CONTENT" | grep 'sha256 arm:' | sed -E 's/.*"([a-f0-9]{64})".*/\1/')
-SHA_X86_64=$(echo "$CASK_CONTENT" | grep 'x86_64:' | sed -E 's/.*"([a-f0-9]{64})".*/\1/')
-SHA_X86_64_LINUX=$(echo "$CASK_CONTENT" | grep 'x86_64_linux:' | sed -E 's/.*"([a-f0-9]{64})".*/\1/')
-SHA_ARM64_LINUX=$(echo "$CASK_CONTENT" | grep 'arm64_linux:' | sed -E 's/.*"([a-f0-9]{64})".*/\1/')
-
-# Get current version
-CURRENT_VERSION=$(grep -m1 'version = ' "$NIX_FILE" | sed -E 's/.*version = "([^"]+)".*/\1/')
-
-# Validate extracted data
-if [ -z "$NEW_VERSION" ] || [ -z "$SHA_ARM" ] || [ -z "$SHA_X86_64" ] || [ -z "$SHA_X86_64_LINUX" ] || [ -z "$SHA_ARM64_LINUX" ]; then
-    echo -e "${RED}Error: Failed to extract all required values from Homebrew cask${NC}"
-    echo "Version: $NEW_VERSION"
-    echo "ARM: $SHA_ARM"
-    echo "x86_64: $SHA_X86_64"
-    echo "x86_64_linux: $SHA_X86_64_LINUX"
-    echo "arm64_linux: $SHA_ARM64_LINUX"
-    exit 1
-fi
-
-# Check if update is needed
-if [ "$CURRENT_VERSION" = "$NEW_VERSION" ]; then
-    echo -e "${GREEN}Already up to date: $CURRENT_VERSION${NC}"
-    exit 0
-fi
-
-echo -e "${YELLOW}Updating from $CURRENT_VERSION to $NEW_VERSION${NC}"
-
-if [ "$DRY_RUN" = true ]; then
-    echo -e "${YELLOW}DRY RUN - No changes will be made${NC}"
-    echo ""
-    echo "Would update:"
-    echo "  Version: $CURRENT_VERSION -> $NEW_VERSION"
-    echo "  aarch64-darwin SHA: $SHA_ARM"
-    echo "  x86_64-darwin SHA:  $SHA_X86_64"
-    echo "  x86_64-linux SHA:   $SHA_X86_64_LINUX"
-    echo "  aarch64-linux SHA:  $SHA_ARM64_LINUX"
-    exit 0
-fi
-
-# Update version
-sed -i.tmp "s/version = \".*\";/version = \"$NEW_VERSION\";/" "$NIX_FILE"
-
-# Update SHA256 hashes using awk for more reliable parsing
-awk -v sha_arm="$SHA_ARM" -v sha_x86="$SHA_X86_64" -v sha_x86_linux="$SHA_X86_64_LINUX" -v sha_arm_linux="$SHA_ARM64_LINUX" '
-/aarch64-darwin = {/ { in_arm = 1 }
-/x86_64-darwin = {/ { in_x86 = 1 }
-/x86_64-linux = {/ { in_x86_linux = 1 }
-/aarch64-linux = {/ { in_arm_linux = 1 }
-/};/ {
-  in_arm = 0
-  in_x86 = 0
-  in_x86_linux = 0
-  in_arm_linux = 0
-}
-/sha256 = / {
-  if (in_arm) {
-    sub(/sha256 = ".*";/, "sha256 = \"" sha_arm "\";")
-  } else if (in_x86) {
-    sub(/sha256 = ".*";/, "sha256 = \"" sha_x86 "\";")
-  } else if (in_x86_linux) {
-    sub(/sha256 = ".*";/, "sha256 = \"" sha_x86_linux "\";")
-  } else if (in_arm_linux) {
-    sub(/sha256 = ".*";/, "sha256 = \"" sha_arm_linux "\";")
-  }
-}
-{ print }
-' "$NIX_FILE" > "$NIX_FILE.new"
-
-mv "$NIX_FILE.new" "$NIX_FILE"
-
-# Clean up temp files
-rm -f "$NIX_FILE.tmp"
-
-echo -e "${GREEN}Successfully updated to version $NEW_VERSION${NC}"
-echo ""
-echo "Updated SHA256 hashes:"
-echo "  aarch64-darwin: $SHA_ARM"
-echo "  x86_64-darwin:  $SHA_X86_64"
-echo "  x86_64-linux:   $SHA_X86_64_LINUX"
-echo "  aarch64-linux:  $SHA_ARM64_LINUX"
-echo ""
-echo "Next steps:"
-echo "  1. Review changes: git diff $NIX_FILE"
-echo "  2. Test build: NIXPKGS_ALLOW_UNFREE=1 nix-build -E 'with import <nixpkgs> { config.allowUnfree = true; }; callPackage ./packages/claude-code {}'"
-echo "  3. Verify version: ./result/bin/claude --version"
-echo "  4. Commit: git add $NIX_FILE && git commit -m 'claude-code: Update to version $NEW_VERSION'"
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -3,5 +3,4 @@
  vulkanHDRLayer = pkgs.callPackage ./vulkan-hdr-layer {};
  tea-rbw = pkgs.callPackage ./tea-rbw {};
  app-launcher-server = pkgs.callPackage ./app-launcher-server {};
-  claude-code = pkgs.callPackage ./claude-code {};
 }
--- a/roles/desktop/default.nix
+++ b/roles/desktop/default.nix
@@ -11,6 +11,7 @@ with lib;
    kde = mkOption { type = types.bool; default = false; description = "Enable KDE."; };
    gaming = {
      enable = mkOption { type = types.bool; default = false; description = "Enable gaming support."; };
+      emulation = mkOption { type = types.bool; default = false; description = "Enable emulation support."; };
    };
    sddm = mkOption { type = types.bool; default = false; description = "Enable SDDM greeter."; };
  };
@@ -22,5 +23,6 @@ with lib;
    ./kde.nix
    ./programs.nix
    ./sddm.nix
+    ./steamos.nix
  ];
 }
--- a/roles/desktop/gaming.nix
+++ b/roles/desktop/gaming.nix
@@ -9,27 +9,27 @@ in
  config = mkMerge [
    (mkIf (cfg.enable && cfg.gaming.enable) {
      environment.systemPackages = with pkgs; [
+        steam
        lutris
        moonlight
-
-        # Emulators
-        dolphin-emu
-
-        # Re-enabled in 25.11 after binary build was fixed
-        dolphin-emu-primehack
-
-        # Experimenting with just using the steam version + downloading
-        # indiviudal cores
-        #retroarch-full
-        ryubing
      ];

-      programs.steam = {
-        enable = true;
-        remotePlay.openFirewall = true;
-        dedicatedServer.openFirewall = true;
-        localNetworkGameTransfers.openFirewall = true;
-      };
+      # Possibly other gaming specific services or settings
+    })
+
+    (mkIf (cfg.enable && cfg.gaming.emulation) {
+      environment.systemPackages = with pkgs; [
+        ryubing
+        dolphin-emu
+      ];
+      # TODO: Remove me once dolphin-emu and dolphin-emu-primehack update
+      #       dependencies to mbedtls from mbedtls_2 (which is currently)
+      #       unmaintained
+      nixpkgs.config.permittedInsecurePackages = [ "mbedtls-2.28.10" ];
+
+      warnings = [
+        "Using insecure mbedtls-2.28.10 for Dolphin Emu - check for updates regularly"
+      ];
    })
  ];
 }
--- a/roles/desktop/steamos.nix
+++ b/roles/desktop/steamos.nix
@@ -43,9 +43,5 @@ in
    };

    jovian.decky-loader.enable = cfg.steamos.enableDeckyLoader;
-
-    environment.systemPackages = with pkgs; [
-      maliit-keyboard
-    ];
  };
 }
--- a/roles/desktop/x11.nix
+++ b/roles/desktop/x11.nix
@@ -19,20 +19,8 @@ in
          polkit_gnome                    # GNOME polkit authentication agent (more stable with i3)
          picom                           # Compositor for smooth rendering (important for Nvidia)
          networkmanagerapplet            # NetworkManager system tray applet
-          ddcutil                         # DDC/CI monitor control for brightness
        ];
      };
    };
-
-    # Enable DDC/CI support for monitor brightness control
-    boot.kernelModules = [ "i2c-dev" ];
-
-    # Add ddcutil udev rules and user permissions
-    hardware.i2c.enable = true;
-
-    # Install ddcutil system-wide
-    environment.systemPackages = with pkgs; [
-      ddcutil
-    ];
  };
 }
--- a/roles/jovian-compat.nix
+++ b/roles/jovian-compat.nix
@@ -0,0 +1,43 @@
+{ lib, config, ... }:
+
+# Compatibility shim to provide services.logind.settings for NixOS 25.05
+# This allows Jovian-NixOS to work with stable NixOS
+# REMOVE THIS FILE when upgrading to NixOS 25.11 or later
+
+with lib;
+
+let
+  nixosVersion = config.system.nixos.release;
+  isCompatibleVersion = versionOlder nixosVersion "25.11";
+in
+{
+  options.services.logind.settings = mkOption {
+    type = types.attrsOf (types.attrsOf types.anything);
+    default = {};
+    description = "systemd-logind configuration. See logind.conf(5) for available options.";
+  };
+
+  config = mkMerge [
+    {
+      assertions = [
+        {
+          assertion = isCompatibleVersion;
+          message = ''
+            The Jovian compatibility shim (roles/jovian-compat.nix) is only needed for NixOS 25.05 and earlier.
+            You are running NixOS ${nixosVersion}.
+            Please remove 'roles/jovian-compat.nix' from your flake.nix imports.
+          '';
+        }
+      ];
+    }
+    (mkIf (config.services.logind.settings != {}) {
+      # Convert the settings to extraConfig format for older NixOS
+      services.logind.extraConfig = let
+        mkSection = section: settings:
+          "[${section}]\n" +
+          (concatStringsSep "\n" (mapAttrsToList (k: v: "${k}=${toString v}") settings));
+      in
+        concatStringsSep "\n\n" (mapAttrsToList mkSection config.services.logind.settings);
+    })
+  ];
+}
--- a/roles/remote-build/default.nix
+++ b/roles/remote-build/default.nix
@@ -91,11 +91,6 @@ in

      users.groups.${cfg.builderUser} = {};

-      # Ensure home directory has correct permissions
-      systemd.tmpfiles.rules = [
-        "d /var/lib/${cfg.builderUser} 0700 ${cfg.builderUser} ${cfg.builderUser} -"
-      ];
-
      # Allow builder user to perform builds
      nix.settings.trusted-users = [ cfg.builderUser ];