refactor: standardize config structure and consolidate modules
- Standardized apps/ directory by renaming all entry points (e.g., home.nix) to default.nix and updating imports to use directory paths. - Consolidated system/ logic into modules/system/, eliminating the top-level system/ directory and redundant wrappers. - Merged subsidiary utility scripts (e.g., hakase-popup.nix, switch-wallpaper.nix) into their parent default.nix files for better cohesion. - Cleaned up unused files and updated all module references to reflect the new structure.
This commit is contained in:
kenji
@@ -0,0 +1,84 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
myConfig,
|
||||
...
|
||||
}: let
|
||||
wallpaperDir = "${config.home.homeDirectory}/.config/nixos/assets/Wallpapers";
|
||||
defaultWallpaper = "${wallpaperDir}/${myConfig.hyprland.wallpaper}";
|
||||
cacheWallpaper = "${config.home.homeDirectory}/.cache/current_wallpaper";
|
||||
|
||||
switch-wallpaper = pkgs.writeShellScriptBin "hakase-wallpaper-switch" ''
|
||||
if [[ "$1" != "run" ]]; then
|
||||
if command -v ghostty &> /dev/null; then
|
||||
ghostty --class="org.hakase.switch-wallpaper" --title="Wallpaper Selector" -e bash -c "hakase-wallpaper-switch run || read -p 'Hit Enter to close...'"
|
||||
exit 0
|
||||
elif command -v kitty &> /dev/null; then
|
||||
kitty --class org.hakase.switch-wallpaper --title "Wallpaper Selector" -e bash -c "hakase-wallpaper-switch run || read -p 'Hit Enter to close...'"
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
tmp_file=$(mktemp)
|
||||
target_dir="$HOME/Pictures/Wallpapers"
|
||||
if [ ! -d "$target_dir" ]; then
|
||||
target_dir="$HOME"
|
||||
fi
|
||||
|
||||
# Ensure we are in a terminal that supports yazi
|
||||
${pkgs.yazi}/bin/yazi "$target_dir" --chooser-file="$tmp_file"
|
||||
|
||||
if [ ! -f "$tmp_file" ]; then
|
||||
echo "No selection file created."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
WALLPAPER=$(cat "$tmp_file")
|
||||
rm -f "$tmp_file"
|
||||
|
||||
if [ -z "$WALLPAPER" ]; then
|
||||
echo "No wallpaper selected."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Persistence logic
|
||||
CACHE_FILE="$HOME/.cache/current_wallpaper"
|
||||
cp "$WALLPAPER" "$CACHE_FILE"
|
||||
|
||||
# Reload hyprpaper
|
||||
${pkgs.hyprland}/bin/hyprctl hyprpaper unload all
|
||||
${pkgs.hyprland}/bin/hyprctl hyprpaper preload "$CACHE_FILE"
|
||||
${pkgs.hyprland}/bin/hyprctl hyprpaper wallpaper ",$CACHE_FILE"
|
||||
|
||||
exec matugen image "$CACHE_FILE"
|
||||
'';
|
||||
in {
|
||||
services.hyprpaper = {
|
||||
enable = true;
|
||||
settings = {
|
||||
preload = [cacheWallpaper];
|
||||
wallpaper = [
|
||||
",${cacheWallpaper}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
switch-wallpaper
|
||||
];
|
||||
|
||||
home.activation.setupWallpaper = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||
if [ ! -f "${cacheWallpaper}" ]; then
|
||||
mkdir -p "$(dirname "${cacheWallpaper}")"
|
||||
if [ -f "${defaultWallpaper}" ]; then
|
||||
cp "${defaultWallpaper}" "${cacheWallpaper}"
|
||||
else
|
||||
echo "Default wallpaper not found at ${defaultWallpaper}"
|
||||
touch "${cacheWallpaper}"
|
||||
fi
|
||||
fi
|
||||
'';
|
||||
|
||||
systemd.user.startServices = "sd-switch";
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
myConfig,
|
||||
...
|
||||
}: let
|
||||
wallpaperDir = "${config.home.homeDirectory}/.config/nixos/assets/Wallpapers";
|
||||
defaultWallpaper = "${wallpaperDir}/${myConfig.hyprland.wallpaper}";
|
||||
cacheWallpaper = "${config.home.homeDirectory}/.cache/current_wallpaper";
|
||||
in {
|
||||
services.hyprpaper = {
|
||||
enable = true;
|
||||
settings = {
|
||||
preload = [cacheWallpaper];
|
||||
wallpaper = [
|
||||
",${cacheWallpaper}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
home.activation.setupWallpaper = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||
if [ ! -f "${cacheWallpaper}" ]; then
|
||||
mkdir -p "$(dirname "${cacheWallpaper}")"
|
||||
if [ -f "${defaultWallpaper}" ]; then
|
||||
cp "${defaultWallpaper}" "${cacheWallpaper}"
|
||||
else
|
||||
echo "Default wallpaper not found at ${defaultWallpaper}"
|
||||
touch "${cacheWallpaper}"
|
||||
fi
|
||||
fi
|
||||
'';
|
||||
|
||||
systemd.user.startServices = "sd-switch";
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
{pkgs, ...}: {
|
||||
# FIXME: please revise to use uwsm and xdg-terminal-exec
|
||||
# also, add features and fix the following:
|
||||
# * multiple wallpapers
|
||||
# * day/noon/night wallpaper
|
||||
# * set first, default wallpaper to hyprland one-dark
|
||||
# * be consistent in formatting!
|
||||
|
||||
# flow:
|
||||
# Menu for options: 1. Single Wallpaper, 2. Multiple Wallpapers, 3. Timed Wallpapers
|
||||
home.packages = with pkgs; [
|
||||
(writeShellScriptBin "hakase-wallpaper-switch" ''
|
||||
if [[ "$1" != "run" ]]; then
|
||||
if command -v ghostty &> /dev/null; then
|
||||
ghostty --class="org.hakase.switch-wallpaper" --title="Wallpaper Selector" -e bash -c "hakase-wallpaper-switch run || read -p 'Hit Enter to close...'"
|
||||
exit 0
|
||||
elif command -v kitty &> /dev/null; then
|
||||
kitty --class org.hakase.switch-wallpaper --title "Wallpaper Selector" -e bash -c "hakase-wallpaper-switch run || read -p 'Hit Enter to close...'"
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
tmp_file=$(mktemp)
|
||||
target_dir="$HOME/Pictures/Wallpapers"
|
||||
if [ ! -d "$target_dir" ]; then
|
||||
target_dir="$HOME"
|
||||
fi
|
||||
|
||||
# Ensure we are in a terminal that supports yazi
|
||||
${pkgs.yazi}/bin/yazi "$target_dir" --chooser-file="$tmp_file"
|
||||
|
||||
if [ ! -f "$tmp_file" ]; then
|
||||
echo "No selection file created."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
WALLPAPER=$(cat "$tmp_file")
|
||||
rm -f "$tmp_file"
|
||||
|
||||
if [ -z "$WALLPAPER" ]; then
|
||||
echo "No wallpaper selected."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Persistence logic
|
||||
CACHE_FILE="$HOME/.cache/current_wallpaper"
|
||||
cp "$WALLPAPER" "$CACHE_FILE"
|
||||
|
||||
# Reload hyprpaper
|
||||
${pkgs.hyprland}/bin/hyprctl hyprpaper unload all
|
||||
${pkgs.hyprland}/bin/hyprctl hyprpaper preload "$CACHE_FILE"
|
||||
${pkgs.hyprland}/bin/hyprctl hyprpaper wallpaper ",$CACHE_FILE"
|
||||
|
||||
exec matugen image "$CACHE_FILE"
|
||||
'')
|
||||
];
|
||||
}
|
||||
Reference in New Issue
Block a user