diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-01-28 18:31:30 +1100 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-01-28 18:31:30 +1100 |
| commit | 631f3c297cb85710a1ecf79abc7b0dbd0c78ef0a (patch) | |
| tree | f512d360ee171f15f6154b5a3f7de104479b1781 /install | |
| parent | install: scripts install completions (diff) | |
| download | caelestia-cli-631f3c297cb85710a1ecf79abc7b0dbd0c78ef0a.tar.gz caelestia-cli-631f3c297cb85710a1ecf79abc7b0dbd0c78ef0a.tar.bz2 caelestia-cli-631f3c297cb85710a1ecf79abc7b0dbd0c78ef0a.zip | |
install: fix hypr installation
Diffstat (limited to 'install')
| -rwxr-xr-x | install/hypr.fish | 10 | ||||
| -rw-r--r-- | install/util.fish | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/install/hypr.fish b/install/hypr.fish index 4ff9088..83fcc91 100755 --- a/install/hypr.fish +++ b/install/hypr.fish @@ -3,14 +3,16 @@ . (dirname (status filename))/util.fish install-deps git uwsm hyprland-git hyprpaper-git hyprlock-git hypridle-git polkit-gnome gnome-keyring wl-clipboard wireplumber -install-optional-deps 'gammastep (night light)' 'wlogout (secondary session menu)' 'grimblast-git (screenshot freeze)' 'hypricker-git (colour picker)' 'foot (terminal emulator)' 'firefox (web browser)' 'vscodium-bin (IDE)' 'thunar (file manager)' 'nemo (secondary file manager)' 'fuzzel (secondary app launcher)' +install-optional-deps 'gammastep (night light)' 'wlogout (secondary session menu)' 'grimblast-git (screenshot freeze)' 'hyprpicker-git (colour picker)' 'foot (terminal emulator)' 'firefox (web browser)' 'vscodium-bin (IDE)' 'thunar (file manager)' 'nemo (secondary file manager)' 'fuzzel (secondary app launcher)' set -l hypr $CONFIG/../hypr -confirm-overwrite $hypr -git clone 'https://github.com/caelestia-dots/hypr.git' $hypr +# Cause hyprland autogenerates a config file when it is removed +confirm-overwrite $hypr dummy +git clone 'https://github.com/caelestia-dots/hypr.git' /tmp/caelestia-hypr +rm -rf $hypr && mv /tmp/caelestia-hypr $hypr -sudo pacman -S --needed --noconfirm ydotool +pacman -Q ydotool &> /dev/null || sudo pacman -S --needed --noconfirm ydotool systemctl --user enable --now ydotool.service log 'Done.' diff --git a/install/util.fish b/install/util.fish index 30ee6e1..64364bf 100644 --- a/install/util.fish +++ b/install/util.fish @@ -5,7 +5,7 @@ function confirm-overwrite -a path read -l -p "input '$(realpath $path) already exists. Overwrite? [y/N] ' -n" confirm if test "$confirm" = 'y' -o "$confirm" = 'Y' log 'Continuing.' - rm -rf $path + set -q $argv[2] || rm -rf $path # If a second arg is provided, don't delete else log 'Exiting.' exit |