From 9cae22e7908267c47a0e02c9c75fc459b0d77261 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Sat, 20 Jun 2026 14:28:03 +1000 Subject: [PATCH] feat: remove app2unit --- README.md | 3 +-- default.nix | 9 ++++----- src/caelestia/subcommands/record.py | 4 ++-- src/caelestia/subcommands/toggle.py | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 928c791e..9b6713dd 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ The main control script for the Caelestia dotfiles. - [`swappy`](https://github.com/jtheoof/swappy) - screenshot editor - [`grim`](https://gitlab.freedesktop.org/emersion/grim) - taking screenshots - [`dart-sass`](https://github.com/sass/dart-sass) - discord theming -- [`app2unit`](https://github.com/Vladimir-csp/app2unit) - launching apps - [`wl-clipboard`](https://github.com/bugaevc/wl-clipboard) - copying to clipboard - [`slurp`](https://github.com/emersion/slurp) - selecting an area - [`gpu-screen-recorder`](https://git.dec05eba.com/gpu-screen-recorder/about) - screen recording @@ -77,7 +76,7 @@ Install all [dependencies](#dependencies), then install e.g. via an AUR helper (yay) ```sh -yay -S libnotify swappy grim dart-sass app2unit wl-clipboard slurp gpu-screen-recorder glib2 cliphist fuzzel python-build python-installer python-hatch python-hatch-vcs +yay -S libnotify swappy grim dart-sass wl-clipboard slurp gpu-screen-recorder glib2 cliphist fuzzel python-build python-installer python-hatch python-hatch-vcs ``` Now, clone the repo, `cd` into it, build the wheel via `python -m build --wheel` diff --git a/default.nix b/default.nix index 22fb0b64..88dd9b83 100644 --- a/default.nix +++ b/default.nix @@ -8,7 +8,7 @@ slurp, wl-clipboard, cliphist, - app2unit, + xdg-utils, dart-sass, grim, fuzzel, @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication { slurp wl-clipboard cliphist - app2unit + xdg-utils dart-sass grim fuzzel @@ -65,11 +65,10 @@ python3.pkgs.buildPythonApplication { substituteInPlace src/caelestia/subcommands/screenshot.py \ --replace-fail '"qs", "-c", "caelestia"' '"caelestia-shell"' - # Use config bin instead of discord + fix todoist + fix app2unit + # Use config bin instead of discord + fix todoist substituteInPlace src/caelestia/subcommands/toggle.py \ --replace-fail 'discord' ${discordBin} \ - --replace-fail '["todoist"]' '["todoist.desktop"]'\ - --replace-fail 'app2unit' ${app2unit}/bin/app2unit + --replace-fail '["todoist"]' '["todoist.desktop"]' # Use config style instead of darkly substituteInPlace src/caelestia/data/templates/qtengine.json \ diff --git a/src/caelestia/subcommands/record.py b/src/caelestia/subcommands/record.py index 372aee41..f6fb05e8 100644 --- a/src/caelestia/subcommands/record.py +++ b/src/caelestia/subcommands/record.py @@ -120,7 +120,7 @@ class Command: ) if action == "watch": - subprocess.Popen(["app2unit", "-O", new_path], start_new_session=True) + subprocess.Popen(["xdg-open", new_path], start_new_session=True) elif action == "open": p = subprocess.run( [ @@ -135,6 +135,6 @@ class Command: ] ) if p.returncode != 0: - subprocess.Popen(["app2unit", "-O", new_path.parent], start_new_session=True) + subprocess.Popen(["xdg-open", new_path.parent], start_new_session=True) elif action == "delete": new_path.unlink() diff --git a/src/caelestia/subcommands/toggle.py b/src/caelestia/subcommands/toggle.py index f114bbfa..349928c3 100644 --- a/src/caelestia/subcommands/toggle.py +++ b/src/caelestia/subcommands/toggle.py @@ -135,7 +135,7 @@ class Command: if (spawn[0].endswith(".desktop") or shutil.which(spawn[0])) and not any( selector(client) for client in self.get_clients() ): - hypr.dispatch("exec", f"[workspace special:{self.args.workspace}] app2unit -- {shlex.join(spawn)}") + hypr.dispatch("exec", f"[workspace special:{self.args.workspace}] {shlex.join(spawn)}") return True else: return False