Set labwc as default compositor

Update the default compositor as Labwc instead of Weston. Remove unused Waybar packages. Signed-off-by: Berk Arslan <[email protected]>
brianmcgillion · Mar 20, 2024 · b78b258 · b78b258
1 parent 98a6074
commit b78b258
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/modules/desktop/profiles/graphics.nix b/modules/desktop/profiles/graphics.nix
@@ -14,7 +14,7 @@ in
       enable = mkEnableOption "Graphics profile";
       compositor = mkOption {
         type = types.enum compositors;
-        default = "weston";
+        default = "labwc";
         description = ''
           Which Wayland compositor to use.
 

diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -20,8 +20,6 @@
         ghaf = {
           users.accounts.enable = lib.mkDefault configHost.ghaf.users.accounts.enable;
           profiles.graphics.enable = true;
-          # Uncomment this line to take LabWC in use
-          # profiles.graphics.compositor = "labwc";
           # To enable screen locking set graphics.labwc.lock to true
           graphics.labwc.lock.enable = false;
           profiles.applications.enable = false;

diff --git a/overlays/custom-packages/default.nix b/overlays/custom-packages/default.nix
@@ -15,6 +15,7 @@
   nm-launcher = final.callPackage ../../packages/nm-launcher {};
   labwc = import ./labwc {inherit prev;};
   tpm2-pkcs11 = import ./tpm2-pkcs11 {inherit prev;};
+  waybar = import ./waybar {inherit prev;};
   # launcher overlays
   networkmanagerapplet = import ./networkmanagerapplet {inherit prev;};
   htop = import ./htop {inherit prev;};

diff --git a/overlays/custom-packages/waybar/default.nix b/overlays/custom-packages/waybar/default.nix
@@ -0,0 +1,13 @@
+# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+# This overlay customizes waybar
+#
+{prev}: (
+  prev.waybar.override {
+    hyprlandSupport = false;
+    swaySupport = false;
+    jackSupport = false;
+    cavaSupport = false;
+  }
+)
diff --git a/targets/nvidia-jetson-orin/flake-module.nix b/targets/nvidia-jetson-orin/flake-module.nix
@@ -77,6 +77,7 @@
                 debug.enable = variant == "debug";
               };
               windows-launcher.enable = true;
+              profiles.graphics.compositor = "weston";
             };
           }
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,6 +77,7 @@ @@
                     debug.enable = variant == "debug";
                   };
                   windows-launcher.enable = true;
+                  profiles.graphics.compositor = "weston";
                 };
               }
@@ Expand Down @@