From 350aaf8690d8a3cffa624679bb005d49359439ce Mon Sep 17 00:00:00 2001
From: jay <jay@lawsnote.com>
Date: Wed, 19 Apr 2023 00:29:36 +0800
Subject: [PATCH] update

---
 home/.chezmoi.toml.tmpl            |  4 +++
 home/dot_config/hypr/hyprland.conf |  3 ++-
 home/dot_config/waybar/config      | 43 +++---------------------------
 3 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/home/.chezmoi.toml.tmpl b/home/.chezmoi.toml.tmpl
index 9e105af..fce2fdd 100644
--- a/home/.chezmoi.toml.tmpl
+++ b/home/.chezmoi.toml.tmpl
@@ -44,3 +44,7 @@
   golang = {{ $installGo }}
   nodejs = {{ $installNode }}
   rust = {{ $installRust }}
+
+[merge]
+  command = "nvim"
+  args = ["-d", "{{ "{{" }} .Destination {{ "}}" }}", "{{ "{{" }} .Source {{ "}}" }}", "{{ "{{" }} .Target {{ "}}" }}"]
diff --git a/home/dot_config/hypr/hyprland.conf b/home/dot_config/hypr/hyprland.conf
index ba5a671..600a6ce 100644
--- a/home/dot_config/hypr/hyprland.conf
+++ b/home/dot_config/hypr/hyprland.conf
@@ -42,7 +42,7 @@ input {
     kb_options =
     kb_rules =
 
-    follow_mouse = 1
+    follow_mouse = 2
 
     touchpad {
         scroll_factor = 0.6
@@ -141,6 +141,7 @@ bind = $mainMod, D, exec, wofi --show drun
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod SHIFT, J, togglesplit, # dwindle
 bind = $mainMod SHIFT, P, exec, ~/.config/wofi/wofi-power.sh
+bind = $mainMod SHIFT, X, exec, swaylock -f -i ~/.config/swaylock/bg.png -s fill
 
 binde = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
 bindr = ,XF86AudioRaiseVolume, exec, pkill -RTMIN+8 waybar
diff --git a/home/dot_config/waybar/config b/home/dot_config/waybar/config
index 9d64e6e..43b274b 100644
--- a/home/dot_config/waybar/config
+++ b/home/dot_config/waybar/config
@@ -1,6 +1,6 @@
 // vim: set ft=jsonc:
 {
-    // "layer": "top", // Waybar at top layer
+    "layer": "top", // Waybar at top layer
     "position": "top", // Waybar position (top|bottom|left|right)
     "height": 30, // Waybar height (to be removed for auto height)
     // "width": 1280, // Waybar width
@@ -43,7 +43,9 @@
     },
     "wlr/workspaces": {
       "format": "{name}",
-      "on-click": "activate"
+      "on-click": "activate",
+      "on-scroll-up": "hyprctl dispatch workspace e+1",
+      "on-scroll-down": "hyprctl dispatch workspace e-1"
     },
     "custom/pipewire": {
       "exec": "/home/jay/bin/get-volume.sh",
@@ -57,43 +59,6 @@
       },
       "on-click": "pavucontrol"
     },
-    "sway/workspaces": {
-        "disable-scroll": true,
-        // "all-outputs": true,
-        // "persistent_workspaces": {
-        //   "1": [],
-        //   "2": [],
-        //   "3": [],
-        //   "4": [],
-        //   "5": [],
-        //   "6": [],
-        //   "7": [],
-        //   "8": [],
-        //   "9": [],
-        //   "10": [],
-        // },
-        // "format": "{name}: {icon}",
-        // "format-icons": {
-        //     "1": "",
-        //     "2": "",
-        //     "3": "",
-        //     "4": "",
-        //     "5": "",
-        //     "urgent": "",
-        //     "focused": "",
-        //     "default": ""
-        // }
-    },
-    "sway/mode": {
-        "format": "<span style=\"italic\">{}</span>"
-    },
-    "sway/scratchpad": {
-        "format": "{icon} {count}",
-        "show-empty": false,
-        "format-icons": ["", ""],
-        "tooltip": true,
-        "tooltip-format": "{app}: {title}"
-    },
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {