一大波更新

master
yutent 2023-07-11 07:29:36 +00:00
parent 8a559daf10
commit d512449151
22 changed files with 225 additions and 105 deletions

View File

@ -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

View File

@ -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 = ▂▂▂

View File

@ -2,7 +2,8 @@
background = #475569
foreground = #d8dee9
altbackground = #39404f
altbackground = #55657d
altbackground2 = #3d495b
altforeground = #768bb2
accent = #81a1c1

View File

@ -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}

View File

@ -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
; 直接引入整个目录
include-directory = ./modules

View File

@ -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

View File

@ -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

View File

@ -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}

View File

@ -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}

View File

@ -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

View File

@ -1,6 +1,6 @@
[module/logo]
type = custom/text
content =
content-foreground = ${color.red}
content-padding = 3
format =
format-foreground = ${color.red}
format-padding = 3
click-left = rofi -show drun -theme launcher

View File

@ -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-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-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}

View File

@ -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

View File

@ -0,0 +1,7 @@
[module/tray]
type = internal/tray
;tray-position = adaptive
tray-padding = 4
tray-detached = false
tray-background = ${color.background}

View File

@ -1,10 +1,6 @@
[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
@ -12,44 +8,23 @@ use-ui-max = false
; 音量显示格式
; 可用标签 <bar-volume> 音量条
format-volume = <ramp-volume><label-volume>
format-volume-background = ${color.background}
format-volume-padding = 1
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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -7,6 +7,7 @@
bg: #39404f80;
fg: #f8f8f2;
dark: #39404f;
red: #bf616a;
blue: #81a1c1;
green: #a3be8c;
grey: #ffffff10;

View File

@ -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;
}

View File

@ -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 {

View File

@ -37,7 +37,7 @@ super + shift + k
# 电源快捷键
ctrl + alt + shift + Escape
.local/bin/scripts/powermenu.sh
.local/bin/scripts/rofi_powermenu.sh
# --------------- end --------------------