feat: add Wayland/Sway profile for Arch Linux VM

svnlto · svnlto · commit df2e38aca2da · 2025-10-14T10:54:57.000+07:00
Add optional profile architecture for composable configurations:
- Create common/profiles/wayland.nix with Sway window manager
- Add defaultUsername variable for DRY principle
- Add arch homeConfiguration with Wayland profile via extraModules
- Update CLAUDE.md with profile architecture documentation

Benefits:
- Default Linux configs stay minimal (Docker/containers unaffected)
- Explicit opt-in for desktop environments via extraModules
- Easy to compose multiple profiles in future
- Clear separation between base and optional functionality
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -18,12 +18,15 @@ git pull && nixswitch
 
 ### Linux (Home Manager)
 ```bash
-# Apply generic Linux configuration
+# Apply generic Linux configuration (minimal - for Docker/containers)
 hmswitch
 
 # Apply user-specific configuration (if exists)
 hm-user
 
+# Apply Arch VM with Wayland/Sway
+home-manager switch --flake ~/.config/nix#arch
+
 # Manual commands
 home-manager switch --flake ~/.config/nix#linux
 home-manager switch --flake ~/.config/nix#$(whoami)  # user-specific
@@ -51,6 +54,8 @@ This is a **cross-platform Nix configuration** managing both macOS hosts and Lin
 │   ├── programs/default.nix     # Shared program configs (direnv, gh, zsh)
 │   ├── packages.nix             # Package definitions for all systems
 │   ├── home-packages.nix        # Home Manager package imports
+│   ├── profiles/                # Optional configuration profiles
+│   │   └── wayland.nix          # Wayland/Sway desktop environment
 │   ├── claude-code/             # Claude Code integration with custom commands
 │   ├── neovim/                  # Neovim configuration
 │   ├── tmux/                    # Tmux configuration
@@ -93,6 +98,7 @@ This is a **cross-platform Nix configuration** managing both macOS hosts and Lin
 ### Making Configuration Changes
 1. Edit configuration files in appropriate directory:
    - `common/` for shared changes
+   - `common/profiles/` for optional profiles (Wayland, etc.)
    - `systems/aarch64-darwin/` for macOS-specific
    - `systems/aarch64-linux/` for Linux-specific
 2. Apply changes using commands above
@@ -104,11 +110,42 @@ This is a **cross-platform Nix configuration** managing both macOS hosts and Lin
 - **macOS system packages**: Edit `common/packages.nix` (darwinSystemPackages list)
 - **macOS GUI apps**: Edit `systems/aarch64-darwin/homebrew.nix`
 - **Linux-specific packages**: Edit `systems/aarch64-linux/home-linux.nix`
+- **Profile-specific packages**: Edit `common/profiles/*.nix` (e.g., `wayland.nix` for Sway/Wayland packages)
 
 **IMPORTANT**: Platform-specific packages must be separated:
 - macOS-only packages (like `reattach-to-user-namespace`) go in `darwinPackages` and are imported via `systems/aarch64-darwin/home.nix`
+- Profile-specific packages (like Sway/Wayland tools) go in `common/profiles/*.nix` and are opt-in via `extraModules`
 - Never put macOS-only packages in shared `devPackages` or they'll break Linux builds
 
+### Configuration Profiles
+
+**Profile Architecture**: Optional configurations that extend the base system without polluting minimal environments.
+
+**Available Profiles**:
+- `common/profiles/wayland.nix` - Wayland/Sway desktop environment with window manager, status bar, and utilities
+
+**Using Profiles**:
+Profiles are opt-in via `extraModules` in `flake.nix`:
+
+```nix
+# Minimal configuration (default)
+linux = mkHomeManagerConfig {
+  username = "user";
+};
+
+# With Wayland/Sway profile
+arch = mkHomeManagerConfig {
+  username = "svenlito";
+  extraModules = [ ./common/profiles/wayland.nix ];
+};
+```
+
+**Benefits**:
+- Default stays minimal (Docker/containers unaffected)
+- Explicit opt-in for additional functionality
+- Easy to compose multiple profiles
+- Clear separation of concerns
+
 ### Adding New Hosts
 Create new configuration in `flake.nix`:
 ```nix
@@ -143,7 +180,8 @@ Located in `common/claude-code/`, this provides:
 - **Node.js**: Uses nodePackages.pnpm from nixpkgs
 
 ### Multi-Environment Support
-- **Generic Linux**: Flexible Home Manager configuration for any Linux environment
+- **Generic Linux**: Flexible Home Manager configuration for any Linux environment (minimal by default)
+- **Profile-based configs**: Optional modules for desktop environments (Wayland/Sway), server tools, etc.
 - **Development Shell**: Available via `nix develop` for working on this configuration
 - **Auto-Detection**: Shell aliases automatically detect system type and hostname
 
@@ -156,12 +194,18 @@ Located in `common/claude-code/`, this provides:
 - SSH configuration for VM connectivity
 
 ### Linux (home-manager)
-- Minimal configuration - only Linux-specific settings
+- **Minimal by default** - base configuration for Docker/containers
+- **Profile system** - opt-in desktop environments (Wayland/Sway) or additional tools
 - Docker integration (docker-compose package)
 - Linux-specific packages: htop, neofetch, curl, wget
 - Imports both `common/home-manager-base.nix` and `common/default.nix`
 - Auto-optimise-store enabled (better suited for Linux than macOS)
 
+**Available Configurations**:
+- `#linux` - Minimal (Docker/containers)
+- `#ubuntu` - Minimal for Ubuntu environments
+- `#arch` - Full desktop with Wayland/Sway (via `wayland.nix` profile)
+
 ## Security Considerations
 - SSH keys managed through 1Password integration
 - Tailscale for secure cloud connectivity
diff --git a/common/profiles/wayland.nix b/common/profiles/wayland.nix
@@ -0,0 +1,205 @@
+# Wayland/Sway Profile
+# Optional module for desktop environments with Sway window manager
+# Usage: Add to extraModules in flake.nix for specific configurations
+{ config, pkgs, ... }:
+
+{
+  # Wayland-specific packages
+  home.packages = with pkgs; [
+    # Window manager
+    sway # Tiling Wayland compositor
+    swaylock # Screen locker
+    swayidle # Idle management daemon
+
+    # UI components
+    waybar # Customizable status bar
+    wofi # Application launcher
+    mako # Notification daemon
+
+    # Utilities
+    grim # Screenshot tool
+    slurp # Screen region selector
+    wl-clipboard # Clipboard utilities (wl-copy, wl-paste)
+    foot # Wayland-native terminal emulator
+
+    # Additional desktop tools
+    firefox # Web browser (Wayland-native)
+  ];
+
+  # Sway window manager configuration
+  wayland.windowManager.sway = {
+    enable = true;
+    config = {
+      modifier = "Mod4"; # Super/Windows key
+      terminal = "foot";
+      menu = "wofi --show drun";
+
+      bars = [{ command = "waybar"; }];
+
+      # Keybindings with vi-style navigation
+      keybindings = let mod = config.wayland.windowManager.sway.config.modifier;
+      in {
+        # Basic actions
+        "${mod}+Return" =
+          "exec ${config.wayland.windowManager.sway.config.terminal}";
+        "${mod}+Shift+q" = "kill";
+        "${mod}+d" = "exec ${config.wayland.windowManager.sway.config.menu}";
+
+        # Focus navigation (vi-style)
+        "${mod}+h" = "focus left";
+        "${mod}+j" = "focus down";
+        "${mod}+k" = "focus up";
+        "${mod}+l" = "focus right";
+
+        # Move windows (vi-style)
+        "${mod}+Shift+h" = "move left";
+        "${mod}+Shift+j" = "move down";
+        "${mod}+Shift+k" = "move up";
+        "${mod}+Shift+l" = "move right";
+
+        # Workspaces
+        "${mod}+1" = "workspace number 1";
+        "${mod}+2" = "workspace number 2";
+        "${mod}+3" = "workspace number 3";
+        "${mod}+4" = "workspace number 4";
+        "${mod}+5" = "workspace number 5";
+        "${mod}+6" = "workspace number 6";
+        "${mod}+7" = "workspace number 7";
+        "${mod}+8" = "workspace number 8";
+        "${mod}+9" = "workspace number 9";
+        "${mod}+0" = "workspace number 10";
+
+        # Move containers to workspaces
+        "${mod}+Shift+1" = "move container to workspace number 1";
+        "${mod}+Shift+2" = "move container to workspace number 2";
+        "${mod}+Shift+3" = "move container to workspace number 3";
+        "${mod}+Shift+4" = "move container to workspace number 4";
+        "${mod}+Shift+5" = "move container to workspace number 5";
+        "${mod}+Shift+6" = "move container to workspace number 6";
+        "${mod}+Shift+7" = "move container to workspace number 7";
+        "${mod}+Shift+8" = "move container to workspace number 8";
+        "${mod}+Shift+9" = "move container to workspace number 9";
+        "${mod}+Shift+0" = "move container to workspace number 10";
+
+        # Layout
+        "${mod}+b" = "splith";
+        "${mod}+v" = "splitv";
+        "${mod}+s" = "layout stacking";
+        "${mod}+w" = "layout tabbed";
+        "${mod}+e" = "layout toggle split";
+        "${mod}+f" = "fullscreen toggle";
+        "${mod}+Shift+space" = "floating toggle";
+        "${mod}+space" = "focus mode_toggle";
+
+        # Reload/Exit
+        "${mod}+Shift+c" = "reload";
+        "${mod}+Shift+e" =
+          "exec swaynag -t warning -m 'Exit sway?' -b 'Yes' 'swaymsg exit'";
+
+        # Screenshots
+        "Print" = ''exec grim -g "$(slurp)" - | wl-copy'';
+        "Shift+Print" = ''
+          exec grim -g "$(slurp)" ~/Pictures/screenshot-$(date +%Y%m%d-%H%M%S).png'';
+      };
+
+      # Input configuration (adjust as needed)
+      input = {
+        "*" = {
+          xkb_layout = "us";
+          # Uncomment for touchpad
+          # tap = "enabled";
+          # natural_scroll = "enabled";
+        };
+      };
+
+      # Output configuration (adjust for your display)
+      output = {
+        "*" = {
+          bg = "#1e1e2e solid_color"; # Catppuccin Mocha background
+        };
+      };
+    };
+  };
+
+  # Waybar status bar configuration
+  programs.waybar = {
+    enable = true;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+        modules-left = [ "sway/workspaces" "sway/mode" ];
+        modules-center = [ "sway/window" ];
+        modules-right = [ "cpu" "memory" "clock" ];
+
+        cpu = {
+          format = " {usage}%";
+          tooltip = false;
+        };
+
+        memory = {
+          format = " {}%";
+          tooltip = false;
+        };
+
+        clock = {
+          format = " {:%H:%M}";
+          format-alt = " {:%Y-%m-%d}";
+          tooltip-format = "<tt><small>{calendar}</small></tt>";
+        };
+
+        "sway/workspaces" = {
+          disable-scroll = true;
+          all-outputs = true;
+        };
+      };
+    };
+
+    # Catppuccin Mocha theme for Waybar
+    style = ''
+      * {
+        font-family: "Hack Nerd Font";
+        font-size: 13px;
+        border: none;
+        border-radius: 0;
+      }
+
+      window#waybar {
+        background: #1e1e2e;
+        color: #cdd6f4;
+      }
+
+      #workspaces button {
+        padding: 0 5px;
+        background: transparent;
+        color: #cdd6f4;
+        border-bottom: 3px solid transparent;
+      }
+
+      #workspaces button.focused {
+        background: #313244;
+        border-bottom: 3px solid #89b4fa;
+      }
+
+      #clock,
+      #cpu,
+      #memory {
+        padding: 0 10px;
+        margin: 0 5px;
+        background: #313244;
+      }
+    '';
+  };
+
+  # Mako notification daemon configuration
+  services.mako = {
+    enable = true;
+    backgroundColor = "#1e1e2e";
+    textColor = "#cdd6f4";
+    borderColor = "#89b4fa";
+    borderSize = 2;
+    borderRadius = 5;
+    defaultTimeout = 5000;
+  };
+}
diff --git a/flake.nix b/flake.nix
@@ -31,6 +31,9 @@
 
   outputs = inputs@{ self, nix-darwin, nixpkgs, nix-homebrew, home-manager, }:
     let
+      # Default username across all configurations
+      defaultUsername = "svenlito";
+
       # Utility function to create nixpkgs for different systems
       mkNixpkgs = system:
         import nixpkgs {
@@ -105,7 +108,7 @@
       darwinConfigurations = {
         "rick" = mkDarwinSystem (validateUsername "rick" {
           hostname = "rick";
-          username = "svenlito";
+          username = defaultUsername;
         });
       };
 
@@ -118,6 +121,12 @@
         };
 
         ubuntu = mkHomeManagerConfig { username = "ubuntu"; };
+
+        # Arch Linux VM with Wayland/Sway profile
+        arch = mkHomeManagerConfig {
+          username = defaultUsername;
+          extraModules = [ ./common/profiles/wayland.nix ];
+        };
       };
 
       # Development shell for working on this configuration
diff --git a/systems/aarch64-darwin/homebrew.nix b/systems/aarch64-darwin/homebrew.nix
@@ -31,6 +31,7 @@
       # Development & Terminal
       "orbstack"
       "ghostty"
+      "utm"
 
       # Networking & VPN
       "tailscale-app"
