Remove nvim
This commit is contained in:
35
files/.vimrc
35
files/.vimrc
@@ -20,14 +20,6 @@ Plug 'jiangmiao/auto-pairs' " pair completion
|
|||||||
|
|
||||||
Plug 'airblade/vim-gitgutter' " show git changes
|
Plug 'airblade/vim-gitgutter' " show git changes
|
||||||
|
|
||||||
Plug 'itchyny/lightline.vim' " bar
|
|
||||||
Plug 'ryanoasis/vim-devicons' " icons in bar
|
|
||||||
|
|
||||||
if executable("fzf") " fzf support and bindings
|
|
||||||
Plug 'junegunn/fzf'
|
|
||||||
Plug 'junegunn/fzf.vim'
|
|
||||||
endif
|
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
" ============================== Colors
|
" ============================== Colors
|
||||||
@@ -63,25 +55,6 @@ set scrolloff=5 " min lines above or below the cursor
|
|||||||
set laststatus=2
|
set laststatus=2
|
||||||
set showtabline=0
|
set showtabline=0
|
||||||
|
|
||||||
function! GitStatus()
|
|
||||||
let [a,m,r] = GitGutterGetHunkSummary()
|
|
||||||
return printf('+%d ~%d -%d', a, m, r)
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! FileNameWithIcon() abort
|
|
||||||
return winwidth(0) > 70 ? WebDevIconsGetFileTypeSymbol() . ' ' . expand('%:T') : ''
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
let g:lightline = { 'colorscheme': 'gruvbox' }
|
|
||||||
|
|
||||||
let g:lightline.component_function = { 'gitstatus': 'GitStatus' }
|
|
||||||
let g:lightline.component = { 'filename_with_icon': '%{FileNameWithIcon()}' }
|
|
||||||
|
|
||||||
let g:lightline.active = {
|
|
||||||
\ 'left': [['mode', 'readonly'], ['filename_with_icon', 'modified']],
|
|
||||||
\ 'right': [['lineinfo'], ['percent'], ['gitstatus', 'fileformat', 'fileencoding', 'filetype']]
|
|
||||||
\ }
|
|
||||||
|
|
||||||
" ============================== Indents and Whitespaces
|
" ============================== Indents and Whitespaces
|
||||||
set list
|
set list
|
||||||
set listchars=tab:──\ ,extends:›,precedes:‹,nbsp:·,trail:·
|
set listchars=tab:──\ ,extends:›,precedes:‹,nbsp:·,trail:·
|
||||||
@@ -113,11 +86,3 @@ cmap Wq wq
|
|||||||
cmap Q q
|
cmap Q q
|
||||||
cmap W w
|
cmap W w
|
||||||
cmap q1 q!
|
cmap q1 q!
|
||||||
|
|
||||||
" fzf
|
|
||||||
if has ("nvim")
|
|
||||||
nmap <leader>ff :Files<CR>
|
|
||||||
nmap <leader>ft :enew<CR>:Files<CR>
|
|
||||||
else
|
|
||||||
nmap <leader>ft :enew<CR>
|
|
||||||
end
|
|
||||||
|
|||||||
14
files/.zshrc
14
files/.zshrc
@@ -43,15 +43,15 @@ esac
|
|||||||
export PROMPT="${NAME}${DIR}${GIT} ${ICON}%{$reset_color%} "
|
export PROMPT="${NAME}${DIR}${GIT} ${ICON}%{$reset_color%} "
|
||||||
zstyle ':vcs_info:git:*' formats '|%b '
|
zstyle ':vcs_info:git:*' formats '|%b '
|
||||||
|
|
||||||
|
export EDITOR="vim"
|
||||||
|
export VISIAL=${EDITOR}
|
||||||
|
|
||||||
# ============================== Aliases
|
# ============================== Aliases
|
||||||
alias emacsnw="TERM=alacritty-direct emacsclient -nw -a 'vim'"
|
alias emacsnw="TERM=alacritty-direct emacsclient -nw -a 'vim'"
|
||||||
alias fontscache="fc-cache -f -v"
|
alias fontscache="fc-cache -f -v"
|
||||||
alias ofen="cc"
|
alias ofen="cc"
|
||||||
alias mon2cam="deno run --unstable -A -r -q https://raw.githubusercontent.com/ShayBox/Mon2Cam/master/src/mod.ts"
|
alias uni="cd ~/data/nextcloud/uni"
|
||||||
|
alias duni="cd ~/dev/uni/"
|
||||||
if command -v nvim &> /dev/null; then
|
|
||||||
alias vim="nvim"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if command -v rg &> /dev/null; then
|
if command -v rg &> /dev/null; then
|
||||||
alias grep="rg"
|
alias grep="rg"
|
||||||
@@ -79,10 +79,6 @@ if [ -f ~/.zshrc_local ]; then
|
|||||||
source ~/.zshrc_local
|
source ~/.zshrc_local
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ============================== Exports
|
|
||||||
export EDITOR="vim"
|
|
||||||
export VISUAL="vim"
|
|
||||||
|
|
||||||
# ============================== Completion
|
# ============================== Completion
|
||||||
unsetopt menu_complete # do not autoselect the first completion entry
|
unsetopt menu_complete # do not autoselect the first completion entry
|
||||||
unsetopt flowcontrol
|
unsetopt flowcontrol
|
||||||
|
|||||||
Reference in New Issue
Block a user