dotfiles

commit f68965c42fcc1f3eea7d549d13d2343c5edffc29
parent 12ccdfbe99dbd55a9c83a735d5ef263681812942
Author: maydayv7 <maydayv7@gmail.com>
Date:   Wed, 28 Feb 2024 13:18:35 +0530

chore: Update Hyprland

Diffstat:

8 files changed, 94 insertions(+), 70 deletions(-)
diff --git a/files/flake.nix b/files/flake.nix
@@ -82,6 +82,9 @@
       # Waybar
       waybar = readFile ./hyprland/waybar.css;
 
+      # WLogout
+      wlogout = readFile ./hyprland/wlogout.css;
+
       # NWG Shell
       nwg = {
         drawer = readFile ./hyprland/nwg/drawer.css;
diff --git a/files/hyprland/binds.pango b/files/hyprland/binds.pango
@@ -1,11 +1,11 @@
 <span size="10.75pt">
 <b><big>Keyboard Shortcuts</big></b>																	<b><big>Mouse Actions</big></b>
-<i>$mod -> SUPER</i>																			<i>L</i> or <i>R -> Left/Right Click</i>
+<i>$mod -> SUPER</i>																			<i>L'</i> or <i>R' -> Left/Right Click</i>
 
-<tt>$mod Q</tt>							Quit application										<tt>$mod L</tt>				Move window
-<tt>$mod P</tt>							Pin window on all Workspaces							<tt>$mod R</tt>				Window resize
-<tt>$mod M</tt>							Maximize window										<tt>$mod CTRL L</tt>		Window resize
-<tt>$mod SHIFT M</tt>					Fullscreen window										<tt>$mod SHIFT L</tt>		Move window into application group
+<tt>$mod Q</tt>							Quit application										<tt>$mod L'</tt>				Move window
+<tt>$mod P</tt>							Pin window on all Workspaces							<tt>$mod R'</tt>				Window resize
+<tt>$mod M</tt>							Maximize window										<tt>$mod CTRL L'</tt>		Window resize
+<tt>$mod SHIFT M</tt>					Fullscreen window										<tt>$mod SHIFT L'</tt>		Move window into application group
 <tt>ALT Q</tt>								Minimize window
 <tt>ALT SHIFT Q</tt>					Show minimized windows
 <tt>$mod <i>ARROW</i></tt>						Switch focus to window in desired direction
@@ -46,7 +46,7 @@
 <tt>$mod Shift T</tt>					Toggle Terminal in Quake mode
 <tt>$mod V</tt>							Toggle Clipboard
 <tt>$mod W</tt>							Web Browser
-<tt>$mod Return</tt>					Task Manager
+<tt>$mod Enter</tt>						Task Manager
 <tt>$mod N</tt>							Show received notifications in order
 <tt>$mod /</tt>							Application Launcher
 <tt>Calculator</tt>						Calculator
diff --git a/files/hyprland/nwg/wrapper.css b/files/hyprland/nwg/wrapper.css
@@ -4,10 +4,9 @@
 }
 
 window {
-  background-color: rgba(0, 0, 0, 0.3);
+  background: alpha(@theme_bg_color, 0.7);
 }
 
 #box-inner {
-  background-color: transparent;
   padding: 0 20px 0 20px;
 }
diff --git a/files/hyprland/wlogout.css b/files/hyprland/wlogout.css
@@ -0,0 +1,26 @@
+* {
+  background: none;
+}
+
+window {
+  background-color: rgba(0, 0, 0, 0.5);
+}
+
+button {
+  background: rgba(0, 0, 0, 0.05);
+  border-radius: 8px;
+  box-shadow:
+    inset 0 0 0 1px rgba(255, 255, 255, 0.1),
+    0 0 rgba(0, 0, 0, 0.5);
+  margin: 1rem;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 25%;
+}
+
+button:focus,
+button:active,
+button:hover {
+  background-color: rgba(255, 255, 255, 0.2);
+  outline-style: none;
+}
diff --git a/flake.lock b/flake.lock
@@ -602,11 +602,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707115426,
-        "narHash": "sha256-2hLPzUTsaOC8pmOSR0QEbBhtotqRVtgOSEGY+ElMkAk=",
+        "lastModified": 1708921401,
+        "narHash": "sha256-ab7RjgNRdMf3ao8sDXA1kAhfB2aDG6hx4hm7VV6DqJA=",
         "owner": "DreamMaoMao",
         "repo": "hych",
