Taskbar replacement using EWW

Signed-off-by: Kajus Naujokaitis <[email protected]>
tiiuae · Sep 20, 2024 · 572a065 · 572a065
1 parent e1f09e6
commit 572a065
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 89 deletions.
diff --git a/modules/common/development/debug-tools.nix b/modules/common/development/debug-tools.nix
@@ -36,26 +36,25 @@ in
           # For lsusb:
 
           usbutils
-
           # Useful in NetVM
-          ethtool
 
+          ethtool
           # Basic monitors
+
           iftop
           iotop
           traceroute
           dig
           evtest
-
           # For deleting Linux Boot Manager entries in automated testing
-          efibootmgr
 
+          efibootmgr
           # Performance testing
+
           speedtest-cli
           iperf
           tree
           file
-
           # to build ghaf on target
 
           git

diff --git a/modules/desktop/graphics/ewwbar.nix b/modules/desktop/graphics/ewwbar.nix
@@ -252,8 +252,8 @@ in
                 :class "keyboard-layout"
                 :halign "center"
                 :valign "center"
-                (label :text keyboard_layout)))
-        (defpoll keyboard_layout :interval "1s" "${pkgs.sway}/bin/setxkbmap -query | ${pkgs.gawk}/bin/awk '/layout/{print $2}' | tr a-z A-Z")
+                (label  :text keyboard_layout)))
+        (defpoll keyboard_layout :interval "1s" "${pkgs.xorg.setxkbmap}/bin/setxkbmap -query | ${pkgs.gawk}/bin/awk '/layout/{print $2}' | tr a-z A-Z")
 
         ;; Bluetooth Widget ;;
         (defwidget bluetooth []
@@ -397,7 +397,7 @@ in
             :reserve    (struts :distance "50px" :side "bottom")
             :wm-ignore false
             :windowtype "dock"
-            :hexpand "true"
+            :hexpand "false"
             :vexpand "false"
             :stacking "fg"
             :exclusive "true"

diff --git a/modules/desktop/graphics/fonts.nix b/modules/desktop/graphics/fonts.nix
@@ -11,14 +11,6 @@ let
 in
 {
   config = lib.mkIf labwc.enable {
-    fonts.packages = builtins.attrValues {
-      inherit (pkgs)
-        inter
-        fira-code-nerdfont
-        material-icons
-        jetbrains-mono
-        hack-font
-        ;
-    };
+    fonts.packages = builtins.attrValues { inherit (pkgs) inter fira-code-nerdfont hack-font; };
   };
 }
diff --git a/packages/wifi-signal-strength-grpc/default.nix b/packages/wifi-signal-strength-grpc/default.nix