From dabb11eb273cb8dd56515cd1f8b1d6a17b206a98 Mon Sep 17 00:00:00 2001
From: AngeD <ange.duhayon@epitech.eu>
Date: Tue, 30 Aug 2022 09:49:06 +0200
Subject: [PATCH] merge: work

---
 .config/kitty/kitty.conf                      |  8 ------
 .config/nvim/init.lua                         | 27 +++++++++++--------
 .config/nvim/pack/plugins/opt/nvim-treesitter |  2 +-
 3 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 .config/kitty/kitty.conf

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
deleted file mode 100644
index d4922b2..0000000
--- a/.config/kitty/kitty.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-update_check_interval 0
-
-font_family DejaVuSansMono Nerd Font Mono
-font_size   14.0
-
-background_opacity 0.8
-
-enable_audio_bell no
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 2cf280b..23143a6 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -3,7 +3,6 @@ vim.cmd("packadd nvim-treesitter")
 require'nvim-treesitter.configs'.setup {
     auto_install = true,
     highlight = {enable = true},
-    indent = {enable = true},
 }
 
 vim.cmd("packadd black")
@@ -19,10 +18,11 @@ vim.cmd("packadd nvim-lspconfig")
 vim.cmd("packadd vim-dirdiff")
 
 vim.cmd("packadd vim-easy-align")
-vim.keymap.set("n", "ga", "<Plug>(EasyAlign)<C-x>")
+vim.keymap.set("n", "ga", "<Plug>(EasyAlign)")
 vim.keymap.set("x", "ga", "<Plug>(EasyAlign)<C-x>")
 
 -- variables
+vim.g.mapleader      = " "
 vim.o.path           = vim.o.path .. ",**"
 vim.o.expandtab      = true
 vim.o.smartindent    = true
@@ -37,17 +37,22 @@ vim.o.mouse          = "a"
 vim.o.suffixes       = vim.o.suffixes .. ",.pyc"
 vim.o.foldmethod     = "indent"
 vim.o.foldlevel      = 99
-vim.o.grepprg        = "grep -rn $*"
 vim.wo.cc            = "80"
 
-vim.cmd("au BufWrite * :%s/\\s\\+$//e")
-
 -- keybindings
-vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")
+--            (mode, key,         command             )
 
-vim.keymap.set("n", "<C-h>", "<C-w>h"     )
-vim.keymap.set("n", "<C-j>", "<C-w>j"     )
-vim.keymap.set("n", "<C-k>", "<C-w>k"     )
-vim.keymap.set("n", "<C-l>", "<C-w>l"     )
+-- terminal escape key
+vim.keymap.set("t",  "<Esc>",     "<C-\\><C-n>"       )
 
-vim.keymap.set("n", "gf",    "gF"         )
+-- movement keys
+vim.keymap.set("n",  "<C-h>",     "<C-w>h"            )
+vim.keymap.set("n",  "<C-j>",     "<C-w>j"            )
+vim.keymap.set("n",  "<C-k>",     "<C-w>k"            )
+vim.keymap.set("n",  "<C-l>",     "<C-w>l"            )
+
+-- go to file:line instead of just file
+vim.keymap.set("n",  "gf",        "gF"                )
+
+-- remove trailing whitespaces
+vim.keymap.set("n",  "<Leader>w", ":%s/\\s\\+$//e<CR>")
diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter
index f3c53d2..f0c9a18 160000
--- a/.config/nvim/pack/plugins/opt/nvim-treesitter
+++ b/.config/nvim/pack/plugins/opt/nvim-treesitter
@@ -1 +1 @@
-Subproject commit f3c53d225ada93a99bfd818e1c40012400e2dc55
+Subproject commit f0c9a186eab06d7e4dcd78c973dcb60b702ac5d2