From d512449151044124bc99637e33bf48aae0daf90d Mon Sep 17 00:00:00 2001
From: yutent <yutent.io@gmail.com>
Date: Tue, 11 Jul 2023 07:29:36 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=A4=A7=E6=B3=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 home/config/bspwm/bspwmrc                 |  8 ++--
 home/config/ncmpcpp/config                |  5 ++-
 home/config/polybar/colors.ini            |  5 ++-
 home/config/polybar/config.ini            | 18 +++------
 home/config/polybar/modules.ini           | 10 +----
 home/config/polybar/modules/bettery.ini   | 42 ++++++++++++++++++++
 home/config/polybar/modules/bluetooth.ini | 22 +++++++++++
 home/config/polybar/modules/comm.ini      | 22 +++++------
 home/config/polybar/modules/date.ini      |  3 +-
 home/config/polybar/modules/ethernet.ini  | 32 +++++++++++++++
 home/config/polybar/modules/launch.ini    |  8 ++--
 home/config/polybar/modules/mpd.ini       | 25 ++++++++----
 home/config/polybar/modules/power.ini     |  9 +++--
 home/config/polybar/modules/tray.ini      |  7 ++++
 home/config/polybar/modules/volume.ini    | 48 ++++++-----------------
 home/config/polybar/modules/wifi.ini      | 32 +++++++++++++++
 home/config/polybar/modules/workspace.ini | 10 ++---
 home/config/polybar/modules/xwindow.ini   |  8 ++++
 home/config/rofi/colors.rasi              |  1 +
 home/config/rofi/launcher.rasi            |  5 ++-
 home/config/rofi/powermenu.rasi           |  8 ++--
 home/config/sxhkd/sxhkdrc                 |  2 +-
 22 files changed, 225 insertions(+), 105 deletions(-)
 create mode 100644 home/config/polybar/modules/bettery.ini
 create mode 100644 home/config/polybar/modules/bluetooth.ini
 create mode 100644 home/config/polybar/modules/ethernet.ini
 create mode 100644 home/config/polybar/modules/tray.ini
 create mode 100644 home/config/polybar/modules/wifi.ini
 create mode 100644 home/config/polybar/modules/xwindow.ini

diff --git a/home/config/bspwm/bspwmrc b/home/config/bspwm/bspwmrc
index 974803c..3efa2e8 100644
--- a/home/config/bspwm/bspwmrc
+++ b/home/config/bspwm/bspwmrc
@@ -31,8 +31,8 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 #wmname LG3D
 
 # 设置显示器分辨率
-xrandr --output HDMI-2 --mode 1920x1080 --rate 60 --right-of HDMI-1 --mode 1920x1080 --rate 60
-
+xrandr --output HDMI-2 --auto --right-of HDMI-1
+xrandr --output HDMI-1 --mode 1920x1080 --rate 60
 
 # 干掉已经运行的进程
 killall -9 sxhkd picom nm-applet dunst xsettingsd polybar
@@ -52,7 +52,7 @@ bspc config active_border_color "$color_background"
 bspc config presel_feedback_color "$color_background"
 
 # 工作区跟随鼠标切换
-bspc config focus_follows_pointer true
+bspc config focus_follows_pointer false
 
 # monocle 布局关闭边框、边距
 bspc config borderless_monocle true
@@ -60,7 +60,7 @@ bspc config gapless_monocle true
 
 
 # 工作区只有一个窗口时, 将工作区切为monocle布局
-bspc config single_monocle true
+# bspc config single_monocle true
 
 
 
diff --git a/home/config/ncmpcpp/config b/home/config/ncmpcpp/config
index 4e4d66d..d076aac 100644
--- a/home/config/ncmpcpp/config
+++ b/home/config/ncmpcpp/config
@@ -18,8 +18,9 @@ alternative_header_second_line_format = {$b$3%a$/b - $5%t$9}
 visualizer_data_source        = /tmp/mpd.fifo
 visualizer_output_name        = "mpd visualizer"
 visualizer_in_stereo          = "yes"
