fix: resolve VM startup failures, broken Hyprland functionality, and theme integration

- Fix QEMU syntax and root filesystem conflicts in vm-guest.nix.
- Repair numerous broken relative paths and imports across the codebase.
- Set 'summer-night' as the default distro theme with full branding integration.
- Implement declarative system-wide font installation including the 'nomarchy' font.
- Fix Waybar startup by dynamically generating theme-aware CSS.
- Restore Hyprland keybindings (Super+Return, Super+Space) and wallpaper loading.
- Add missing scripts: nomarchy-launch-walker, nomarchy-toggle-waybar, nomarchy-refresh-config.
- Enable UWSM and correctly disable conflicting Hyprland systemd services.
This commit is contained in:
Bernardo Magri
2026-04-12 20:54:03 +01:00
parent bbdf34ced8
commit a7dbca80a6
32 changed files with 253 additions and 115 deletions

View File

@@ -80,69 +80,23 @@ let
nomarchy-scripts = pkgs.stdenv.mkDerivation {
pname = "nomarchy-scripts";
version = "1.0.0";
src = ../../bin;
src = ./utils;
nativeBuildInputs = [ pkgs.makeWrapper ];
installPhase = ''
mkdir -p $out/bin
# Copy scripts preserving directory structure for category detection
for category in appearance apps hardware system utils wm; do
if [ -d "$category" ]; then
for script in "$category"/*; do
if [ -f "$script" ]; then
cp "$script" "$out/bin/"
fi
done
fi
done
cp * $out/bin/
chmod +x $out/bin/*
patchShebangs $out/bin
'';
postFixup = ''
# Wrap scripts with category-specific dependencies
# Wrap all scripts with all dependencies for robustness
deps="${lib.makeBinPath allDeps}"
for file in $out/bin/*; do
if [ -f "$file" ]; then
scriptName=$(basename "$file")
# Determine category from original source location
category=""
for cat in appearance apps hardware system utils wm; do
if [ -f "$src/$cat/$scriptName" ]; then
category="$cat"
break
fi
done
# Select dependencies based on category
case "$category" in
appearance)
deps="${lib.makeBinPath (coreDeps ++ categoryDeps.appearance)}"
;;
apps)
deps="${lib.makeBinPath (coreDeps ++ categoryDeps.apps)}"
;;
hardware)
deps="${lib.makeBinPath (coreDeps ++ categoryDeps.hardware)}"
;;
system)
deps="${lib.makeBinPath (coreDeps ++ categoryDeps.system)}"
;;
utils)
deps="${lib.makeBinPath (coreDeps ++ categoryDeps.utils)}"
;;
wm)
deps="${lib.makeBinPath (coreDeps ++ categoryDeps.wm)}"
;;
*)
# Fallback to all deps for unknown categories
deps="${lib.makeBinPath allDeps}"
;;
esac
wrapProgram "$file" \
--prefix PATH : "$deps" \
${envWrapperArgs}

View File

@@ -0,0 +1,21 @@
#!/bin/bash
# Wrapper to launch walker with elephant provider, or fallback to rofi if walker is missing.
if command -v walker >/dev/null 2>&1; then
if ! pgrep -x elephant > /dev/null; then
setsid uwsm-app -- elephant &
fi
exec uwsm-app -- walker "$@"
elif command -v rofi >/dev/null 2>&1; then
# Convert walker arguments to rofi arguments if possible
# This is a very basic mapping for --dmenu
if [[ "$*" == *"--dmenu"* ]]; then
exec rofi -dmenu "$@"
else
exec rofi -show drun
fi
else
notify-send "Error" "Neither walker nor rofi found." -u critical
exit 1
fi

View File

@@ -0,0 +1,44 @@
#!/bin/bash
# nomarchy-refresh-config: Restore a specific configuration file to its stock version.
# Usage: nomarchy-refresh-config <relative-path-to-config>
# Example: nomarchy-refresh-config hypr/hyprland.conf
CONFIG_FILE=$1
if [[ -z $CONFIG_FILE ]]; then
echo "Usage: nomarchy-refresh-config <config-path>"
exit 1
fi
# Determine source directory (where stock configs are stored)
# In Nomarchy, we deploy them via Nix, but we also keep a copy in local share for easy access
STOCK_DIR="$HOME/.local/share/nomarchy/themes" # Fallback if specific config isn't themed
# Wait, actually we should use the one from /etc/nixos if available
STOCK_BASE="/etc/nixos/nomarchy/core/home/config"
if [ ! -d "$STOCK_BASE" ]; then
# Fallback to local share if /etc/nixos is not available
STOCK_BASE="$HOME/.local/share/nomarchy/config"
fi
SOURCE_FILE="$STOCK_BASE/$CONFIG_FILE"
DEST_FILE="$HOME/.config/$CONFIG_FILE"
if [ ! -f "$SOURCE_FILE" ]; then
# Try searching in features/ as well
STOCK_BASE="/etc/nixos/nomarchy/features"
# Find the file in features
SOURCE_FILE=$(find "$STOCK_BASE" -name "$(basename "$CONFIG_FILE")" | head -n 1)
fi
if [[ -n $SOURCE_FILE ]] && [[ -f "$SOURCE_FILE" ]]; then
echo "Refreshing $DEST_FILE from stock $SOURCE_FILE..."
mkdir -p "$(dirname "$DEST_FILE")"
cp "$SOURCE_FILE" "$DEST_FILE"
notify-send "Config Refreshed" "$CONFIG_FILE has been restored to defaults."
else
echo "Error: Stock configuration for $CONFIG_FILE not found."
notify-send -u critical "Error" "Stock configuration for $CONFIG_FILE not found."
exit 1
fi

View File

@@ -0,0 +1,10 @@
#!/bin/bash
# nomarchy-toggle-waybar: Toggle the Waybar status bar on and off.
if pgrep -x waybar > /dev/null; then
pkill waybar
else
# Start waybar in the background using uwsm
uwsm-app -- waybar &
fi