dotfiles

commit 467801f23d6a280a491c2a6da950f2cde7e2ddc0
parent 22275b4683d3edd14b83c0297960cfb5141900c0
Author: maydayv7 <maydayv7@gmail.com>
Date:   Mon, 24 Feb 2025 02:03:30 +0530

fix(Hyprland): Waybar Niggles

Diffstat:

10 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/devices/valkyrie/default.nix b/devices/valkyrie/default.nix
@@ -48,9 +48,9 @@
   };
 
   gui = {
-    desktop = "gnome";
+    desktop = "hyprland";
     display = "eDP-1";
-    wallpaper = "Nix";
+    wallpaper = "Thread";
     fancy = true;
   };
 
diff --git a/files/flake.nix b/files/flake.nix
@@ -84,6 +84,9 @@
       # Greeter Configuration
       greeter = readFile ./hyprland/greeter.conf;
 
+      # Minimize Workspace
+      minimize = "";
+
       # Pyprland
       pypr = readFile ./hyprland/pypr.toml;
 
diff --git a/files/hyprland/kebihelp.json b/files/hyprland/kebihelp.json
@@ -363,7 +363,7 @@
           },
           {
             "value": "ALT SHIFT Q",
-            "label": "Minimized Submap"
+            "label": "Minimize Submap"
           },
           {
             "value": "Return or L'",
diff --git a/files/hyprland/waybar.css b/files/hyprland/waybar.css
@@ -47,6 +47,12 @@ window#waybar {
   border: 2px solid @base04;
 }
 
+.modules-left #workspaces button.special {
+  opacity: 0.8;
+  padding-right: 3px;
+  margin-left: 5px;
+}
+
 #submap {
   color: @base00;
   background-color: @base08;
@@ -79,12 +85,7 @@ window#waybar {
 }
 
 #media .drawer box {