-visualizer_type               = "spectrum"
-
+visualizer_look               = ●●
+#visualizer_type              = "spectrum"
+visualizer_type               = "ellipse"
 
 # 进度条
 progressbar_look              = ▂▂▂
diff --git a/home/config/polybar/colors.ini b/home/config/polybar/colors.ini
index a20d1f4..83e8264 100644
--- a/home/config/polybar/colors.ini
+++ b/home/config/polybar/colors.ini
@@ -2,7 +2,8 @@
 
 background = #475569
 foreground = #d8dee9
-altbackground = #39404f
+altbackground = #55657d
+altbackground2 = #3d495b
 altforeground = #768bb2
 accent = #81a1c1
 
@@ -21,4 +22,4 @@ altyellow = #ebcb8b
 altblue = #81a1c1
 altmagenta = #b48ead
 altcyan = #8fbcbb
-altwhite = #eceff4
\ No newline at end of file
+altwhite = #eceff4
diff --git a/home/config/polybar/config.ini b/home/config/polybar/config.ini
index a0dafc2..3747f1a 100644
--- a/home/config/polybar/config.ini
+++ b/home/config/polybar/config.ini
@@ -10,7 +10,9 @@ include-file = ./modules.ini
 
 
 [bar/main]
-;override-redirect = true
+monitor-strict = true
+
+override-redirect = true
 owm-restack = bspwm 
 
 ;locale = zh_CN.UTF-8
@@ -34,14 +36,15 @@ font-0 = "Raleway:size=11;3"
 font-1 = "HarmonyOS Sans SC:size=11;3"
 font-2 = "Material Icons:size=14;5"
 font-3 = "Symbols Nerd Font:size=15;4"
-font-4 = "Arial:size=10;4"
+font-4 = "Arail:size=10;3"
+font-5 = "Material Icons:size=10;5"
 ;font-5 = "DejaVu Sans:size=15;4"
 
 fixed-center = true
 
 modules-left = logo workspace pipe-db mpd   
 modules-center = date
-modules-right = netspeed pipe tray pipe volume power
+modules-right = netspeed pipe tray pipe ethernet wifi bluetooth volume battery pipe power
 
 
 tray-maxsize = 16
@@ -77,12 +80,3 @@ compositing-overline = over
 compositing-underline = over
 compositing-border = over
 
-
-
-[module/tray]
-type = internal/tray
-
-;tray-position = adaptive
-tray-padding = 4
-tray-detached = false
-tray-background = ${color.background}
diff --git a/home/config/polybar/modules.ini b/home/config/polybar/modules.ini
index 9354369..e5b42c4 100644
--- a/home/config/polybar/modules.ini
+++ b/home/config/polybar/modules.ini
@@ -1,10 +1,4 @@
 ; load all modules
 ;
