kenji/alt-illogical-impulse
1
0
Fork 0
forked from Shinonome/alt-illogical-impulse
Code Pull Requests Activity

Add matugen directory to backup handling

Browse Source 
- Add matugen to writable-mode backup script directory list
- Add matugen conflict handling to Home Manager activation script
- Handle both symlinked and regular matugen directories
- Prevents activation failures due to existing matugen configs

This resolves the 'mkdir: cannot create directory' and 'ln: failed to create symbolic link'
errors that occur when ~/.config/matugen already exists during Home Manager activation.
This commit is contained in:
Celes Renata
2025-08-10 13:25:22 -07:00
parent 0321f75443
commit c90cc9427c
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/home-manager.nix
+10
View File
@@ -195,6 +195,11 @@ EOF
$DRY_RUN_CMD echo " → Removed conflicting symlinked fish config" $DRY_RUN_CMD echo " → Removed conflicting symlinked fish config"
fi fi
if [[ -L "$HOME/.config/matugen" ]]; then
$DRY_RUN_CMD rm "$HOME/.config/matugen"
$DRY_RUN_CMD echo " → Removed conflicting symlinked matugen config"
fi
# Also handle if they exist as regular directories # Also handle if they exist as regular directories
if [[ -d "$HOME/.local/share/konsole" && ! -L "$HOME/.local/share/konsole" ]]; then if [[ -d "$HOME/.local/share/konsole" && ! -L "$HOME/.local/share/konsole" ]]; then
$DRY_RUN_CMD mv "$HOME/.local/share/konsole" "$HOME/.local/share/konsole.backup-$(date +%Y%m%d-%H%M%S)" $DRY_RUN_CMD mv "$HOME/.local/share/konsole" "$HOME/.local/share/konsole.backup-$(date +%Y%m%d-%H%M%S)"
@@ -205,6 +210,11 @@ EOF
$DRY_RUN_CMD mv "$HOME/.config/fish" "$HOME/.config/fish.backup-$(date +%Y%m%d-%H%M%S)" $DRY_RUN_CMD mv "$HOME/.config/fish" "$HOME/.config/fish.backup-$(date +%Y%m%d-%H%M%S)"
$DRY_RUN_CMD echo " → Backed up existing fish config directory" $DRY_RUN_CMD echo " → Backed up existing fish config directory"
fi fi
if [[ -d "$HOME/.config/matugen" && ! -L "$HOME/.config/matugen" ]]; then
$DRY_RUN_CMD mv "$HOME/.config/matugen" "$HOME/.config/matugen.backup-$(date +%Y%m%d-%H%M%S)"
$DRY_RUN_CMD echo " → Backed up existing matugen config directory"
fi
''; '';
# Copy quickshell config after link generation # Copy quickshell config after link generation
modules/writable-mode.nix
+1 -1
View File
@@ -58,7 +58,7 @@ let
mkdir -p "$BACKUP_DIR" mkdir -p "$BACKUP_DIR"
# Backup specific directories that will be overwritten # Backup specific directories that will be overwritten
for dir in quickshell hypr fish foot kitty fuzzel wlogout; do for dir in quickshell hypr fish foot kitty fuzzel wlogout matugen; do
if [[ -d "$CONFIG_DIR/$dir" ]]; then if [[ -d "$CONFIG_DIR/$dir" ]]; then
info " Backing up $dir" info " Backing up $dir"
cp -r "$CONFIG_DIR/$dir" "$BACKUP_DIR/" 2>/dev/null || true cp -r "$CONFIG_DIR/$dir" "$BACKUP_DIR/" 2>/dev/null || true