Chore/nixfiles review fixes #14

2026-06-04T14:58:59+01:00

lyrathorpe commented

2026-06-04 14:58:59 +01:00

No description provided.

lyrathorpe added 8 commits 2026-06-04 14:58:59 +01:00

fix(vim): replace unavailable peaksea colorscheme with catppuccin-mocha 11cac1aeac

peaksea is neither in the plugin list nor packaged in nixpkgs vimPlugins,
so `colorscheme peaksea` errored on startup and vim fell back to the
default scheme. Add catppuccin-vim and select catppuccin_mocha (matching
the swaylock/dunst palette); drop the dead peaksea packadd guard.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

fix(zsh): drop duplicate history-substring-search plugin 1d79ba175a

historySubstringSearch.enable already wires the home-manager module and
keybindings; the oh-my-zsh plugin of the same name was redundant.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

fix(sway): use wayland WINIT backend in session env 9a17994c30

WINIT_UNIX_BACKEND was set to x11, forcing winit apps onto XWayland in a
Wayland session, contradicting the rest of the block. Set it to wayland,
normalise the heredoc indentation, and drop the unused `options` arg.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

ci: evaluate the darwin host configuration de702d5ceb

The eval loop covered only the NixOS hosts, so the nix-darwin host could
break unnoticed. Add an eval step for darwinConfigurations.lyrathorpe-mac.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

docs: add README with hosts, apply steps, and firmware caveat f42b134ab1

Document the host table, rebuild commands, and that the MBP Asahi firmware
dir is gitignored and must be populated out-of-band before that host builds.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

refactor(nixos): extract shared modules, enable firewall, pin nixpkgs url 85139ddfb1

- Add common-nixos.nix (timezone, locale, git/fastfetch) imported by every
  NixOS host, and laptop.nix (systemd-boot, sway, dvorak, iwd, firewall)
  imported by X1 and MBP. Strip the nixos-generate-config boilerplate from
  both machine configs and reduce them to host-specific settings.
- Enable the firewall on the laptops (was disabled); X1 opens 22 next to
  its sshd.
- Pin nixpkgs input to github:nixos/nixpkgs/nixos-26.05 for consistency;
  lock rev unchanged (still b51242d).
- Drop unused module arguments.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

refactor(nixos): extract workstation.nix base from laptop.nix 0227f9d3ef

Move the form-factor-agnostic settings (systemd-boot, swayDesktop, dvorak
console, firewall) into a shared workstation.nix so laptop.nix and the new
desktop.nix can both import them without drifting. laptop.nix keeps only the
iwd Wi-Fi backend.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

feat(nixos): add desktop module with non-portable home-manager profile

CI / flake (pull_request) Successful in 2m17s

Details

333cb21152

Add system/modules/desktop.nix (counterpart to laptop.nix): imports the
workstation base and uses wired NetworkManager instead of iwd.

Thread a `portable` flag (default true) through mkHost into specialArgs and
home-manager.extraSpecialArgs, mirroring username/fullName. lyrathorpe/home/
sway.nix consumes it to drop mobile components on desktop hosts:
- status bar swaps the battery block for CPU temperature + network throughput
- screen-brightness keybindings are omitted (no internal backlight)

No host uses desktop.nix yet; a future desktop host imports it and sets
`portable = false`. Verified by evaluating sway.nix both ways:
laptop -> [.. sound battery time] + brightness keys;
desktop -> [.. temperature net sound time], no brightness keys.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

lyrathorpe merged commit 7436d64447 into main

2026-06-04 15:02:08 +01:00

lyrathorpe deleted branch chore/nixfiles-review-fixes

2026-06-04 15:02:09 +01:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: lyrathorpe/nixfiles#14