Add Waybar configuration

Waybar configuration modified based on the default bar configuration and launchers added. Pulseaudio is added to guivm. Nmcli is used to get the network connection data in wifi-signal-strength script and nm-launcher connection structure is copied. Weston and waybar launchers are unified and name section added. Nerdfonts FiraCode is added. All the style and configuration files are created in weston.config.nix. Compositor and waypipe display name must be overriden as in comments in guivm.nix to use waybar properly. Signed-off-by: Berk Arslan <[email protected]>
tiiuae · Feb 5, 2024 · 8c4baa7 · 8c4baa7
1 parent 704e5cd
commit 8c4baa7
Show file tree

Hide file tree

Showing 14 changed files with 475 additions and 41 deletions.
diff --git a/docs/src/ref_impl/creating_appvm.md b/docs/src/ref_impl/creating_appvm.md
@@ -63,7 +63,7 @@ Each VM has the following properties:
 
 ## Adding Application Launcher in GUI VM
 
-To add an app launcher, add an element in the [guivm.nix](../../../modules/virtualization/microvm/guivm.nix) file to the **graphics.weston.launchers** list.
+To add an app launcher, add an element in the [guivm.nix](../../../modules/virtualization/microvm/guivm.nix) file to the **graphics.launchers** list.
 
 A launcher element has 2 properties:
 

diff --git a/modules/graphics/default.nix b/modules/graphics/default.nix
@@ -5,6 +5,7 @@
     ./weston.nix
     ./labwc.nix
     ./weston.ini.nix
+    ./waybar.config.nix
     ./demo-apps.nix
     ./fonts.nix
     ./gnome.nix

diff --git a/modules/graphics/demo-apps.nix b/modules/graphics/demo-apps.nix
@@ -7,7 +7,6 @@
   ...
 }: let
   cfg = config.ghaf.graphics.demo-apps;
-  inherit (config.ghaf.graphics) weston;
 
   /*
   Scaled down firefox icon
@@ -36,31 +35,36 @@
 in {
   options.ghaf.graphics.demo-apps = with lib; {
     chromium = mkProgramOption "Chromium browser" false;
-    firefox = mkProgramOption "Firefox browser" weston.enableDemoApplications;
+    firefox = mkProgramOption "Firefox browser" config.ghaf.graphics.enableDemoApplications;
     gala-app = mkProgramOption "Gala App" false;
-    element-desktop = mkProgramOption "Element desktop" weston.enableDemoApplications;
-    zathura = mkProgramOption "zathura" weston.enableDemoApplications;
+    element-desktop = mkProgramOption "Element desktop" config.ghaf.graphics.enableDemoApplications;
+    zathura = mkProgramOption "zathura" config.ghaf.graphics.enableDemoApplications;
   };
 
-  config = lib.mkIf weston.enable {
-    ghaf.graphics.weston.launchers =
+  config = lib.mkIf config.ghaf.profiles.graphics.enable {
+    ghaf.graphics.launchers =
       lib.optional cfg.chromium {
+        name = "chromium";
         path = "${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland";
         icon = "${pkgs.chromium}/share/icons/hicolor/24x24/apps/chromium.png";
       }
       ++ lib.optional cfg.firefox {
+        name = "firefox";
         path = "${pkgs.firefox}/bin/firefox";
         icon = "${firefox-icon}/share/icons/hicolor/24x24/apps/firefox.png";
       }
       ++ lib.optional cfg.element-desktop {
+        name = "element";
         path = "${pkgs.element-desktop}/bin/element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland";
         icon = "${pkgs.element-desktop}/share/icons/hicolor/24x24/apps/element.png";
       }
       ++ lib.optional cfg.gala-app {
+        name = "gala";
         path = "${pkgs.gala-app}/bin/gala --enable-features=UseOzonePlatform --ozone-platform=wayland";
         icon = "${pkgs.gala-app}/gala/resources/icon-24x24.png";
       }
       ++ lib.optional cfg.zathura {
+        name = "zathura";
         path = "${pkgs.zathura}/bin/zathura";
         icon = "${pkgs.zathura}/share/icons/hicolor/32x32/apps/org.pwmt.zathura.png";
       };

diff --git a/modules/graphics/fonts.nix b/modules/graphics/fonts.nix
@@ -6,12 +6,18 @@
   config,
   ...
 }: let
-  cfg = config.ghaf.graphics.weston;
+  inherit (config.ghaf.graphics) weston labwc;
 in {
-  config = lib.mkIf cfg.enable {
-    fonts.packages = with pkgs; [
-      fira-code
-      hack-font
-    ];
-  };
+  config =
+    lib.mkIf weston.enable {
+      fonts.fonts = with pkgs; [
+        fira-code
+        hack-font
+      ];
+    }
+    // lib.mkIf labwc.enable {
+      fonts.packages = with pkgs; [
+        (nerdfonts.override {fonts = ["FiraCode"];})
+      ];
+    };
 }