diff options
Diffstat (limited to '')
-rwxr-xr-x | .config/bspwm/bspwmrc | 43 | ||||
-rw-r--r-- | .config/env | 2 | ||||
-rw-r--r-- | .config/nvim/bindings.vim | 4 | ||||
-rw-r--r-- | .config/nvim/init.vim | 2 | ||||
-rw-r--r-- | .config/nvim/langs.vim | 8 | ||||
-rw-r--r-- | .config/nvim/plug-config/airline.vim | 8 | ||||
-rw-r--r-- | .config/nvim/plug.vim | 2 | ||||
-rw-r--r-- | .config/sxhkd/sxhkdrc | 11 | ||||
-rw-r--r-- | .config/vifm/vifmrc | 1 | ||||
-rw-r--r-- | .config/zsh/.zshrc | 4 | ||||
-rw-r--r-- | .config/zsh/alias.zsh | 2 | ||||
-rwxr-xr-x | .local/bin/mpview | 6 |
12 files changed, 57 insertions, 36 deletions
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 4cdd9b2..cbc90d7 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -23,7 +23,7 @@ use constant { LOWBAT_PATH => '/usr/local/bin/lowbat', EMACS_PATH => '/usr/local/bin/emacs', NEOVIM_PATH => '/usr/local/bin/nvim', - ALACRITTY_PATH => '/usr/local/bin/alacritty', + TERM_PATH => '/usr/local/bin/st', PGREP_PATH => '/bin/pgrep', ESPEAK_PATH => '/usr/local/bin/espeak', SH_PATH => '/bin/sh', @@ -54,10 +54,9 @@ use constant { XSET_R_RATE_DELAY => 200, XSET_R_RATE_RATE => 150 }; -use constant WALLPAPER_PATH => '/usr/home/jozan/Pictures/wallpaper.jpg'; use constant COWSAY_WELCOME => 'Welcome back, partner! And remember to try glest!'; use constant NETWORK_TEST_URL => 'https://www.freebsd.org/'; -use constant SLEEP_TIME => 3.2; +use constant SLEEP_TIME => 1; sub run_if_dead { @@ -183,28 +182,28 @@ sub fg_on_three_screens $term_pid[0] = fork(); if (not $term_pid[0]) { exec( - ALACRITTY_PATH, '-e', SH_PATH, '-c', - COWSAY_PATH . ' "' . COWSAY_WELCOME . '"; ' . FISH_PATH + TERM_PATH, '-e', SH_PATH, '-c', + COWSAY_PATH . ' "' . COWSAY_WELCOME . '"; ' . ZSH_PATH ); exit; } Time::HiRes::sleep(SLEEP_TIME); $term_pid[1] = fork(); if (not $term_pid[1]) { - exec(ALACRITTY_PATH, '-e', HTOP_PATH); + exec(TERM_PATH, '-e', HTOP_PATH); exit; } Time::HiRes::sleep(SLEEP_TIME); $term_pid[2] = fork(); if (not $term_pid[2]) { - exec(ALACRITTY_PATH, '-e', GOTOP_PATH); + exec(TERM_PATH, '-e', GOTOP_PATH); exit; } Time::HiRes::sleep(SLEEP_TIME); system(BSPC_PATH, 'node', '-f', 'west'); $term_pid[3] = fork(); if (not $term_pid[3]) { - exec(ALACRITTY_PATH, '-e', VIFM_PATH); + exec(TERM_PATH, '-e', VIFM_PATH); exit; } Time::HiRes::sleep(SLEEP_TIME); @@ -224,28 +223,28 @@ sub fg_on_two_screens $term_pid[0] = fork(); if (not $term_pid[0]) { exec( - ALACRITTY_PATH, '-e', SH_PATH, '-c', - COWSAY_PATH . ' "' . COWSAY_WELCOME . '"; ' . FISH_PATH + TERM_PATH, '-e', SH_PATH, '-c', + COWSAY_PATH . ' "' . COWSAY_WELCOME . '"; ' . ZSH_PATH ); exit; } Time::HiRes::sleep(SLEEP_TIME); $term_pid[1] = fork(); if (not $term_pid[1]) { - exec(ALACRITTY_PATH, '-e', HTOP_PATH); + exec(TERM_PATH, '-e', HTOP_PATH); exit; } Time::HiRes::sleep(SLEEP_TIME); $term_pid[2] = fork(); if (not $term_pid[2]) { - exec(ALACRITTY_PATH, '-e', GOTOP_PATH); + exec(TERM_PATH, '-e', GOTOP_PATH); exit; } Time::HiRes::sleep(SLEEP_TIME); system(BSPC_PATH, 'node', '-f', 'west'); $term_pid[3] = fork(); if (not $term_pid[3]) { - exec(ALACRITTY_PATH, '-e', VIFM_PATH); + exec(TERM_PATH, '-e', VIFM_PATH); exit; } Time::HiRes::sleep(SLEEP_TIME); @@ -265,8 +264,8 @@ sub fg_on_one_screen $term_pid[0] = fork(); if (not $term_pid[0]) { exec( - ALACRITTY_PATH, '-e', SH_PATH, '-c', - COWSAY_PATH . ' "' . COWSAY_WELCOME . '"; ' . FISH_PATH + TERM_PATH, '-e', SH_PATH, '-c', + COWSAY_PATH . ' "' . COWSAY_WELCOME . '"; ' . ZSH_PATH ); exit; } @@ -274,19 +273,19 @@ sub fg_on_one_screen system(BSPC_PATH, 'node', '-p', 'west'); $term_pid[1] = fork(); if (not $term_pid[1]) { - exec(ALACRITTY_PATH, '-e', HTOP_PATH); + exec(TERM_PATH, '-e', HTOP_PATH); exit; } Time::HiRes::sleep(SLEEP_TIME); $term_pid[2] = fork(); if (not $term_pid[2]) { - exec(ALACRITTY_PATH, '-e', GOTOP_PATH); + exec(TERM_PATH, '-e', GOTOP_PATH); } Time::HiRes::sleep(SLEEP_TIME); system(BSPC_PATH, 'node', '-f', 'east'); $term_pid[3] = fork(); if (not $term_pid[3]) { - exec(ALACRITTY_PATH, '-e', VIFM_PATH); + exec(TERM_PATH, '-e', VIFM_PATH); } Time::HiRes::sleep(SLEEP_TIME); system(BSPC_PATH, 'node', '-f', 'west'); @@ -326,25 +325,25 @@ sub run_fg_programs system(BSPC_PATH, 'desktop', '-f', '11'); $pid[0] = fork(); if (not $pid[0]) { - exec(ALACRITTY_PATH, '-e', NEOMUTT_PATH); + exec(TERM_PATH, '-e', NEOMUTT_PATH); } Time::HiRes::sleep(SLEEP_TIME); system(BSPC_PATH, 'desktop', '-f', '10'); $pid[1] = fork(); if (not $pid[1]) { - exec(ALACRITTY_PATH, '-e', SCLI_PATH); + exec(TERM_PATH, '-e', SCLI_PATH); } Time::HiRes::sleep(SLEEP_TIME); system(BSPC_PATH, 'desktop', '-f', '09'); $pid[2] = fork(); if (not $pid[2]) { - exec(ALACRITTY_PATH, '-e', VIMPC_PATH); + exec(TERM_PATH, '-e', VIMPC_PATH); } Time::HiRes::sleep(SLEEP_TIME); system(BSPC_PATH, 'desktop', '-f', '01'); $pid[3] = fork(); if (not $pid[3]) { - exec(ALACRITTY_PATH, '-e', NEOVIM_PATH); + exec(TERM_PATH, '-e', NEOVIM_PATH); } Time::HiRes::sleep(SLEEP_TIME); system(BSPC_PATH, 'desktop', '-f', '12'); diff --git a/.config/env b/.config/env index 4fecc7c..1171b41 100644 --- a/.config/env +++ b/.config/env @@ -18,7 +18,7 @@ export PATH="$HOME"/.local/bin:"$PATH":/usr/local/llvm11/bin export EDITOR='nvim' export VISUAL='nvim' export PAGER='less' -export TERMINAL='alacritty' +export TERMINAL='st' export BROWSER='firefox' export READER='zathura' export FILE='vifm' diff --git a/.config/nvim/bindings.vim b/.config/nvim/bindings.vim index 4e7d776..d6219b9 100644 --- a/.config/nvim/bindings.vim +++ b/.config/nvim/bindings.vim @@ -13,7 +13,7 @@ nnoremap <C-o> <C-w>o nnoremap <C-q> <C-w>q nnoremap <silent> <leader> :WhichKey '\'<CR> nnoremap <silent> <leader>b :Buffers<CR> -nnoremap <leader>d :w<CR>:bp<CR>:bd #<CR> +nnoremap <leader>d :bd<CR> nnoremap <silent> <leader>e :Files<CR> nnoremap <silent> <leader>ga :Ag<CR> nnoremap <leader>gg :Grep<Space> @@ -27,7 +27,7 @@ nnoremap <leader>w :w<CR> nnoremap <leader>x :w<CR>:bp<CR>:bd #<CR> let g:which_key_map.b = 'buffers' let g:which_key_map.c = { 'name': '+nerd-commenter' } -let g:which_key_map.d = 'write-and-close-buffer' +let g:which_key_map.d = 'close-buffer' let g:which_key_map.e = 'files' let g:which_key_map.g = { 'name': '+grep' } let g:which_key_map.g.a = 'the_silver_searcher' diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index e810fe3..4c7d5c2 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -20,7 +20,7 @@ source /home/jozan/.config/nvim/bindings.vim source /home/jozan/.config/nvim/sidebars.vim source /home/jozan/.config/nvim/langs.vim source /home/jozan/.config/nvim/plug-config/airline.vim -" source /home/jozan/.config/nvim/plug-config/coc.vim +source /home/jozan/.config/nvim/plug-config/coc.vim source /home/jozan/.config/nvim/plug-config/floaterm.vim source /home/jozan/.config/nvim/plug-config/nerd-commenter.vim source /home/jozan/.config/nvim/plug-config/org.vim diff --git a/.config/nvim/langs.vim b/.config/nvim/langs.vim index cc441cd..26b96d7 100644 --- a/.config/nvim/langs.vim +++ b/.config/nvim/langs.vim @@ -1,5 +1,13 @@ let g:asmsyntax = 'asm' let perl_include_pod = 1 +autocmd BufNewFile,BufRead *.h + \ set filetype=c +autocmd BufNewFile,BufRead *.c + \ set filetype=c +autocmd BufNewFile,BufRead *.cxx + \ set filetype=cpp +autocmd BufNewFile,BufRead *.hxx + \ set filetype=cpp autocmd FileType fish \ compiler fish autocmd FileType perl diff --git a/.config/nvim/plug-config/airline.vim b/.config/nvim/plug-config/airline.vim index 7fe7088..7ccc408 100644 --- a/.config/nvim/plug-config/airline.vim +++ b/.config/nvim/plug-config/airline.vim @@ -6,6 +6,12 @@ let g:airline_theme = 'base16_default' let g:airline_powerline_fonts = 1 let g:airline_symbols_ascii = 1 let g:airline#parts#ffenc#skip_expected_string = 'utf-8[unix]' +let g:airline#extensions#whitespace#enabled = 1 +let g:airline#extensions#whitespace#checks = + \ [ 'indent', 'trailing', 'long', 'mixed-indent-file', 'conflicts' ] +let g:airline#extensions#whitespace#max_lines = 20000 +let g:airline#extensions#whitespace#show_message = 1 +let g:airline#extensions#whitespace#mixed_indent_algo = 2 let g:airline#extensions#battery#enabled = 1 let g:airline#extensions#coc#enabled = 1 let airline#extensions#coc#warning_symbol = 'W:' @@ -17,4 +23,4 @@ let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#buffer_idx_mode = 1 " let g:airline#extensions#tabline#left_sep = ' ' " let g:airline#extensions#tabline#left_alt_sep = '|' -let g:airline#extensions#tabline#formatter = 'unique_tail_improved' +let g:airline#extensions#tabline#formatter = 'default' diff --git a/.config/nvim/plug.vim b/.config/nvim/plug.vim index 543058a..38e8d08 100644 --- a/.config/nvim/plug.vim +++ b/.config/nvim/plug.vim @@ -14,7 +14,7 @@ Plug 'mg979/vim-visual-multi' Plug 'mhinz/vim-signify' Plug 'mhinz/vim-startify' Plug 'morhetz/gruvbox' -" Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'} +Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'} Plug 'paretje/nvim-man' Plug 'preservim/tagbar' Plug 'preservim/nerdcommenter' diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 5cf5301..816f05e 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -1,5 +1,5 @@ super + Return - /usr/local/bin/alacritty + /usr/local/bin/st super + p /usr/local/bin/dmenu_run -c -l 5 -m 0 -fn "mononoki Nerd Font:size=12" -nb "#222222" -nf "#bbbbbb" -sb "#b92121" -sf "#eeeeee" @@ -95,13 +95,16 @@ super + {Left,Down,Up,Right} /usr/local/bin/bspc node -v {-20 0,0 20,0 -20,20 0} super + 1 - /usr/local/bin/alacritty -e vifm + /usr/local/bin/st -e /usr/local/bin/vifm + super + 2 - /usr/local/bin/alacritty -e nvim + /usr/local/bin/st -e /usr/local/bin/nvim + super + 3 /usr/local/bin/firefox --kiosk https://start.duckduckgo.com/ + super + 4 - /usr/local/bin/alacritty -e w3m https://start.duckduckgo.com/ + /usr/local/bin/st -e /usr/local/bin/w3m https://start.duckduckgo.com/ {XF86AudioRaiseVolume} /usr/home/jozan/.local/bin/mixer-set raise >/dev/null 2>&1 diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 1db30d2..abea8be 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -73,7 +73,6 @@ filetype *.zip,*.rar,*.tar.gz ext %f fileviewer *.[1-8] man ./%c | col -b filetype *.[1-8] man ./%c -fileviewer *.jpg,*.jpeg,*.png,*.ico vifmimg draw %px %py %pw %ph %c %pc vifmimg clear filextype *.bmp,*.jpg,*.jpeg,*.png,*.ico,*.gif,*.xpm sxiv -b -ia %f 2>/dev/null & filextype *.svg inkscape %f 2>/dev/null & diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 4e9260a..a70c794 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -32,9 +32,11 @@ zle -N history-beginning-search-forward-end history-search-end setopt inc_append_history setopt share_history -autoload -U compinit +zstyle ':completion:*' completer _complete +zstyle ':completion:*' matcher-list '' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' '+l:|=* r:|=*' zstyle ':completion:*' menu select zstyle ':completion:*' list-colors 'di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30' +autoload -U compinit zmodload zsh/complist compinit _comp_options+=(globdots) diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh index 25f8fb2..aecf6cc 100644 --- a/.config/zsh/alias.zsh +++ b/.config/zsh/alias.zsh @@ -30,6 +30,7 @@ alias mkdir='mkdir -v' alias rmdir='rmdir -v' alias chmod='chmod -v' alias chown='chown -v' +alias mount='mount -v' alias grep='grep --color' alias diff='colordiff' alias tree='tree -C' @@ -58,6 +59,7 @@ alias mutt='neomutt' alias nmt='neomutt' alias sxiv='sxiv -b' alias pinfo='pkg info -x' +alias psearch='pkg search' search() { make -C /usr/ports search name=$1 | grep 'Path:'; } diff --git a/.local/bin/mpview b/.local/bin/mpview index 804a32d..c1ea734 100755 --- a/.local/bin/mpview +++ b/.local/bin/mpview @@ -64,19 +64,21 @@ sub main } $size = get_size(); if ($size != 0) { - print 'mpv --ytdl-format=[height<=' . $size . '] ' . $ARGV[0] . "\n"; + print 'mpv --really-quiet --audio-channels=stereo --ytdl-format=[height<=' . $size . '] ' . $ARGV[0] . "\n"; exec( 'mpv', '--really-quiet', + '--audio-channels=stereo', '--ytdl-format=[height<=' . $size . ']', $ARGV[0] ); } else { - print 'mpv ' . $ARGV[0] . "\n"; + print 'mpv --really-quiet --audio-channels=stereo ' . $ARGV[0] . "\n"; exec( 'mpv', '--really-quiet', + '--audio-channels=stereo', $ARGV[0] ); } |