configs

git clone git://git.codymlewis.com/configs.git
Log | Files | Refs | README

commit 16d28cef14fb137756f42ca54814c1853ce00598
parent 3759d6215d94806d88c644bec4d2aa0a81068354
Author: Cody Lewis <cody@codymlewis.com>
Date:   Fri, 25 Sep 2020 16:39:31 +1000

Updated mpv, mpd, vim, ncmpcpp, and zsh configs

Diffstat:
M.gitignore | 3+++
Mmpd/mpd.conf | 5+++++
Mmpv/mpv.conf | 1-
Mncmpcpp/config | 10+++++-----
Mvim/vimrc | 13++++++++++++-
Mzsh/.zprofile | 14++++++--------
Mzsh/.zshrc | 15+++++++++++++--
7 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore @@ -38,3 +38,6 @@ mpd/database Android Open Source Project/ QtProject.conf .zcompdump +mutt/secrets.gpg +mutt/gpg.rc +mutt/sig diff --git a/mpd/mpd.conf b/mpd/mpd.conf @@ -60,6 +60,11 @@ audio_output { mixer_index "0" # optional } +# audio_output { +# type "alsa" +# name "ALSA" +# } + replaygain "auto" #replaygain_preamp "0" #replaygain_missing_preamp "0" diff --git a/mpv/mpv.conf b/mpv/mpv.conf @@ -1,3 +1,2 @@ -hwdec=vaapi sub-auto=fuzzy ytdl-raw-options=sub-format=en,write-srt= diff --git a/ncmpcpp/config b/ncmpcpp/config @@ -12,7 +12,7 @@ mpd_crossfade_time = 2 ## Available values: spectrum, wave, wave_filled, ellipse. visualizer_type = wave_filled visualizer_look = ●▮ -visualizer_color = cyan +visualizer_color = yellow # song_list_format = {%a - }{%t}|{$8%f$9}$R{$3(%l)$9} #song_status_format = {{%a{ "%b"{ (%y)}} - }{%t}}|{%f} @@ -75,16 +75,16 @@ colors_enabled = yes # empty_tag_color = cyan # header_window_color = cyan volume_color = default:b -state_line_color = 55 -state_flags_color = red:b +state_line_color = green +state_flags_color = cyan:b main_window_color = white color1 = white color2 = green progressbar_color = 60:b -progressbar_elapsed_color = 55:b +progressbar_elapsed_color = red:b # statusbar_color = default # statusbar_time_color = default:b -player_state_color = red:b +player_state_color = cyan:b # alternative_ui_separator_color = black:b # window_border_color = green # active_window_border = red diff --git a/vim/vimrc b/vim/vimrc @@ -37,6 +37,13 @@ endif filetype plugin indent on syntax enable +augroup filetypedetect + " Mail + autocmd BufRead,BufNewFile *mutt-* setfiletype mail + autocmd BufRead,BufNewFile *tex setlocal spell + autocmd BufRead,BufNewFile *md setlocal spell +augroup END + " Plugin config let g:airline#extensions#tabline#enabled = 1 let g:AutoPairsUseInsertedCount = 1 @@ -55,6 +62,8 @@ imap <expr><TAB> \ neosnippet#expandable_or_jumpable() ? \ "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>" +set completeopt-=preview + if has('conceal') set conceallevel=2 concealcursor=niv endif @@ -80,6 +89,7 @@ nmap <leader>h :wincmd h<CR> nmap <leader>j :wincmd j<CR> nmap <leader>k :wincmd k<CR> nmap <leader>l :wincmd l<CR> +nmap <leader>t :vsplit +terminal<CR> set number set relativenumber @@ -108,8 +118,9 @@ set wrap map <tab> :bnext<CR> map <s-tab> :bprevious<CR> -map <f9> :Explore<CR> +map <C-t> :Explore<CR> map <f10> :buffer<space> +map <C-w> :bd<CR> map <f5> :make<CR> map <f2> :set paste!<CR> diff --git a/zsh/.zprofile b/zsh/.zprofile @@ -2,11 +2,10 @@ export EDITOR="nvim" export TERMINAL="st" -export BROWSER="brave" +export BROWSER="chromium" export READER="zathura" -export XDG_CONFIG_HOME="$HOME.config" +export XDG_CONFIG_HOME="$HOME/.config" export XDG_USER_CONFIG_DIR="$XDG_CONFIG_HOME" -export PATH="$HOME.local/bin:$PATH" export HISTFILE="$XDG_CONFIG_HOME"/zsh/history export HISTFILESIZE=1000000000 export HISTSIZE=1000000000 @@ -17,15 +16,14 @@ export ANDROID_HOME="$HOME/Android/Sdk" export ANDROID_NDK_ROOT="$ANDROID_HOME/ndk/21.1.6352462/" export ANDROIDAPI="26" # export NDKAPI="21" +export PATH="$HOME/.local/bin:$ANDROID_HOME/platform-tools:$PATH" -[ -d "$HOME.nvm" ] && export NVM_DIR="$HOME/.nvm" && \ +[ -d "$HOME/.nvm" ] && export NVM_DIR="$HOME/.nvm" && \ [ -s "$NVM_DIR/nvm.sh" ] && \. "NVM_DIR/nvm.sh" -[ -d "$HOME/bin" ] && export PATH="$HOME/bin:$PATH" - # Add RVM to PATH for scripting. -[ -d "$HOME.rvm" ] && export PATH="$PATH:$HOME.rvm/bin" -[[ -s "$HOME.rvm/scripts/rvm" ]] && source "$HOME.rvm/scripts/rvm" +[ -d "$HOME/.rvm" ] && export PATH="$PATH:$HOME/.rvm/bin" +[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" pgrep 'mpd' > /dev/null || mpd ~/.config/mpd/mpd.conf & pgrep 'startx' > /dev/null || startx diff --git a/zsh/.zshrc b/zsh/.zshrc @@ -2,11 +2,22 @@ zmodload zsh/complist autoload -Uz compinit +autoload -Uz vcs_info compinit setopt COMPLETE_ALIASES +precmd_vcs_info() { vcs_info } +precmd_functions+=( precmd_vcs_info ) +setopt prompt_subst + zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' zstyle ':completion:*' completer _expand _complete _ignored _approximate _prefix zstyle ':completion:*' menu select=2 +zstyle ':vcs_info:git:*' formats '%F{240}(%b)%f%F{red}%u%f%F{green}%c%f' +zstyle ':vcs_info:git:*' check-for-changes true +zstyle ':vcs_info:git:*' check-for-staged-changes true +zstyle ':vcs_info:git:*' stagedstr '+' +zstyle ':vcs_info:git:*' unstagedstr '*' +zstyle ':vcs_info:*' enable git autoload -Uz up-line-or-beginning-search down-line-or-beginning-search zle -N up-line-or-beginning-search @@ -19,7 +30,8 @@ setopt SHARE_HISTORY [[ -n "${key[Up]}" ]] && bindkey -- "${key[Up]}" up-line-or-beginning-search [[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search -export PROMPT="%F{green}%n%f%F{yellow}@%f%B%F{blue}%m%b%f %F{magenta}%~%f %F{red}%#%f " +export PROMPT="%F{yellow}[%f%(?.%F{green}.%F{red})%?%f%F{yellow}]%f %B%F{magenta}%~%f%b %F{red}%#%f " +export RPROMPT="\$vcs_info_msg_0_" bindkey -e @@ -38,7 +50,6 @@ alias k="kak" alias v="nvim" alias vs="nvim -S" alias vt="nvim -t" -alias e="emacsclient -nw" alias z="zathura" alias g="git" alias x='exit'