-include-file = ./modules/comm.ini
-include-file = ./modules/launch.ini
-include-file = ./modules/date.ini
-include-file = ./modules/speed.ini
-include-file = ./modules/workspace.ini
-include-file = ./modules/power.ini
-include-file = ./modules/volume.ini
-include-file = ./modules/mpd.ini
\ No newline at end of file
+; 直接引入整个目录
+include-directory = ./modules
diff --git a/home/config/polybar/modules/bettery.ini b/home/config/polybar/modules/bettery.ini
new file mode 100644
index 0000000..b90650a
--- /dev/null
+++ b/home/config/polybar/modules/bettery.ini
@@ -0,0 +1,42 @@
+;[module/battery]
+;type = internal/battery
+;
+;full-at = 99
+;
+;battery = intel-rapl
+;adapter = intel-rapl
+;
+;format-charging = <animation-charging> <label-charging>
+;format-charging-prefix = " "
+;format-charging-prefix-font = 3
+;format-charging-prefix-foreground = ${color.red}
+;format-charging-background = ${color.altbackground}
+;
+;
+;label-charging = %percentage%%
+;label-discharging = %percentage%%
+;
+;
+;format-full = <label-full>
+;format-full-prefix = " "
+;format-full-prefix-font = 3
+;format-full-prefix-foreground = ${color.red}
+;format-full-background = ${color.altbackground}
+;
+;label-full = %percentage%%
+
+
+
+[module/battery]
+type = custom/text
+
+format = %{T5} 99% %{T-}
+format-foreground = ${color.accent}
+format-background = ${color.altbackground2}
+format-margin = 1
+
+format-prefix = ""
+format-prefix-foreground = ${color.green}
+format-prefix-background = ${color.altbackground}
+format-prefix-padding = 1
+format-prefix-font = 3
diff --git a/home/config/polybar/modules/bluetooth.ini b/home/config/polybar/modules/bluetooth.ini
new file mode 100644
index 0000000..bcbf759
--- /dev/null
+++ b/home/config/polybar/modules/bluetooth.ini
@@ -0,0 +1,22 @@
+[module/bluetooth]
+type = custom/script
+exec = $HOME/.config/polybar/scripts/bluetooth.sh
+interval = 5
+tail = true
+format = <label>
+format-margin = 1
+
+format-prefix = 
+format-prefix-font = 3
+format-prefix-foreground = ${color.blue}
+format-prefix-background = ${color.altbackground}
+format-prefix-padding = 1
+
+label = %output%
+label-foreground = ${color.accent}
+label-background = ${color.altbackground2}
+label-font = 6
+label-padding = 2
+
+
+click-left = blueman-manager
\ No newline at end of file
diff --git a/home/config/polybar/modules/comm.ini b/home/config/polybar/modules/comm.ini
index d3fd71d..0e3e941 100644
--- a/home/config/polybar/modules/comm.ini
+++ b/home/config/polybar/modules/comm.ini
@@ -1,24 +1,20 @@
-; 3个空格分隔模块
 [module/pipe]
 type = custom/text
-content = %{T1}   %{T-}
+format = %{T1}  %{T-}
 
-; 双倍分隔
 [module/pipe-db]
 type = custom/text
-content = %{T1}      %{T-}
+format = %{T1} %{T-}
+format-padding = 2
 
-
-; 左半圆
 [module/LD]
 type = custom/text
-content = "%{T3}%{T-}"
-content-background = ${color.background}
-content-foreground = ${color.altbackground}
+format = "%{T3}%{T-}"
+format-background = ${color.background}
+format-foreground = ${color.altbackground}
 
-; 右半圆
 [module/RD]
 type = custom/text
-content = "%{T3}%{T-}"
-content-background = ${color.background}
-content-foreground = ${color.altbackground}
+format = "%{T3}%{T-}"
+format-background = ${color.background}
+format-foreground = ${color.altbackground}
diff --git a/home/config/polybar/modules/date.ini b/home/config/polybar/modules/date.ini
index c7ca94f..fb49c66 100644
--- a/home/config/polybar/modules/date.ini
+++ b/home/config/polybar/modules/date.ini
@@ -3,5 +3,4 @@ type = internal/date
 format-padding = 3
 date = "%a, %m/%d"
 time = "%k:%M"
-; 点击用alacrity打开日历命令
-label = %{A1:alacritty --title Calendar --config-file $HOME/.config/alacritty/calendar.yml --hold -e ".local/bin/scripts/calendar.sh":}%date% %time%%{A}
\ No newline at end of file
+label = %{A1:alacritty --title Calendar --config-file $HOME/.config/alacritty/calendar.yml --hold -e ".local/bin/scripts/calendar.sh":}%date% %time%%{A}
diff --git a/home/config/polybar/modules/ethernet.ini b/home/config/polybar/modules/ethernet.ini
new file mode 100644
index 0000000..c7e8a0a
--- /dev/null
+++ b/home/config/polybar/modules/ethernet.ini
@@ -0,0 +1,32 @@
+[module/ethernet]
+type = internal/network
+interface = enp86s0
+
+; 已连接
+format-connected = <label-connected>
+format-connected-prefix = ""
+format-connected-prefix-foreground = ${color.green}
+format-connected-prefix-background = ${color.altbackground}
+format-connected-prefix-padding = 1
+format-connected-prefix-font = 3
+format-connected-foreground = ${color.accent}
+format-connected-background = ${color.altbackground2}
+format-connected-margin = 1
+
+label-connected = " %local_ip% "
+label-connected-font = 5
+
+
+; 未连接
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = ""
+format-disconnected-prefix-foreground = ${color.green}
+format-disconnected-prefix-background = ${color.altbackground}
+format-disconnected-prefix-padding = 1
+format-disconnected-prefix-font = 3
+format-disconnected-foreground = ${color.accent}
+format-disconnected-background = ${color.altbackground2}
+format-disconnected-margin = 1
+
+label-disconnected = " offline "
+label-disconnected-font = 5
\ No newline at end of file
diff --git a/home/config/polybar/modules/launch.ini b/home/config/polybar/modules/launch.ini
index e7034c4..f4409fb 100644
--- a/home/config/polybar/modules/launch.ini
+++ b/home/config/polybar/modules/launch.ini
@@ -1,6 +1,6 @@
 [module/logo]
 type = custom/text
