nevaforget/moonarch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: nevaforget:466ba773dc8a3fac1cf8c1b4897b67ea8fa4ecb5
Branches Tags
nevaforget:main
...
compare: nevaforget:62495d8e3db23190b15da6c9158c40e9dff8f579
Branches Tags
nevaforget:main

2 Commits
466ba773dc ... 62495d8e3d

Author SHA1 Message Date
nevaforget
62495d8e3d fix: prevent kanshi config from breaking wdisplays-persistent
All checks were successful
Update PKGBUILD version / update-pkgver (push) Successful in 3s
Details 
Remove ABOUTME comments from kanshi default config — they broke
the profile parser in wdisplays-persistent store.c, preventing
config saves. Also skip kanshi in transform.sh when user profiles
already exist, since display layouts are machine-specific.
 2026-04-07 12:23:06 +02:00
nevaforget
76f5602b47 Migrate archinstall config to v4 format 
archinstall v4.1 introduced new canonical key names. Update
user_configuration.json to the current schema:
- audio_config → nested under app_config
- bootloader → bootloader_config with explicit uki flag
- gfx_driver value updated to "All open-source (default)"
- custom-commands → custom_commands (underscore)
 2026-04-07 11:56:01 +02:00
3 changed files with 12 additions and 7 deletions
Show Stats Expand all files Collapse all files

15
config/user_configuration.json
View File

@ -2,11 +2,16 @@
"__comment": "ABOUTME: archinstall configuration for Moonarch.", "__comment": "ABOUTME: archinstall configuration for Moonarch.",
"__comment2": "ABOUTME: Base setup — kernel, disk and filesystem are chosen interactively.", "__comment2": "ABOUTME: Base setup — kernel, disk and filesystem are chosen interactively.",
"audio_config": { "app_config": {
"audio": "pipewire" "audio_config": {
"audio": "pipewire"
}
}, },
"bootloader": "Systemd-boot", "bootloader_config": {
"bootloader": "Systemd-boot",
"uki": false
},
"kernels": ["linux-zen"], "kernels": ["linux-zen"],
@ -52,7 +57,7 @@
], ],
"profile_config": { "profile_config": {
"gfx_driver": "All open-source", "gfx_driver": "All open-source (default)",
"greeter": "greetd", "greeter": "greetd",
"profile": { "profile": {
"main": "Desktop", "main": "Desktop",
@ -71,7 +76,7 @@
"timezone": "Europe/Berlin", "timezone": "Europe/Berlin",
"custom-commands": [ "custom_commands": [
"git clone https://gitea.moonarch.de/nevaforget/moonarch.git /opt/moonarch" "git clone https://gitea.moonarch.de/nevaforget/moonarch.git /opt/moonarch"
] ]
} }

2
defaults/xdg/kanshi/config
View File

@ -1,2 +0,0 @@
# ABOUTME: kanshi configuration for dynamic display output management.
# ABOUTME: Add profiles here to auto-switch outputs on hotplug events.

2
scripts/transform.sh
View File

@ -301,6 +301,8 @@ for src_dir in /etc/xdg/*/; do
[[ -d "$DEFAULTS_DIR/xdg/$app_name" ]] || continue [[ -d "$DEFAULTS_DIR/xdg/$app_name" ]] || continue
# gtk-4.0 is handled separately with Colloid-Grey-Dark-Catppuccin theme symlinks # gtk-4.0 is handled separately with Colloid-Grey-Dark-Catppuccin theme symlinks
[[ "$app_name" == "gtk-4.0" ]] && continue [[ "$app_name" == "gtk-4.0" ]] && continue
# kanshi profiles are user-specific (display setup) — only seed, never overwrite
[[ "$app_name" == "kanshi" ]] && [[ -d "$HOME/.config/kanshi" ]] && continue
dest_dir="$HOME/.config/$app_name" dest_dir="$HOME/.config/$app_name"
rm -rf "$dest_dir" 2>/dev/null || sudo rm -rf "$dest_dir" rm -rf "$dest_dir" 2>/dev/null || sudo rm -rf "$dest_dir"
cp -r --no-preserve=ownership "$src_dir" "$dest_dir" cp -r --no-preserve=ownership "$src_dir" "$dest_dir"