20de3d4f97
Six unreferenced files surfaced under features/desktop/hyprland/config/ during the Pillar 8 sweep: - `looknfeel.conf` and `autostart.conf` were deployed to ~/.config/hypr/ but never sourced by nomarchy.conf. The substantive versions live in core/home/config/nomarchy/default/hypr/ and are sourced from there. Removed the deployment lines in features/desktop/hyprland/default.nix alongside the file deletes. - `hyprlock.conf`, `hyprsunset.conf`, `xdph.conf` weren't deployed at all and weren't referenced anywhere. Pure leftovers. The entire `features/desktop/hyprland-preview-share-picker/` directory was also orphan: no `default.nix`, no Nix module imports the `config.yaml`. Only mention was inside the (now-deleted) `xdph.conf`. Deleted the directory. No behavioral change — these files weren't being used. Just removes dead surface that confuses contributors looking for the "real" config location.
80 lines
2.9 KiB
Nix
80 lines
2.9 KiB
Nix
{ config, pkgs, lib, ... }:
|
|
|
|
let
|
|
nomarchyLib = import ../../../lib { inherit lib; };
|
|
assetsPath = ../../../themes/palettes;
|
|
|
|
# Use shared wallpaper resolver
|
|
activeWallpaper = nomarchyLib.resolveWallpaper {
|
|
wallpaperPath = config.nomarchy.wallpaper;
|
|
themeName = config.nomarchy.theme;
|
|
inherit assetsPath;
|
|
};
|
|
|
|
hyprlandState = config.nomarchy.hyprland;
|
|
in
|
|
{
|
|
home.sessionVariables = lib.mkDefault {
|
|
WLR_NO_HARDWARE_CURSORS = "1";
|
|
HYPRLAND_LOG_WLR = "1";
|
|
};
|
|
|
|
wayland.windowManager.hyprland = {
|
|
enable = lib.mkDefault true;
|
|
systemd.enable = lib.mkDefault false;
|
|
settings = lib.mkDefault {
|
|
"debug" = {
|
|
"disable_logs" = false;
|
|
"enable_stdout_logs" = true;
|
|
};
|
|
"cursor" = {
|
|
"no_hardware_cursors" = true;
|
|
};
|
|
"general" = {
|
|
"gaps_in" = hyprlandState.gaps_in;
|
|
"gaps_out" = hyprlandState.gaps_out;
|
|
"border_size" = hyprlandState.border_size;
|
|
"col.active_border" = "rgb(${config.colorScheme.palette.base0E})";
|
|
"col.inactive_border" = "rgb(${config.colorScheme.palette.base03})";
|
|
};
|
|
};
|
|
# Not mkDefault: this is the entry point that wires the rest of Nomarchy's
|
|
# Hyprland config tree. mkDefault here gets silently replaced by any host
|
|
# that adds extraConfig with mkAfter/normal priority, dropping all bindings,
|
|
# autostart, theme colors, etc. — see live-ISO regression where this hid
|
|
# every keybinding behind two welcome notifications.
|
|
extraConfig = ''
|
|
source = ~/.config/hypr/nomarchy.conf
|
|
'';
|
|
};
|
|
|
|
# Deploy Hyprland configuration files. Only the files that nomarchy.conf
|
|
# actually sources are deployed here — looknfeel.conf and autostart.conf
|
|
# live under ~/.config/nomarchy/default/hypr/ and are deployed by the
|
|
# core/home bulk-nomarchy dir, so duplicating them here was dead surface.
|
|
xdg.configFile."hypr/nomarchy.conf".source = ./config/nomarchy.conf;
|
|
xdg.configFile."hypr/monitors.conf".source = lib.mkDefault ./config/monitors.conf;
|
|
xdg.configFile."hypr/input.conf".source = lib.mkDefault ./config/input.conf;
|
|
xdg.configFile."hypr/bindings.conf".source = lib.mkDefault ./config/bindings.conf;
|
|
|
|
# Run swaybg as a proper systemd user service rather than a Hyprland exec-once.
|
|
# exec-once fails silently (black screen with no visible error) when timing
|
|
# against uwsm's graphical-session target is off; a service surfaces failures
|
|
# via `systemctl --user status nomarchy-wallpaper` and auto-restarts.
|
|
systemd.user.services.nomarchy-wallpaper = {
|
|
Unit = {
|
|
Description = "Nomarchy desktop wallpaper (swaybg)";
|
|
PartOf = [ "graphical-session.target" ];
|
|
After = [ "graphical-session.target" ];
|
|
};
|
|
Service = {
|
|
ExecStart = "${pkgs.swaybg}/bin/swaybg -i %h/.config/nomarchy/current/background -m fill";
|
|
Restart = "on-failure";
|
|
RestartSec = "2";
|
|
};
|
|
Install = {
|
|
WantedBy = [ "graphical-session.target" ];
|
|
};
|
|
};
|
|
}
|