This commit is contained in:
jay 2023-04-19 00:29:36 +08:00
parent f69fcdf744
commit 350aaf8690
3 changed files with 10 additions and 40 deletions

View File

@ -44,3 +44,7 @@
golang = {{ $installGo }} golang = {{ $installGo }}
nodejs = {{ $installNode }} nodejs = {{ $installNode }}
rust = {{ $installRust }} rust = {{ $installRust }}
[merge]
command = "nvim"
args = ["-d", "{{ "{{" }} .Destination {{ "}}" }}", "{{ "{{" }} .Source {{ "}}" }}", "{{ "{{" }} .Target {{ "}}" }}"]

View File

@ -42,7 +42,7 @@ input {
kb_options = kb_options =
kb_rules = kb_rules =
follow_mouse = 1 follow_mouse = 2
touchpad { touchpad {
scroll_factor = 0.6 scroll_factor = 0.6
@ -141,6 +141,7 @@ bind = $mainMod, D, exec, wofi --show drun
bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod SHIFT, J, togglesplit, # dwindle bind = $mainMod SHIFT, J, togglesplit, # dwindle
bind = $mainMod SHIFT, P, exec, ~/.config/wofi/wofi-power.sh 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%+ binde = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
bindr = ,XF86AudioRaiseVolume, exec, pkill -RTMIN+8 waybar bindr = ,XF86AudioRaiseVolume, exec, pkill -RTMIN+8 waybar

View File

@ -1,6 +1,6 @@
// vim: set ft=jsonc: // vim: set ft=jsonc:
{ {
// "layer": "top", // Waybar at top layer "layer": "top", // Waybar at top layer
"position": "top", // Waybar position (top|bottom|left|right) "position": "top", // Waybar position (top|bottom|left|right)
"height": 30, // Waybar height (to be removed for auto height) "height": 30, // Waybar height (to be removed for auto height)
// "width": 1280, // Waybar width // "width": 1280, // Waybar width
@ -43,7 +43,9 @@
}, },
"wlr/workspaces": { "wlr/workspaces": {
"format": "{name}", "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": { "custom/pipewire": {
"exec": "/home/jay/bin/get-volume.sh", "exec": "/home/jay/bin/get-volume.sh",
@ -57,43 +59,6 @@
}, },
"on-click": "pavucontrol" "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": { "idle_inhibitor": {
"format": "{icon}", "format": "{icon}",
"format-icons": { "format-icons": {