From c64043053d4c032769211a04c51b43eeb102c771 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Tue, 18 Mar 2025 21:24:42 +0000
Subject: change bg and font

---
 Xdefaults                         |   5 +-
 bg.png                            | Bin 0 -> 51544 bytes
 config/polybar/config             |  93 +++++++++++++++++---------------------
 config/polybar/launch.sh          |   2 +-
 config/rofi/colors-rofi-dark.rasi |   4 +-
 config/vim/vimrc                  |  18 ++++++++
 scripts/mpd-zscroll               |   9 +++-
 7 files changed, 74 insertions(+), 57 deletions(-)
 create mode 100644 bg.png

diff --git a/Xdefaults b/Xdefaults
index 5aa5457..8364b21 100644
--- a/Xdefaults
+++ b/Xdefaults
@@ -10,6 +10,7 @@
 #define font2 xft:MesloLGM Nerd Font Mono:minispace=False:size=10
 #define font3 xft:Noto Sans Mono CJK TC:minispace=False:size=10
 #define font4 xft:Noto Color Emoji:style=regular:size=10
+
 URxvt.letterSpace: spacing
 URxvt.lineSpace: 0
 
@@ -55,7 +56,9 @@ dzen2.font: mononoki
 ! Set depth to make transparency work.
 URxvt*depth: 32
 
-*.font: mononoki:minispace=False:size=10:antialias=true
+! *.font: mononoki:minispace=False:size=10:antialias=true
+*.font: FiraMono Nerd Font:minispace=False:size=10:antialias=true
+
 URxvt.font: font1,font2,font3,font4
 URxvt.boldFont: font1:style=bold,font2:style=bold,font3:style=bold,font4
 URxvt.italicFont:font1:style=italic,font2:style=italic,font3:style=italic,font4
diff --git a/bg.png b/bg.png
new file mode 100644
index 0000000..fd1be07
Binary files /dev/null and b/bg.png differ
diff --git a/config/polybar/config b/config/polybar/config
index 88f1d26..ca0de4b 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -14,12 +14,9 @@ fg1 = #fefefe
 monitor = ${env:MONITOR}
 
 enable-ipc                = true
-font-0                    = mononoki:style=Regular:pixelsize=11;3
-font-1                    = mononoki:style=Regular:pixelsize=15;4
-font-2                    = mononoki:style=Regular:pixelsize=19;5
-font-3                    = mononoki:style=Regular:pixelsize=11;3
-font-4                    = MesloLGM Nerd Font Mono:style=Regular:pixelsize=14;2
-font-5                    = Noto Sans Mono CJK TC:style=Medium,Regular;pixelsize=10;2
+font-0                    = FiraMono Nerd Font:style=Regular,size=10;3
+font-1                    = MesloLGM Nerd Font Mono:style=Regular:pixelsize=14;3
+font-2                    = Noto Sans Mono CJK TC:style=Medium,Regular;pixelsize=10;3
 
 height                    = 32
 
@@ -37,32 +34,42 @@ padding-right		      = 1
 [bar/time]
 inherit			          = bar/base
 modules-center		      = time
-width                     = 80
+width                     = 86
 
 [bar/time1920]
 inherit                   = bar/time
-offset-x                  = 1798
+offset-x                  = 1792
 
 [bar/time1080]
 inherit                   = bar/time
-offset-x                  = 958
+offset-x                  = 952
 
 [bar/time2560]
 inherit                   = bar/time
-offset-x                  = 2438
+offset-x                  = 2432
 
 [bar/ws]
 inherit                   = bar/base
-width                     = 245
+width                     = 248
 offset-x                  = 32
 modules-left              = workspaces 
 tray-position		      = right
 
 [bar/right]
 inherit                   = bar/base
-width                     = 400
-modules-center		      = temperature memory network battery pulseaudio vpn microphone time
+width                     = 420
+modules-center		      = temperature memory network battery pulseaudio vpn microphone
 tray-position		      = right
+padding                   = 1
+
+[bar/right2560]
+inherit                   = bar/right
+offset-x                  = 1980
+
+[bar/right1920]
+inherit                   = bar/right
+offset-x                  = 1340
+
 
 [bar/mpd]
 inherit                   = bar/base
@@ -70,35 +77,15 @@ width                     = 250
 fixed-center              = true
 modules-right		      = mpdctrls
 modules-left		      = mpdsong
-padding		              = 2
-
-[bar/right2560]
-inherit                   = bar/right
-offset-x                  = 2118
+padding		              = 1
 
 [bar/mpd2560]
 inherit                   = bar/mpd
-offset-x                  = 1836
-
-[bar/right1920]
-inherit                   = bar/right
-offset-x                  = 1478
+offset-x                  = 1698
 
 [bar/mpd1920]
 inherit                   = bar/mpd
-offset-x                  = 1046
-
-
-
-[module/wsnumber]
-type                      = custom/scrip80
-exec                      = bspc query -D -d focused --names
-tail                      = true
-interval                  = 0
-format                    = "<label>"
-format-foreground         = ${color.background}
-format-background         = ${color.colorlb}
-format-padding            = 0
+offset-x                  = 1058
 
 [module/xwindow]
 type                      = internal/xwindow
@@ -113,15 +100,14 @@ enable-click = true
 enable-scroll = true
 
 format = <label-state>
-format-padding            = 0
 label-monitor             = %name%
-label-active              = %{T2}雷%{T-}
+label-active              = %{T2}%{T-}
 label-active-padding      = 1
