mirror of
https://github.com/danbulant/dots-hyprland
synced 2026-05-24 12:22:09 +00:00
installation: remove ags
This commit is contained in:
parent
57327ab0fe
commit
1591b72e4a
3 changed files with 6 additions and 48 deletions
10
diagnose
10
diagnose
|
|
@ -38,16 +38,6 @@ ii_check_venv() {
|
||||||
which python
|
which python
|
||||||
deactivate
|
deactivate
|
||||||
}
|
}
|
||||||
ii_check_ags() {
|
|
||||||
pkill ags
|
|
||||||
pkill agsv1
|
|
||||||
agsv1 > ii_ags.log 2>&1 &
|
|
||||||
GUI_PID=$!
|
|
||||||
sleep 10
|
|
||||||
kill $GUI_PID
|
|
||||||
echo "AGS log saved to \"ii_ags.log\"."
|
|
||||||
}
|
|
||||||
#x ii_check_ags
|
|
||||||
|
|
||||||
e "Checking git repo info"
|
e "Checking git repo info"
|
||||||
x git remote get-url origin
|
x git remote get-url origin
|
||||||
|
|
|
||||||
43
install.sh
43
install.sh
|
|
@ -155,11 +155,11 @@ v mkdir -p $XDG_BIN_HOME $XDG_CACHE_HOME $XDG_CONFIG_HOME $XDG_DATA_HOME
|
||||||
# original dotfiles and new ones in the SAME DIRECTORY
|
# original dotfiles and new ones in the SAME DIRECTORY
|
||||||
# (eg. in ~/.config/hypr) won't be mixed together
|
# (eg. in ~/.config/hypr) won't be mixed together
|
||||||
|
|
||||||
# MISC (For .config/* but not AGS, not Fish, not Hyprland)
|
# MISC (For .config/* but not fish, not Hyprland)
|
||||||
case $SKIP_MISCCONF in
|
case $SKIP_MISCCONF in
|
||||||
true) sleep 0;;
|
true) sleep 0;;
|
||||||
*)
|
*)
|
||||||
for i in $(find .config/ -mindepth 1 -maxdepth 1 ! -name 'ags' ! -name 'fish' ! -name 'hypr' -exec basename {} \;); do
|
for i in $(find .config/ -mindepth 1 -maxdepth 1 ! -name 'fish' ! -name 'hypr' -exec basename {} \;); do
|
||||||
# i=".config/$i"
|
# i=".config/$i"
|
||||||
echo "[$0]: Found target: .config/$i"
|
echo "[$0]: Found target: .config/$i"
|
||||||
if [ -d ".config/$i" ];then v rsync -av --delete ".config/$i/" "$XDG_CONFIG_HOME/$i/"
|
if [ -d ".config/$i" ];then v rsync -av --delete ".config/$i/" "$XDG_CONFIG_HOME/$i/"
|
||||||
|
|
@ -176,24 +176,6 @@ case $SKIP_FISH in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# For AGS
|
|
||||||
case $SKIP_AGS in
|
|
||||||
true) sleep 0;;
|
|
||||||
*)
|
|
||||||
v rsync -av --delete --exclude '/user_options.jsonc' .config/ags/ "$XDG_CONFIG_HOME"/ags/
|
|
||||||
t="$XDG_CONFIG_HOME/ags/user_options.jsonc"
|
|
||||||
if [ -f $t ];then
|
|
||||||
echo -e "\e[34m[$0]: \"$t\" already exists.\e[0m"
|
|
||||||
# v cp -f .config/ags/user_options.jsonc $t.new
|
|
||||||
existed_ags_opt=y
|
|
||||||
else
|
|
||||||
echo -e "\e[33m[$0]: \"$t\" does not exist yet.\e[0m"
|
|
||||||
v cp .config/ags/user_options.jsonc $t
|
|
||||||
existed_ags_opt=n
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# For Hyprland
|
# For Hyprland
|
||||||
case $SKIP_HYPRLAND in
|
case $SKIP_HYPRLAND in
|
||||||
true) sleep 0;;
|
true) sleep 0;;
|
||||||
|
|
@ -202,15 +184,9 @@ case $SKIP_HYPRLAND in
|
||||||
t="$XDG_CONFIG_HOME/hypr/hyprland.conf"
|
t="$XDG_CONFIG_HOME/hypr/hyprland.conf"
|
||||||
if [ -f $t ];then
|
if [ -f $t ];then
|
||||||
echo -e "\e[34m[$0]: \"$t\" already exists.\e[0m"
|
echo -e "\e[34m[$0]: \"$t\" already exists.\e[0m"
|
||||||
if [ -f "$XDG_STATE_HOME/ags/user/firstrun.txt" ]
|
v mv $t $t.old
|
||||||
then
|
v cp -f .config/hypr/hyprland.conf $t
|
||||||
v cp -f .config/hypr/hyprland.conf $t.new
|
existed_hypr_conf_firstrun=y
|
||||||
existed_hypr_conf=y
|
|
||||||
else
|
|
||||||
v mv $t $t.old
|
|
||||||
v cp -f .config/hypr/hyprland.conf $t
|
|
||||||
existed_hypr_conf_firstrun=y
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo -e "\e[33m[$0]: \"$t\" does not exist yet.\e[0m"
|
echo -e "\e[33m[$0]: \"$t\" does not exist yet.\e[0m"
|
||||||
v cp .config/hypr/hyprland.conf $t
|
v cp .config/hypr/hyprland.conf $t
|
||||||
|
|
@ -260,10 +236,7 @@ grep -q 'source ${XDG_CONFIG_HOME:-~/.config}/zshrc.d/dots-hyprland.zsh' ~/.zshr
|
||||||
|
|
||||||
warn_files=()
|
warn_files=()
|
||||||
warn_files_tests=()
|
warn_files_tests=()
|
||||||
warn_files_tests+=(/usr/local/bin/ags)
|
|
||||||
warn_files_tests+=(/usr/local/etc/pam.d/ags)
|
|
||||||
warn_files_tests+=(/usr/local/lib/{GUtils-1.0.typelib,Gvc-1.0.typelib,libgutils.so,libgvc.so})
|
warn_files_tests+=(/usr/local/lib/{GUtils-1.0.typelib,Gvc-1.0.typelib,libgutils.so,libgvc.so})
|
||||||
warn_files_tests+=(/usr/local/share/com.github.Aylur.ags)
|
|
||||||
warn_files_tests+=(/usr/local/share/fonts/TTF/Rubik{,-Italic}'[wght]'.ttf)
|
warn_files_tests+=(/usr/local/share/fonts/TTF/Rubik{,-Italic}'[wght]'.ttf)
|
||||||
warn_files_tests+=(/usr/local/share/licenses/ttf-rubik)
|
warn_files_tests+=(/usr/local/share/licenses/ttf-rubik)
|
||||||
warn_files_tests+=(/usr/local/share/fonts/TTF/Gabarito-{Black,Bold,ExtraBold,Medium,Regular,SemiBold}.ttf)
|
warn_files_tests+=(/usr/local/share/fonts/TTF/Gabarito-{Black,Bold,ExtraBold,Medium,Regular,SemiBold}.ttf)
|
||||||
|
|
@ -289,10 +262,6 @@ printf "\e[36mPress \e[30m\e[46m Ctrl+Super+T \e[0m\e[36m to select a wallpaper\
|
||||||
printf "\e[36mPress \e[30m\e[46m Super+/ \e[0m\e[36m for a list of keybinds\e[0m\n"
|
printf "\e[36mPress \e[30m\e[46m Super+/ \e[0m\e[36m for a list of keybinds\e[0m\n"
|
||||||
printf "\n"
|
printf "\n"
|
||||||
|
|
||||||
case $existed_ags_opt in
|
|
||||||
y) printf "\n\e[33m[$0]: Warning: \"$XDG_CONFIG_HOME/ags/user_options.jsonc\" already existed before and we didn't overwrite it. \e[0m\n"
|
|
||||||
# printf "\e[33mPlease use \"$XDG_CONFIG_HOME/ags/user_options.jsonc.new\" as a reference for a proper format.\e[0m\n"
|
|
||||||
;;esac
|
|
||||||
case $existed_hypr_conf_firstrun in
|
case $existed_hypr_conf_firstrun in
|
||||||
y) printf "\n\e[33m[$0]: Warning: \"$XDG_CONFIG_HOME/hypr/hyprland.conf\" already existed before. As it seems it is your first run, we replaced it with a new one. \e[0m\n"
|
y) printf "\n\e[33m[$0]: Warning: \"$XDG_CONFIG_HOME/hypr/hyprland.conf\" already existed before. As it seems it is your first run, we replaced it with a new one. \e[0m\n"
|
||||||
printf "\e[33mAs it seems it is your first run, we replaced it with a new one. The old one has been renamed to \"$XDG_CONFIG_HOME/hypr/hyprland.conf.old\".\e[0m\n"
|
printf "\e[33mAs it seems it is your first run, we replaced it with a new one. The old one has been renamed to \"$XDG_CONFIG_HOME/hypr/hyprland.conf.old\".\e[0m\n"
|
||||||
|
|
@ -311,7 +280,7 @@ case $existed_hyprlock_conf in
|
||||||
;;esac
|
;;esac
|
||||||
|
|
||||||
if [[ -z "${ILLOGICAL_IMPULSE_VIRTUAL_ENV}" ]]; then
|
if [[ -z "${ILLOGICAL_IMPULSE_VIRTUAL_ENV}" ]]; then
|
||||||
printf "\n\e[31m[$0]: \!! Important \!! : Please ensure environment variable \e[0m \$ILLOGICAL_IMPULSE_VIRTUAL_ENV \e[31m is set to proper value (by default \"~/.local/state/ags/.venv\"), or AGS config will not work. We have already provided this configuration in ~/.config/hypr/hyprland/env.conf, but you need to ensure it is included in hyprland.conf, and also a restart is needed for applying it.\e[0m\n"
|
printf "\n\e[31m[$0]: \!! Important \!! : Please ensure environment variable \e[0m \$ILLOGICAL_IMPULSE_VIRTUAL_ENV \e[31m is set to proper value (by default \"~/.local/state/quickshell/.venv\"), or Quickshell config will not work. We have already provided this configuration in ~/.config/hypr/hyprland/env.conf, but you need to ensure it is included in hyprland.conf, and also a restart is needed for applying it.\e[0m\n"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -z "${warn_files[@]}" ]]; then
|
if [[ ! -z "${warn_files[@]}" ]]; then
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@ source ./scriptdata/installers
|
||||||
prevent_sudo_or_root
|
prevent_sudo_or_root
|
||||||
|
|
||||||
if command -v pacman >/dev/null 2>&1;then printf "\e[31m[$0]: pacman found, it seems that the system is ArchLinux or Arch-based distro. Aborting...\e[0m\n";exit 1;fi
|
if command -v pacman >/dev/null 2>&1;then printf "\e[31m[$0]: pacman found, it seems that the system is ArchLinux or Arch-based distro. Aborting...\e[0m\n";exit 1;fi
|
||||||
v install-agsv1
|
|
||||||
v install-Rubik
|
v install-Rubik
|
||||||
v install-Gabarito
|
v install-Gabarito
|
||||||
v install-OneUI
|
v install-OneUI
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue