From 57e226d2db43ffe77e0f0e9c6cd552801651d5d8 Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Wed, 17 Apr 2024 09:42:33 +0700
Subject: [PATCH] chore(vim): Converted some config and remapping to lua

---
 .config/nvim/init.lua            |  3 ++-
 .config/nvim/lazy-lock.json      |  6 ++++++
 .config/nvim/lua/null/config.lua | 12 ++++++++++++
 .config/nvim/lua/null/init.lua   |  4 ++--
 .config/nvim/lua/null/plug.lua   | 21 +++++++++++++++++++++
 .config/nvim/lua/null/remap.lua  | 23 +++++++++++++++++++++++
 .config/vim/vim_uni              | 14 +++++++-------
 7 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 .config/nvim/lazy-lock.json
 create mode 100644 .config/nvim/lua/null/remap.lua

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 5844566..7b9038b 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -20,7 +20,8 @@
 --        null2264's NeoVim Config        --
 --========================================--
 
-require("null")
+-- TODO: Uncomment once we done migrating
+-- require("null")
 
 -- FIXME: Turn all these to LUA
 vim.cmd("source ~/.config/vim/vim_nix")
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
new file mode 100644
index 0000000..e653b0d
--- /dev/null
+++ b/.config/nvim/lazy-lock.json
@@ -0,0 +1,6 @@
+{
+  "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" },
+  "oil.nvim": { "branch": "master", "commit": "e462a3446505185adf063566f5007771b69027a1" },
+  "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" }
+}
\ No newline at end of file
diff --git a/.config/nvim/lua/null/config.lua b/.config/nvim/lua/null/config.lua
index e69de29..206d0a3 100644
--- a/.config/nvim/lua/null/config.lua
+++ b/.config/nvim/lua/null/config.lua
@@ -0,0 +1,12 @@
+require("null.remap")
+
+local o = vim.opt
+local g = vim.g
+
+o.nu = true
+o.relativenumber = true
+
+g.mapleader = " "
+g.guifont = { "Sarasa UI J", ":h16" }
+
+require("oil").setup()
diff --git a/.config/nvim/lua/null/init.lua b/.config/nvim/lua/null/init.lua
index b56700e..68d388d 100644
--- a/.config/nvim/lua/null/init.lua
+++ b/.config/nvim/lua/null/init.lua
@@ -1,6 +1,6 @@
--- vim_uni
-require("null.config")
 -- vim_plug
 require("null.plug")
+-- vim_uni
+require("null.config")
 -- vim_nix
 require("null.nix")  -- n*x specific stuff
diff --git a/.config/nvim/lua/null/plug.lua b/.config/nvim/lua/null/plug.lua
index e69de29..17bab1a 100644
--- a/.config/nvim/lua/null/plug.lua
+++ b/.config/nvim/lua/null/plug.lua
@@ -0,0 +1,21 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+	vim.fn.system({
+		"git",
+		"clone",
+		"--filter=blob:none",
+		"https://github.com/folke/lazy.nvim.git",
+		"--branch=stable", -- latest stable release
+		lazypath,
+	})
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup({
+	{
+  		"stevearc/oil.nvim",
+  		opts = {},
+  		dependencies = { "nvim-tree/nvim-web-devicons" },
+	},
+	"tpope/vim-commentary", -- shortcut to comment a line
+})
diff --git a/.config/nvim/lua/null/remap.lua b/.config/nvim/lua/null/remap.lua
new file mode 100644
index 0000000..1c0f3d8
--- /dev/null
+++ b/.config/nvim/lua/null/remap.lua
@@ -0,0 +1,23 @@
+-- Loaded by `null.config`
+local remap = function(mode, key, target, opts)
+    vim.api.nvim_set_keymap(mode, key, target, opts or {
+	    noremap = true,
+	    silent = true,
+    })
+end
+
+-- Map Ctrl+U as U so it can be used as redo
+remap("n", "<C-u>", "U")
+-- Map U as redo
+remap("n", "U", "<C-r>")
+
+-- Yank and Put
+remap("n", "<C-y>", '"+y')
+remap("n", "<C-p>", '"+p')
+remap("n", "<C-Y>", '"+y')
+remap("n", "<C-P>", '"+p')
+
+-- Comment a line like how it is on VSC (using vim-commentary)
+remap("n", "<C-/>", "gcc", { noremap = false })
+remap("v", "<C-/>", "gc", { noremap = false })
+remap("i", "<C-/>", "<esc>gcc", { noremap = false })
diff --git a/.config/vim/vim_uni b/.config/vim/vim_uni
index 63aec03..b486137 100644
--- a/.config/vim/vim_uni
+++ b/.config/vim/vim_uni
@@ -6,7 +6,7 @@
 " ----- Vim Initial Config
 set encoding=utf-8
 set hls
-set number relativenumber
+set number relativenumber " -- converted
 set ignorecase
 set smartcase
 set mouse=a
@@ -24,8 +24,8 @@ set fillchars=eob:\
 syntax on
 filetype indent plugin on
 map <C-n> :NERDTreeToggle<CR>
-let mapleader=" "
-set guifont=Iosevka:h15
+let mapleader=" " " -- converted
+set guifont=Iosevka:h15 " -- converted
 
 " ----- Folding stuff
 set foldnestmax=10
@@ -40,19 +40,19 @@ autocmd FileType python setlocal foldmethod=indent
 " Norm but in shortcut
 vnoremap . :normal .<CR>
 
-" Map ctrl + u as U
+" Map ctrl + u as U -- converted
 noremap <C-u> U
 
-" Map U as redo (ctrl + r)
+" Map U as redo (ctrl + r) -- converted
 noremap U <C-r>
 
-" Yank and Put to/from clipboard/primary
+" Yank and Put to/from clipboard/primary -- converted
 noremap <C-y> "+y
 noremap <C-p> "+p
 noremap <C-Y> "+y
 noremap <C-P> "+P
 
-" Shortcut to comment a line
+" Shortcut to comment a line -- converted
 map <C-/> gcc
 vmap <C-/> gc
 imap <C-/> <esc>gc