Theme System: - Move all theme app configs to apps/ subdirectory (20 themes) - Add theme-loader.nix for dynamic theme config deployment - Simplify stylix.nix to focus on base theming only Override System: - Add overrides.nix for file-based config overrides - Add behavior-configs.nix for non-visual configuration - Split hypr/nomarchy.conf into behavior vs visual sections Module Improvements: - Add lib.mkDefault to all customizable settings - Add modules/lib/ with shared utilities and state schema - Update all home and system modules for downstream overridability Installer: - New minimal TTY installer (installer/install.sh) - Golden path: BTRFS + LUKS2 (disko-golden.nix) - New installer-iso.nix for TTY-only installation - Keep graphical installer as installerIsoGraphical option Cleanup: - Remove obsolete install.sh, disko-ext4.nix, install-nomarchy.sh - Update live-iso.nix references - Add .claude/ to .gitignore for local IDE settings Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
85 lines
1.9 KiB
Nix
85 lines
1.9 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
|
|
./options.nix
|
|
./state.nix
|
|
./overrides.nix
|
|
./behavior-configs.nix
|
|
./theme-loader.nix
|
|
./theme-files.nix
|
|
./fonts.nix
|
|
./alacritty.nix
|
|
./nightlight.nix
|
|
./idle.nix
|
|
./stylix.nix
|
|
./hyprland.nix
|
|
./waybar.nix
|
|
./walker.nix
|
|
./theme-switcher.nix
|
|
./scripts.nix
|
|
./configs.nix
|
|
./swayosd.nix
|
|
./security.nix
|
|
./battery-monitor.nix
|
|
./bash.nix
|
|
];
|
|
|
|
colorScheme = lib.mkDefault (nomarchyLib.getColorScheme config.nomarchy.theme);
|
|
|
|
home.packages = lib.mkDefault (with pkgs; [
|
|
# Core applications
|
|
firefox
|
|
xfce.thunar
|
|
neovim
|
|
|
|
# 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
|
|
|
|
# Theming
|
|
yaru-theme
|
|
bibata-cursors
|
|
|
|
# Fonts
|
|
nerd-fonts.jetbrains-mono
|
|
nerd-fonts.roboto-mono
|
|
nerd-fonts.fira-code
|
|
nerd-fonts.ubuntu-mono
|
|
] ++ userPackages);
|
|
}
|