-content = 
-content-foreground = ${color.red}
-content-padding = 3
-click-left = rofi -show drun -theme launcher
\ No newline at end of file
+format = 
+format-foreground = ${color.red}
+format-padding = 3
+click-left = rofi -show drun -theme launcher
diff --git a/home/config/polybar/modules/mpd.ini b/home/config/polybar/modules/mpd.ini
index 4fd062c..e1f67e6 100644
--- a/home/config/polybar/modules/mpd.ini
+++ b/home/config/polybar/modules/mpd.ini
@@ -1,25 +1,34 @@
 [module/mpd]
 type = internal/mpd
 
-
+; mpd 在线
 format-online =  <icon-prev> <toggle> <icon-next> <label-song>
-format-online-background = ${color.background}
+format-online-background = ${color.altbackground}
+format-online-padding = 1
 
 
+; mpd 离线
 format-offline = <label-offline>
-format-offline-prefix = " "
-format-offline-background = ${color.background}
+format-offline-prefix = "  "
+format-offline-foreground = ${color.blue}
+format-offline-background = ${color.altbackground}
 
 label-offline = "mpd is offline..."
+label-offline-foreground = ${color.accent}
+label-offline-background = ${color.altbackground2}
+label-offline-padding = 2
 
 
 ; 当前歌曲
-label-song = %{A1:alacritty --config-file $HOME/.config/alacritty/mpc.yml -e ncmpcpp:}  %artist% - %title%%{A}
-;label-song-maxlen = 25
+label-song = %{A1:alacritty --config-file $HOME/.config/alacritty/mpc.yml -e ncmpcpp:}%artist% - %title%%{A}
 label-song-ellipsis = true
+label-song-foreground = ${color.accent}
+label-song-background = ${color.altbackground2}
+label-song-padding = 2
+
 
 ; 歌曲时长
-;label-time = %elapsed%/%total%
+label-time = %elapsed%/%total%
 
 
 
@@ -44,3 +53,5 @@ icon-prev-foreground = ${color.blue}
 icon-next = 
 icon-next-foreground = ${color.blue}
 
+
+
diff --git a/home/config/polybar/modules/power.ini b/home/config/polybar/modules/power.ini
index ec8cccc..be901b0 100644
--- a/home/config/polybar/modules/power.ini
+++ b/home/config/polybar/modules/power.ini
@@ -2,8 +2,9 @@
 [module/power]
 type = custom/text
 
-content = %{T9}襤%{T-}
-content-foreground = ${color.red}
-content-padding = 2
+format = 
+format-foreground = ${color.red}
+format-background = ${color.altbackground}
+format-padding = 1
 
-click-left = ~/.local/bin/scripts/rofi_powermenu.sh
\ No newline at end of file
+click-left = ~/.local/bin/scripts/rofi_powermenu.sh
diff --git a/home/config/polybar/modules/tray.ini b/home/config/polybar/modules/tray.ini
new file mode 100644
index 0000000..5062cac
--- /dev/null
+++ b/home/config/polybar/modules/tray.ini
@@ -0,0 +1,7 @@
+[module/tray]
+type = internal/tray
+
+;tray-position = adaptive
+tray-padding = 4
+tray-detached = false
+tray-background = ${color.background}
\ No newline at end of file
diff --git a/home/config/polybar/modules/volume.ini b/home/config/polybar/modules/volume.ini
index b29270a..3670bdb 100644
--- a/home/config/polybar/modules/volume.ini
+++ b/home/config/polybar/modules/volume.ini
@@ -1,55 +1,30 @@
 [module/volume]
 type = internal/pulseaudio
 
