1
0
mirror of https://github.com/alrayyes/server-dotfiles synced 2023-11-14 15:56:25 +00:00

Compare commits

...

5 Commits

Author SHA1 Message Date
c459edde5d fixed error 2020-08-24 14:31:14 +02:00
Ryan Kes
ff3cc0ab9c use ripgrep with fzf 2020-08-24 14:22:39 +02:00
a626c4f78b colorize diff and make sure fzf uses ripgrep 2020-08-24 14:14:01 +02:00
6b87c06fdf don't use coc 2020-08-24 14:07:28 +02:00
Ryan Kes
62df494508 neovim config now in sync with desktop dotfiles 2020-08-24 14:00:45 +02:00
4 changed files with 62 additions and 12 deletions

View File

@ -90,9 +90,9 @@ A repository of my personal server configuration files.
*** General
- [[https://github.com/bling/vim-bufferline][bling/vim-bufferline]]
- [[https://github.com/ctrlpvim/ctrlp.vim][ctrlp/ctrlp.vim]]
- [[https://github.com/easymotion/vim-easymotion][easymotion/vim-easymotion]]
- [[https://github.com/farmergreg/vim-lastplace][farmergreg/vim-lastplace]]
-[[https://github.com/junegunn/fzf][ junegunn/fzf]]
- [[https://github.com/justinmk/vim-sneak][justinmk/vim-sneak]]
- [[https://github.com/junegunn/fzf.vim][junegunn/fzf.vim]]
- [[https://github.com/mbbill/undotree][mbbill/undotree]]
- [[https://github.com/mhinz/vim-signify][mhinz/vim-signify]]
- [[https://github.com/myusuf3/numbers.vim][myusuf3/numbers.vim]]
@ -104,6 +104,7 @@ A repository of my personal server configuration files.
- [[https://github.com/vim-airline/vim-airline][vim-airline/vim-airline]]
*** Programming
- [[https://github.com/airblade/vim-gitgutter][airblade/vim-gitgutter]]
- [[https://github.com/alvan/vim-closetag][alvan/vim-closetag]]
- [[https://github.com/dense-analysis/ale][dense-analysis/ale]]
- [[https://github.com/godlygeek/tabular][godlygeek/tabular]]
- [[https://github.com/preservim/nerdcommenter][preservim/nerdcommenter]]
@ -115,7 +116,6 @@ A repository of my personal server configuration files.
*** UI
- [[https://github.com/morhetz/gruvbox][morhetz/gruvbox]]
- [[https://github.com/ryanoasis/vim-devicons][ryanoasis/vim-devicons]]
* Configuration
** Installation
#+BEGIN_SRC shell

View File

@ -39,12 +39,12 @@ set -xg RUSTUP_HOME ~/.local/share/rustup
set -xg GOPATH ~/.local/share/go
# nvim alias
abbr --add v "nvim"
abbr --add sv "sudo nvim"
abbr --add v 'nvim'
abbr --add sv 'sudo nvim'
# ls alias
abbr --add ls "exa"
abbr --add l "exa -al"
abbr --add ls 'exa'
abbr --add l 'exa -al'
# git alaises
abbr --add gpoat "git push origin --all && git push origin --tags"
@ -56,6 +56,9 @@ abbr --add g "git"
abbr --add mv "mv -i"
abbr --add rm "rm -i"
# Colorize diff
abbr --add diff "diff --color"
# Load lfcd wiith proper icons
function lf
set -lx LF_ICONS "\
@ -220,7 +223,6 @@ ex=:\
/usr/bin/lf
end
# bat
abbr --add bat "batcat"
@ -247,3 +249,9 @@ if set -q FZF_COMPLETE
bind -M insert \t '__fzf_complete'
end
end
# Make fzf use ripgrep if available
if type -q rg
export FZF_DEFAULT_COMMAND='rg --files'
export FZF_DEFAULT_OPTS='-m --height 50% --border'
end

View File

@ -17,10 +17,9 @@
Plug 'unblevable/quick-scope'
" }
Plug 'bling/vim-bufferline'
Plug 'easymotion/vim-easymotion'
Plug 'farmergreg/vim-lastplace'
Plug 'junegunn/fzf'
Plug 'justinmk/vim-sneak'
Plug 'ctrlpvim/ctrlp.vim'
Plug 'junegunn/fzf.vim'
Plug 'mbbill/undotree'
Plug 'mhinz/vim-signify'
Plug 'myusuf3/numbers.vim'
@ -34,6 +33,7 @@
" Programming {
Plug 'airblade/vim-gitgutter'
Plug 'alvan/vim-closetag'
Plug 'dense-analysis/ale'
Plug 'godlygeek/tabular'
Plug 'preservim/nerdcommenter'
@ -168,9 +168,42 @@
let g:ale_sign_warning = '⚠️'
" Fix files
let g:ale_fixers = {'javascript': ['prettier', 'eslint']}
let g:ale_fixers = {'javascript': ['prettier', 'eslint'], 'sh': ['shfmt'], 'json': ['prettier']}
" Fix files automatically on save
let g:ale_fix_on_save = 1
" }
" easymotion {
let g:EasyMotion_do_mapping = 0 " Disable default mappings
" Jump to anywhere you want with minimal keystrokes, with just one key binding.
" `s{char}{label}`
nmap s <Plug>(easymotion-overwin-f)
" or
" `s{char}{char}{label}`
" Need one more keystroke, but on average, it may be more comfortable.
nmap s <Plug>(easymotion-overwin-f2)
" Turn on case-insensitive feature
let g:EasyMotion_smartcase = 1
" JK motions: Line motions
map <Leader>j <Plug>(easymotion-j)
map <Leader>k <Plug>(easymotion-k)
" }
" fzf {
nnoremap <silent> <C-f> :Files<CR>
nnoremap <silent> <Leader>f :Rg<CR>
nnoremap <silent> <Leader>f :Rg<CR>
nnoremap <silent> <Leader>/ :BLines<CR>
nnoremap <silent> <Leader>' :Marks<CR>
nnoremap <silent> <Leader>g :Commits<CR>
nnoremap <silent> <Leader>H :Helptags<CR>
nnoremap <silent> <Leader>hh :History<CR>
nnoremap <silent> <Leader>h: :History:<CR>
nnoremap <silent> <Leader>h/ :History/<CR>
" }
" }

View File

@ -66,4 +66,13 @@ alias g="git"
alias mv="mv -i"
alias rm="rm -i"
# Colorize diff
alias diff="diff --color"
# Make fzf use ripgrep if available
if type rg &> /dev/null; then
export FZF_DEFAULT_COMMAND='rg --files'
export FZF_DEFAULT_OPTS='-m --height 50% --border'
fi
neofetch