From d8f83befe5bb0eb77934e0276e30bc8f9fd7ecf8 Mon Sep 17 00:00:00 2001
From: rxyhn <rxyhn.dev@gmail.com>
Date: Wed, 3 Jan 2024 04:23:59 +0700
Subject: [PATCH] [chore]: update

---
 flake.lock                                    | 18 +++----
 home/modules/programs/vscode.nix              |  2 +-
 .../windowManager/hyprland/config/binds.nix   |  1 +
 .../windowManager/hyprland/default.nix        |  1 +
 .../hyprland/programs/waybar.nix              | 54 +++++++++++++++++++
 5 files changed, 66 insertions(+), 10 deletions(-)
 create mode 100644 home/modules/windowManager/hyprland/programs/waybar.nix

diff --git a/flake.lock b/flake.lock
index 5b122b9b..0920e351 100644
--- a/flake.lock
+++ b/flake.lock
@@ -313,11 +313,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1704146726,
-        "narHash": "sha256-MS/VO4Bv2N0yAUrWxCmwTU7+g5GhI6lEMy7R3ZzmswU=",
+        "lastModified": 1704209910,
+        "narHash": "sha256-M+FImUWkeJUsdZd+X9cWNmhqJDguoKKmzX0kGMQIXnA=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "1607e967041fd3311411de0def8cdc0610274f98",
+        "rev": "4f26c4e1ebf868243dc628182c88d7feb52c8472",
         "type": "github"
       },
       "original": {
@@ -646,11 +646,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704141360,
-        "narHash": "sha256-3bK5UHGCHS0+B+V1pI2/o1IbKz7k+k/oLHOh3NM022U=",
+        "lastModified": 1704201485,
+        "narHash": "sha256-pFDUR45wmq1HehY3WlJOJydFkLOzKC2pWqvMykLj2Qk=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "b83d6df5901421af8313c6d394f3c76897f4758a",
+        "rev": "b0c06873775fe978bd9384ab14c24903bde92e74",
         "type": "github"
       },
       "original": {
@@ -741,11 +741,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1704192246,
-        "narHash": "sha256-H3Tl1OwwQbFjRbdx+3SsJ18UX57P/4/AQUEfJDkqPPc=",
+        "lastModified": 1704224443,
+        "narHash": "sha256-BhoQWg+1Rf6Ie6CnnPwX4rn2bBnQHWsZEKVEnNnkTp8=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "57697230c5cbfab52f2b381c2a3f8a1ba9576840",
+        "rev": "c4f5f8beacb9819f19dbae1d1e09c2dfd404d542",
         "type": "github"
       },
       "original": {
diff --git a/home/modules/programs/vscode.nix b/home/modules/programs/vscode.nix
index 8b50d3c0..55f6a617 100644
--- a/home/modules/programs/vscode.nix
+++ b/home/modules/programs/vscode.nix
@@ -69,7 +69,7 @@
         cursorSmoothCaretAnimation = "on";
         cursorWidth = 2;
         find.addExtraSpaceOnTop = false;
-        fontFamily = "'monospace', monospace";
+        fontFamily = "'monospace', monospace, 'tabler-icons'";
         fontLigatures = true;
         fontSize = 16;
         formatOnPaste = true;
diff --git a/home/modules/windowManager/hyprland/config/binds.nix b/home/modules/windowManager/hyprland/config/binds.nix
index 92ff5815..8b1238ba 100644
--- a/home/modules/windowManager/hyprland/config/binds.nix
+++ b/home/modules/windowManager/hyprland/config/binds.nix
@@ -36,6 +36,7 @@ in {
 
           "$mod, Space, exec, run-as-service $(wofi -S drun)"
           "$mod, Return, exec, run-as-service kitty"
+          "$mod, Escape, exec, wlogout -p layer-shell"
           "$mod, L, exec, loginctl lock-session"
           "$mod, O, exec, run-as-service wl-ocr"
 
diff --git a/home/modules/windowManager/hyprland/default.nix b/home/modules/windowManager/hyprland/default.nix
index 3982d639..ef188b2b 100644
--- a/home/modules/windowManager/hyprland/default.nix
+++ b/home/modules/windowManager/hyprland/default.nix
@@ -10,6 +10,7 @@
 
     ./config
     ./programs/swaylock.nix
+    ./programs/waybar.nix
     ./programs/wlogout.nix
     ./programs/wofi.nix
 
diff --git a/home/modules/windowManager/hyprland/programs/waybar.nix b/home/modules/windowManager/hyprland/programs/waybar.nix
new file mode 100644
index 00000000..57d09815
--- /dev/null
+++ b/home/modules/windowManager/hyprland/programs/waybar.nix
@@ -0,0 +1,54 @@
+{...}: let
+  snowflake = builtins.fetchurl rec {
+    name = "Logo-${sha256}.svg";
+    url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nix-snowflake.svg";
+    sha256 = "14mbpw8jv1w2c5wvfvj8clmjw0fi956bq5xf9s2q3my14far0as8";
+  };
+in {
+  programs.waybar = {
+    enable = true;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        mode = "dock";
+        exclusive = true;
+        passthrough = false;
+        fixed-center = true;
+        gtk-layer-shell = true;
+        height = 40;
+        spacing = 0;
+        margin-top = 0;
+        margin-right = 0;
+        margin-bottom = 0;
+        margin-left = 0;
+        modules-left = [
+          "custom/search"
+          "hyprland/workspaces"
+        ];
+        modules-center = [];
+        modules-right = [];
+        "custom/search" = {
+          format = " ";
+          tooltip = false;
+          on-click = "sh -c 'run-as-service $(wofi -S drun)'";
+        };
+        "hyprland/workspaces" = {
+          active-only = false;
+          all-outputs = true;
+          disable-scroll = true;
+          on-click = "activate";
+          format = "{icon}";
+          format-icons = {
+            active = "";
+            default = "ﰓ";
+            empty = "ﰓ";
+          };
+          persistent_workspaces = {
+            "*" = 5;
+          };
+        };
+      };
+    };
+  };
+}