Merge remote-tracking branch 'refs/remotes/lab/main'

This commit is contained in:
Akemi Izuko 2023-12-23 20:14:19 -07:00
commit 7baf2b2a71
Signed by: akemi
GPG key ID: 8DE0764E1809E9FC
3 changed files with 16 additions and 5 deletions

View file

@ -11,12 +11,18 @@ battery_charge() {
} }
display_brightness() { display_brightness() {
local x
if command -v ddcutil &>/dev/null; then if command -v ddcutil &>/dev/null; then
ddcutil getvcp 10 | awk ' x="$(ddcutil getvcp 10 2>/dev/null |\
match($0, /[0-9]+,/) { printf "%s", substr($0, RSTART, RLENGTH - 1) }' awk 'match($0, /[0-9]+,/) { printf "%s", substr($0, RSTART, RLENGTH - 1) }')"
else
light -G | awk '{ split($0, a, "."); printf "%s", a[1] }'
fi fi
if [[ -z "$x" ]]; then
x="$(light -G | awk '{ split($0, a, "."); printf "%s", a[1] }')"
fi
printf "%s" "$x"
} }
get_volume() { get_volume() {

View file

@ -91,6 +91,9 @@ bind T clock-mode
bind-key -n M-0 switch-client -n bind-key -n M-0 switch-client -n
bind-key -n M-9 switch-client -p bind-key -n M-9 switch-client -p
unbind-key w
bind-key w choose-session
# Tmux Keybinds ===================================================== # Tmux Keybinds =====================================================
# Reload tmux quickly # Reload tmux quickly
unbind R unbind R

View file

@ -229,7 +229,7 @@ let RG_TEMPLATE = 'rg --hidden --no-ignore --follow '
let $FZF_DEFAULT_COMMAND = RG_TEMPLATE . '--files ' let $FZF_DEFAULT_COMMAND = RG_TEMPLATE . '--files '
" Use ripgrep with fzf (from Jonhoo) " Use ripgrep with fzf (from Jonhoo)
noremap <leader>s :Rg<CR> noremap <leader>S :Rg<CR>
command! -bang -nargs=* Rg command! -bang -nargs=* Rg
\ call fzf#vim#grep( \ call fzf#vim#grep(
\ RG_TEMPLATE \ RG_TEMPLATE
@ -239,6 +239,8 @@ command! -bang -nargs=* Rg
\ : fzf#vim#with_preview('right:50%:hidden', '?'), \ : fzf#vim#with_preview('right:50%:hidden', '?'),
\ <bang>0) \ <bang>0)
noremap <leader>s :BLines <CR>
" FZF colors match vim colorscheme " FZF colors match vim colorscheme
let g:fzf_colors = let g:fzf_colors =
\ { 'fg': ['fg', 'Normal'], \ { 'fg': ['fg', 'Normal'],