From 99fe1caf19c2fe8be6d30e4718a87c76b2af9ef2 Mon Sep 17 00:00:00 2001 From: jay Date: Wed, 26 Jun 2024 00:25:23 +0800 Subject: [PATCH] update --- home/dot_config/nvim/lua/plugins/go.lua | 2 +- home/dot_config/nvim/lua/plugins/list.lua | 1 + home/dot_config/sway/config | 1 + home/dot_config/waybar/config | 46 +++++++++++------------ home/dot_config/waybar/style.css | 3 +- home/dot_tmux.conf | 4 ++ home/dot_zprofile.tmpl | 6 --- 7 files changed, 30 insertions(+), 33 deletions(-) diff --git a/home/dot_config/nvim/lua/plugins/go.lua b/home/dot_config/nvim/lua/plugins/go.lua index 41b146a..86d5839 100644 --- a/home/dot_config/nvim/lua/plugins/go.lua +++ b/home/dot_config/nvim/lua/plugins/go.lua @@ -14,7 +14,7 @@ return { g.go_fmt_fail_silently = 1 g.go_fmt_command = "goimports" - g.go_def_mode = 'godef' + g.go_def_mode = 'gopls' g.go_decls_includes = "func,type" g.go_highlight_types = 1 g.go_highlight_fields = 1 diff --git a/home/dot_config/nvim/lua/plugins/list.lua b/home/dot_config/nvim/lua/plugins/list.lua index 0140e04..3f26822 100644 --- a/home/dot_config/nvim/lua/plugins/list.lua +++ b/home/dot_config/nvim/lua/plugins/list.lua @@ -135,6 +135,7 @@ return { path = '~/vimwiki/', syntax = 'markdown', ext = '.md', + custom_wiki2html = "~/bin/wiki2html.sh", } } end diff --git a/home/dot_config/sway/config b/home/dot_config/sway/config index a1c9a51..a6f2fb8 100644 --- a/home/dot_config/sway/config +++ b/home/dot_config/sway/config @@ -93,6 +93,7 @@ input type:touchpad { bindsym $alt+Shift+v exec ~/bin/auto-screenshot-monitor # Start a terminal bindsym $mod+Return exec $term + bindsym $mod+Shift+Return exec env ZSH_TMUX_AUTOCONNECT=false $term # Kill focused window bindsym $mod+Shift+q kill diff --git a/home/dot_config/waybar/config b/home/dot_config/waybar/config index 24b41e1..29c69e1 100644 --- a/home/dot_config/waybar/config +++ b/home/dot_config/waybar/config @@ -1,7 +1,7 @@ -// vim: set ft=jsonc: +// vim: set ft=jsonc : { - "layer": "top", // Waybar at top layer - "position": "top", // Waybar position (top|bottom|left|right) + "layer": "top", // Waybar at top layer + "position": "top", // Waybar position (top|bottom|left|right) // "height": 30, // Waybar height (to be removed for auto height) "margin": "3 3 0 3", // "width": 1280, // Waybar width @@ -15,6 +15,8 @@ "custom/sep", "network", "custom/sep", + "bluetooth", + "custom/sep", "custom/pipewire", "cpu", "memory", @@ -39,7 +41,7 @@ }, "custom/pipewire": { "exec": "/home/jay/bin/get-volume.sh", - "interval": "once", + "interval": 2, "return-type": "json", "signal": 8, "format": "{icon} {percentage}%", @@ -57,11 +59,11 @@ "tooltip": false }, "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } }, "tray": { // "icon-size": 21, @@ -76,9 +78,9 @@ "interval": 1 }, "cpu": { - "format": " {usage}%({load})", - "interval": 2, - "tooltip": false + "format": " {usage}%({load})", + "interval": 2, + "tooltip": false }, "memory": { "interval": 10, @@ -99,21 +101,21 @@ "format-icons": ["", "", "", "", "", "", "", "", ""] }, "battery": { - "states": { + "states": { // "good": 95, "warning": 30, "critical": 15 - }, - "format": "{icon} {capacity}%", - "format-charging": "󰂄 {capacity}%", - "format-plugged": " {capacity}%", - "format-alt": "{icon} {time}", + }, + "format": "{icon} {capacity}%", + "format-charging": "󰂄 {capacity}%", + "format-plugged": " {capacity}%", + "format-alt": "{icon} {time}", // "format-good": "", // An empty format will hide the module // "format-full": "", "format-icons": ["", "", "", "", ""] }, "battery#bat2": { - "bat": "BAT2" + "bat": "BAT2" }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface @@ -123,12 +125,6 @@ "format-linked": "{ifname} (No IP) ", "format-disconnected": "Disconnected ⚠", "format-alt": "{ifname}: {ipaddr}/{cidr}" - }, - "wireplumber": { - "format": "{icon} {percentage}%", - "on-click": "helvum", - "format-muted": "", - "format-icons": ["", "", ""] } } diff --git a/home/dot_config/waybar/style.css b/home/dot_config/waybar/style.css index d6672a0..6ed2043 100644 --- a/home/dot_config/waybar/style.css +++ b/home/dot_config/waybar/style.css @@ -119,7 +119,8 @@ window#waybar.hidden { #cpu, #memory, -#network { +#network, +#bluetooth { padding-left: 5px; padding-right: 5px; transition: none; diff --git a/home/dot_tmux.conf b/home/dot_tmux.conf index 9973fbd..60b811b 100644 --- a/home/dot_tmux.conf +++ b/home/dot_tmux.conf @@ -10,6 +10,10 @@ run-shell "tmux setenv -g TMUX_VERSION_29 $(awk 'BEGIN {print (\"'$(tmux -V | se set -g default-terminal screen-256color set-option -ga terminal-overrides ",*256col*:Tc" +set -g allow-passthrough on +set -ga update-environment TERM +set -ga update-environment TERM_PROGRAM + # scrollback buffer n lines set -g history-limit 10000 diff --git a/home/dot_zprofile.tmpl b/home/dot_zprofile.tmpl index 82a6034..d3312ed 100644 --- a/home/dot_zprofile.tmpl +++ b/home/dot_zprofile.tmpl @@ -103,9 +103,3 @@ function minio-size { function zfs-usage { awk '/^size/ { print $1 " " $3 / 1048576 }' < /proc/spl/kstat/zfs/arcstats } - -# The next line updates PATH for the Google Cloud SDK. -if [ -f '/home/jay/apps/google-cloud-sdk/path.zsh.inc' ]; then . '/home/jay/apps/google-cloud-sdk/path.zsh.inc'; fi - -# The next line enables shell command completion for gcloud. -if [ -f '/home/jay/apps/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/jay/apps/google-cloud-sdk/completion.zsh.inc'; fi