diff --git a/bin/omarchy-capture-screenshot b/bin/omarchy-capture-screenshot index ca18d125..a9ff98c3 100755 --- a/bin/omarchy-capture-screenshot +++ b/bin/omarchy-capture-screenshot @@ -16,7 +16,7 @@ fi pkill slurp && exit 0 -SCREENSHOT_EDITOR="${OMARCHY_SCREENSHOT_EDITOR:-satty}" +SCREENSHOT_EDITOR="${OMARCHY_SCREENSHOT_EDITOR:-tensaku-edit}" # Parse --editor flag from any position ARGS=() @@ -31,15 +31,7 @@ set -- "${ARGS[@]}" open_editor() { local filepath="$1" - if [[ $SCREENSHOT_EDITOR == "satty" ]]; then - satty --filename "$filepath" \ - --output-filename "$filepath" \ - --actions-on-enter save-to-clipboard \ - --save-after-copy \ - --copy-command 'wl-copy --type image/png' - else - $SCREENSHOT_EDITOR "$filepath" - fi + "$SCREENSHOT_EDITOR" "$filepath" } MODE="${1:-smart}" diff --git a/bin/omarchy-clipboard-open b/bin/omarchy-clipboard-open index 04ea3d77..ecd0cbfe 100755 --- a/bin/omarchy-clipboard-open +++ b/bin/omarchy-clipboard-open @@ -29,7 +29,7 @@ open_image() { local path="$1" [[ -r $path ]] || exit 1 - exec satty --filename "$path" --output-filename "$path" + exec tensaku-edit "$path" } open_text() { diff --git a/config/imv/config b/config/imv/config index e515d966..f96aa6a3 100644 --- a/config/imv/config +++ b/config/imv/config @@ -12,5 +12,5 @@ # Rotate the currently open image by 90 degrees = exec mogrify -rotate 90 "$imv_current_file" -# Edit the current image in Satty and quit the viewer - = exec satty --filename "$imv_current_file" & ; quit +# Edit the current image in Tensaku and quit the viewer + = exec tensaku-edit "$imv_current_file" & ; quit diff --git a/default/hypr/apps/system.lua b/default/hypr/apps/system.lua index 77380582..a7206550 100644 --- a/default/hypr/apps/system.lua +++ b/default/hypr/apps/system.lua @@ -3,16 +3,18 @@ o.window({ tag = "floating-window" }, { float = true }) o.window({ tag = "floating-window" }, { center = true }) o.window({ tag = "floating-window" }, { size = { 875, 600 } }) -o.window("(org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.codeberg.dnkl.foot|org.gnome.NautilusPreviewer|org.gnome.Evince|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)", { - tag = "+floating-window", -}) o.window( + "(org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.codeberg.dnkl.foot|org.gnome.NautilusPreviewer|org.gnome.Evince|Omarchy|About|TUI.float|imv|mpv)", { - class = "(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus)", - title = "^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)", - }, - { tag = "+floating-window" } + tag = "+floating-window", + } ) +o.window({ + class = "(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus)", + title = "^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)", +}, { tag = "+floating-window" }) +o.window("dev.tensaku.Tensaku", { float = true }) +o.window("dev.tensaku.Tensaku", { center = true }) o.window("org.gnome.Calculator", { float = true }) -- Fullscreen screensaver. @@ -21,12 +23,18 @@ o.window("org.omarchy.screensaver", { float = true }) o.window("org.omarchy.screensaver", { animation = "slide" }) -- No transparency on media windows. -o.window("^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$", { - tag = "-default-opacity", -}) -o.window("^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$", { - opacity = "1 1", -}) +o.window( + "^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$", + { + tag = "-default-opacity", + } +) +o.window( + "^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$", + { + opacity = "1 1", + } +) -- Popped window rounding. o.window({ tag = "pop" }, { rounding = 8 }) diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages index 9b02f943..cf574584 100644 --- a/install/omarchy-base.packages +++ b/install/omarchy-base.packages @@ -109,7 +109,7 @@ quickshell ripgrep ruby rust -satty +tensaku sddm slurp socat diff --git a/migrations/1781286586.sh b/migrations/1781286586.sh new file mode 100644 index 00000000..3ee941be --- /dev/null +++ b/migrations/1781286586.sh @@ -0,0 +1,4 @@ +echo "Replace Satty with Tensaku" + +omarchy-pkg-add tensaku +omarchy-pkg-drop satty diff --git a/test/shell.d/clipboard-test.sh b/test/shell.d/clipboard-test.sh index 763a9630..352599b6 100644 --- a/test/shell.d/clipboard-test.sh +++ b/test/shell.d/clipboard-test.sh @@ -160,12 +160,12 @@ printf '%s\n' "$1" >"$EDITOR_PATH_OUT" cat "$1" >"$EDITOR_TEXT_OUT" SH -cat >"$TMPDIR/bin/satty" <<'SH' +cat >"$TMPDIR/bin/tensaku-edit" <<'SH' #!/bin/bash -printf '%s\n' "$*" >"$SATTY_OUT" +printf '%s\n' "$*" >"$TENSAKU_OUT" SH -chmod +x "$TMPDIR/bin/wl-copy" "$TMPDIR/bin/wl-paste" "$TMPDIR/bin/wtype" "$TMPDIR/bin/omarchy-launch-browser" "$TMPDIR/bin/omarchy-launch-editor" "$TMPDIR/bin/satty" +chmod +x "$TMPDIR/bin/wl-copy" "$TMPDIR/bin/wl-paste" "$TMPDIR/bin/wtype" "$TMPDIR/bin/omarchy-launch-browser" "$TMPDIR/bin/omarchy-launch-editor" "$TMPDIR/bin/tensaku-edit" capture_output=$(XDG_RUNTIME_DIR="$TMPDIR" PATH="$TMPDIR/bin:$PATH" "$ROOT/shell/plugins/clipboard/capture.sh") [[ $capture_output == '{"type":"text","text":"terminal copy"}' ]] || fail "clipboard capture records normal text events" @@ -237,8 +237,8 @@ pass "clipboard open helper opens text entries in editor" [[ $(<"$TMPDIR/editor-path") == "$TMPDIR"/state/omarchy/clipboard-open/clipboard.*.txt ]] || fail "clipboard open helper writes text entries to a temporary file" pass "clipboard open helper writes text entries to a temporary file" -SATTY_OUT="$TMPDIR/satty" HOME="$TMPDIR/home" PATH="$TMPDIR/bin:$PATH" \ +TENSAKU_OUT="$TMPDIR/tensaku" HOME="$TMPDIR/home" PATH="$TMPDIR/bin:$PATH" \ "$ROOT/bin/omarchy-clipboard-open" --history-index 2 -[[ $(<"$TMPDIR/satty") == "--filename $TMPDIR/image.png --output-filename $TMPDIR/image.png" ]] || fail "clipboard open helper opens image entries in satty" -pass "clipboard open helper opens image entries in satty" +[[ $(<"$TMPDIR/tensaku") == "$TMPDIR/image.png" ]] || fail "clipboard open helper opens image entries in Tensaku" +pass "clipboard open helper opens image entries in Tensaku"