From 85d56f97d18e46d82aab1f166dd2c772b4eb29c8 Mon Sep 17 00:00:00 2001
From: Hektor Misplon <hektor.misplon@pm.me>
Date: Sun, 19 Oct 2025 20:14:10 +0200
Subject: [PATCH] Migrate vim init config to neovim

---
 .config/nvim/init.lua                         |  9 +++-
 .../base.vim => .config/nvim/lua/base.lua     |  9 ++--
 .config/nvim/lua/keymaps.lua                  | 47 +++++++++++++++++++
 .../plugins.vim => .config/nvim/lua/plug.lua  |  7 +--
 .config/nvim/lua/vim.lua                      |  5 --
 .vim/init/colors.vim                          |  3 --
 .vim/init/mappings.vim                        | 44 -----------------
 .vimrc                                        |  4 --
 8 files changed, 60 insertions(+), 68 deletions(-)
 rename .vim/init/base.vim => .config/nvim/lua/base.lua (95%)
 rename .vim/init/plugins.vim => .config/nvim/lua/plug.lua (94%)
 delete mode 100644 .config/nvim/lua/vim.lua
 delete mode 100644 .vim/init/colors.vim
 delete mode 100644 .vim/init/mappings.vim
 delete mode 100644 .vimrc

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 2ed7ee5..8534b57 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,6 +1,13 @@
 require("nixCatsUtils").setup({ non_nix_value = true }) -- https://github.com/BirdeeHub/nixCats-nvim/blob/77dffad8235eb77684fcb7599487c8e9f23d5b8f/templates/example/init.lua
 
-require("vim")
+vim.cmd([[
+set termguicolors
+set bg=light
+hi Normal ctermbg=none guibg=NONE
+]])
+
+require("base")
+require("plug")
 require("ftdetect")
 require("keymaps")
 require("highlight")
