From aee77e91c7ac23457bd161a70b26f79144e008c6 Mon Sep 17 00:00:00 2001 From: John Ogle Date: Sat, 10 Jan 2026 12:57:38 -0800 Subject: [PATCH] Remove wixos (WSL) configuration WSL is no longer used. This removes: - machines/wixos/ directory and configuration.nix - nixos-wsl input from flake.nix - nixosConfigurations.wixos output - References to wixos in AGENTS.md and .goosehints Implements bead: nixos-configs-2mk --- .goosehints | 2 +- AGENTS.md | 4 +- flake.lock | 67 ++++---------------------------- flake.nix | 19 ++------- machines/wixos/configuration.nix | 56 -------------------------- 5 files changed, 12 insertions(+), 136 deletions(-) delete mode 100644 machines/wixos/configuration.nix diff --git a/.goosehints b/.goosehints index 1e28f8b..6ab0ed8 100644 --- a/.goosehints +++ b/.goosehints @@ -9,7 +9,7 @@ Directory Structure: ---------------------- • packages/ - Custom Nix packages leveraged across various configurations. • roles/ - Role-based configurations (e.g., kodi, bluetooth) each with its own module (default.nix) for inclusion in machine setups. -• machines/ - Machine-specific configurations (e.g., nix-book, z790prors, boxy, wixos) including configuration.nix and hardware-configuration.nix tailored for each hardware. +• machines/ - Machine-specific configurations (e.g., nix-book, zix790prors, boxy) including configuration.nix and hardware-configuration.nix tailored for each hardware. • home/ - Home-manager configurations for personal environments and application settings (e.g., home-nix-book.nix, home-z790prors.nix). Design Principles: diff --git a/AGENTS.md b/AGENTS.md index 18097c7..3301d99 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -10,7 +10,7 @@ This is a NixOS configuration repository using flakes, managing multiple machine ### Flake Structure - **flake.nix**: Main entry point defining inputs (nixpkgs, home-manager, plasma-manager, etc.) and outputs for multiple NixOS configurations -- **Machines**: `nix-book`, `boxy`, `wixos` (WSL configuration), `zix790prors`, `live-usb`, `johno-macbookpro` (Darwin/macOS) +- **Machines**: `nix-book`, `boxy`, `zix790prors`, `live-usb`, `johno-macbookpro` (Darwin/macOS) - **Home configurations**: Standalone home-manager configuration for user `johno` ### Directory Structure @@ -74,7 +74,6 @@ The repository also uses a modular home-manager role system for user-space confi - **nix-book**: Compact laptop → excludes office/media roles due to SSD space constraints - **boxy**: Living room media center → optimized for media consumption, excludes sync/office (shared machine) - **zix790prors**: All-purpose workstation → full desktop experience with all roles enabled -- **wixos**: WSL2 development → full desktop experience, inherits from zix790prors Windows host - **live-usb**: Temporary environment → only base + desktop roles, no persistent services - **johno-macbookpro**: macOS work laptop → Darwin-specific configuration with development tools @@ -107,7 +106,6 @@ darwin-rebuild build --flake .#johno-macbookpro - `nix-book`: Compact laptop with storage constraints, uses `home/home-laptop-compact.nix` - `boxy`: Shared living room media center/gaming desktop with AMD GPU, uses `home/home-media-center.nix` - `zix790prors`: Powerful all-purpose workstation (gaming, 3D modeling, development), dual-boots Windows 11 with shared btrfs /games partition, uses `home/home-desktop.nix` -- `wixos`: WSL2 development environment running in Windows partition of zix790prors, uses `home/home-desktop.nix` - `live-usb`: Bootable ISO configuration, uses `home/home-live-usb.nix` - `johno-macbookpro`: macOS work laptop, uses `home/home-darwin-work.nix` diff --git a/flake.lock b/flake.lock index 6f83b19..59d1fd4 100644 --- a/flake.lock +++ b/flake.lock @@ -60,22 +60,6 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1765121682, - "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -241,38 +225,18 @@ "type": "github" } }, - "nixos-wsl": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1765841014, - "narHash": "sha256-55V0AJ36V5Egh4kMhWtDh117eE3GOjwq5LhwxDn9eHg=", - "owner": "nix-community", - "repo": "NixOS-WSL", - "rev": "be4af8042e7a61fa12fda58fe9a3b3babdefe17b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "main", - "repo": "NixOS-WSL", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", - "owner": "NixOS", + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -293,22 +257,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1767480499, - "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -364,8 +312,7 @@ "jovian": "jovian", "nix-darwin": "nix-darwin", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", - "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", "plasma-manager-unstable": "plasma-manager-unstable" diff --git a/flake.nix b/flake.nix index e9c8f20..1dcd92f 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; - + nix-darwin = { url = "github:nix-darwin/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -55,7 +54,7 @@ }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nixos-wsl, ... } @ inputs: let + outputs = { self, nixpkgs, nixpkgs-unstable, ... } @ inputs: let # Shared overlay function to reduce duplication across module sets # Parameters: # unstableOverlays: Additional overlays to apply when importing nixpkgs-unstable @@ -84,6 +83,7 @@ }; }; + nixosModules = [ ./roles inputs.home-manager.nixosModules.home-manager @@ -157,19 +157,6 @@ ]; }; - nixosConfigurations.wixos = nixpkgs.lib.nixosSystem rec { - system = "x86_64-linux"; - modules = nixosModules ++ [ - nixos-wsl.nixosModules.default - ./machines/wixos/configuration.nix - inputs.home-manager.nixosModules.home-manager - { - home-manager.users.johno = import ./home/home-desktop.nix; - home-manager.extraSpecialArgs = { inherit system; }; - } - ]; - }; - nixosConfigurations.zix790prors = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = nixosModules ++ [ diff --git a/machines/wixos/configuration.nix b/machines/wixos/configuration.nix deleted file mode 100644 index 66ce114..0000000 --- a/machines/wixos/configuration.nix +++ /dev/null @@ -1,56 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -# NixOS-WSL specific options are documented on the NixOS-WSL repository: -# https://github.com/nix-community/NixOS-WSL - -{ config, lib, pkgs, ... }: - -{ - imports = [ - ]; - - roles = { - audio.enable = true; - desktop = { - enable = true; - wayland = true; - }; - nvidia = { - enable = true; - package = "latest"; - graphics.extraPackages = with pkgs; [ - mesa - libvdpau-va-gl - libva-vdpau-driver - ]; - }; - users.enable = true; - }; - - networking.hostName = "wixos"; - - wsl.enable = true; - wsl.defaultUser = "johno"; - wsl.startMenuLaunchers = true; - wsl.useWindowsDriver = true; - wsl.wslConf.network.hostname = "wixos"; - wsl.wslConf.user.default = "johno"; - - # WSL-specific environment variables for graphics - environment.sessionVariables = { - LD_LIBRARY_PATH = [ - "/usr/lib/wsl/lib" - "/run/opengl-driver/lib" - ]; - }; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It's perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? -} -- 2.49.1