-        "rev": "455758f8a73c3d0be8ea6b0e2e05f979f41dba8a",
+        "rev": "3c7d0a21776c01eadceb4f910876ff7bd3c30a2b",
         "type": "github"
       },
       "original": {
@@ -622,11 +622,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707093208,
-        "narHash": "sha256-IYsoBwEhWxmMfJdxqSLj9hrtBnIhSmaSXtxZutY9BpE=",
+        "lastModified": 1709043503,
+        "narHash": "sha256-GHrgunfo+UARnf3OgNhdXoNFALRAmQEGhlZ8x5TBvkQ=",
         "owner": "DreamMaoMao",
         "repo": "hycov",
-        "rev": "27e8b2679d32c72b1ecf7501c994ff809161c828",
+        "rev": "7d48cff8364a7b6ae52a3472ad1dfe01b9f728ae",
         "type": "github"
       },
       "original": {
@@ -638,6 +638,7 @@
     "hyprland": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
+        "hyprlang": "hyprlang",
         "nixpkgs": "nixpkgs_2",
         "systems": [
           "systems"
@@ -646,11 +647,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1707098342,
-        "narHash": "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig=",
+        "lastModified": 1709080360,
+        "narHash": "sha256-oZe4k6jtO/0govmERGcbeyvE9EfTvXY5bnyIs6AsL9U=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "84ab8d11e8951a6551d1e1bf87796a8589da6d47",
+        "rev": "1c460e98f870676b15871fe4e5bfeb1a32a3d6d8",
         "type": "github"
       },
       "original": {
@@ -666,11 +667,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706478736,
-        "narHash": "sha256-V1T0x16p4r+/fdWR5RU2lV0tTW0YrA8K9+GIibsZAeQ=",
+        "lastModified": 1708270226,
+        "narHash": "sha256-PCsEiFKBDZ1VKw8rlo8D/J+22gic7ls5zDWcU3AAxGQ=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "24e33780589f5c15132fc86c97ea033e56b06f59",
+        "rev": "f99822818ec8276cfd6ec99ab60c4708c9884e3d",
         "type": "github"
       },
       "original": {
@@ -708,16 +709,19 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
-          "xdph",
           "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1704287638,
-        "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=",
+        "lastModified": 1708787654,
+        "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97",
+        "rev": "0fce791ba2334aca183f2ed42399518947550d0d",
         "type": "github"
       },
       "original": {
@@ -872,11 +876,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1706191920,
-        "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=",
+        "lastModified": 1708807242,
+        "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae5c332cbb5827f6b1f02572496b141021de335f",
+        "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
         "type": "github"
       },
       "original": {
@@ -1362,18 +1366,18 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1706359063,
-        "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=",
+        "lastModified": 1708558866,
+        "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
+        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.freedesktop.org",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
+        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
         "type": "gitlab"
       }
     },
@@ -1383,7 +1387,10 @@
           "hyprland",
           "hyprland-protocols"
         ],
-        "hyprlang": "hyprlang",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -1394,11 +1401,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706145785,
-        "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=",
+        "lastModified": 1708696469,
+        "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "5a592647587cd20b9692a347df6939b6d371b3bb",
+        "rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
         "type": "github"
       },
       "original": {
diff --git a/modules/gui/desktop/hyprland/apps/default.nix b/modules/gui/desktop/hyprland/apps/default.nix
@@ -97,6 +97,8 @@ in {
       # Shortcuts
       wayland.windowManager.hyprland.settings.bind = [
         "$mod SHIFT, slash, exec, pkill -f -1 nwg-wrapper" # Binds List
+        "$mod, slash, exec, ulauncher-toggle"
+        "$mod, slash, bringactivetotop,"
         "$mod, A, exec, nwg-drawer"
         "$mod SHIFT, C, exec, hyprpicker -arf hex"
         "$mod, D, exec, pypr toggle displays"
@@ -106,7 +108,6 @@ in {
         "$mod SHIFT, T, exec, pypr toggle term"
         "$mod, V, exec, pypr toggle clip"
         "$mod, W, exec, firefox"
-        "$mod, slash, exec, ulauncher-toggle"
         "$mod, Return, exec, missioncenter"
         ", XF86Calculator, exec, qalculate-gtk"
         "$mod, Escape, exec, wlogout -p layer-shell"
diff --git a/modules/gui/desktop/hyprland/apps/rules.nix b/modules/gui/desktop/hyprland/apps/rules.nix
@@ -11,6 +11,9 @@ _: {
       # Clipboard
       "float, title:^(nwg-clipman)$"
 
+      # Application Launcher
+      "opacity 0.9 override, class:^(ulauncher)$"
+
       # PiP Window
       "float, title:^(Picture-in-Picture)$"
       "pin, title:^(Picture-in-Picture)$"
diff --git a/modules/gui/desktop/hyprland/apps/security.nix b/modules/gui/desktop/hyprland/apps/security.nix
@@ -2,6 +2,7 @@
   sys,
   lib,
   pkgs,
+  files,
   ...
 }: let
   inherit (sys.stylix) fonts;
@@ -61,40 +62,24 @@ in {
   # Logout
   programs.wlogout = {
     enable = true;
-    style = ''
-      * { background: none; }
-      window { background-color: rgba(0, 0, 0, .5); }
-
-      button {
-        background: rgba(0, 0, 0, .05);
-        border-radius: 8px;
-        box-shadow: inset 0 0 0 1px rgba(255, 255, 255, .1), 0 0 rgba(0, 0, 0, .5);
-        margin: 1rem;
-        background-repeat: no-repeat;
-        background-position: center;
-        background-size: 25%;
-      }
-
-      button:focus, button:active, button:hover {
-        background-color: rgba(255, 255, 255, 0.2);
-        outline-style: none;
-      }
-
-      ${lib.concatMapStringsSep "\n" (
-          name: ''
-            #${name} {
-              background-image: image(url("${pkgs.wlogout}/share/wlogout/icons/${name}.png"));
-            }
-          ''
-        ) [
-          "lock"
-          "logout"
-          "suspend"
-          "hibernate"
-          "shutdown"
-          "reboot"
-        ]}
-    '';
+    style =
+      files.hyprland.wlogout
+      + ''
+        ${lib.concatMapStringsSep "\n" (
+            name: ''
+              #${name} {
+                background-image: image(url("${pkgs.wlogout}/share/wlogout/icons/${name}.png"));
+              }
+            ''
+          ) [
+            "lock"
+            "logout"
+            "suspend"
+            "hibernate"
+            "shutdown"
+            "reboot"
+          ]}
+      '';
   };
 
   # Authorization Agent