Merge branch 'master' into arch-laptop

config/.config/nvim/lua/config/packer.lua

@@ -260,18 +260,8 @@ return require('packer').startup(function(use)
         end
     }
 
-    use {
+    use 'nvim-tree/nvim-web-devicons'
-        "utilyre/barbecue.nvim",
+
-        tag = "*",
-        requires = {
-            "SmiteshP/nvim-navic",
-            "nvim-tree/nvim-web-devicons", -- optional dependency
-        },
-        after = "nvim-web-devicons", -- keep this if you're using NvChad
-        config = function()
-            require("barbecue").setup()
-        end,
-    }
 
     use {
         'nvim-lualine/lualine.nvim',

config/.config/nvim/lua/config/set.lua

@@ -13,6 +13,9 @@ vim.opt.showmode = false
 
 vim.opt.smartindent = true
 
+vim.opt.spell = true
+vim.opt.spelllang = "en_us"
+
 vim.opt.swapfile = false
 vim.opt.backup = false
 vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"

config/.config/polybar/config.ini

@@ -22,7 +22,7 @@ screenchange-reload = true
 ;compositing-background = screen
 ;compositing-foreground = source
 ;compositing-border = over
-;pseudo-transparency = false
+;pseudo-transparency = true
 
 [global/wm]
 margin-top = 0
@@ -39,59 +39,78 @@ background = ${xrdb:background}
 foreground = ${xrdb:foreground}
 override-redirect = true
 wm-restack = bspwm
-font-0 = Olympe Mono Hacked:style=Regular:pixelsize=13;2
+font-0 = Olympe Mono Hacked:style=Regular:pixelsize=11;2
-font-1 = Cascadia Code:style=Regular:pixelsize=13:2
+font-1 = Cascadia Code:style=Regular:pixelsize=11:2
 font-2 = NotoColorEmoji:pixelsize=16
-font-3 = Font Awesome 5 Brands:style=Regular:size=13;2
+font-3 = Font Awesome 6 Brands:style=Regular:size=13;2
-font-4 = Font Awesome 5 Free Solid:style=Regular:size=9;2
+font-4 = Font Awesome 6 Free Solid:style=Regular:size=9;2
 height = 20
 line-size = 2
 modules-left = bspwm
-modules-right = music pulseaudio battery network redshift datetime
+modules-right = music memory filesystem xkeyboard network redshift pulseaudio backlight tray battery datetime
-padding = 3
+padding = 0
 module-margin = 1.5
 
-#[module/apple]
+[module/tray]
-#type = custom/text
+type = internal/tray
-#content =  
 
+[module/xkeyboard]
+type = internal/xkeyboard
+format = 󰌌 <label-layout>
+
+[module/filesystem]
+type = internal/fs
+mount-0 = /
+format-mounted =   <label-mounted>
+label-mounted = %used% / %total%
+
+[module/memory]
+type = internal/memory
+format = <label>
+label =   %used%
 [module/bspwm]
 type = internal/bspwm
 
-label-focused = %name%
+label-focused = %icon%
 label-focused-underline= ${xrdb:foreground}
+label-focused-background = ${xrdb:foreground}
+label-focused-foreground = ${xrdb:background}
 label-focused-padding = 1
 label-focused-font = 0
 
-label-occupied = %name%
+label-occupied = %icon%
 label-occupied-padding = 1
 label-occupied-font = 0
+label-occupied-underline= ${xrdb:foreground}
 
-label-urgent = %name%!
+label-urgent = %icon%
 label-urgent-padding = 1
 label-urgent-font = 0
+label-urgent-background = ${xrdb:color1}
+label-urgent-underline = ${xrdb:color1}
 
-label-empty = %name%
+label-empty = %icon%
 label-empty-padding = 1
 label-empty-font = 0
 ;extra icons to choose from
 ;http://fontawesome.io/cheatsheet/
 ;       v     
 
-ws-icon-0 = Web; 
+# ws-icon-0 = 1; 
-ws-icon-1 = Term;
+ws-icon-0 = 1;א
-ws-icon-2 = School;
+ws-icon-1 = 2;ב
-ws-icon-3 = Game;
+ws-icon-2 = 3;ג
-ws-icon-4 = Music;
+ws-icon-3 = 4;ד
-ws-icon-5 = Chat;
+ws-icon-4 =  5;ה
-ws-icon-6 = Sys;
+ws-icon-5 = 6;ו
-ws-icon-7 = Dev;
+ws-icon-6 = 7;ז
-ws-icon-8 = Extra;
+ws-icon-7 = 8;ח
+ws-icon-8 = 9;ט
 ;ws-icon-9 = 10;
 ws-icon-default = " "
 
 #; Separator in between workspaces
-#; label-separator = |
+# label-separator = |
 #
 
 ;[module/music]
@@ -105,16 +124,27 @@ ws-icon-default = " "
 
 [module/battery]
 type = internal/battery
-battery = BAT0
+battery = BAT1
 adapter = ADP0
-format-charging = <ramp-capacity>
+format-charging = 󰂄 <label-charging>
-format-discharging = <ramp-capacity>
+format-discharging = <ramp-capacity> <label-discharging>
-ramp-capacity-0 = ""
+label-discharging = %percentage%%
-ramp-capacity-1 = ""
+label-charging = %percentage%%
-ramp-capacity-2 = ""
+label-full = 󱟢 %percentage%%
-ramp-capacity-3 = ""
+# ramp-capacity-0 = ""
-ramp-capacity-4 = ""
+ramp-capacity-0 = "󰁺"
+# ramp-capacity-1 = ""
+ramp-capacity-1 = "󰁼"
+# ramp-capacity-2 = ""
+ramp-capacity-2 = "󰁾"
+# ramp-capacity-3 = ""
+ramp-capacity-3 = "󰂀"
+# ramp-capacity-4 = ""
+ramp-capacity-4 = "󰁹"
 
+[module/backlight]
+type = internal/backlight
+format = 󰌵 <label>
 [module/pulseaudio]
 type = internal/pulseaudio
 
@@ -132,7 +162,7 @@ interval = 5
 ;   <label-volume> (default)
 ;   <ramp-volume>
 ;   <bar-volume>
-format-volume = <label-volume>
+format-volume = <ramp-volume> <label-volume>
 ; Available tags:
 ;   <label-muted> (default)
 ;   <ramp-volume>
@@ -147,7 +177,7 @@ label-volume =  %percentage%%
 ; Available tokens:
 ;   %percentage% (default)
 ;   %decibels%
-label-muted = muted
+label-muted =  %percentage%%
 
 ; Only applies if <ramp-volume> is used
 ramp-volume-0 = 
@@ -155,14 +185,15 @@ ramp-volume-1 = 
 ramp-volume-2 = 
 
 ; Right and Middle click
-click-right = kitty -e pulsemixer
+click-right = st -e pulsemixer
 ; click-middle = 
 
 [module/network]
 type = internal/network
-interface = enp4s0
+interface = wlan0
-label-disconnected = " Not connected" 
+label-disconnected = "󰖪" 
-label-connected = ""
+label-connected = "  %essid%:%local_ip%"
+click-left = st -e iwctl
 
 [module/redshift]
 type = custom/text
@@ -172,4 +203,4 @@ click-right = redshift -x
 
 [module/datetime]
 type = internal/date
-date = %a %b %d  %I:%M %p
+date = %a %b %d %I:%M:%S %p