diff --git a/dots-extra/vianix/README.md b/dots-extra/via-nix/README.md similarity index 100% rename from dots-extra/vianix/README.md rename to dots-extra/via-nix/README.md diff --git a/dots-extra/vianix/hypridle.conf b/dots-extra/via-nix/hypridle.conf similarity index 100% rename from dots-extra/vianix/hypridle.conf rename to dots-extra/via-nix/hypridle.conf diff --git a/sdata/dist-nix/README.md b/sdata/dist-nix/README.md index cc1c8dd07..3a8120e04 100644 --- a/sdata/dist-nix/README.md +++ b/sdata/dist-nix/README.md @@ -24,6 +24,7 @@ TODO: ```plain Failed to connect to user scope bus via local transport: $DBUS_SESSION_BUS_ADDRESS and $XDG_RUNTIME_DIR not defined (consider using --machine=@.host --user to connect to bus of other user) ``` +- [ ] Handle problem that `pkill qs` and `pkill hyprland` does not work (should be `.quickshell-wra` and `.Hyprland-wrapp` when installed via Nix). ## Attentions ### PAM diff --git a/sdata/subcmd-install/3.files-legacy.sh b/sdata/subcmd-install/3.files-legacy.sh index b18e828ad..bda6434de 100644 --- a/sdata/subcmd-install/3.files-legacy.sh +++ b/sdata/subcmd-install/3.files-legacy.sh @@ -91,9 +91,16 @@ case $SKIP_HYPRLAND in *) if ! [ -d "$XDG_CONFIG_HOME"/hypr ]; then v mkdir -p "$XDG_CONFIG_HOME"/hypr ; fi warning_rsync_delete; v rsync -av --delete dots/.config/hypr/hyprland/ "$XDG_CONFIG_HOME"/hypr/hyprland/ - for i in hypr{land,idle,lock}.conf {monitors,workspaces}.conf ; do + for i in hypr{land,lock}.conf {monitors,workspaces}.conf ; do copy_file_s_t "dots/.config/hypr/$i" "${XDG_CONFIG_HOME}/hypr/$i" done + for i in hypridle.conf ; do + if [[ ! "${INSTALL_VIA_NIX}" == true ]]; then + copy_file_s_t "dots-extra/via-nix/$i" "${XDG_CONFIG_HOME}/hypr/$i" + else + copy_file_s_t "dots/.config/hypr/$i" "${XDG_CONFIG_HOME}/hypr/$i" + fi + done if [ "$OS_GROUP_ID" = "fedora" ];then v bash -c "printf \"# For fedora to setup polkit\nexec-once = /usr/libexec/kf6/polkit-kde-authentication-agent-1\n\" >> ${XDG_CONFIG_HOME}/hypr/hyprland/execs.conf" fi