-; Sink to be used, if it exists (find using `pacmd list-sinks`, name field)
-; If not, uses default sink
-sink =
-
 ; Use PA_VOLUME_UI_MAX (~153%) if true, or PA_VOLUME_NORM (100%) if false
 ; Default: true
 use-ui-max = false
 
 ; 音量显示格式
 ; 可用标签 <bar-volume> 音量条
-format-volume = <ramp-volume> <label-volume>
-format-volume-background = ${color.background}
-format-volume-padding = 1
+format-volume = <ramp-volume><label-volume>
+format-volume-margin = 1
 
 ; 静音图标
-format-muted = <label-muted>
+format-muted = " "
 format-muted-prefix = 婢
-format-muted-prefix-font = 2
-format-muted-prefix-foreground = ${color.altforeground}
-format-muted-background = ${color.background}
-format-muted-padding = 1
+format-muted-prefix-font = 3
+format-muted-prefix-foreground = ${color.blue}
+format-muted-prefix-background = ${color.altbackground}
+format-muted-prefix-padding = 1
 
-; 静音的文字提示,
-label-muted = " "
-label-muted-foreground = ${color.altforeground}
 
 # 数字音量
-;label-font = 4
 label-volume-font = 5
+label-volume-background = ${color.altbackground2}
+label-volume-foreground = ${color.accent}
+label-volume-padding = 1
 
-; 音量条
-;bar-volume-width = 5
-;bar-volume-gradient = false
-
-;bar-volume-indicator = 雷
-;bar-volume-indicator-font = 3
-;bar-volume-indicator-foreground = ${color.blue}
-
-;bar-volume-fill = 絛
-;bar-volume-fill-font = 3
-;bar-volume-foreground-0 = ${color.blue}
-;bar-volume-foreground-1 = ${color.blue}
-;bar-volume-foreground-2 = ${color.blue}
-;bar-volume-foreground-3 = ${color.blue}
-;bar-volume-foreground-4 = ${color.blue}
-
-;bar-volume-empty = 絛
-;bar-volume-empty-font = 3
-;bar-volume-empty-foreground = ${color.altbackground}
 
 ; 根据音量变换图标
 ramp-volume-0 = 奄
@@ -64,3 +39,6 @@ ramp-volume-8 = 墳
 ramp-volume-9 = 墳
 ramp-volume-font = 3
 ramp-volume-foreground = ${color.blue}
+ramp-volume-background = ${color.altbackground}
+ramp-volume-padding = 2
+
diff --git a/home/config/polybar/modules/wifi.ini b/home/config/polybar/modules/wifi.ini
new file mode 100644
index 0000000..18e7e34
--- /dev/null
+++ b/home/config/polybar/modules/wifi.ini
@@ -0,0 +1,32 @@
+[module/wifi]
+type = internal/network
+interface = wlo1
+
+; 已连接
+format-connected = <label-connected>
+format-connected-prefix = ""
+format-connected-prefix-foreground = ${color.green}
+format-connected-prefix-background = ${color.altbackground}
+format-connected-prefix-padding = 1
+format-connected-prefix-font = 3
+format-connected-foreground = ${color.accent}
+format-connected-background = ${color.altbackground2}
+format-connected-margin = 1
+
+label-connected = " %essid% "
+label-connected-font = 5
+
+
+; 未连接
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = ""
+format-disconnected-prefix-foreground = ${color.green}
+format-disconnected-prefix-background = ${color.altbackground}
+format-disconnected-prefix-padding = 1
+format-disconnected-prefix-font = 3
+format-disconnected-foreground = ${color.accent}
+format-disconnected-background = ${color.altbackground2}
+format-disconnected-margin = 1
+
+label-disconnected = " offline "
+label-disconnected-font = 5
\ No newline at end of file
diff --git a/home/config/polybar/modules/workspace.ini b/home/config/polybar/modules/workspace.ini
index d864726..4640478 100644
--- a/home/config/polybar/modules/workspace.ini
+++ b/home/config/polybar/modules/workspace.ini
@@ -1,4 +1,4 @@
-[module/workspaces]
+[module/workspace]
 type = internal/xworkspaces
 
 enable-click = true
