877da19770
- Migrate VM and graphical ISO to home-manager.nixosModules.home-manager; drop the standalone-HM sudo-based activation script (ran HM against /root because HOME wasn't reset) in flake.nix, core/system/vm-guest.nix, hosts/live-iso.nix. - Run swaybg as nomarchy-wallpaper.service instead of a silent Hyprland exec-once so failures surface in systemctl. - Skip the battery monitor unit on hosts without /sys/class/power_supply/BAT* (VMs, desktops). - Don't wrap walker --dmenu in uwsm-app; redirect setsid background std-fds in nomarchy-launch-walker so $(menu ...) in nomarchy-menu doesn't hang. - Restart waybar/walker via systemctl --user rather than pkill + uwsm-app to stop the post-theme-switch color race. - Wire nomarchy-restart-walker/-waybar into nomarchy-theme-set so themes that only change the imported CSS reload correctly. - Waybar: pin #custom-nomarchy to the Nomarchy font and use the U+F000 codepoint so the logo shows across all themes. - Auto-install the correct icon-theme package per palette via a new nomarchyLib.iconThemePackage helper in lib/default.nix; Everforest now actually renders for summer-night. - Pre-cache every theme's HM generation: new packages.allThemeVariants flake output and nomarchy-themes-prebuild script so theme switches are cache-only (no Stylix rebuild, no downloads). - Add nomarchy-test-live-iso to boot the graphical ISO in QEMU the same way nomarchy-test-vm does, with virtio-gpu support added to live-iso.nix. - Installer-generated home.nix/system.nix now ship a curated, commented app menu (btop/fastfetch/chromium on by default) plus optional system services (Docker, libvirtd, Tailscale, Syncthing, Flatpak, Steam). - nomarchy-test-vm now wipes the stale nomarchy.qcow2 before launch. - Remove obsolete GEMINI.md and PLAN.md. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
90 lines
2.4 KiB
Nix
90 lines
2.4 KiB
Nix
{ config, pkgs, inputs, lib, ... }:
|
|
|
|
let
|
|
nomarchyLib = import ../lib { inherit lib; };
|
|
userPackagesFile = "${config.home.homeDirectory}/.config/home-manager/user-packages.json";
|
|
userPackages = if builtins.pathExists userPackagesFile then
|
|
let
|
|
pkgNames = builtins.fromJSON (builtins.readFile userPackagesFile);
|
|
# Filter to only packages that exist in pkgs to prevent build failures
|
|
validPkgs = builtins.filter (name: builtins.hasAttr name pkgs) pkgNames;
|
|
in builtins.map (name: pkgs.${name}) validPkgs
|
|
else [];
|
|
in
|
|
{
|
|
imports = [
|
|
inputs.nix-colors.homeManagerModules.default
|
|
inputs.walker.homeManagerModules.default
|
|
../core/home
|
|
../themes/engine/stylix-compat.nix
|
|
../themes/engine/loader.nix
|
|
../themes/engine/files.nix
|
|
../themes/engine/scripts.nix
|
|
../themes/engine/stylix.nix
|
|
../themes/engine/switcher.nix
|
|
./apps/alacritty/default.nix
|
|
./apps/btop/default.nix
|
|
./apps/chromium/default.nix
|
|
./apps/elephant/default.nix
|
|
./apps/ghostty/default.nix
|
|
./apps/kitty/default.nix
|
|
./apps/lazygit/default.nix
|
|
./apps/opencode/default.nix
|
|
./apps/tmux/default.nix
|
|
./apps/vscode.nix
|
|
./apps/walker.nix
|
|
./apps/swayosd.nix
|
|
./desktop/nightlight.nix
|
|
./desktop/idle.nix
|
|
./desktop/hyprland/default.nix
|
|
./desktop/waybar/default.nix
|
|
./scripts/default.nix
|
|
./scripts/battery-monitor.nix
|
|
];
|
|
|
|
|
|
colorScheme = lib.mkDefault (nomarchyLib.getColorScheme config.nomarchy.theme);
|
|
|
|
# Enable neovim program module (required for stylix integration)
|
|
programs.neovim.enable = lib.mkDefault true;
|
|
|
|
home.packages = lib.mkDefault (with pkgs; [
|
|
# Core applications
|
|
firefox
|
|
xfce.thunar
|
|
|
|
# Media
|
|
imv # Image viewer
|
|
mpv # Video player
|
|
|
|
# Hyprland ecosystem
|
|
swww # Wallpaper daemon
|
|
mako # Notification daemon
|
|
hyprlock # Lock screen
|
|
|
|
# Screenshot and clipboard
|
|
wl-clipboard
|
|
grim
|
|
slurp
|
|
|
|
# Hardware control
|
|
brightnessctl
|
|
playerctl
|
|
pamixer
|
|
|
|
# Utilities
|
|
jq
|
|
xmlstarlet
|
|
mise
|
|
gum # TUI components for scripts
|
|
xdg-terminal-exec
|
|
swaybg
|
|
rofi-wayland
|
|
|
|
# Theming — cursor package stays here; icon theme packages are pulled in
|
|
# dynamically by themes/engine/stylix.nix via nomarchyLib.iconThemePackage
|
|
# so switching to e.g. summer-night auto-installs everforest-gtk-theme.
|
|
bibata-cursors
|
|
]);
|
|
}
|