I need to commit more often..

This commit is contained in:
Mark Riedesel 2020-01-11 07:52:28 -06:00
parent 891f6219d5
commit 95b9939333
4 changed files with 25 additions and 16 deletions

View file

@ -1,5 +1,9 @@
font_family Envy Code R font_family Envy Code R
bold_font Envy Code R Bold
italic_font Envy Code R Italic
font_size 10.0 font_size 10.0
window_padding_width 10.0 window_padding_width 10.0
term xterm-256color term xterm-256color
enable_audio_bell no

View file

@ -25,6 +25,9 @@ set smartcase
set ignorecase set ignorecase
set incsearch " search as you type set incsearch " search as you type
set hidden " sometimes I don't want to save a buffer before switching away from it set hidden " sometimes I don't want to save a buffer before switching away from it
set cmdheight=2
set updatetime=300
set signcolumn=yes
set completeopt-=preview set completeopt-=preview
set matchtime=1 set matchtime=1
@ -76,16 +79,18 @@ Plug 'tpope/vim-fugitive', "{{{
map \gs :Gstatus<CR> map \gs :Gstatus<CR>
"}}} "}}}
Plug 'carlitux/deoplete-ternjs', {'do': 'npm install -g tern'} Plug 'carlitux/deoplete-ternjs', {'do': 'npm install -g tern'}
Plug 'w0rp/ale', "{{{ "Plug 'w0rp/ale', "{{{
let g:ale_linters = { " let g:ale_linters = {
\ 'c': ['clang'], " \ 'c': ['clang'],
\ 'cpp': ['clangx'], " \ 'cpp': ['clangx'],
\ 'php': ['phpcs'], " \ 'php': ['phpcs'],
\ 'javascript': ['eslint'], " \ 'javascript': ['eslint'],
\} " \}
let g:ale_python_pylint_options = '--load-plugins pylint_django' " let g:ale_python_pylint_options = '--load-plugins pylint_django'
let g:ale_sign_error = '⬤' " let g:ale_sign_error = '⬤'
"}}} ""}}}
" Use release branch (Recommend)
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'vim-airline/vim-airline-themes' Plug 'vim-airline/vim-airline-themes'
Plug 'vim-airline/vim-airline', "{{{ Plug 'vim-airline/vim-airline', "{{{
let g:airline_symbols = {} let g:airline_symbols = {}

View file

@ -1,5 +1,5 @@
alias wallpaper="feh --bg-fill -z" alias wallpaper="feh --bg-fill -z"
alias retheme="wal -q -t -i ~/wallpaper" alias retheme="wal -q -t -i ~/wallpaper --saturate 0.8"
alias svim="sudo nvim" alias svim="sudo nvim"
alias capesc="setxkbmap -option caps:escape" alias capesc="setxkbmap -option caps:escape"
alias mapstylus='xinput --map-to-output $(xinput --list --id-only "ELAN2514:00 04F3:2594 Pen Pen (0)") eDP-1' alias mapstylus='xinput --map-to-output $(xinput --list --id-only "ELAN2514:00 04F3:2594 Pen Pen (0)") eDP-1'
@ -33,6 +33,6 @@ alias egrep='egrep --color=auto'
alias edit='${EDITOR}:-vim}' alias edit='${EDITOR}:-vim}'
# Prefer neovim if available # Prefer neovim if available
if (( $+commands[nvim] )) then # if (( $+commands[nvim] )) then
alias vim='nvim' # alias vim='nvim'
fi # fi

2
zshrc
View file

@ -9,7 +9,7 @@ setopt COMPLETE_IN_WORD # Allow completion from within a word/phrase
setopt PROMPT_SUBST # Enable parameter expansion, etc. in prompt setopt PROMPT_SUBST # Enable parameter expansion, etc. in prompt
# aliases # aliases
alias retheme='wal -q -t -i ~/wallpaper' alias retheme='wal -q -t -i ~/wallpaper -saturate 0.8'
alias sudo='sudo ' alias sudo='sudo '
alias tmux='TERM=xterm-256color tmux' alias tmux='TERM=xterm-256color tmux'
alias svim='sudo vim' alias svim='sudo vim'