From b03fe685dc067e4543d18f31498319e207aee158 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 5 Jun 2024 11:23:12 +0200 Subject: [PATCH] clan-app: rename clan-vm-manager --- docs/CONTRIBUTING.md | 2 +- formatter.nix | 7 ++-- pkgs/{clan-vm-manager => clan-app}/.envrc | 2 +- pkgs/{clan-vm-manager => clan-app}/README.md | 26 +++++++------- .../bin/clan-vm-manager | 2 +- .../clan-vm-manager.code-workspace | 0 .../clan_app}/__init__.py | 2 +- .../clan_app}/__main__.py | 0 .../clan_app}/app.py | 8 ++--- .../clan_app}/assets/__init__.py | 0 .../clan_app}/assets/clan_black.png | Bin .../clan_app}/assets/clan_black_notext.png | Bin .../clan_app}/assets/clan_white.png | Bin .../clan_app}/assets/clan_white_notext.png | Bin .../clan_app}/assets/cybernet.jpeg | Bin .../clan_app}/assets/cybernet_no_text.jpeg | Bin .../clan_app}/assets/firestorm.jpeg | Bin .../clan_app}/assets/penguin.jpeg | Bin .../clan_app}/assets/placeholder.jpeg | Bin .../clan_app}/assets/placeholder2.jpeg | Bin .../clan_app}/assets/style.css | 0 .../clan_app}/assets/zenith.jpeg | Bin .../clan_app}/components/__init__.py | 0 .../clan_app}/components/executor.py | 0 .../clan_app}/components/gkvstore.py | 0 .../clan_app}/components/interfaces.py | 0 .../clan_app}/components/list_splash.py | 2 +- .../clan_app}/components/trayicon.py | 2 +- .../clan_app}/components/vmobj.py | 4 +-- .../clan_app}/singletons/__init__.py | 0 .../clan_app}/singletons/toast.py | 4 +-- .../clan_app}/singletons/use_join.py | 4 +-- .../clan_app}/singletons/use_views.py | 0 .../clan_app}/singletons/use_vms.py | 10 +++--- .../clan_app}/views/__init__.py | 0 .../clan_app}/views/details.py | 0 .../clan_app}/views/list.py | 18 +++++----- .../clan_app}/views/logs.py | 2 +- .../clan_app}/views/webview.py | 4 +-- .../clan_app}/windows/__init__.py | 0 .../clan_app}/windows/main_window.py | 18 +++++----- .../{clan-vm-manager => clan-app}/default.nix | 32 +++++++++--------- pkgs/{clan-vm-manager => clan-app}/demo.sh | 0 pkgs/clan-app/flake-module.nix | 24 +++++++++++++ .../install-desktop.sh | 8 ++--- pkgs/{clan-vm-manager => clan-app}/notes.md | 0 .../pyproject.toml | 10 +++--- .../screenshots/image.png | Bin pkgs/{clan-vm-manager => clan-app}/shell.nix | 18 +++++----- .../tests/command.py | 0 .../tests/conftest.py | 4 +-- .../tests/helpers/cli.py | 2 +- .../tests/root.py | 0 .../tests/temporary_dir.py | 0 .../tests/test_cli.py | 2 +- .../tests/test_join.py | 0 .../tests/wayland.py | 2 +- pkgs/clan-vm-manager/flake-module.nix | 24 ------------- .../gui-installer/flake-module.nix | 2 +- .../gui-installer/gui-installer.sh | 2 +- pkgs/flake-module.nix | 2 +- 61 files changed, 122 insertions(+), 127 deletions(-) rename pkgs/{clan-vm-manager => clan-app}/.envrc (77%) rename pkgs/{clan-vm-manager => clan-app}/README.md (75%) rename pkgs/{clan-vm-manager => clan-app}/bin/clan-vm-manager (85%) rename pkgs/{clan-vm-manager => clan-app}/clan-vm-manager.code-workspace (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/__init__.py (81%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/__main__.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/app.py (94%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/__init__.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/clan_black.png (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/clan_black_notext.png (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/clan_white.png (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/clan_white_notext.png (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/cybernet.jpeg (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/cybernet_no_text.jpeg (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/firestorm.jpeg (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/penguin.jpeg (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/placeholder.jpeg (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/placeholder2.jpeg (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/style.css (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/assets/zenith.jpeg (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/components/__init__.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/components/executor.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/components/gkvstore.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/components/interfaces.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/components/list_splash.py (98%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/components/trayicon.py (99%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/components/vmobj.py (99%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/singletons/__init__.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/singletons/toast.py (97%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/singletons/use_join.py (96%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/singletons/use_views.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/singletons/use_vms.py (95%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/views/__init__.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/views/details.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/views/list.py (95%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/views/logs.py (97%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/views/webview.py (98%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/windows/__init__.py (100%) rename pkgs/{clan-vm-manager/clan_vm_manager => clan-app/clan_app}/windows/main_window.py (83%) rename pkgs/{clan-vm-manager => clan-app}/default.nix (86%) rename pkgs/{clan-vm-manager => clan-app}/demo.sh (100%) create mode 100644 pkgs/clan-app/flake-module.nix rename pkgs/{clan-vm-manager => clan-app}/install-desktop.sh (73%) rename pkgs/{clan-vm-manager => clan-app}/notes.md (100%) rename pkgs/{clan-vm-manager => clan-app}/pyproject.toml (83%) rename pkgs/{clan-vm-manager => clan-app}/screenshots/image.png (100%) rename pkgs/{clan-vm-manager => clan-app}/shell.nix (76%) rename pkgs/{clan-vm-manager => clan-app}/tests/command.py (100%) rename pkgs/{clan-vm-manager => clan-app}/tests/conftest.py (92%) rename pkgs/{clan-vm-manager => clan-app}/tests/helpers/cli.py (89%) rename pkgs/{clan-vm-manager => clan-app}/tests/root.py (100%) rename pkgs/{clan-vm-manager => clan-app}/tests/temporary_dir.py (100%) rename pkgs/{clan-vm-manager => clan-app}/tests/test_cli.py (75%) rename pkgs/{clan-vm-manager => clan-app}/tests/test_join.py (100%) rename pkgs/{clan-vm-manager => clan-app}/tests/wayland.py (90%) delete mode 100644 pkgs/clan-vm-manager/flake-module.nix diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index d8c0115ff..864caa185 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -121,7 +121,7 @@ git+file:///home/lhebendanz/Projects/clan-core │ ├───clan-cli omitted (use '--all-systems' to show) │ ├───clan-cli-docs omitted (use '--all-systems' to show) │ ├───clan-ts-api omitted (use '--all-systems' to show) -│ ├───clan-vm-manager omitted (use '--all-systems' to show) +│ ├───clan-app omitted (use '--all-systems' to show) │ ├───default omitted (use '--all-systems' to show) │ ├───deploy-docs omitted (use '--all-systems' to show) │ ├───docs omitted (use '--all-systems' to show) diff --git a/formatter.nix b/formatter.nix index 121795a10..12853b5a4 100644 --- a/formatter.nix +++ b/formatter.nix @@ -10,10 +10,9 @@ treefmt.programs.mypy.enable = true; treefmt.programs.mypy.directories = { "pkgs/clan-cli".extraPythonPackages = self'.packages.clan-cli.testDependencies; - "pkgs/clan-vm-manager".extraPythonPackages = - # clan-vm-manager currently only exists on linux - (self'.packages.clan-vm-manager.externalTestDeps or [ ]) - ++ self'.packages.clan-cli.testDependencies; + "pkgs/clan-app".extraPythonPackages = + # clan-app currently only exists on linux + (self'.packages.clan-app.externalTestDeps or [ ]) ++ self'.packages.clan-cli.testDependencies; }; treefmt.settings.formatter.nix = { diff --git a/pkgs/clan-vm-manager/.envrc b/pkgs/clan-app/.envrc similarity index 77% rename from pkgs/clan-vm-manager/.envrc rename to pkgs/clan-app/.envrc index 329a5f07b..77e116591 100644 --- a/pkgs/clan-vm-manager/.envrc +++ b/pkgs/clan-app/.envrc @@ -3,4 +3,4 @@ source_up watch_file flake-module.nix shell.nix default.nix # Because we depend on nixpkgs sources, uploading to builders takes a long time -use flake .#clan-vm-manager --builders '' +use flake .#clan-app --builders '' diff --git a/pkgs/clan-vm-manager/README.md b/pkgs/clan-app/README.md similarity index 75% rename from pkgs/clan-vm-manager/README.md rename to pkgs/clan-app/README.md index 8a31c44eb..fa4098036 100644 --- a/pkgs/clan-vm-manager/README.md +++ b/pkgs/clan-app/README.md @@ -1,4 +1,4 @@ -# Clan VM Manager +# clan app Provides users with the simple functionality to manage their locally registered clans. @@ -9,19 +9,19 @@ Provides users with the simple functionality to manage their locally registered Run this application ```bash -./bin/clan-vm-manager +./bin/clan-app ``` Join the default machine of a clan ```bash -./bin/clan-vm-manager [clan-uri] +./bin/clan-app [clan-uri] ``` Join a specific machine of a clan ```bash -./bin/clan-vm-manager [clan-uri]#[machine] +./bin/clan-app [clan-uri]#[machine] ``` For more available commands see the developer section below. @@ -35,7 +35,7 @@ For more available commands see the developer section below. gsettings set org.gtk.Settings.Debug enable-inspector-keybinding true # Start the application with the debugger attached -GTK_DEBUG=interactive ./bin/clan-vm-manager --debug +GTK_DEBUG=interactive ./bin/clan-app --debug ``` Appending `--debug` flag enables debug logging printed into the console. @@ -45,7 +45,7 @@ Appending `--debug` flag enables debug logging printed into the console. To activate profiling you can run ```bash -PERF=1 ./bin/clan-vm-manager +PERF=1 ./bin/clan-app ``` ### Library Components @@ -75,20 +75,20 @@ gtk4-icon-browser ### Links -Here are some important documentation links related to the Clan VM Manager: +Here are some important documentation links related to the Clan App: -- [Adw PyGobject Reference](http://lazka.github.io/pgi-docs/index.html#Adw-1): This link provides the PyGObject reference documentation for the Adw library, which is used in the Clan VM Manager. It contains detailed information about the Adw widgets and their usage. +- [Adw PyGobject Reference](http://lazka.github.io/pgi-docs/index.html#Adw-1): This link provides the PyGObject reference documentation for the Adw library, which is used in the Clan App. It contains detailed information about the Adw widgets and their usage. -- [GTK4 PyGobject Reference](http://lazka.github.io/pgi-docs/index.html#Gtk-4.0): This link provides the PyGObject reference documentation for GTK4, the toolkit used for building the user interface of the Clan VM Manager. It includes information about GTK4 widgets, signals, and other features. +- [GTK4 PyGobject Reference](http://lazka.github.io/pgi-docs/index.html#Gtk-4.0): This link provides the PyGObject reference documentation for GTK4, the toolkit used for building the user interface of the clan app. It includes information about GTK4 widgets, signals, and other features. -- [Adw Widget Gallery](https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/widget-gallery.html): This link showcases a widget gallery for Adw, allowing you to see the available widgets and their visual appearance. It can be helpful for designing the user interface of the Clan VM Manager. +- [Adw Widget Gallery](https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/widget-gallery.html): This link showcases a widget gallery for Adw, allowing you to see the available widgets and their visual appearance. It can be helpful for designing the user interface of the clan app. -- [Python + GTK3 Tutorial](https://python-gtk-3-tutorial.readthedocs.io/en/latest/textview.html): Although the Clan VM Manager uses GTK4, this tutorial for GTK3 can still be useful as it covers the basics of building GTK-based applications with Python. It includes examples and explanations for various GTK widgets, including text views. +- [Python + GTK3 Tutorial](https://python-gtk-3-tutorial.readthedocs.io/en/latest/textview.html): Although the clan app uses GTK4, this tutorial for GTK3 can still be useful as it covers the basics of building GTK-based applications with Python. It includes examples and explanations for various GTK widgets, including text views. - [GNOME Human Interface Guidelines](https://developer.gnome.org/hig/): This link provides the GNOME Human Interface Guidelines, which offer design and usability recommendations for creating GNOME applications. It covers topics such as layout, navigation, and interaction patterns. ## Error handling -> Error dialogs should be avoided where possible, since they are disruptive. -> +> Error dialogs should be avoided where possible, since they are disruptive. +> > For simple non-critical errors, toasts can be a good alternative. \ No newline at end of file diff --git a/pkgs/clan-vm-manager/bin/clan-vm-manager b/pkgs/clan-app/bin/clan-vm-manager similarity index 85% rename from pkgs/clan-vm-manager/bin/clan-vm-manager rename to pkgs/clan-app/bin/clan-vm-manager index a6c6a17ba..167616d6a 100755 --- a/pkgs/clan-vm-manager/bin/clan-vm-manager +++ b/pkgs/clan-app/bin/clan-vm-manager @@ -7,7 +7,7 @@ module_path = Path(__file__).parent.parent.absolute() sys.path.insert(0, str(module_path)) sys.path.insert(0, str(module_path.parent / "clan_cli")) -from clan_vm_manager import main # NOQA +from clan_app import main # NOQA if __name__ == "__main__": main() diff --git a/pkgs/clan-vm-manager/clan-vm-manager.code-workspace b/pkgs/clan-app/clan-vm-manager.code-workspace similarity index 100% rename from pkgs/clan-vm-manager/clan-vm-manager.code-workspace rename to pkgs/clan-app/clan-vm-manager.code-workspace diff --git a/pkgs/clan-vm-manager/clan_vm_manager/__init__.py b/pkgs/clan-app/clan_app/__init__.py similarity index 81% rename from pkgs/clan-vm-manager/clan_vm_manager/__init__.py rename to pkgs/clan-app/clan_app/__init__.py index d1cc2a96f..c1d6251f3 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/__init__.py +++ b/pkgs/clan-app/clan_app/__init__.py @@ -3,7 +3,7 @@ import sys from clan_cli.profiler import profile -from clan_vm_manager.app import MainApplication +from clan_app.app import MainApplication log = logging.getLogger(__name__) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/__main__.py b/pkgs/clan-app/clan_app/__main__.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/__main__.py rename to pkgs/clan-app/clan_app/__main__.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/app.py b/pkgs/clan-app/clan_app/app.py similarity index 94% rename from pkgs/clan-vm-manager/clan_vm_manager/app.py rename to pkgs/clan-app/clan_app/app.py index d247f7f68..1e0acade3 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/app.py +++ b/pkgs/clan-app/clan_app/app.py @@ -4,8 +4,8 @@ from typing import Any, ClassVar import gi -from clan_vm_manager import assets -from clan_vm_manager.singletons.toast import InfoToast, ToastOverlay +from clan_app import assets +from clan_app.singletons.toast import InfoToast, ToastOverlay gi.require_version("Gtk", "4.0") gi.require_version("Adw", "1") @@ -13,8 +13,8 @@ gi.require_version("Adw", "1") from clan_cli.custom_logger import setup_logging from gi.repository import Adw, Gdk, Gio, Gtk -from clan_vm_manager.components.interfaces import ClanConfig -from clan_vm_manager.singletons.use_join import GLib, GObject +from clan_app.components.interfaces import ClanConfig +from clan_app.singletons.use_join import GLib, GObject from .windows.main_window import MainWindow diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/__init__.py b/pkgs/clan-app/clan_app/assets/__init__.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/__init__.py rename to pkgs/clan-app/clan_app/assets/__init__.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_black.png b/pkgs/clan-app/clan_app/assets/clan_black.png similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/clan_black.png rename to pkgs/clan-app/clan_app/assets/clan_black.png diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_black_notext.png b/pkgs/clan-app/clan_app/assets/clan_black_notext.png similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/clan_black_notext.png rename to pkgs/clan-app/clan_app/assets/clan_black_notext.png diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_white.png b/pkgs/clan-app/clan_app/assets/clan_white.png similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/clan_white.png rename to pkgs/clan-app/clan_app/assets/clan_white.png diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/clan_white_notext.png b/pkgs/clan-app/clan_app/assets/clan_white_notext.png similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/clan_white_notext.png rename to pkgs/clan-app/clan_app/assets/clan_white_notext.png diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/cybernet.jpeg b/pkgs/clan-app/clan_app/assets/cybernet.jpeg similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/cybernet.jpeg rename to pkgs/clan-app/clan_app/assets/cybernet.jpeg diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/cybernet_no_text.jpeg b/pkgs/clan-app/clan_app/assets/cybernet_no_text.jpeg similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/cybernet_no_text.jpeg rename to pkgs/clan-app/clan_app/assets/cybernet_no_text.jpeg diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/firestorm.jpeg b/pkgs/clan-app/clan_app/assets/firestorm.jpeg similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/firestorm.jpeg rename to pkgs/clan-app/clan_app/assets/firestorm.jpeg diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/penguin.jpeg b/pkgs/clan-app/clan_app/assets/penguin.jpeg similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/penguin.jpeg rename to pkgs/clan-app/clan_app/assets/penguin.jpeg diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/placeholder.jpeg b/pkgs/clan-app/clan_app/assets/placeholder.jpeg similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/placeholder.jpeg rename to pkgs/clan-app/clan_app/assets/placeholder.jpeg diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/placeholder2.jpeg b/pkgs/clan-app/clan_app/assets/placeholder2.jpeg similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/placeholder2.jpeg rename to pkgs/clan-app/clan_app/assets/placeholder2.jpeg diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/style.css b/pkgs/clan-app/clan_app/assets/style.css similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/style.css rename to pkgs/clan-app/clan_app/assets/style.css diff --git a/pkgs/clan-vm-manager/clan_vm_manager/assets/zenith.jpeg b/pkgs/clan-app/clan_app/assets/zenith.jpeg similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/assets/zenith.jpeg rename to pkgs/clan-app/clan_app/assets/zenith.jpeg diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/__init__.py b/pkgs/clan-app/clan_app/components/__init__.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/components/__init__.py rename to pkgs/clan-app/clan_app/components/__init__.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/executor.py b/pkgs/clan-app/clan_app/components/executor.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/components/executor.py rename to pkgs/clan-app/clan_app/components/executor.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/gkvstore.py b/pkgs/clan-app/clan_app/components/gkvstore.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/components/gkvstore.py rename to pkgs/clan-app/clan_app/components/gkvstore.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/interfaces.py b/pkgs/clan-app/clan_app/components/interfaces.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/components/interfaces.py rename to pkgs/clan-app/clan_app/components/interfaces.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/list_splash.py b/pkgs/clan-app/clan_app/components/list_splash.py similarity index 98% rename from pkgs/clan-vm-manager/clan_vm_manager/components/list_splash.py rename to pkgs/clan-app/clan_app/components/list_splash.py index 73a5b73e1..827c72a4b 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/list_splash.py +++ b/pkgs/clan-app/clan_app/components/list_splash.py @@ -4,7 +4,7 @@ from typing import TypeVar import gi -from clan_vm_manager import assets +from clan_app import assets gi.require_version("Adw", "1") from gi.repository import Adw, GdkPixbuf, Gio, GObject, Gtk diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py b/pkgs/clan-app/clan_app/components/trayicon.py similarity index 99% rename from pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py rename to pkgs/clan-app/clan_app/components/trayicon.py index 89c900af7..79eec779b 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/trayicon.py +++ b/pkgs/clan-app/clan_app/components/trayicon.py @@ -562,7 +562,7 @@ class StatusNotifierImplementation(BaseImplementation): ) self.tray_icon.register() - from clan_vm_manager.assets import loc + from clan_app.assets import loc icon_path = str(loc / "clan_white_notext.png") self.set_icon(icon_path) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py b/pkgs/clan-app/clan_app/components/vmobj.py similarity index 99% rename from pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py rename to pkgs/clan-app/clan_app/components/vmobj.py index 27da01ba1..3949e27fa 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/components/vmobj.py +++ b/pkgs/clan-app/clan_app/components/vmobj.py @@ -17,8 +17,8 @@ from clan_cli.clan_uri import ClanURI from clan_cli.history.add import HistoryEntry from clan_cli.machines.machines import Machine -from clan_vm_manager.components.executor import MPProcess, spawn -from clan_vm_manager.singletons.toast import ( +from clan_app.components.executor import MPProcess, spawn +from clan_app.singletons.toast import ( InfoToast, SuccessToast, ToastOverlay, diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/__init__.py b/pkgs/clan-app/clan_app/singletons/__init__.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/singletons/__init__.py rename to pkgs/clan-app/clan_app/singletons/__init__.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/toast.py b/pkgs/clan-app/clan_app/singletons/toast.py similarity index 97% rename from pkgs/clan-vm-manager/clan_vm_manager/singletons/toast.py rename to pkgs/clan-app/clan_app/singletons/toast.py index 2be797a48..85da51730 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/toast.py +++ b/pkgs/clan-app/clan_app/singletons/toast.py @@ -9,8 +9,8 @@ gi.require_version("Adw", "1") from gi.repository import Adw -from clan_vm_manager.singletons.use_views import ViewStack -from clan_vm_manager.views.logs import Logs +from clan_app.singletons.use_views import ViewStack +from clan_app.views.logs import Logs log = logging.getLogger(__name__) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py b/pkgs/clan-app/clan_app/singletons/use_join.py similarity index 96% rename from pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py rename to pkgs/clan-app/clan_app/singletons/use_join.py index 6e71d1663..18ad418e0 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_join.py +++ b/pkgs/clan-app/clan_app/singletons/use_join.py @@ -7,8 +7,8 @@ import gi from clan_cli.clan_uri import ClanURI from clan_cli.history.add import HistoryEntry, add_history -from clan_vm_manager.components.gkvstore import GKVStore -from clan_vm_manager.singletons.use_vms import ClanStore +from clan_app.components.gkvstore import GKVStore +from clan_app.singletons.use_vms import ClanStore gi.require_version("Gtk", "4.0") gi.require_version("Adw", "1") diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_views.py b/pkgs/clan-app/clan_app/singletons/use_views.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/singletons/use_views.py rename to pkgs/clan-app/clan_app/singletons/use_views.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py b/pkgs/clan-app/clan_app/singletons/use_vms.py similarity index 95% rename from pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py rename to pkgs/clan-app/clan_app/singletons/use_vms.py index 67b8f6d59..5060b76a1 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py +++ b/pkgs/clan-app/clan_app/singletons/use_vms.py @@ -7,11 +7,11 @@ import gi from clan_cli.clan_uri import ClanURI from clan_cli.history.add import HistoryEntry -from clan_vm_manager import assets -from clan_vm_manager.components.gkvstore import GKVStore -from clan_vm_manager.components.vmobj import VMObject -from clan_vm_manager.singletons.use_views import ViewStack -from clan_vm_manager.views.logs import Logs +from clan_app import assets +from clan_app.components.gkvstore import GKVStore +from clan_app.components.vmobj import VMObject +from clan_app.singletons.use_views import ViewStack +from clan_app.views.logs import Logs gi.require_version("GObject", "2.0") gi.require_version("Gtk", "4.0") diff --git a/pkgs/clan-vm-manager/clan_vm_manager/views/__init__.py b/pkgs/clan-app/clan_app/views/__init__.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/views/__init__.py rename to pkgs/clan-app/clan_app/views/__init__.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/views/details.py b/pkgs/clan-app/clan_app/views/details.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/views/details.py rename to pkgs/clan-app/clan_app/views/details.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/views/list.py b/pkgs/clan-app/clan_app/views/list.py similarity index 95% rename from pkgs/clan-vm-manager/clan_vm_manager/views/list.py rename to pkgs/clan-app/clan_app/views/list.py index 5792c7957..b165cac0e 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/views/list.py +++ b/pkgs/clan-app/clan_app/views/list.py @@ -7,20 +7,20 @@ from typing import Any, TypeVar import gi from clan_cli.clan_uri import ClanURI -from clan_vm_manager.components.gkvstore import GKVStore -from clan_vm_manager.components.interfaces import ClanConfig -from clan_vm_manager.components.list_splash import EmptySplash -from clan_vm_manager.components.vmobj import VMObject -from clan_vm_manager.singletons.toast import ( +from clan_app.components.gkvstore import GKVStore +from clan_app.components.interfaces import ClanConfig +from clan_app.components.list_splash import EmptySplash +from clan_app.components.vmobj import VMObject +from clan_app.singletons.toast import ( LogToast, SuccessToast, ToastOverlay, WarningToast, ) -from clan_vm_manager.singletons.use_join import JoinList, JoinValue -from clan_vm_manager.singletons.use_views import ViewStack -from clan_vm_manager.singletons.use_vms import ClanStore, VMStore -from clan_vm_manager.views.logs import Logs +from clan_app.singletons.use_join import JoinList, JoinValue +from clan_app.singletons.use_views import ViewStack +from clan_app.singletons.use_vms import ClanStore, VMStore +from clan_app.views.logs import Logs gi.require_version("Adw", "1") from gi.repository import Adw, Gdk, Gio, GLib, GObject, Gtk diff --git a/pkgs/clan-vm-manager/clan_vm_manager/views/logs.py b/pkgs/clan-app/clan_app/views/logs.py similarity index 97% rename from pkgs/clan-vm-manager/clan_vm_manager/views/logs.py rename to pkgs/clan-app/clan_app/views/logs.py index f7fb804f5..4ce2dacb7 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/views/logs.py +++ b/pkgs/clan-app/clan_app/views/logs.py @@ -5,7 +5,7 @@ import gi gi.require_version("Adw", "1") from gi.repository import Adw, Gio, Gtk -from clan_vm_manager.singletons.use_views import ViewStack +from clan_app.singletons.use_views import ViewStack log = logging.getLogger(__name__) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/views/webview.py b/pkgs/clan-app/clan_app/views/webview.py similarity index 98% rename from pkgs/clan-vm-manager/clan_vm_manager/views/webview.py rename to pkgs/clan-app/clan_app/views/webview.py index 4d8e9cd64..8a40c223f 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/views/webview.py +++ b/pkgs/clan-app/clan_app/views/webview.py @@ -16,9 +16,7 @@ gi.require_version("WebKit", "6.0") from gi.repository import GLib, WebKit site_index: Path = ( - Path(sys.argv[0]).absolute() - / Path("../..") - / Path("clan_vm_manager/.webui/index.html") + Path(sys.argv[0]).absolute() / Path("../..") / Path("clan_app/.webui/index.html") ).resolve() log = logging.getLogger(__name__) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/__init__.py b/pkgs/clan-app/clan_app/windows/__init__.py similarity index 100% rename from pkgs/clan-vm-manager/clan_vm_manager/windows/__init__.py rename to pkgs/clan-app/clan_app/windows/__init__.py diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py b/pkgs/clan-app/clan_app/windows/main_window.py similarity index 83% rename from pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py rename to pkgs/clan-app/clan_app/windows/main_window.py index 92dcf2798..6911b2434 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/windows/main_window.py +++ b/pkgs/clan-app/clan_app/windows/main_window.py @@ -5,20 +5,20 @@ import gi from clan_cli.api import API from clan_cli.history.list import list_history -from clan_vm_manager.components.interfaces import ClanConfig -from clan_vm_manager.singletons.toast import ToastOverlay -from clan_vm_manager.singletons.use_views import ViewStack -from clan_vm_manager.singletons.use_vms import ClanStore -from clan_vm_manager.views.details import Details -from clan_vm_manager.views.list import ClanList -from clan_vm_manager.views.logs import Logs -from clan_vm_manager.views.webview import WebView +from clan_app.components.interfaces import ClanConfig +from clan_app.singletons.toast import ToastOverlay +from clan_app.singletons.use_views import ViewStack +from clan_app.singletons.use_vms import ClanStore +from clan_app.views.details import Details +from clan_app.views.list import ClanList +from clan_app.views.logs import Logs +from clan_app.views.webview import WebView gi.require_version("Adw", "1") from gi.repository import Adw, Gio, GLib, Gtk -from clan_vm_manager.components.trayicon import TrayIcon +from clan_app.components.trayicon import TrayIcon log = logging.getLogger(__name__) diff --git a/pkgs/clan-vm-manager/default.nix b/pkgs/clan-app/default.nix similarity index 86% rename from pkgs/clan-vm-manager/default.nix rename to pkgs/clan-app/default.nix index 2bf0a5012..ac352d39c 100644 --- a/pkgs/clan-vm-manager/default.nix +++ b/pkgs/clan-app/default.nix @@ -24,10 +24,10 @@ let source = ./.; desktop-file = makeDesktopItem { - name = "org.clan.vm-manager"; - exec = "clan-vm-manager %u"; - icon = ./clan_vm_manager/assets/clan_white.png; - desktopName = "Clan Manager"; + name = "org.clan.app"; + exec = "clan-app %u"; + icon = ./clan_app/assets/clan_white.png; + desktopName = "Clan App"; startupWMClass = "clan"; mimeTypes = [ "x-scheme-handler/clan" ]; }; @@ -69,7 +69,7 @@ let pythonWithTestDeps = python3.withPackages (_ps: testDependencies); in python3.pkgs.buildPythonApplication rec { - name = "clan-vm-manager"; + name = "clan-app"; src = source; format = "pyproject"; @@ -99,8 +99,8 @@ python3.pkgs.buildPythonApplication rec { # also re-expose dependencies so we test them in CI passthru = { tests = { - clan-vm-manager-pytest = - runCommand "clan-vm-manager-pytest" { inherit buildInputs propagatedBuildInputs nativeBuildInputs; } + clan-app-pytest = + runCommand "clan-app-pytest" { inherit buildInputs propagatedBuildInputs nativeBuildInputs; } '' cp -r ${source} ./src chmod +w -R ./src @@ -112,8 +112,8 @@ python3.pkgs.buildPythonApplication rec { mkdir -p .home/.local/share/fonts export HOME=.home - fc-cache --verbose - # > fc-cache succeded + fc-cache --verbose + # > fc-cache succeded echo "Loaded the following fonts ..." fc-list @@ -124,7 +124,7 @@ python3.pkgs.buildPythonApplication rec { touch $out ''; - clan-vm-manager-no-breakpoints = runCommand "clan-vm-manager-no-breakpoints" { } '' + clan-app-no-breakpoints = runCommand "clan-app-no-breakpoints" { } '' if grep --include \*.py -Rq "breakpoint()" ${source}; then echo "breakpoint() found in ${source}:" grep --include \*.py -Rn "breakpoint()" ${source} @@ -142,10 +142,10 @@ python3.pkgs.buildPythonApplication rec { passthru.runtimeDependencies = runtimeDependencies; passthru.testDependencies = testDependencies; - # TODO: place webui in lib/python3.11/site-packages/clan_vm_manager + # TODO: place webui in lib/python3.11/site-packages/clan_app postInstall = '' - mkdir -p $out/clan_vm_manager/.webui - cp -r ${webview-ui}/lib/node_modules/@clan/webview-ui/dist/* $out/clan_vm_manager/.webui + mkdir -p $out/clan_app/.webui + cp -r ${webview-ui}/lib/node_modules/@clan/webview-ui/dist/* $out/clan_app/.webui ''; # Don't leak python packages into a devshell. @@ -160,13 +160,13 @@ python3.pkgs.buildPythonApplication rec { mkdir -p .home/.local/share/fonts export HOME=.home - fc-cache --verbose - # > fc-cache succeded + fc-cache --verbose + # > fc-cache succeded echo "Loaded the following fonts ..." fc-list - PYTHONPATH= $out/bin/clan-vm-manager --help + PYTHONPATH= $out/bin/clan-app --help ''; desktopItems = [ desktop-file ]; } diff --git a/pkgs/clan-vm-manager/demo.sh b/pkgs/clan-app/demo.sh similarity index 100% rename from pkgs/clan-vm-manager/demo.sh rename to pkgs/clan-app/demo.sh diff --git a/pkgs/clan-app/flake-module.nix b/pkgs/clan-app/flake-module.nix new file mode 100644 index 000000000..3bc0c1195 --- /dev/null +++ b/pkgs/clan-app/flake-module.nix @@ -0,0 +1,24 @@ +{ ... }: +{ + perSystem = + { + config, + pkgs, + lib, + system, + ... + }: + if lib.elem system lib.platforms.darwin then + { } + else + { + devShells.clan-app = pkgs.callPackage ./shell.nix { + inherit (config.packages) clan-app webview-ui; + }; + packages.clan-app = pkgs.python3.pkgs.callPackage ./default.nix { + inherit (config.packages) clan-cli webview-ui; + }; + + checks = config.packages.clan-app.tests; + }; +} diff --git a/pkgs/clan-vm-manager/install-desktop.sh b/pkgs/clan-app/install-desktop.sh similarity index 73% rename from pkgs/clan-vm-manager/install-desktop.sh rename to pkgs/clan-app/install-desktop.sh index 445839786..0481621f8 100755 --- a/pkgs/clan-vm-manager/install-desktop.sh +++ b/pkgs/clan-app/install-desktop.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -CLAN=$(nix build .#clan-vm-manager --print-out-paths) +CLAN=$(nix build .#clan-app --print-out-paths) if ! command -v xdg-mime &> /dev/null; then echo "Warning: 'xdg-mime' is not available. The desktop file cannot be installed." @@ -8,14 +8,14 @@ fi # install desktop file set -eou pipefail -DESKTOP_FILE_NAME=org.clan.vm-manager.desktop +DESKTOP_FILE_NAME=org.clan.app.desktop DESKTOP_DST=~/.local/share/applications/"$DESKTOP_FILE_NAME" DESKTOP_SRC="$CLAN/share/applications/$DESKTOP_FILE_NAME" -UI_BIN="$CLAN/bin/clan-vm-manager" +UI_BIN="$CLAN/bin/clan-app" cp -f "$DESKTOP_SRC" "$DESKTOP_DST" sleep 2 -sed -i "s|Exec=.*clan-vm-manager|Exec=$UI_BIN|" "$DESKTOP_DST" +sed -i "s|Exec=.*clan-app|Exec=$UI_BIN|" "$DESKTOP_DST" xdg-mime default "$DESKTOP_FILE_NAME" x-scheme-handler/clan echo "==== Validating desktop file installation ====" set -x diff --git a/pkgs/clan-vm-manager/notes.md b/pkgs/clan-app/notes.md similarity index 100% rename from pkgs/clan-vm-manager/notes.md rename to pkgs/clan-app/notes.md diff --git a/pkgs/clan-vm-manager/pyproject.toml b/pkgs/clan-app/pyproject.toml similarity index 83% rename from pkgs/clan-vm-manager/pyproject.toml rename to pkgs/clan-app/pyproject.toml index 169f9a22d..b8eafa20c 100644 --- a/pkgs/clan-vm-manager/pyproject.toml +++ b/pkgs/clan-app/pyproject.toml @@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta" [project] -name = "clan-vm-manager" -description = "clan vm manager" +name = "clan-app" +description = "clan app" dynamic = ["version"] -scripts = { clan-vm-manager = "clan_vm_manager:main" } +scripts = { clan-app = "clan_app:main" } [project.urls] Homepage = "https://clan.lol/" @@ -18,7 +18,7 @@ Repository = "https://git.clan.lol/clan/clan-core" exclude = ["result"] [tool.setuptools.package-data] -clan_vm_manager = ["**/assets/*"] +clan_app = ["**/assets/*"] [tool.pytest.ini_options] testpaths = "tests" @@ -43,5 +43,5 @@ ignore_missing_imports = true [tool.ruff] target-version = "py311" line-length = 88 -lint.select = [ "E", "F", "I", "U", "N", "RUF", "ANN", "A" ] +lint.select = ["E", "F", "I", "U", "N", "RUF", "ANN", "A"] lint.ignore = ["E501", "E402", "N802", "ANN101", "ANN401", "A003"] diff --git a/pkgs/clan-vm-manager/screenshots/image.png b/pkgs/clan-app/screenshots/image.png similarity index 100% rename from pkgs/clan-vm-manager/screenshots/image.png rename to pkgs/clan-app/screenshots/image.png diff --git a/pkgs/clan-vm-manager/shell.nix b/pkgs/clan-app/shell.nix similarity index 76% rename from pkgs/clan-vm-manager/shell.nix rename to pkgs/clan-app/shell.nix index 4de1f494c..29f3fc6e3 100644 --- a/pkgs/clan-vm-manager/shell.nix +++ b/pkgs/clan-app/shell.nix @@ -1,7 +1,7 @@ { lib, stdenv, - clan-vm-manager, + clan-app, mkShell, ruff, desktop-file-utils, @@ -15,7 +15,7 @@ let devshellTestDeps = - clan-vm-manager.externalTestDeps + clan-app.externalTestDeps ++ (with python3.pkgs; [ rope mypy @@ -26,7 +26,7 @@ let ]); in mkShell { - inherit (clan-vm-manager) nativeBuildInputs; + inherit (clan-app) nativeBuildInputs; buildInputs = [ ruff @@ -45,18 +45,18 @@ mkShell { shellHook = '' export GIT_ROOT=$(git rev-parse --show-toplevel) - export PKG_ROOT=$GIT_ROOT/pkgs/clan-vm-manager + export PKG_ROOT=$GIT_ROOT/pkgs/clan-app - # Add clan-vm-manager command to PATH + # Add clan-app command to PATH export PATH="$PKG_ROOT/bin":"$PATH" # Add clan-cli to the python path so that we can import it without building it in nix first export PYTHONPATH="$GIT_ROOT/pkgs/clan-cli":"$PYTHONPATH" # Add the webview-ui to the .webui directory - rm -rf ./clan_vm_manager/.webui/* - mkdir -p ./clan_vm_manager/.webui - cp -a ${webview-ui}/lib/node_modules/@clan/webview-ui/dist/* ./clan_vm_manager/.webui - chmod -R +w ./clan_vm_manager/.webui + rm -rf ./clan_app/.webui/* + mkdir -p ./clan_app/.webui + cp -a ${webview-ui}/lib/node_modules/@clan/webview-ui/dist/* ./clan_app/.webui + chmod -R +w ./clan_app/.webui ''; } diff --git a/pkgs/clan-vm-manager/tests/command.py b/pkgs/clan-app/tests/command.py similarity index 100% rename from pkgs/clan-vm-manager/tests/command.py rename to pkgs/clan-app/tests/command.py diff --git a/pkgs/clan-vm-manager/tests/conftest.py b/pkgs/clan-app/tests/conftest.py similarity index 92% rename from pkgs/clan-vm-manager/tests/conftest.py rename to pkgs/clan-app/tests/conftest.py index 1841dc81e..244f5bfe8 100644 --- a/pkgs/clan-vm-manager/tests/conftest.py +++ b/pkgs/clan-app/tests/conftest.py @@ -7,9 +7,7 @@ from clan_cli.custom_logger import setup_logging from clan_cli.nix import nix_shell sys.path.append(str(Path(__file__).parent / "helpers")) -sys.path.append( - str(Path(__file__).parent.parent) -) # Also add clan vm manager to PYTHONPATH +sys.path.append(str(Path(__file__).parent.parent)) # Also add clan app to PYTHONPATH pytest_plugins = [ "temporary_dir", diff --git a/pkgs/clan-vm-manager/tests/helpers/cli.py b/pkgs/clan-app/tests/helpers/cli.py similarity index 89% rename from pkgs/clan-vm-manager/tests/helpers/cli.py rename to pkgs/clan-app/tests/helpers/cli.py index 1c2532d5b..f420ca3d6 100644 --- a/pkgs/clan-vm-manager/tests/helpers/cli.py +++ b/pkgs/clan-app/tests/helpers/cli.py @@ -3,7 +3,7 @@ import shlex from clan_cli.custom_logger import get_caller -from clan_vm_manager import main +from clan_app import main log = logging.getLogger(__name__) diff --git a/pkgs/clan-vm-manager/tests/root.py b/pkgs/clan-app/tests/root.py similarity index 100% rename from pkgs/clan-vm-manager/tests/root.py rename to pkgs/clan-app/tests/root.py diff --git a/pkgs/clan-vm-manager/tests/temporary_dir.py b/pkgs/clan-app/tests/temporary_dir.py similarity index 100% rename from pkgs/clan-vm-manager/tests/temporary_dir.py rename to pkgs/clan-app/tests/temporary_dir.py diff --git a/pkgs/clan-vm-manager/tests/test_cli.py b/pkgs/clan-app/tests/test_cli.py similarity index 75% rename from pkgs/clan-vm-manager/tests/test_cli.py rename to pkgs/clan-app/tests/test_cli.py index 654fa82a2..182098859 100644 --- a/pkgs/clan-vm-manager/tests/test_cli.py +++ b/pkgs/clan-app/tests/test_cli.py @@ -5,4 +5,4 @@ from cli import Cli def test_help(capfd: pytest.CaptureFixture) -> None: cli = Cli() with pytest.raises(SystemExit): - cli.run(["clan-vm-manager", "--help"]) + cli.run(["clan-app", "--help"]) diff --git a/pkgs/clan-vm-manager/tests/test_join.py b/pkgs/clan-app/tests/test_join.py similarity index 100% rename from pkgs/clan-vm-manager/tests/test_join.py rename to pkgs/clan-app/tests/test_join.py diff --git a/pkgs/clan-vm-manager/tests/wayland.py b/pkgs/clan-app/tests/wayland.py similarity index 90% rename from pkgs/clan-vm-manager/tests/wayland.py rename to pkgs/clan-app/tests/wayland.py index 1156b666d..a5607e945 100644 --- a/pkgs/clan-vm-manager/tests/wayland.py +++ b/pkgs/clan-app/tests/wayland.py @@ -21,7 +21,7 @@ GtkProc = NewType("GtkProc", Popen) @pytest.fixture(scope="function") def app() -> Generator[GtkProc, None, None]: - rapp = Popen([sys.executable, "-m", "clan_vm_manager"], text=True) + rapp = Popen([sys.executable, "-m", "clan_app"], text=True) yield GtkProc(rapp) # Cleanup: Terminate your application rapp.terminate() diff --git a/pkgs/clan-vm-manager/flake-module.nix b/pkgs/clan-vm-manager/flake-module.nix deleted file mode 100644 index f374a95f5..000000000 --- a/pkgs/clan-vm-manager/flake-module.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ ... }: -{ - perSystem = - { - config, - pkgs, - lib, - system, - ... - }: - if lib.elem system lib.platforms.darwin then - { } - else - { - devShells.clan-vm-manager = pkgs.callPackage ./shell.nix { - inherit (config.packages) clan-vm-manager webview-ui; - }; - packages.clan-vm-manager = pkgs.python3.pkgs.callPackage ./default.nix { - inherit (config.packages) clan-cli webview-ui; - }; - - checks = config.packages.clan-vm-manager.tests; - }; -} diff --git a/pkgs/distro-packages/gui-installer/flake-module.nix b/pkgs/distro-packages/gui-installer/flake-module.nix index add9a32db..6c656d658 100644 --- a/pkgs/distro-packages/gui-installer/flake-module.nix +++ b/pkgs/distro-packages/gui-installer/flake-module.nix @@ -9,7 +9,7 @@ contents = [ { src = "${./gui-installer.sh}"; - dst = "/usr/bin/clan-vm-manager"; + dst = "/usr/bin/clan-app"; } ]; } diff --git a/pkgs/distro-packages/gui-installer/gui-installer.sh b/pkgs/distro-packages/gui-installer/gui-installer.sh index 243b3bbfd..c222b1431 100755 --- a/pkgs/distro-packages/gui-installer/gui-installer.sh +++ b/pkgs/distro-packages/gui-installer/gui-installer.sh @@ -53,7 +53,7 @@ ensure_nix_installed() { start_clan_gui() { PATH="${PATH:+$PATH:}/nix/var/nix/profiles/default/bin" \ exec nix run \ - https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-vm-manager \ + https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-app \ --no-accept-flake-config \ --extra-experimental-features flakes nix-command -- "$@" } diff --git a/pkgs/flake-module.nix b/pkgs/flake-module.nix index 4adefdb8b..b4ee8e217 100644 --- a/pkgs/flake-module.nix +++ b/pkgs/flake-module.nix @@ -3,7 +3,7 @@ { imports = [ ./clan-cli/flake-module.nix - ./clan-vm-manager/flake-module.nix + ./clan-app/flake-module.nix ./installer/flake-module.nix ./schemas/flake-module.nix ./webview-ui/flake-module.nix