diff --git a/.vim/init/base.vim b/.config/nvim/lua/base.lua
similarity index 95%
rename from .vim/init/base.vim
rename to .config/nvim/lua/base.lua
index b96b18b..1cb023a 100644
--- a/.vim/init/base.vim
+++ b/.config/nvim/lua/base.lua
@@ -1,7 +1,5 @@
-" General config {{{
-"
+vim.cmd([[
 " Tip: acronyms for overview, use `:h` for a quick lookup.
-
 set nocp                               " Disable vi incompatibility
 filetype plugin indent on              " Filetype recognition
 set enc=utf8                           " Default to UTF-8 encoding
@@ -28,6 +26,5 @@ set lcs=trail:·,tab:→\ ,nbsp:␣         " Whitespace rendering
 set ar                                 " Autoread
 set spellsuggest+=5                    " Limit spell suggestions
 set wildignore+=*/node_modules/*,*/tmp/*,*.so,*.swp,*.zip
-set thesaurus+=~/.vim/thesaurus/mthesaur.txt
-
-" }}}
+" set thesaurus+=./thesaurus/mthesaur.txt " FIXME
+]])
diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index 0dbf725..5d2c59f 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -1,3 +1,50 @@
+vim.cmd([[
+" Leader keys
+let mapleader = " "
+let maplocalleader = ";"
+
+" Splits & navigation
+nm s <c-w>           " Split horizontal
+nm ss :sp<CR><c-w>w| " Split horizontal
+nm sv :vs<CR><c-w>w| " Split vertical
+nm sw <c-w>w|        " Navigate splits
+nm sh <c-w>h|        "
+nm sj <c-w>j|        "
+nm sk <c-w>k|        "
+nm sl <c-w>l|        "
+nn sH <c-w>8<|       " Resize splits
+nn sJ <c-w>8-|       "
+nn sK <c-w>8+|       "
+nn sL <c-w>8>|       "
+nn s= <c-w>=|        " Equalize splits
+
+" Open
+nn sb :Lex<cr>|          " File tree
+nn <leader><leader> :noh<cr> |"
+nn <leader>t :term<cr>| " Open terminal
+
+" Remaps
+ino <nowait> jj <esc>|   " Normal now
+nn  <left>  <nop>|       " Hard mode
+nn  <down>  <nop>|       " "
+nn  <up>    <nop>|       " "
+nn  <right> <nop>|       " "
+ino <left>  <nop>|       " "
+ino <down>  <nop>|       " "
+ino <up>    <nop>|       " "
+ino <right> <nop>|       " "
+
+" Search
+nn <c-_> :noh<cr>| " map 'ctrl + /'
+
+" Line numbers
+nn <leader>n :set nu! rnu!<cr>
+
+" Vim configuration
+nn <leader>ec :vs $MYVIMRC<cr>
+nn <leader>so :so %<cr>
+]])
+
 local set = vim.keymap.set
 
 set("n", "<leader>cx", "<cmd>!chmod +x %<CR>", { silent = true, desc = "Run `chmod +x` on current file" })
diff --git a/.vim/init/plugins.vim b/.config/nvim/lua/plug.lua
similarity index 94%
rename from .vim/init/plugins.vim
rename to .config/nvim/lua/plug.lua
index b3d86f0..a7df64c 100644
--- a/.vim/init/plugins.vim
+++ b/.config/nvim/lua/plug.lua
@@ -1,7 +1,4 @@
-" Plugins {{{
-
-" Plug setup {{{
-
+vim.cmd([[
 call plug#begin()
 Plug 'machakann/vim-sandwich'
 Plug 'Shougo/context_filetype.vim'
@@ -31,4 +28,4 @@ Plug 'goerz/jupytext.vim'
 " OpenSCAD
 Plug 'sirtaj/vim-openscad'
 call plug#end()
-" }}}
+]])
diff --git a/.config/nvim/lua/vim.lua b/.config/nvim/lua/vim.lua
deleted file mode 100644
index d84410f..0000000
--- a/.config/nvim/lua/vim.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.cmd([[
-set runtimepath^=~/.vim runtimepath+=~/.vim/after
-let &packpath = &runtimepath
-source ~/.vimrc"
-]])
diff --git a/.vim/init/colors.vim b/.vim/init/colors.vim
deleted file mode 100644
index b025225..0000000
--- a/.vim/init/colors.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set termguicolors
-set bg=light
-hi Normal ctermbg=none guibg=NONE
diff --git a/.vim/init/mappings.vim b/.vim/init/mappings.vim
deleted file mode 100644
index 5e942a4..0000000
--- a/.vim/init/mappings.vim
+++ /dev/null
@@ -1,44 +0,0 @@
-" Leader keys
-let mapleader = " "
-let maplocalleader = ";"
-
-" Splits & navigation
-nm s <c-w>           " Split horizontal
-nm ss :sp<CR><c-w>w| " Split horizontal
-nm sv :vs<CR><c-w>w| " Split vertical
-nm sw <c-w>w|        " Navigate splits
-nm sh <c-w>h|        "
-nm sj <c-w>j|        "
-nm sk <c-w>k|        "
-nm sl <c-w>l|        "
-nn sH <c-w>8<|       " Resize splits
-nn sJ <c-w>8-|       "
-nn sK <c-w>8+|       "
-nn sL <c-w>8>|       "
-nn s= <c-w>=|        " Equalize splits
-
-" Open
-nn sb :Lex<cr>|          " File tree
-nn <leader><leader> :noh<cr> |"
-nn <leader>t :term<cr>| " Open terminal
-
-" Remaps
-ino <nowait> jj <esc>|   " Normal now
-nn  <left>  <nop>|       " Hard mode
-nn  <down>  <nop>|       " "
-nn  <up>    <nop>|       " "
-nn  <right> <nop>|       " "
-ino <left>  <nop>|       " "
-ino <down>  <nop>|       " "
-ino <up>    <nop>|       " "
-ino <right> <nop>|       " "
-
-" Search
-nn <c-_> :noh<cr>| " map 'ctrl + /'
-
-" Line numbers
-nn <leader>n :set nu! rnu!<cr>
-
-" Vim configuration
-nn <leader>ec :vs $MYVIMRC<cr>
-nn <leader>so :so %<cr>
diff --git a/.vimrc b/.vimrc
deleted file mode 100644
index e67cfb4..0000000
--- a/.vimrc
+++ /dev/null
@@ -1,4 +0,0 @@
-source ~/.vim/init/base.vim
-source ~/.vim/init/mappings.vim
-source ~/.vim/init/plugins.vim
-source ~/.vim/init/colors.vim