Merge pull request #30 from dhruveshb-mecha/dev-v2

ci: labwc and package configs added

debian/distro/build-debian.nu

@@ -109,6 +109,8 @@ configure_default_user
 
 configure_greeter
 
+configure_mechanix_system_dbus 
+
 configure_sys_files
 
   # Stage4: Cleanup

debian/distro/conf-packages/target.yml

@@ -59,7 +59,7 @@ package_groups:
       - xwayland
       - xorg
       # - meta-utils
-      - sway
+      - labwc
       - weston
   - name: greeter
     packages:
@@ -75,4 +75,9 @@ package_groups:
       - libasound2-plugins
   - name: mechanix
     packages:
-      - mechanix-status-bar
+      - mechanix-launcher
+      - mechanix-keyboard
+      - mechanix_desktop_dbus_server
+      - mechanix_system_dbus_server
+
+

debian/distro/modules/system-config.nu

@@ -80,12 +80,11 @@ export def configure_greeter [] {
   # CHROOT usermod -aG render greeter
   # CHROOT usermod -d /usr/greeter greeter
 
-  let config_append = "
-  # Performs auto login for default user
+  let config_append = "\n" + ("# Performs auto login for default user
+
   [initial_session]
-  command = \"sway\"
-  user = \"mecha\"
-  "
+  command = \"labwc\"
+  user = \"mecha\"" | str trim)
 
   let greetd_config_path = $rootfs_dir + "/etc/greetd/config.toml"
   echo $config_append | sudo tee -a $greetd_config_path
@@ -161,4 +160,43 @@ export def enable_watchdog_timer [rootfs_dir: string] {
 
   SUDO mv $tmp_watchdog_conf $watchdog_conf_path
 
+}
+
+
+export def configure_mechanix_system_dbus [] {
+  log_info "Configuring mechanix system dbus service:"
+  let rootfs_dir = $env.ROOTFS_DIR
+
+  let service_content = "[Unit]
+Description=Mechanix Services (zbus)
+After=systemd-user-sessions.service
+DefaultDependencies=no
+
+[Service]
+User=root
+Type=exec
+ExecStart=sudo /usr/bin/mechanix_system_dbus_server -c /etc/mechanix-gui/server/system/services-config.yml
+Restart=always
+RestartSec=2s
+
+[Install]
+WantedBy=sysinit.target"
+
+  let service_dir = $rootfs_dir + "/lib/systemd/system"
+  let service_dest = $service_dir + "/mechanix-system-dbus.service"
+
+  # Create directory if it doesn't exist
+  if not ($service_dir | path exists) {
+    log_debug $"Creating directory: ($service_dir)"
+    SUDO mkdir -p $service_dir
+  }
+
+  # Write service file directly using sudo tee
+  echo $service_content | sudo tee $service_dest
+
+  # Enable the service using chroot
+  alias CHROOT = sudo chroot $rootfs_dir
+  CHROOT systemctl enable mechanix-system-dbus.service
+
+  log_debug "Mechanix system dbus service configured successfully."
 }