aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2017-12-22 19:15:32 +0100
committerAdrian Kummerlaender2017-12-22 19:15:32 +0100
commit69522f13976bbebc8f49ab3e3a2da2253d60c963 (patch)
tree92af313237320b11bc5cad228e77acc5f93f4149
parent812a7abb72486519b075d2937692e4fd74488e34 (diff)
downloaddotfiles-69522f13976bbebc8f49ab3e3a2da2253d60c963.tar
dotfiles-69522f13976bbebc8f49ab3e3a2da2253d60c963.tar.gz
dotfiles-69522f13976bbebc8f49ab3e3a2da2253d60c963.tar.bz2
dotfiles-69522f13976bbebc8f49ab3e3a2da2253d60c963.tar.xz
dotfiles-69522f13976bbebc8f49ab3e3a2da2253d60c963.zip
Add vim-easymotion, vim-incsearch, fzf
-rw-r--r--busking/.config/busking/config1
-rw-r--r--fish/.config/fish/config.fish1
-rw-r--r--vim/.vimrc44
3 files changed, 25 insertions, 21 deletions
diff --git a/busking/.config/busking/config b/busking/.config/busking/config
index ed1add9..438bcb9 100644
--- a/busking/.config/busking/config
+++ b/busking/.config/busking/config
@@ -8,4 +8,5 @@ application/x-mobipocket-ebook = ebook-viewer
application/epub* = ebook-viewer
application/vnd.ms-excel = libreoffice
inode/directory = ranger?:urxvtc
+model/x.stl-binary = fstl
@^(https?://|www\.) = firefox
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 67f0781..b6caa42 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -9,6 +9,7 @@ alias ls='ls -h --color --group-directories-first'
alias csi='csi -q'
alias mp3-dl='youtube-dl --extract-audio --audio-format mp3 -o "%(title)s.%(ext)s"'
alias weather='curl wttr.in/Karlsruhe'
+alias ff='vim (fzf --height 50%)'
eval (dircolors -c ~/.dir_colors)
eval (python -m virtualfish)
diff --git a/vim/.vimrc b/vim/.vimrc
index 7a5678f..4a8d44c 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,24 +1,27 @@
call plug#begin('~/.vim/plugins')
-Plug 'ctrlpvim/ctrlp.vim' " fuzzy file, ctag search
-Plug 'scrooloose/nerdtree' " nicer file browser with sidebar support
-Plug 'simnalamburt/vim-mundo' " visualize undo tree
-Plug 'vim-airline/vim-airline' " better status bar
-Plug 'vim-airline/vim-airline-themes' " airline themes
-Plug 'tpope/vim-unimpaired' " bracket mappings
-Plug 'airblade/vim-gitgutter' " display git diffs alongside line numbers
-Plug 'qpkorr/vim-renamer' " file renaming utility
-Plug 'vim-pandoc/vim-pandoc' " `pandoc` integration
-Plug 'vim-pandoc/vim-pandoc-syntax' " `pandoc` syntax module
-Plug 'junegunn/goyo.vim' " distraction free writing mode
-Plug 'elmanuelito/vim-matlab-behave' " add basic matlab support
-Plug 'vim-latex/vim-latex' " latex integration, main usecase for me is the concealment of math expressions
-Plug 'Chiel92/vim-autoformat' " autoformatting integration
-Plug 'majutsushi/tagbar' " display ctag tree in sidebar
-Plug 'godlygeek/tabular' " text alignment helper
-Plug 'MarcWeber/vim-addon-local-vimrc' " folder specific vim configuration
-Plug 'nathanaelkane/vim-indent-guides' " pretty indentations
-Plug 'octol/vim-cpp-enhanced-highlight' " better C++ highlighting
+Plug 'ctrlpvim/ctrlp.vim' " fuzzy file, ctag search
+Plug 'scrooloose/nerdtree' " nicer file browser with sidebar support
+Plug 'simnalamburt/vim-mundo' " visualize undo tree
+Plug 'vim-airline/vim-airline' " better status bar
+Plug 'vim-airline/vim-airline-themes' " airline themes
+Plug 'tpope/vim-unimpaired' " bracket mappings
+Plug 'airblade/vim-gitgutter' " display git diffs alongside line numbers
+Plug 'qpkorr/vim-renamer' " file renaming utility
+Plug 'vim-pandoc/vim-pandoc' " `pandoc` integration
+Plug 'vim-pandoc/vim-pandoc-syntax' " `pandoc` syntax module
+Plug 'junegunn/goyo.vim' " distraction free writing mode
+Plug 'elmanuelito/vim-matlab-behave' " add basic matlab support
+Plug 'vim-latex/vim-latex' " latex integration, main usecase for me is the concealment of math expressions
+Plug 'Chiel92/vim-autoformat' " autoformatting integration
+Plug 'majutsushi/tagbar' " display ctag tree in sidebar
+Plug 'godlygeek/tabular' " text alignment helper
+Plug 'MarcWeber/vim-addon-local-vimrc' " folder specific vim configuration
+Plug 'nathanaelkane/vim-indent-guides' " pretty indentations
+Plug 'octol/vim-cpp-enhanced-highlight' " better C++ highlighting
+Plug 'easymotion/vim-easymotion' " visual motion help
+Plug 'haya14busa/incsearch.vim' " visual incremental search
+Plug 'haya14busa/incsearch-easymotion.vim' " intergration of incsearch and easymotion
call plug#end()
@@ -57,11 +60,10 @@ set smartcase
let mapleader=","
map <leader>s :let @/=""<CR>
-map <leader>fc :foldclose<CR>
-map <leader>fo :foldopen<CR>
map <leader>t :Tab/\|<CR>
map <leader>c zz
map <leader>d <c-]>
+map <leader>f <Plug>(incsearch-easymotion-/)
nmap <backspace> :e#<CR>
nmap f za