@@ -6,17 +6,17 @@ enable-scroll = false
 
 index-sort = true
 
-label-active = ﱣ
+label-active = 
 label-active-foreground = ${color.green}
 ;label-active-background = ${color.altbackground}
 label-active-padding = 1
 
-label-occupied = 綠
+label-occupied = 
 label-occupied-foreground = ${color.accent}
 ;label-occupied-background = ${color.altbackground}
 label-occupied-padding = 1
 
-label-empty = 祿
+label-empty = 
 label-empty-foreground = ${color.accent}
 ;label-empty-background = ${color.altbackground}
-label-empty-padding = 1
\ No newline at end of file
+label-empty-padding = 1
diff --git a/home/config/polybar/modules/xwindow.ini b/home/config/polybar/modules/xwindow.ini
new file mode 100644
index 0000000..98321f2
--- /dev/null
+++ b/home/config/polybar/modules/xwindow.ini
@@ -0,0 +1,8 @@
+[module/xwindow]
+type = internal/xwindow
+format-prefix = " "
+format-prefix-foreground = ${color.blue}
+format-background = ${color.altbackground}
+
+label = %title%
+label-maxlen = 25
\ No newline at end of file
diff --git a/home/config/rofi/colors.rasi b/home/config/rofi/colors.rasi
index 0bce6f2..3885d6b 100644
--- a/home/config/rofi/colors.rasi
+++ b/home/config/rofi/colors.rasi
@@ -7,6 +7,7 @@
   bg: #39404f80;
   fg: #f8f8f2;
   dark: #39404f;
+  red: #bf616a;
   blue: #81a1c1;
   green: #a3be8c;
   grey: #ffffff10;
diff --git a/home/config/rofi/launcher.rasi b/home/config/rofi/launcher.rasi
index 30662f4..047cc6c 100644
--- a/home/config/rofi/launcher.rasi
+++ b/home/config/rofi/launcher.rasi
@@ -7,7 +7,7 @@ configuration {
   drun-icon-theme: "Reversal-green-dark";
 
   drun {
-    display-name: "";
+    display-name: "";
   }
 
   run {
@@ -23,7 +23,7 @@ configuration {
   }
 
   ssh {
-    display-name: "⚝";
+    display-name: "";
   }
 
   drun-display-format: "{name}";
@@ -64,6 +64,7 @@ entry {
 
 prompt {
   padding: 16px;
+  vertical-align: 0.5;
   background-color: transparent;
 }
 
diff --git a/home/config/rofi/powermenu.rasi b/home/config/rofi/powermenu.rasi
index e47ef71..29416e5 100644
--- a/home/config/rofi/powermenu.rasi
+++ b/home/config/rofi/powermenu.rasi
@@ -29,12 +29,12 @@ inputbar {
 
 textbox-prompt-colon {
   expand: false;
-  str: "";
-  font: "'Material Icons' 24px";
-  padding: 12px 14px;
+  str: "";
+  font: "'Material Icons' bold 24px";
+  padding: 12px 17px;
   border-radius: 50%;
   background-color: @blue;
-  text-color: @fg;
+  text-color: @red;
   vertical-align: 0.5;
 }
 prompt {
diff --git a/home/config/sxhkd/sxhkdrc b/home/config/sxhkd/sxhkdrc
index df209b6..a3bc5f0 100644
--- a/home/config/sxhkd/sxhkdrc
+++ b/home/config/sxhkd/sxhkdrc
@@ -37,7 +37,7 @@ super + shift + k
 
 # 电源快捷键
 ctrl + alt + shift + Escape
-  .local/bin/scripts/powermenu.sh
+  .local/bin/scripts/rofi_powermenu.sh
 
 # ---------------  end  --------------------