One more try to getting back to vim.

This commit is contained in:
Bartek Stalewski 2021-10-27 15:43:35 +02:00
parent 0b356a0885
commit d4f36022a0
5 changed files with 17 additions and 13 deletions

View File

@ -11,9 +11,9 @@ rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~
mkdir -p ~/.cache/ ~/.config ~/.local/bin ~/.local/settings
## neovim
rm -rf ~/.config/nvim
ln -sf ~/.local/repos/dotfiles/nvim ~/.config/
touch ~/.local/settings/init.vim
rm -rf ~/.config/vim
ln -sf ~/.local/repos/dotfiles/vim ~/.config/
touch ~/.local/settings/vimrc
## fdignore
rm -rf ~/.config/fd

View File

@ -1,3 +1,4 @@
set runtimepath+=$XDG_CONFIG_HOME/vim
call plug#begin('$XDG_DATA_HOME/vim-plugins')
Plug 'fatih/molokai'
Plug 'junegunn/fzf'
@ -15,13 +16,16 @@ call plug#end()
set title
set number
set gdefault
set wildmenu
set nobackup
set incsearch
set expandtab
set smartcase
set splitbelow
set splitright
set ignorecase
set nohlsearch
set autoindent
set noshowmode
set shiftround
set cursorline
@ -32,11 +36,16 @@ set nowritebackup
set bs=2
set tabstop=2
set scrolloff=5
set backspace=eol,start,indent
set matchpairs+=(:),{:},[:],<:>,':',":"
set laststatus=2
set shiftwidth=2
set showtabline=0
set softtabstop=2
set winminheight=0
set matchpairs+=(:),{:},[:],<:>,':',":"
runtime ftplugin/man.vim
autocmd FileType man setlocal nogdefault nonumber nocursorcolumn
nmap <tab> <C-w>w
nmap <Esc><CR> :wq!<CR>
@ -92,4 +101,4 @@ function! LightLineReadonly()
return &readonly && &filetype !=# 'help' ? 'RO' : ''
endfunction
source ~/.local/settings/init.vim
source ~/.local/settings/vimrc

View File

@ -8,7 +8,9 @@ setopt HIST_REDUCE_BLANKS
setopt SHARE_HISTORY
export PATH=~/.local/bin:$PATH
export MANPAGER="nvim +Man!"
export EDITOR=vim
export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
export MANPAGER="vim -M +MANPAGER"
export LESSHISTFILE='/dev/null'
[ ! -L ~/.cache ] && { rm -rf ~/.cache; ln -sf $XDG_CACHE_HOME ~/.cache ; }

View File

@ -16,13 +16,6 @@ fi
if [ $(command -v fd) ]; then
alias fd='fd -H -L --ignore-file ~/.local/settings/fd'
fi
if [ $(command -v nvim) ]; then
export EDITOR='nvim'
alias vim='nvim'
alias vimdiff='nvim -d'
else
export EDITOR='vim'
fi
function ud() {
wd dots