labwc: Cascading window style & full screen launcher

This sets a cascading window policy, so not all windows are launched center of screen. It also makes the launcher use the full screen, now it can better support small devices too. This improves usability. Tidy up launcher names and descriptions, and also change styling for date/time to 24h time as per previous requirement. Signed-off-by: Humaid Alqasimi <humaid.alqassimi@tii.ae>
josa41 · Oct 8, 2024 · 637bdfd · 637bdfd
1 parent 8e2d17b
commit 637bdfd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/modules/common/services/desktop.nix b/modules/common/services/desktop.nix
@@ -100,8 +100,8 @@ in
               icon = "${pkgs.icon-pack}/teams-for-linux.svg";
             }
             {
-              name = "Gnome Text Editor";
-              description = "Text Editor and Note-Taking Application";
+              name = "Text Editor";
+              description = "Simple Text Editor";
               vm = "Business";
               path = "${pkgs.givc-cli}/bin/givc-cli ${cliArgs} start --vm business-vm gnome-text-editor";
               icon = "${pkgs.icon-pack}/org.gnome.TextEditor.svg";
@@ -149,21 +149,21 @@ in
 
             {
               name = "Calculator";
-              description = "Application that solves mathematical equations";
+              description = "Solve Math Problems";
               path = "${pkgs.gnome-calculator}/bin/gnome-calculator";
               icon = "${pkgs.gnome-calculator}/share/icons/hicolor/scalable/apps/org.gnome.Calculator.svg";
             }
 
             {
-              name = "Sticky-Notes";
-              description = "Note-Taking Application for quick TODO items";
+              name = "Sticky Notes";
+              description = "Sticky Notes on your Desktop";
               path = "${pkgs.sticky-notes}/bin/com.vixalien.sticky";
               icon = "${pkgs.sticky-notes}/share/icons/hicolor/scalable/apps/com.vixalien.sticky.svg";
             }
 
             {
               name = "File Manager";
-              description = "File manager application";
+              description = "Organize & Manage Files";
               path = "${pkgs.pcmanfm}/bin/pcmanfm";
               icon = "${pkgs.icon-pack}/system-file-manager.svg";
             }
@@ -177,12 +177,14 @@ in
 
             {
               name = "Bluetooth Settings";
+              description = "Manage Bluetooth Devices & Settings";
               path = "${pkgs.bt-launcher}/bin/bt-launcher";
               icon = "${pkgs.icon-pack}/bluetooth-48.svg";
             }
 
             {
               name = "Audio Control";
+              description = "System Audio Control";
               path = "${pkgs.ghaf-audio-control}/bin/GhafAudioControlStandalone --pulseaudio_server=audio-vm:4713";
               icon = "${pkgs.icon-pack}/preferences-sound.svg";
             }

diff --git a/modules/desktop/graphics/ewwbar.nix b/modules/desktop/graphics/ewwbar.nix
@@ -357,8 +357,8 @@ in
         ;;							   Variables        					     ;;	
         ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
         (defpoll keyboard_layout :interval "1s" "${pkgs.xorg.setxkbmap}/bin/setxkbmap -query | ${pkgs.gawk}/bin/awk '/layout/{print $2}' | tr a-z A-Z")
-        (defpoll time :interval "1s" "date +'%I:%M%p'")
-        (defpoll date :interval "1m" "date +'%a %d/%m' | tr a-z A-Z")
+        (defpoll time :interval "1s" "date +'%H:%M'")
+        (defpoll date :interval "1m" "date +'%a %b %-d'")
         (defpoll calendar_day :interval "10h"
             "date '+%d'")
         (defpoll calendar_month :interval "10h"
@@ -868,7 +868,7 @@ in
             @include widget($padding: 14px, $radius: 6px, $bg: $bg-primary);
         }
 
-        @mixin floating_widget($margin: 0em 0.3em 0em 0em){
+        @mixin floating_widget($margin: 0.3em 0.3em 0em 0em){
             @include unset($rec: true);
             border-radius: 6px;
             margin: $margin;
@@ -1130,7 +1130,6 @@ in
         .eww_bar {
             background-color: $bg-primary;
             padding: 0.2em 1em 0.2em 1em;
-            margin-bottom: 0.3em;
         }
 
         .icon_button {

diff --git a/modules/desktop/graphics/ghaf-launcher.nix b/modules/desktop/graphics/ghaf-launcher.nix
@@ -7,7 +7,6 @@ let
     window {
         background-color: #121212;
         color: #fff;
-        border-radius: 4px;
     }
 
     /* search entry */
@@ -64,6 +63,6 @@ pkgs.writeShellApplication {
     rm -rf "$HOME/.config/nwg-drawer"
     #ln -s "${drawerCSS}/nwg-drawer" "$HOME/.config/"
 
-    nwg-drawer -r -c 5 -ml 440 -mr 440 -mt 420 -nofs -nocats -s ${drawerCSS}/nwg-drawer/drawer.css
+    nwg-drawer -r -nofs -nocats -s ${drawerCSS}/nwg-drawer/drawer.css
   '';
 }
diff --git a/modules/desktop/graphics/labwc.config.nix b/modules/desktop/graphics/labwc.config.nix
@@ -82,6 +82,10 @@ let
         <delay inner="500" outer="500"/>
       </overlay>
     </snapping>
+    <placement>
+      <policy>cascade</policy>
+      <cascadeOffset x="40" y="30" />
+    </placement>
     <keyboard>
       <default />
       <keybind key="W-l">