-label-occupied            = %{T2}ﲭ%{T-}
+label-occupied            = %{T2}%{T-}
 label-occupied-padding    = 1
-label-empty               = %{T2}ﱤ%{T-}
+label-empty               = %{T2}%{T-}
 label-empty-padding       = 1
-label-urgent              = %{T2}ﲭ%{T-}
+label-urgent              = %{T2}%{T-}
 label-urgent-padding      = 1
 
 
@@ -130,7 +116,7 @@ type                      = internal/date
 interval                  = 10
 time                      = "%H:%M"
 date                      = "%d %b"
-label                     = %{T2}◷%{T-} %time%
+label                     = %{T2}%{T-} %time%
 label-padding             = 0
 
 [module/mpdctrls]
@@ -177,15 +163,15 @@ label-volume              = %percentage:3:3%%
 use-ui-max                = false
 interval                  = 3
 
-ramp-volume-0             = ""
-ramp-volume-1             = ""
-ramp-volume-2             = ""
+ramp-volume-0             = "󰕿"
+ramp-volume-1             = "󰖀"
+ramp-volume-2             = "󰕾"
 
-label-muted               = "%{T3} %{T-}--%"
+label-muted               = "%{T3}󰝟 %{T-}--%"
 
 [module/microphone]
 type = custom/script
-exec = amixer get Capture | tail -2 | grep -q off && echo "" || echo ""
+exec = amixer get Capture | tail -2 | grep -q off && echo " " || echo " "
 interval = 1
 click-left = $HOME/.scripts/toggle-mute.sh
 
@@ -245,11 +231,16 @@ interface = wlan0
 udspeed-minwidth = 5
 accumulate-stats = true
 unknown-as-up = true
-format-connected = <label-connected>
+format-connected = <ramp-signal>
 format-disconnected = <label-disconnected>
 
-format-packetloss = <label-connected>
+format-packetloss = 󰤫
+
+ramp-signal-0 = 󰤯
+ramp-signal-1 = 󰤟
+ramp-signal-2 = 󰤢
+ramp-signal-3 = 󰤥
+ramp-signal-4 = 󰤨
 
-label-connected = 
-label-disconnected = 
+label-disconnected = 󰤯
 
diff --git a/config/polybar/launch.sh b/config/polybar/launch.sh
index a8d55f3..f9ece03 100755
--- a/config/polybar/launch.sh
+++ b/config/polybar/launch.sh
@@ -15,7 +15,7 @@ polybar -m | while read -r mon; do
     export MONITOR=$(echo $mon | cut -d: -f1)
     echo $mon | grep -q "(primary)" && {
         polybar ws &
-
+        polybar time2560 &
         polybar right2560 &
         polybar mpd2560 &
     } || {
diff --git a/config/rofi/colors-rofi-dark.rasi b/config/rofi/colors-rofi-dark.rasi
index 0833237..3f3912c 100644
--- a/config/rofi/colors-rofi-dark.rasi
+++ b/config/rofi/colors-rofi-dark.rasi
@@ -24,8 +24,8 @@
     border-color:       @foreground;
 
     background-color: #00000000;
-    background: #191919e0;
-    background2: #19191900;
+    background: #191919;
+    background2: #191919;
     foreground: #fefefe;
     foreground2: #c5c8c6;
     spacing: 2;
diff --git a/config/vim/vimrc b/config/vim/vimrc
index 6a568a8..b348907 100644
--- a/config/vim/vimrc
+++ b/config/vim/vimrc
@@ -41,6 +41,10 @@ call plug#begin()
 
 Plug 'preservim/nerdtree'
 nnoremap <F5> :NERDTree<CR>
+let NERDTreeMinimalUI=1
+
+Plug 'ryanoasis/vim-devicons'
+set encoding=UTF-8
 
 Plug 'preservim/vim-markdown'
 "let g:vim_markdown_math = 1
@@ -117,6 +121,20 @@ Plug 'heavenshell/vim-pydocstring', { 'do': 'make install', 'for': 'python' }
 
 Plug 'tpope/vim-fugitive'
 
+Plug 'yggdroot/indentline'
+
+Plug 'yuttie/comfortable-motion.vim'
+noremap <silent> <ScrollWheelDown> :call comfortable_motion#flick(40)<CR>
+noremap <silent> <ScrollWheelUp>   :call comfortable_motion#flick(-40)<CR>
+
+let g:comfortable_motion_interval = 2000.0/60
+let g:comfortable_motion_friction = 80.0
+let g:comfortable_motion_air_drag = 2.0
+
+Plug 'myusuf3/numbers.vim'
+
+let g:numbers_exclude = ['tagbar', 'gundo', 'minibufexpl', 'nerdtree']
+
 call plug#end()
 
 highlight Pmenu ctermbg=black guibg=black ctermfg=white
diff --git a/scripts/mpd-zscroll b/scripts/mpd-zscroll
index eba586b..59ec3b9 100755
--- a/scripts/mpd-zscroll
+++ b/scripts/mpd-zscroll
@@ -1,5 +1,10 @@
 #!/bin/sh
 
-zscroll -l 17 --before-text "♪ " --delay 0.3 \
-		--update-check true "mpc current" &
+if [ ! -z "$@" ]; then
+    mpc -f "%title%" current
+else
+    zscroll -l 14 --before-text "󰎇 " --delay 0.2 \
+		--update-check true "$0 current" -p "     " &
+fi
+
 wait
-- 
cgit v1.2.1