fix

git/.gitconfig

@@ -4,7 +4,7 @@
 [core]
   autocrlf = input
   quotepath = false
-  editor = nvim
+  editor = vim
   excludesfile = ~/.dotfile/git/.gitignore
 [push]
   default = current
@@ -38,7 +38,7 @@
   ba = branch -a
   bm = branch --merged
   bn = branch --no-merged
-  pl = pull
+  pu = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
   pt = push origin --tags
   ph = push origin HEAD
   merge2 = !sh -c '_CURRENT_BRANCH=$(git symbolic-ref --short HEAD) && git checkout $1 && git merge $_CURRENT_BRANCH && git checkout $_CURRENT_BRANCH' -

nvim/lua/config/options.lua

@@ -1,20 +1,20 @@
 vim.g.autoformat = true
 
-vim.cmd('set iskeyword+=-') -- treat dash separated words as a word text object"
+vim.cmd("set iskeyword+=-") -- treat dash separated words as a word text object"
-vim.cmd('set shortmess+=c') -- Don't pass messages to |ins-completion-menu|.
+vim.cmd("set shortmess+=c") -- Don't pass messages to |ins-completion-menu|.
-vim.cmd('set inccommand=split') -- Make substitution work in realtime
+vim.cmd("set inccommand=split") -- Make substitution work in realtime
 vim.opt.hidden = true -- Required to keep multiple buffers open multiple buffers
 vim.opt.title = true
-TERMINAL = vim.fn.expand('$TERMINAL')
+TERMINAL = vim.fn.expand("$TERMINAL")
 vim.cmd('let &titleold="' .. TERMINAL .. '"')
 vim.opt.titlestring = "%<%F%=%l/%L - nvim"
 vim.wo.wrap = true -- Display long lines as just one line
-vim.cmd('set whichwrap+=<,>,[,],h,l') -- move to next line with theses keys
+vim.cmd("set whichwrap+=<,>,[,],h,l") -- move to next line with theses keys
-vim.cmd('syntax on') -- syntax highlighting
+vim.cmd("syntax on") -- syntax highlighting
 vim.opt.pumheight = 10 -- Makes popup menu smaller
 vim.opt.fileencoding = "utf-8" -- The encoding written to file
 vim.opt.cmdheight = 2 -- More space for displaying messages
-vim.cmd('set colorcolumn=99999') -- fix indentline for now
+vim.cmd("set colorcolumn=99999") -- fix indentline for now
 vim.opt.mouse = "a" -- Enable your mouse
 vim.opt.splitbelow = true -- Horizontal splits will automatically be below
 vim.opt.termguicolors = true -- set term gui colors most terminals support this
@@ -34,9 +34,9 @@ vim.opt.backup = false -- This is recommended by coc
 vim.opt.writebackup = false -- This is recommended by coc
 vim.wo.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text each time
 vim.opt.updatetime = 300 -- Faster completion
-vim.opt.timeoutlen = 100 -- By default timeoutlen is 1000 ms
+vim.opt.timeoutlen = 500 -- By default timeoutlen is 1000 ms
 vim.opt.clipboard = "unnamedplus" -- Copy paste between vim and everything else
-vim.cmd('filetype plugin on') -- filetype detection
+vim.cmd("filetype plugin on") -- filetype detection
 -- vim.opt.guifont = "JetBrainsMono\\ Nerd\\ Font\\ Mono:h18"
 -- vim.opt.guifont = "Hack\\ Nerd\\ Font\\ Mono"
 -- vim.opt.guifont = "SauceCodePro Nerd Font:h17"
@@ -45,11 +45,11 @@ vim.opt.guifont = "FiraCode Nerd Font:h17"
 -- vim.opt.guifont = "JetBrains\\ Mono\\ Regular\\ Nerd\\ Font\\ Complete"
 vim.g.vim_markdown_folding_disabled = 1
 
-vim.g.vimspector_enable_mappings = 'HUMAN'
+vim.g.vimspector_enable_mappings = "HUMAN"
-vim.g['test#go#rspec#options'] = { nearest= '--v', suite=   '--v' }
+vim.g["test#go#rspec#options"] = { nearest = "--v", suite = "--v" }
 
 -- git blame
-vim.cmd('highlight default link gitblame SpecialComment')
+vim.cmd("highlight default link gitblame SpecialComment")
 vim.g.gitblame_enabled = 0
 
 -- last position jump

script/sourceit.sh

@@ -0,0 +1,2 @@
+#/bin/fish
+source $HOME/.config/fish/config.fish