tmp

Author: luathn

config/bspwm/bspwmrc

@@ -14,7 +14,7 @@ bspc config focus_follows_pointer true
 
 bspc config split_ratio          0.52
 bspc config borderless_monocle   true
-bspc config gapless_monocle      false
+bspc config gapless_monocle      true
 
 # Border colors
 bspc config normal_border_color "#1c1c1c"

config/polybar/config

@@ -30,9 +30,15 @@ alert = #bd2c40
 [bar/mybar]
 ;monitor = ${env:MONITOR:HDMI-1}
 width = 100%
+<<<<<<< Updated upstream
 height = 27
 ;offset-x = 0
 ;offset-y = 0
+=======
+height = 22
+; offset-x = 0
+; offset-y = 0
+>>>>>>> Stashed changes
 radius = 0.0
 fixed-center = false
 
@@ -45,19 +51,18 @@ line-color = #f00
 border-size = 0
 border-color = #00000000
 
-padding-left = 0
+padding-left = 1
 padding-right = 2
 
 module-margin-left = 1
 module-margin-right = 2
 
-font-0 = Hack Nerd Font:style=Regular:antialias=true:pixelsize=9;1
-font-1 = Hack Nerd Font:style=Regular:antialias=true:pixelsize=9;0
-font-2 = Noto Sans Mono:size=9;1
+; font-0 = Hack Nerd Font:style=Regular:antialias=true:pixelsize=9;1
+font-0 = Iosevka:style=Bold:pixelsize=10;3
 
-modules-left = bspwm mpd
-;modules-center = mpd
-modules-right = pulseaudio cpu wlan eth battery date powermenu
+modules-left = cpu memory
+modules-center = bspwm
+modules-right = alsa wlan eth battery date
 
 tray-position = right
 tray-padding = 2
@@ -96,10 +101,10 @@ label-indicator-underline = ${colors.secondary}
 [module/bspwm]
 type = internal/bspwm
 
-ws-icon-0 = I;
-ws-icon-1 = II;
-ws-icon-2 = III;
-ws-icon-3 = IV;
+ws-icon-0 = I;TERM
+ws-icon-1 = II;CHROM
+ws-icon-2 = III;FILE
+ws-icon-3 = IV;ETC
 
 label-focused = %icon%
 label-focused-background = ${colors.background-alt}
@@ -176,17 +181,22 @@ label-song-ellipsis = false
 [module/cpu]
 type = internal/cpu
 interval = 2
+<<<<<<< Updated upstream
 format-prefix = "﬙"
 format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #f90000
+=======
+format-prefix = "CPU "
+format-prefix-foreground = ${colors.red}
+; format-underline = #f90000
+>>>>>>> Stashed changes
 label = %percentage:2%%
 
 [module/memory]
 type = internal/memory
 interval = 2
-format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
-format-underline = #4bffdc
+format-prefix = "MEM "
+format-prefix-foreground = ${colors.red}
 label = %percentage_used%%
 
 [module/wlan]
@@ -216,9 +226,15 @@ type = internal/network
 interface = enp2s0
 interval = 3.0
 
+<<<<<<< Updated upstream
 format-connected-underline = #55aa55
 format-connected-prefix = " "
 format-connected-prefix-foreground = ${colors.foreground-alt}
+=======
+; format-connected-underline = #55aa55
+format-connected-prefix = "ETH: "
+format-connected-prefix-foreground = ${colors.yellow}
+>>>>>>> Stashed changes
 label-connected = Connected
 
 format-disconnected =
@@ -232,14 +248,17 @@ type = internal/date
 interval = 5
 
 date = " %m-%d"
-date-alt = " %Y-%m-%d"
 
 time = %H:%M
-time-alt = %H:%M:%S
 
+<<<<<<< Updated upstream
 format-prefix = 
 format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #0a6cf5
+=======
+format-prefix = "DT:"
+format-prefix-foreground = ${colors.cyan}
+>>>>>>> Stashed changes
 
 label = %date% %time%
 
@@ -282,9 +301,15 @@ format-charging-underline = #ffb52a
 format-discharging = <animation-discharging> <label-discharging>
 format-discharging-underline = ${self.format-charging-underline}
 
