diff --git a/vim/.config/nvim/ginit.vim b/vim/.config/nvim/ginit.vim
new file mode 100644
index 0000000..c8f8e7e
--- /dev/null
+++ b/vim/.config/nvim/ginit.vim
@@ -0,0 +1,29 @@
+" Enable Mouse
+set mouse=a
+
+" Set Editor Font
+if exists(':GuiFont')
+    " Use GuiFont! to ignore font errors
+    GuiFont Hack:10
+endif
+
+" Disable GUI Tabline
+if exists(':GuiTabline')
+    GuiTabline 0
+endif
+
+" Disable GUI Popupmenu
+if exists(':GuiPopupmenu')
+    GuiPopupmenu 0
+endif
+
+" Enable GUI ScrollBar
+if exists(':GuiScrollBar')
+    GuiScrollBar 1
+endif
+
+" Right Click Context Menu (Copy-Cut-Paste)
+nnoremap <silent><RightMouse> :call GuiShowContextMenu()<CR>
+inoremap <silent><RightMouse> <Esc>:call GuiShowContextMenu()<CR>
+xnoremap <silent><RightMouse> :call GuiShowContextMenu()<CR>gv
+snoremap <silent><RightMouse> <C-G>:call GuiShowContextMenu()<CR>gv
diff --git a/vim/.vimrc b/vim/.vimrc
index b5c728f..836b068 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -195,10 +195,6 @@ cmap w!! w !sudo tee > /dev/null %
 " Disable F1 key
 nmap <F1> <nop>
 
-" Go shortcuts just for .go files
-autocmd FileType go nmap <leader>r  <Plug>(go-run)
-autocmd FileType go nmap <leader>t  <Plug>(go-test)
-
 " ==================== File searching ====================
 set wildmenu
 set wildmode=list:full
@@ -212,10 +208,10 @@ nnoremap <leader>t :tabfind *
 
 " ==================== Fugitive ====================
 nnoremap <leader>ga :Git add %:p<CR><CR>
-nnoremap <leader>gs :Gstatus<CR>
-nnoremap <leader>gp :Gpush<CR>
-vnoremap <leader>gb :Gblame<CR>
-
+nnoremap <leader>gs :Git status<CR>
+nnoremap <leader>gp :Git push<CR>
+vnoremap <leader>gb :Git blame<CR>
+nnoremap <leader>gc :Git commit<CR>
 
 " =================== nvim ====================