From c40c7c7345179f7635cc5f604874ac81918ecad8 Mon Sep 17 00:00:00 2001
From: yannickreiss <yannick.reiss@protonmail.ch>
Date: Sun, 1 Sep 2024 07:26:14 +0200
Subject: [PATCH] Add floating term and autoclose, remove easycomplete, which
 caused problems

---
 config.vim                         |  9 +++++---
 plugin_configuration/ale.vim       |  7 ++++--
 plugin_configuration/autoclose.vim |  8 +++++++
 plugin_configuration/fzf.vim       |  7 ++++++
 plugin_configuration/smoothing.vim |  4 +++-
 plugins.vim                        | 34 +++++++++++++++---------------
 vanilla.vim                        |  4 ++++
 7 files changed, 50 insertions(+), 23 deletions(-)
 create mode 100644 plugin_configuration/autoclose.vim
 create mode 100644 plugin_configuration/fzf.vim

diff --git a/config.vim b/config.vim
index e32c743..8cf8d15 100644
--- a/config.vim
+++ b/config.vim
@@ -10,11 +10,14 @@ source ~/.config/vim/plugin_configuration/ale.vim
 " NERDTree show hidden files
 source ~/.config/vim/plugin_configuration/nerdtree.vim
 
-" Easycomplete keybindings and tabine config
-source ~/.config/vim/plugin_configuration/easycomplete.vim
-
 " Smoothing
 source ~/.config/vim/plugin_configuration/smoothing.vim
 
 " Update of plugins
 source ~/.config/vim/plugin_configuration/packagemanager.vim
+
+" FZF window bindings
+source ~/.config/vim/plugin_configuration/fzf.vim
+
+" Autoclose
+source ~/.config/vim/plugin_configuration/autoclose.vim
diff --git a/plugin_configuration/ale.vim b/plugin_configuration/ale.vim
index 71432dc..ee750e2 100644
--- a/plugin_configuration/ale.vim
+++ b/plugin_configuration/ale.vim
@@ -1,5 +1,8 @@
 " Fix files with prettier, and then ESLint.
 let b:ale_fixers = {'*': ['remove_trailing_lines', 'trim_whitespace']}
 let g:ale_fix_on_save = 1
-let g:ale_sign_error = '!'
-let g:ale_sign_warning = '?'
+let g:ale_sign_error = '>>'
+let g:ale_sign_warning = '--'
+let g:ale_ada_gpr_project_file = "default.gpr"
+let g:ale_ada_adals_project = 'default.gpr'
+let g:ale_ada_adals_executable = 'ada_language_server'
diff --git a/plugin_configuration/autoclose.vim b/plugin_configuration/autoclose.vim
new file mode 100644
index 0000000..3972577
--- /dev/null
+++ b/plugin_configuration/autoclose.vim
@@ -0,0 +1,8 @@
+let g:AutoPairsFlyMode = 1
+let g:AutoPairsShortcutBackInsert = '<M-b>'
+
+let g:AutoPairs = {'(':')', '[':']', '{':'}',"'":"'",'"':'"', "`":"`", '```':'```', '"""':'"""', "'''":"'''", "<!--":"-->"}
+
+" Could battle Ultisnips!
+au FileType ada let b:AutoPairs = AutoPairsDefine({'begin' : 'end'})
+
diff --git a/plugin_configuration/fzf.vim b/plugin_configuration/fzf.vim
new file mode 100644
index 0000000..7a85c20
--- /dev/null
+++ b/plugin_configuration/fzf.vim
@@ -0,0 +1,7 @@
+nnoremap <leader>ff <cmd>Files<cr>
+nnoremap <leader>fg <cmd>Lines<cr>
+nnoremap <leader>fb <cmd>Buffers<cr>
+nnoremap <leader>fs <cmd>Snippets<cr>
+nnoremap <leader>fw <cmd>Windows<cr>
+nnoremap <c-f> <cmd>BLines<cr>
+
diff --git a/plugin_configuration/smoothing.vim b/plugin_configuration/smoothing.vim
index f6fc733..3f8b6b1 100644
--- a/plugin_configuration/smoothing.vim
+++ b/plugin_configuration/smoothing.vim
@@ -6,5 +6,7 @@ nnoremap <F8> :TagbarToggle<CR>
 nnoremap <C-y> :BufstopFast<CR>
 
 " Set colorscheme
-colorscheme cyberspace
+colorscheme default
 
+" Set floating terminal
+nnoremap <C-t> :FloatTermNew --height=0.9 --width=0.9 --wintype=float --name=terminal <CR>
diff --git a/plugins.vim b/plugins.vim
index 297f1b6..5d2edd8 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -1,19 +1,19 @@
 call plug#begin('~/.vim/plugged')
-	Plug 'dense-analysis/ale'
-	Plug 'preservim/nerdtree'
-	Plug 'tpope/vim-surround'
-	Plug 'SirVer/ultisnips'
-	Plug 'jayli/vim-easycomplete'
-	Plug 'vim-airline/vim-airline'
-	" Plug 'mhinz/vim-startify'
-	Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-	Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-	Plug 'junegunn/fzf.vim'
-	Plug 'ryanoasis/vim-devicons'
-	Plug 'preservim/tagbar'
-	Plug 'mechatroner/rainbow_csv'
-	Plug 'mihaifm/bufstop'
-	Plug 'hiroakis/cyberspace.vim' " I'm feeling Cyber XD
-	Plug 'tpope/vim-speeddating'
-	Plug 'vim-autoformat/vim-autoformat'
+Plug 'dense-analysis/ale'
+Plug 'preservim/nerdtree'
+Plug 'tpope/vim-surround'
+Plug 'SirVer/ultisnips'
+Plug 'vim-airline/vim-airline'
+" Plug 'mhinz/vim-startify'
+Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
+Plug 'ryanoasis/vim-devicons'
+Plug 'preservim/tagbar'
+Plug 'mihaifm/bufstop'
+Plug 'hiroakis/cyberspace.vim' " I'm feeling Cyber XD
+Plug 'tpope/vim-speeddating'
+Plug 'vim-autoformat/vim-autoformat'
+Plug 'voldikss/vim-floaterm'
+Plug 'jiangmiao/auto-pairs'
 call plug#end()
diff --git a/vanilla.vim b/vanilla.vim
index 8dd894f..b001292 100644
--- a/vanilla.vim
+++ b/vanilla.vim
@@ -12,6 +12,10 @@ set cursorline
 " colorscheme
 colorscheme desert
 
+" Set leader key
+let mapleader = ","
+set showcmd
+
 " open new files right/below
 set splitright
 set splitbelow