+<<<<<<< Updated upstream
 format-full-prefix = " "
 format-full-prefix-foreground = ${colors.foreground-alt}
 format-full-underline = ${self.format-charging-underline}
+=======
+format-full-prefix = "BAT "
+format-full-prefix-foreground = ${colors.blue}
+; format-full-underline = ${self.format-charging-underline}
+>>>>>>> Stashed changes
 
 ramp-capacity-0 = 
 ramp-capacity-1 = 
@@ -310,7 +335,7 @@ expand-right = true
 
 format-spacing = 1
 
-label-open = 
+label-open = POWER
 label-open-foreground = ${colors.secondary}
 label-close =  cancel
 label-close-foreground = ${colors.secondary}
@@ -339,6 +364,47 @@ menu-3-0-exec = i3lock && systemctl suspend
 menu-3-1 = cancel
 menu-3-1-exec = menu-open-0
 
+[module/alsa]
+type = internal/alsa
+
+; Soundcard to be used
+; Usually in the format hw:# where # is the card number
+; You can find the different card numbers in `/proc/asound/cards`
+master-soundcard = default
+speaker-soundcard = default
+headphone-soundcard = default
+
+; Name of the master, speaker and headphone mixers
+; Use the following command to list available mixer controls:
+; $ amixer scontrols | sed -nr "s/.*'([[:alnum:]]+)'.*/\1/p"
+; If master, speaker or headphone-soundcard isn't the default, 
+; use `amixer -c # scontrols` instead where # is the number 
+; of the master, speaker or headphone soundcard respectively
+;
+; Default: Master
+master-mixer = Master
+
+; Optionally define speaker and headphone mixers
+; Default: none
+speaker-mixer = Speaker
+; Default: none
+headphone-mixer = Headphone
+
+; NOTE: This is required if headphone_mixer is defined
+; Use the following command to list available device controls
+; $ amixer controls | sed -r "/CARD/\!d; s/.*=([0-9]+).*name='([^']+)'.*/printf '%3.0f: %s\n' '\1' '\2'/e" | sort
+; You may also need to use `amixer -c # controls` as above for the mixer names
+; Default: none
+headphone-id = 9
+
+; Use volume mapping (similar to amixer -M and alsamixer), where the increase in volume is linear to the ear
+; Default: false
+mapped = true
+
+; Interval for volume increase/decrease (in percent points)
+; Default: 5
+interval = 5
+
 [settings]
 screenchange-reload = true
 ;compositing-background = xor

vim/init.vim

@@ -138,7 +138,129 @@ nnoremap <leader>a :Ack!<Space>
 
 " Fzf
 nnoremap <silent> <c-p> :Files<cr>
+<<<<<<< Updated upstream
 nnoremap <silent> <leader>l :Buffers<cr>
