Browse Source

polybar: add keyboard layout module (EN/RU) and resolve gitignore conflicts

Vitaliy Timtsurak 6 days ago
parent
commit
f491bf1129

+ 1 - 1
Profile.env

@@ -1,2 +1,2 @@
 # work, laptop
-profile=laptop
+profile=work

+ 1 - 0
config/bspwm/bspwmrc

@@ -115,6 +115,7 @@ bspc rule -a org.gnome.Nautilus state=floating follow=on
 bspc rule -a crx_nngceckbapebfimnlniiiahkandclblb state=floating
 bspc rule -a crx_nngceckbapebfimnlniiiahkandclblb state=floating
 bspc rule -a kleopatra state=floating center=true
+bspc rule -a microsip.exe state=floating center=true
 
 bspc rule -a pavucontrol state=floating center=true
 bspc rule -a gnome-calculator state=floating center=true rectangle=200x600

+ 32 - 4
config/polybar/config.ini

@@ -105,7 +105,7 @@ font-3 = "Hack Nerd Font:style=Bold:size=18;3"
 separator = |
 modules-left = arch-icon bspwm xwindow
 modules-center = date
-modules-right = pulseaudio network-wired bluetooth updates cpu memory filesystem temperature battery powermenu
+modules-right = pulseaudio network-wired bluetooth updates cpu memory filesystem temperature battery xkeyboard powermenu
 
 ; Включить поддержку IPC (для отправки команд в polybar)
 enable-ipc = true
@@ -165,7 +165,7 @@ font-3 = "Hack Nerd Font:style=Bold:size=18;3"
 separator = |
 modules-left = arch-icon bspwm xwindow
 modules-center = date
-modules-right = network-wireless
+modules-right = network-wireless xkeyboard
 
 ; Включить поддержку IPC (для отправки команд в polybar)
 enable-ipc = true
@@ -225,7 +225,7 @@ font-3 = "Hack Nerd Font:style=Bold:size=18;3"
 separator = |
 modules-left = arch-icon bspwm xwindow
 modules-center = date
-modules-right = pulseaudio network-wired bluetooth updates cpu memory filesystem temperature battery powermenu
+modules-right = pulseaudio network-wired bluetooth updates cpu memory filesystem temperature battery xkeyboard powermenu
 
 ; Включить поддержку IPC (для отправки команд в polybar)
 enable-ipc = true
@@ -285,7 +285,7 @@ font-3 = "Hack Nerd Font:style=Bold:size=18;3"
 separator = |
 modules-left = arch-icon bspwm xwindow
 modules-center = date
-modules-right = pulseaudio network-wireless bluetooth updates cpu memory filesystem temperature battery powermenu
+modules-right = pulseaudio network-wireless bluetooth updates cpu memory filesystem temperature battery xkeyboard powermenu
 
 ; Включить поддержку IPC (для отправки команд в polybar)
 enable-ipc = true
@@ -593,6 +593,34 @@ content-padding = 1
 ; ЛКМ: запустить скрипт powermenu
 click-left = ~/.config/polybar/scripts/powermenu.sh
 
+; [Модуль] Раскладка клавиатуры
+[module/xkeyboard]
+type = internal/xkeyboard
+
+; Список игнорируемых индикаторов
+blacklist-0 = num lock
+blacklist-1 = scroll lock
+
+; Иконка и формат
+format = <label-layout> <label-indicator>
+format-prefix = "󰌌 "
+format-prefix-foreground = ${colors.secondary}
+
+; Отображение раскладки (RU, EN и т.д.)
+label-layout = %icon%
+label-layout-padding = 1
+label-layout-foreground = ${colors.foreground}
+
+; Настройка иконок для разных раскладок
+layout-icon-default = some-icon
+layout-icon-0 = us;EN
+layout-icon-1 = ru;RU
+
+; Индикатор Caps Lock
+label-indicator-on-capslock = 󰪛
+label-indicator-on-capslock-foreground = ${colors.alert}
+label-indicator-padding = 1
+
 ; -------------------------------------------------------------------
 ;   Прочие настройки
 ; -------------------------------------------------------------------

+ 1 - 1
config/ranger/rifle.conf

@@ -153,8 +153,8 @@ ext pdf, has epdfview, X, flag f = epdfview -- "$@"
 ext pdf, has qpdfview, X, flag f = qpdfview "$@"
 ext pdf, has open,     X, flag f = open "$@"
 
+ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"
 ext docx?, has catdoc,       terminal = catdoc -- "$@" | "$PAGER"
-
 ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has gnumeric,    X, flag f = gnumeric -- "$@"
 ext                        sxc|xlsx?|xlt|xlw|gnm|gnumeric, has kspread,     X, flag f = kspread -- "$@"
 ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f = libreoffice "$@"

+ 10 - 1
home/.local/share/.gitignore

@@ -1,2 +1,11 @@
 recently-used.xbel
-*
+remmina
+backrest
+gvfs-metadata
+ranger
+vlc
+com.yubico.yubioath
+keyrings
+nautilus
+xrdp
+zathura

+ 3 - 0
home/.local/state/.gitignore

@@ -1 +1,4 @@
 kleopatrastaterc
+wireplumber
+nvim
+lesshst

+ 1 - 0
home/bin/nekoray/config/groups/0.json

@@ -8,6 +8,7 @@
     "manually_column_width": false,
     "name": "По умолчанию",
     "order": [
+        0
     ],
     "skip_auto_update": false
 }