-  margin-left: 3px;
-}
-
-#mpris {
-  color: @base00;
-  background-color: @base05;
+  margin-right: 3px;
 }
 
 @keyframes blink {
diff --git a/modules/gui/desktop/hyprland/apps/panel.nix b/modules/gui/desktop/hyprland/apps/panel.nix
@@ -116,6 +116,7 @@ in {
             ignore-workspaces = ["special:scratch_.*"];
             format-icons = {
               default = "";
+              special = "";
               "1" = "";
               "2" = "";
               "3" = "";
@@ -126,8 +127,6 @@ in {
               "8" = "";
               "9" = "";
               OVERVIEW = "";
-              special = "";
-              "special:minimized" = "";
             };
           };
 
@@ -212,7 +211,7 @@ in {
           "group/media" = {
             orientation = "horizontal";
             modules = ["wireplumber" "mpris"];
-            drawer.transition-left-to-right = true;
+            drawer.transition-left-to-right = false;
           };
 
           wireplumber = {
@@ -228,9 +227,9 @@ in {
 
           mpris = {
             dynamic-len = 20;
-            dynamic-importance-order = ["title" "position" "length" "artist"];
-            dynamic-separator = "";
-            format = " {player} {dynamic}";
+            dynamic-order = ["title" "artist" "length"];
+            dynamic-separator = " - ";
+            format = " {player} - {dynamic}";
             format-paused = "󰏤 <i>{player}</i>";
             format-stopped = "";
             tooltip-format-stopped = "Not Playing";
@@ -248,7 +247,7 @@ in {
           "group/power" = {
             orientation = "horizontal";
             modules = ["battery" "power-profiles-daemon"];
-            drawer.transition-left-to-right = true;
+            drawer.transition-left-to-right = false;
           };
 
           battery = {
@@ -318,7 +317,7 @@ in {
           "group/notify" = {
             orientation = "horizontal";
             modules = ["custom/dunst" "idle_inhibitor"];
-            drawer.transition-left-to-right = true;
+            drawer.transition-left-to-right = false;
           };
 
           "custom/dunst" = {
diff --git a/modules/gui/desktop/hyprland/default.nix b/modules/gui/desktop/hyprland/default.nix
@@ -50,17 +50,7 @@ in {
 
           services = {
             # Session
-            displayManager.defaultSession = "Desktop";
-            xserver = {
-              desktopManager.runXdgAutostartIfNone = true;
-              displayManager.session = [
-                {
-                  name = "Desktop";
-                  manage = "desktop";
-                  start = "uwsm start -S -F Hyprland &> /dev/null";
-                }
-              ];
-            };
+            xserver.desktopManager.runXdgAutostartIfNone = true;
 
             # Greeter
             greetd.settings.default_session.command = with programs;
diff --git a/modules/gui/desktop/hyprland/settings/keybindings.nix b/modules/gui/desktop/hyprland/settings/keybindings.nix
@@ -1,4 +1,8 @@
-{sys, ...}: {
+{
+  sys,
+  files,
+  ...
+}: {
   ## Compositor Binds ##
   wayland.windowManager.hyprland = {
     ## Keybindings
@@ -40,16 +44,16 @@
           "$mod, C, centerwindow"
 
           # Window Minimization
-          "ALT, Q, movetoworkspacesilent, special:minimized"
-          "ALT SHIFT, Q, exec, hyprutils toggle minimized"
+          "ALT, Q, movetoworkspacesilent, special:${files.hyprland.minimize}"
+          "ALT SHIFT, Q, exec, hyprutils toggle minimize"
 
           # Cycle Workspaces
           "$mod, comma, split:workspace, m-1"
           "$mod, period, split:workspace, m+1"
 
           # Special Workspace
-          "$mod, 0, togglespecialworkspace, stash"
-          "$mod SHIFT, 0, exec, pypr toggle_special stash"
+          "$mod, 0, togglespecialworkspace, "
+          "$mod SHIFT, 0, exec, pypr toggle_special "
 
           # Move Window to Workspace
           "$mod SHIFT, comma, split:movetoworkspace, r-1"
@@ -156,7 +160,7 @@
       submap = reset
 
       # Window Minimization
-      submap = Minimized
+      submap = Minimize
       bind = , left, movefocus, l
       bind = , right, movefocus, r
       bind = , up, movefocus, u
@@ -165,7 +169,7 @@
       bind = , Return, submap, reset
       bind = , mouse:272, movetoworkspace, +0
       bind = , mouse:272, submap, reset
-      bind = , escape, togglespecialworkspace, minimized
+      bind = , escape, togglespecialworkspace, ${files.hyprland.minimize}
       bind = , escape, submap, reset
       submap = reset
     '';
diff --git a/modules/gui/desktop/hyprland/settings/plugins.nix b/modules/gui/desktop/hyprland/settings/plugins.nix
@@ -32,7 +32,7 @@
 
         # Application Overview
         hycov = {
-          enable_hotarea = 1;
+          enable_hotarea = 0;
           hotarea_pos = 3;
           only_active_workspace = 1;
           overview_gappi = 24;
diff --git a/scripts/hyprutils.nix b/scripts/hyprutils.nix
@@ -21,19 +21,20 @@
         fancy                        - Toggle Compositor Effects
         float                        - Toggle window floating in current workspace
         idle                         - Toggle Idle Daemon service
-        minimized                    - Show minimized windows
+        minimize                     - Show minimized windows
         monitor                      - Toggle specified Monitor
         panel                        - Toggle top Panel
         shader                       - Toggle Compositor Shader
         touchpad                     - Toggle touchpad
   '';
 
+  minimize = "special:${files.hyprland.minimize}";
   daemon = builtins.toFile "daemon.sh" ''
     event_activespecial() {
       case "$WORKSPACENAME" in
-      special:minimized*)
+      ${minimize}*)
         hyprctl dispatch submap reset
-        hyprctl dispatch submap Minimized
+        hyprctl dispatch submap Minimize
       ;;
       esac
     }
@@ -281,10 +282,10 @@ in
               notify idle -i "system-lock-screen" "Started Idle Daemon"
             fi
           ;;
-          "minimized")
-            if hyprctl workspaces | grep "special:minimized"
+          "minimize")
+            if hyprctl workspaces | grep "${minimize}"
             then
-              hyprctl dispatch workspace special:minimized
+              hyprctl dispatch workspace ${minimize}
             else
               hyprctl notify 1 2000 0 "No minimized windows present"
             fi
diff --git a/scripts/packages.sh b/scripts/packages.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env nix
 #! nix shell nixpkgs#bash nixpkgs#coreutils nixpkgs#jq -c bash
-# shellcheck shell=bash
+
 unset NIX_PATH
 set -euo pipefail