From d4f36022a0ea85fc438af8ddf277592caa1f4fa3 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Wed, 27 Oct 2021 15:43:35 +0200
Subject: [PATCH] One more try to getting back to vim.

---
 install.sh                      |  6 +++---
 {nvim => vim}/autoload/plug.vim |  0
 nvim/init.vim => vim/vimrc      | 13 +++++++++++--
 zsh/.zshrc                      |  4 +++-
 zsh/aliases.zsh                 |  7 -------
 5 files changed, 17 insertions(+), 13 deletions(-)
 rename {nvim => vim}/autoload/plug.vim (100%)
 rename nvim/init.vim => vim/vimrc (90%)

diff --git a/install.sh b/install.sh
index 925bbd5..16c9428 100644
--- a/install.sh
+++ b/install.sh
@@ -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
diff --git a/nvim/autoload/plug.vim b/vim/autoload/plug.vim
similarity index 100%
rename from nvim/autoload/plug.vim
rename to vim/autoload/plug.vim
diff --git a/nvim/init.vim b/vim/vimrc
similarity index 90%
rename from nvim/init.vim
rename to vim/vimrc
index b1817a8..0a1b791 100644
--- a/nvim/init.vim
+++ b/vim/vimrc
@@ -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
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 645d45d..3aa6f57 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -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 ; }
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index ea0ead7..1b4619d 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -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