Add autostart toggle, dock pinning, Bitcoin Base/Apps split

This commit is contained in:
2026-03-31 16:40:04 -05:00
parent dfa0249ec4
commit 6b6a90da2a
2 changed files with 114 additions and 8 deletions

View File

@@ -16,10 +16,8 @@ from .service_tile import ServiceTile
APP_ID = "com.sovransystems.hub"
# Initialize libadwaita BEFORE any widget creation
Adw.init()
# Category display order and labels
CATEGORY_ORDER = [
("infrastructure", "Infrastructure"),
("bitcoin-base", "Bitcoin Base"),
@@ -35,6 +33,51 @@ ROLE_LABELS = {
"node": "Bitcoin Node",
}
# XDG paths for autostart control
AUTOSTART_DIR = os.path.join(
os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")),
"autostart",
)
USER_AUTOSTART_FILE = os.path.join(AUTOSTART_DIR, "sovran-hub.desktop")
SYSTEM_AUTOSTART_FILE = "/etc/xdg/autostart/sovran-hub.desktop"
def get_autostart_enabled() -> bool:
"""Check if autostart is enabled for the current user."""
# If user has their own copy, check its X-GNOME-Autostart-enabled
if os.path.isfile(USER_AUTOSTART_FILE):
try:
with open(USER_AUTOSTART_FILE, "r") as f:
for line in f:
if line.strip().lower() == "x-gnome-autostart-enabled=false":
return False
if line.strip().lower() == "hidden=true":
return False
return True
except Exception:
return True
# No user override — system file controls it
return os.path.isfile(SYSTEM_AUTOSTART_FILE)
def set_autostart_enabled(enabled: bool):
"""Enable or disable autostart by writing a user-level desktop file."""
os.makedirs(AUTOSTART_DIR, exist_ok=True)
if enabled:
# Remove the user override so the system file takes effect
if os.path.isfile(USER_AUTOSTART_FILE):
os.remove(USER_AUTOSTART_FILE)
else:
# Write a user override that disables autostart
with open(USER_AUTOSTART_FILE, "w") as f:
f.write("[Desktop Entry]\n")
f.write("Type=Application\n")
f.write("Name=Sovran_SystemsOS Hub\n")
f.write("Exec=sovran-hub\n")
f.write("X-GNOME-Autostart-enabled=false\n")
f.write("Hidden=true\n")
class SovranHubWindow(Adw.ApplicationWindow):
@@ -67,6 +110,43 @@ class SovranHubWindow(Adw.ApplicationWindow):
refresh_btn.connect("clicked", lambda _b: self._refresh_all())
header.pack_end(refresh_btn)
# ── Settings menu ────────────────────────────────────────
menu_btn = Gtk.MenuButton(
icon_name="open-menu-symbolic",
tooltip_text="Settings",
)
popover = Gtk.Popover()
menu_box = Gtk.Box(
orientation=Gtk.Orientation.VERTICAL,
spacing=8,
margin_top=12,
margin_bottom=12,
margin_start=12,
margin_end=12,
)
autostart_row = Gtk.Box(
orientation=Gtk.Orientation.HORIZONTAL,
spacing=12,
)
autostart_label = Gtk.Label(
label="Start at login",
hexpand=True,
halign=Gtk.Align.START,
)
self._autostart_switch = Gtk.Switch(
valign=Gtk.Align.CENTER,
active=get_autostart_enabled(),
)
self._autostart_switch.connect("state-set", self._on_autostart_toggled)
autostart_row.append(autostart_label)
autostart_row.append(self._autostart_switch)
menu_box.append(autostart_row)
popover.set_child(menu_box)
menu_btn.set_popover(popover)
header.pack_end(menu_btn)
self._main_box = Gtk.Box(
orientation=Gtk.Orientation.VERTICAL,
spacing=0,
@@ -111,7 +191,6 @@ class SovranHubWindow(Adw.ApplicationWindow):
method = self._config.get("command_method", "systemctl")
services = self._config.get("services", [])
# Group services by category
grouped = {}
for entry in services:
cat = entry.get("category", "other")
@@ -122,7 +201,6 @@ class SovranHubWindow(Adw.ApplicationWindow):
if not entries:
continue
# Section header
section_label = Gtk.Label(
label=cat_label,
css_classes=["title-4"],
@@ -172,6 +250,10 @@ class SovranHubWindow(Adw.ApplicationWindow):
GLib.idle_add(self._refresh_all)
def _on_autostart_toggled(self, switch, state):
set_autostart_enabled(state)
return False
def _refresh_all(self):
for t in self._tiles:
t.refresh()

View File

@@ -90,7 +90,7 @@ let
# Generated config
cp ${generatedConfig} $out/lib/sovran-hub/config.json
# Icons (SVG + PNG)
# Icons (SVG + PNG) <EFBFBD><EFBFBD><EFBFBD>
install -d $out/share/sovran-hub/icons
cp icons/* $out/share/sovran-hub/icons/ 2>/dev/null || true
@@ -109,20 +109,34 @@ sys.exit(SovranHubApp().run(sys.argv))
LAUNCHER
chmod +x $out/bin/sovran-hub
# Desktop file
# Desktop file (for app launcher + dock)
install -d $out/share/applications
cat > $out/share/applications/Sovran_SystemsOS_Hub.desktop <<DESKTOP
cat > $out/share/applications/sovran-hub.desktop <<DESKTOP
[Desktop Entry]
Type=Application
Name=Sovran_SystemsOS Hub
Comment=Manage Sovran_SystemsOS systemd services
Exec=$out/bin/sovran-hub
Icon=system-run-symbolic
Icon=utilities-system-monitor-symbolic
Terminal=false
Categories=System;Monitor;
StartupWMClass=com.sovransystems.hub
DESKTOP
# Autostart desktop file
install -d $out/etc/xdg/autostart
cat > $out/etc/xdg/autostart/sovran-hub.desktop <<AUTOSTART
[Desktop Entry]
Type=Application
Name=Sovran_SystemsOS Hub
Comment=Manage Sovran_SystemsOS systemd services
Exec=$out/bin/sovran-hub
Icon=utilities-system-monitor-symbolic
Terminal=false
X-GNOME-Autostart-enabled=true
AutostartCondition=unless-exists sovran-hub-no-autostart
AUTOSTART
runHook postInstall
'';
@@ -136,5 +150,15 @@ in
{
config = {
environment.systemPackages = [ sovran-hub ];
# ── XDG autostart: link the system-wide autostart file ─────
environment.etc."xdg/autostart/sovran-hub.desktop".source =
"${sovran-hub}/etc/xdg/autostart/sovran-hub.desktop";
# ── GNOME dock: add to favorites ───────────────────────────
services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
[org.gnome.shell]
favorite-apps=['org.gnome.Nautilus.desktop', 'sovran-hub.desktop', 'org.gnome.Console.desktop', 'firefox.desktop']
'';
};
}