summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>2025-04-04 18:24:02 +1100
committer2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>2025-04-04 18:24:02 +1100
commitad791dfd76bca340ba584f736c6d30ea1cced504 (patch)
treee99b609ac0f37fdf4c78531e9c0ea3ab99262fe5
parentinstall: use systemd services for shell and safeeyes (diff)
downloadcaelestia-cli-ad791dfd76bca340ba584f736c6d30ea1cced504.tar.gz
caelestia-cli-ad791dfd76bca340ba584f736c6d30ea1cced504.tar.bz2
caelestia-cli-ad791dfd76bca340ba584f736c6d30ea1cced504.zip
feat: uwsm app -> app2unit
Also xdg-open -> app2unit
-rwxr-xr-xinstall/scripts.fish2
-rwxr-xr-xinstall/shell.fish2
-rwxr-xr-xrecord.fish2
-rwxr-xr-xscreenshot.fish6
-rw-r--r--toggles/util.fish2
5 files changed, 7 insertions, 7 deletions
diff --git a/install/scripts.fish b/install/scripts.fish
index 700ea8a..c56b61e 100755
--- a/install/scripts.fish
+++ b/install/scripts.fish
@@ -2,7 +2,7 @@
. (dirname (status filename))/util.fish
-install-deps git hyprland-git hyprpaper-git okolors-git imagemagick wl-clipboard fuzzel-git socat foot jq python xdg-user-dirs python-materialyoucolor-git
+install-deps git hyprland-git hyprpaper-git okolors-git imagemagick wl-clipboard fuzzel-git socat foot jq python xdg-user-dirs python-materialyoucolor-git app2unit-git
install-optional-deps 'equibop-bin (discord client)' 'btop (system monitor)' 'wf-recorder (screen recorder)' 'grim (screenshot tool)' 'zen-browser (web browser)' 'spotify-adblock (music player)'
set -l dist $C_DATA/scripts
diff --git a/install/shell.fish b/install/shell.fish
index eca9022..061321d 100755
--- a/install/shell.fish
+++ b/install/shell.fish
@@ -2,7 +2,7 @@
. (dirname (status filename))/util.fish
-install-deps git dart-sass libastal-gjs-git libastal-meta npm curl libnotify ttf-material-symbols-variable-git ttf-jetbrains-mono-nerd ttf-rubik-vf pacman-contrib
+install-deps git dart-sass libastal-gjs-git libastal-meta npm curl libnotify ttf-material-symbols-variable-git ttf-jetbrains-mono-nerd ttf-rubik-vf pacman-contrib app2unit-git
install-optional-deps 'uwsm (for systems using uwsm)' 'yay (AUR package management)' 'fd (launcher file search)' 'tod-bin (launcher todo action)' 'wl-clipboard (clipboard support)' 'foot (opening stuff in terminal)'
set -l shell $C_DATA/shell
diff --git a/record.fish b/record.fish
index 7d76d52..c859d89 100755
--- a/record.fish
+++ b/record.fish
@@ -83,7 +83,7 @@ if pgrep wf-recorder > /dev/null
dbus-send --session --dest=org.freedesktop.FileManager1 --type=method_call /org/freedesktop/FileManager1 org.freedesktop.FileManager1.ShowItems array:string:"file://$new_recording_path" string:'' \
|| xdg-open (dirname $new_recording_path)
case 'save'
- set -l save_file (uwsm app -- zenity --file-selection --save --title='Save As')
+ set -l save_file (app2unit -- zenity --file-selection --save --title='Save As')
test -n "$save_file" && mv $new_recording_path $save_file || warn 'No file selected'
end
else
diff --git a/screenshot.fish b/screenshot.fish
index 7363631..5274c67 100755
--- a/screenshot.fish
+++ b/screenshot.fish
@@ -11,12 +11,12 @@ set -l action (notify-send -i 'image-x-generic-symbolic' -h "STRING:image-path:$
'Screenshot taken' "Screenshot stored in $tmp_file and copied to clipboard")
switch $action
case 'open'
- uwsm app -- swappy -f $tmp_file & disown
+ app2unit -- swappy -f $tmp_file & disown
case 'save'
- set -l save_file (uwsm app -- zenity --file-selection --save --title='Save As')
+ set -l save_file (app2unit -- zenity --file-selection --save --title='Save As')
test -z $save_file && exit 0
if test -f $save_file
- uwsm app -- yad --image='abrt' --title='Warning!' --text-align='center' --buttons-layout='center' --borders=20 \
+ app2unit -- yad --image='abrt' --title='Warning!' --text-align='center' --buttons-layout='center' --borders=20 \
--text='<span size="x-large">Are you sure you want to overwrite this file?</span>' || exit 0
end
cp $tmp_file $save_file
diff --git a/toggles/util.fish b/toggles/util.fish
index f02dc73..3cffc15 100644
--- a/toggles/util.fish
+++ b/toggles/util.fish
@@ -13,7 +13,7 @@ function spawn-client -a selector spawn
hyprctl -j clients | jq -e "first(.[] | select($selector))" > /dev/null
set -l stat $status
if test $stat != 0
- eval "uwsm app -- $spawn & disown"
+ eval "app2unit -- $spawn & disown"
end
test $stat != 0 # Exit 1 if already exists
end