diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
new file mode 100644
index 0000000..0528a65
--- /dev/null
+++ b/ftplugin/fish.vim
@@ -0,0 +1 @@
+:compiler fish
diff --git a/vimrc b/vimrc
index 4b475c6..490ba01 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,9 @@
 " ●
 
+if &shell =~# 'fish$'
+    set shell=bash
+endif
+
 runtime vimrc-config
 
 let g:vimrc_load_dev_plugins = exists('g:vimrc_load_dev_plugins')
@@ -87,12 +91,14 @@ let g:mta_filetypes = {
 if executable('fzf') && v:version >= 704
   Plug 'junegunn/fzf.vim'
 
+  nnoremap <space>fg :GFiles<CR>
   nnoremap <space>ff :Files<CR>
+  nnoremap <space>fr :History<CR>
   nnoremap <space>ft :Tags<CR>
   nnoremap <space>fb :Buffers<CR>
   nnoremap <space>fh :Helptags<CR>
   nnoremap <space>fa :Ag<CR>
-  nnoremap <space>fg :Ag!<CR>
+  nnoremap <space>fA :Ag!<CR>
 
   " Ag! gives fullscreen with preview
   command! -bang -nargs=* Ag
@@ -123,6 +129,7 @@ endif
 Plug 'plasticboy/vim-markdown'
 let g:vim_markdown_toc_autofit = 1
 let g:vim_markdown_fenced_languages = ['bash=sh']
+
 "   #vim-qlist {{{
 " Original: https://github.com/romainl/vim-qlist
 Plug 'studio-vx/vim-qlist'
@@ -452,6 +459,11 @@ if g:vimrc_load_dev_plugins
   " https://github.com/tpope/vim-dispatch
   Plug 'tpope/vim-dispatch'
 
+  "}}}
+"   #vim-fish{{{
+  " https://github.com/dag/vim-fish
+  Plug 'dag/vim-fish'
+
   "}}}
 "   #vim-gutentags {{{
   " https://github.com/ludovicchabant/vim-gutentags
@@ -1102,7 +1114,7 @@ set listchars=eol:¬,tab:>-,trail:~,extends:>,precedes:<,space:·
 
 set foldtext=MyFoldText()
 set conceallevel=2
-set concealcursor=n
+set concealcursor=
 "----------------------------------------------------------------------------}}}
 " #mappings {{{
 let g:mapleader = ' '