+=======
+nnoremap <silent> <leader>b :Buffers<cr>
+nnoremap <silent> <leader>fr :Rg<cr>
+
+" Fugitive
+nnoremap <silent> <leader>gb :Git blame<cr>
+nnoremap <silent> <leader>gd :Gdiff<cr>
+nnoremap <silent> <leader>gh :diffget //2<cr>
+nnoremap <silent> <leader>gl :diffget //3<cr>
+
+" YankStack
+let g:yankstack_yank_keys = ['y', 'd']
+nmap <leader>p <Plug>yankstack_substitute_older_paste
+nmap <leader>P <Plug>yankstack_substitute_newer_paste
+
+" Vim Test
+nmap <silent> <leader>tn :TestNearest<CR>
+nmap <silent> <leader>tf :TestFile<CR>
+nmap <silent> <leader>ts :TestSuite<CR>
+nmap <silent> <leader>tl :TestLast<CR>
+nmap <silent> <leader>tv :TestVisit<CR>
+
+" Defx
+nnoremap <C-n> :Defx<CR>
+nnoremap <silent> <leader>ff :Defx -toggle=0 -search=`expand('%:p')`<CR>
+
+autocmd FileType defx call s:defx_my_settings()
+function! s:defx_my_settings() abort
+  " Define mappings
+  nnoremap <nowait><silent><buffer><expr> c
+  \ defx#do_action('copy')
+  nnoremap <silent><buffer><expr> x
+  \ defx#do_action('move')
+  nnoremap <nowait><silent><buffer><expr> d
+  \ defx#do_action('remove')
+  nnoremap <silent><buffer><expr> p
+  \ defx#do_action('paste')
+  nnoremap <silent><buffer><expr> r
+  \ defx#do_action('rename')
+  nnoremap <silent><buffer><expr> K
+  \ defx#do_action('new_directory')
+  nnoremap <silent><buffer><expr> m
+  \ defx#do_action('new_file')
+  nnoremap <silent><buffer><expr> M
+  \ defx#do_action('new_multiple_files')
+  nnoremap <silent><buffer><expr> <CR>
+  \ defx#is_directory() ?
+  \ defx#do_action('open_or_close_tree') :
+  \ defx#do_action('drop')
+  nnoremap <silent><buffer><expr> o
+  \ defx#is_directory() ?
+  \ defx#do_action('open_or_close_tree') :
+  \ defx#do_action('drop')
+  nnoremap <silent><buffer><expr> <2-LeftMouse>
+  \ defx#is_directory() ?
+  \ defx#do_action('open_or_close_tree') :
+  \ defx#do_action('drop')
+  nnoremap <silent><buffer><expr> i
+  \ defx#do_action('close_tree')
+  nnoremap <silent><buffer><expr> l
+  \ defx#do_action('open_directory')
+  nnoremap <silent><buffer><expr> h
+  \ defx#do_action('cd', ['..'])
+  nnoremap <silent><buffer><expr> v
+  \ defx#do_action('toggle_select')
+  nnoremap <silent><buffer><expr> V
+  \ defx#do_action('clear_select_all')
+  nnoremap <silent><buffer><expr> *
+  \ defx#do_action('toggle_select_all')
+  nnoremap <silent><buffer><expr> E
+  \ defx#do_action('open', 'vsplit')
+  nnoremap <silent><buffer><expr> P
+  \ defx#do_action('preview')
+  nnoremap <silent><buffer><expr> C
+  \ defx#do_action('toggle_columns', 'indent:icon:filename:type:size:time')
+  nnoremap <silent><buffer><expr> S
+  \ defx#do_action('toggle_sort', 'time')
+  nnoremap <silent><buffer><expr> s
+  \ defx#do_action('search')
+  nnoremap <silent><buffer><expr> !
+  \ defx#do_action('execute_command')
+  nnoremap <silent><buffer><expr> X
+  \ defx#do_action('execute_system')
+  nnoremap <silent><buffer><expr> y
+  \ defx#do_action('yank_path')
+  nnoremap <silent><buffer><expr> .
+  \ defx#do_action('toggle_ignored_files')
+  nnoremap <silent><buffer><expr> ;
+  \ defx#do_action('repeat')
+  nnoremap <silent><buffer><expr> ~
+  \ defx#do_action('cd')
+  nnoremap <silent><buffer><expr> q
+  \ defx#do_action('quit')
+  nnoremap <silent><buffer><expr> j
+  \ line('.') == line('$') ? 'gg' : 'j'
+  nnoremap <silent><buffer><expr> k
+  \ line('.') == 1 ? 'G' : 'k'
+  nnoremap <silent><buffer><expr> <C-r>
+  \ defx#do_action('redraw')
+  nnoremap <silent><buffer><expr> <C-g>
+  \ defx#do_action('print')
+  nnoremap <silent><buffer><expr> cd
+  \ defx#do_action('change_vim_cwd')
+endfunction
+
+" CtrlSF
+let g:ctrlsf_mapping = {
+  \ "openb": { "key": "O", "suffix": "<C-w>p" },
+  \ "next": "n",
+  \ "prev": "N",
+  \ "vsplit": "v",
+  \ }
+nmap     <C-F>f <Plug>CtrlSFPrompt
+vmap     <C-F>f <Plug>CtrlSFVwordPath
+vmap     <C-F>F <Plug>CtrlSFVwordExec
+nmap     <C-F>n <Plug>CtrlSFCwordPath
+nmap     <C-F>p <Plug>CtrlSFPwordPath
+nnoremap <C-F>o :CtrlSFOpen<CR>
+nnoremap <C-F>t :CtrlSFToggle<CR>
+inoremap <C-F>t <Esc>:CtrlSFToggle<CR>
+>>>>>>> Stashed changes
 
 " others
 map <leader>= :ALEFix<cr>