Merge remote-tracking branch 'refs/remotes/origin/main'

21 files changed, 25 insertions, 25 deletions

diff --git a/config/essentials/nvim/init.lua b/config/essentials/nvim/init.lua
index 7772f90..ea49ffa 100644
--- a/config/essentials/nvim/init.lua
+++ b/config/essentials/nvim/init.lua
@@ -1 +1 @@
-require("tlast")
+require("user")
diff --git a/config/essentials/nvim/lua/tlast/cmp/init.lua b/config/essentials/nvim/lua/tlast/cmp/init.lua
deleted file mode 100644
index a80856c..0000000
--- a/config/essentials/nvim/lua/tlast/cmp/init.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-require("tlast.cmp.setup")
-
-require("tlast.cmp.arduino")
-require("tlast.cmp.bash")
-require("tlast.cmp.clangd")
-require("tlast.cmp.html")
-require("tlast.cmp.css")
-require("tlast.cmp.java")
-require("tlast.cmp.js")
-require("tlast.cmp.emmet")
-require("tlast.cmp.lua")
-require("tlast.cmp.python")
diff --git a/config/essentials/nvim/lua/tlast/init.lua b/config/essentials/nvim/lua/tlast/init.lua
deleted file mode 100644
index 9a9f387..0000000
--- a/config/essentials/nvim/lua/tlast/init.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-require("tlast.packer")
-require("tlast.remap")
-require("tlast.set")
-require("tlast.cmp")
-require("tlast.zk")
-vim.cmd.source(vim.fn.stdpath("config") .. "/lua/tlast/aucommands.vim")
diff --git a/config/essentials/nvim/lua/tlast/aucommands.vim b/config/essentials/nvim/lua/user/aucommands.vim
index 732985f..732985f 100644
--- a/config/essentials/nvim/lua/tlast/aucommands.vim
+++ b/config/essentials/nvim/lua/user/aucommands.vim
diff --git a/config/essentials/nvim/lua/tlast/cmp/arduino.lua b/config/essentials/nvim/lua/user/cmp/arduino.lua
index 777df8d..777df8d 100644
--- a/config/essentials/nvim/lua/tlast/cmp/arduino.lua
+++ b/config/essentials/nvim/lua/user/cmp/arduino.lua
diff --git a/config/essentials/nvim/lua/tlast/cmp/bash.lua b/config/essentials/nvim/lua/user/cmp/bash.lua
index 91b6fba..91b6fba 100644
--- a/config/essentials/nvim/lua/tlast/cmp/bash.lua
+++ b/config/essentials/nvim/lua/user/cmp/bash.lua
diff --git a/config/essentials/nvim/lua/tlast/cmp/clangd.lua b/config/essentials/nvim/lua/user/cmp/clangd.lua
index 810aa42..810aa42 100644
--- a/config/essentials/nvim/lua/tlast/cmp/clangd.lua
+++ b/config/essentials/nvim/lua/user/cmp/clangd.lua
diff --git a/config/essentials/nvim/lua/tlast/cmp/css.lua b/config/essentials/nvim/lua/user/cmp/css.lua
index 07cb8bc..07cb8bc 100644
--- a/config/essentials/nvim/lua/tlast/cmp/css.lua
+++ b/config/essentials/nvim/lua/user/cmp/css.lua
diff --git a/config/essentials/nvim/lua/tlast/cmp/emmet.lua b/config/essentials/nvim/lua/user/cmp/emmet.lua
index 3193727..3193727 100644
--- a/config/essentials/nvim/lua/tlast/cmp/emmet.lua
+++ b/config/essentials/nvim/lua/user/cmp/emmet.lua
diff --git a/config/essentials/nvim/lua/tlast/cmp/html.lua b/config/essentials/nvim/lua/user/cmp/html.lua
index 69ed29d..69ed29d 100644
--- a/config/essentials/nvim/lua/tlast/cmp/html.lua
+++ b/config/essentials/nvim/lua/user/cmp/html.lua
diff --git a/config/essentials/nvim/lua/user/cmp/init.lua b/config/essentials/nvim/lua/user/cmp/init.lua
new file mode 100644
index 0000000..a545f12
--- /dev/null
+++ b/config/essentials/nvim/lua/user/cmp/init.lua
@@ -0,0 +1,12 @@
+require("user.cmp.setup")
+
+require("user.cmp.arduino")
+require("user.cmp.bash")
+require("user.cmp.clangd")
+require("user.cmp.html")
+require("user.cmp.css")
+require("user.cmp.java")
+require("user.cmp.js")
+require("user.cmp.emmet")
+require("user.cmp.lua")
+require("user.cmp.python")
diff --git a/config/essentials/nvim/lua/tlast/cmp/java.lua b/config/essentials/nvim/lua/user/cmp/java.lua
index 1027588..1027588 100644
--- a/config/essentials/nvim/lua/tlast/cmp/java.lua
+++ b/config/essentials/nvim/lua/user/cmp/java.lua
diff --git a/config/essentials/nvim/lua/tlast/cmp/js.lua b/config/essentials/nvim/lua/user/cmp/js.lua
index 7188a22..7188a22 100644
--- a/config/essentials/nvim/lua/tlast/cmp/js.lua
+++ b/config/essentials/nvim/lua/user/cmp/js.lua
diff --git a/config/essentials/nvim/lua/tlast/cmp/lua.lua b/config/essentials/nvim/lua/user/cmp/lua.lua
index e594870..e594870 100644
--- a/config/essentials/nvim/lua/tlast/cmp/lua.lua
+++ b/config/essentials/nvim/lua/user/cmp/lua.lua
diff --git a/config/essentials/nvim/lua/tlast/cmp/python.lua b/config/essentials/nvim/lua/user/cmp/python.lua
index aec86bd..aec86bd 100644
--- a/config/essentials/nvim/lua/tlast/cmp/python.lua
+++ b/config/essentials/nvim/lua/user/cmp/python.lua
diff --git a/config/essentials/nvim/lua/tlast/cmp/setup.lua b/config/essentials/nvim/lua/user/cmp/setup.lua
index ed8a2d2..ed8a2d2 100644
--- a/config/essentials/nvim/lua/tlast/cmp/setup.lua
+++ b/config/essentials/nvim/lua/user/cmp/setup.lua
diff --git a/config/essentials/nvim/lua/user/init.lua b/config/essentials/nvim/lua/user/init.lua
new file mode 100644
index 0000000..a9ba9c4
--- /dev/null
+++ b/config/essentials/nvim/lua/user/init.lua
@@ -0,0 +1,6 @@
+require("user.packer")
+require("user.remap")
+require("user.set")
+require("user.cmp")
+require("user.zk")
+vim.cmd.source(vim.fn.stdpath("config") .. "/lua/user/aucommands.vim")
diff --git a/config/essentials/nvim/lua/tlast/packer.lua b/config/essentials/nvim/lua/user/packer.lua
index 90ffa5b..90ffa5b 100644
--- a/config/essentials/nvim/lua/tlast/packer.lua
+++ b/config/essentials/nvim/lua/user/packer.lua
diff --git a/config/essentials/nvim/lua/tlast/remap.lua b/config/essentials/nvim/lua/user/remap.lua
index c2d4c0b..962ce46 100644
--- a/config/essentials/nvim/lua/tlast/remap.lua
+++ b/config/essentials/nvim/lua/user/remap.lua
@@ -18,11 +18,11 @@ vim.keymap.set("n", "<Leader>q", "<cmd>q!<cr>", { noremap = true })
 vim.keymap.set("n", "<Leader>Q", "<cmd>qa!<cr>", { noremap = true })
 
 -- Windows
-vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-h>", "<C-W>h", { noremap = true })
-vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-j>", "<C-W>j", { noremap = true })
-vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-k>", "<C-W>k", { noremap = true })
-vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-l>", "<C-W>l", { noremap = true })
-vim.keymap.set({"n", "i", "v", "c", "o", "s", "x"}, "<A-o>", "<C-W>o", { noremap = true })
+vim.keymap.set("n", "<A-h>", "<C-W>h", { noremap = true })
+vim.keymap.set("n", "<A-j>", "<C-W>j", { noremap = true })
+vim.keymap.set("n", "<A-k>", "<C-W>k", { noremap = true })
+vim.keymap.set("n", "<A-l>", "<C-W>l", { noremap = true })
+vim.keymap.set("n", "<A-o>", "<C-W>o", { noremap = true })
 -- command line
 vim.keymap.set("c", "<M-b>", "<C-Left>", { noremap = true })
 vim.keymap.set("c", "<M-f>", "<C-Right>", { noremap = true })
@@ -56,7 +56,7 @@ end, { noremap = true })
 -- utils
 vim.keymap.set("i", "<LocalLeader>r", "<cmd>r!echo -n $RANDOM<cr><esc>kJA", { noremap = true })
 -- ordered list
-vim.keymap.set("v", "<Leader>n", "I0. <esc>gvg<C-a>", { noremap = true })
+vim.keymap.set("n", "<LocalLeader>n", "0vap<C-v>I0. <esc>gvg<C-a>", { noremap = true })
 vim.keymap.set("v", "<Leader>u", "<cmd>'<,'>s/^[0-9]\\+\\. //<cr><esc>", { noremap = true })
 -- scripts
 vim.keymap.set("n", "<Leader>x", "<cmd>!chmod +x %<cr>", { noremap = true, silent = true})
diff --git a/config/essentials/nvim/lua/tlast/set.lua b/config/essentials/nvim/lua/user/set.lua
index 69ee4ae..69ee4ae 100644
--- a/config/essentials/nvim/lua/tlast/set.lua
+++ b/config/essentials/nvim/lua/user/set.lua
diff --git a/config/essentials/nvim/lua/tlast/zk.lua b/config/essentials/nvim/lua/user/zk.lua
index a3cdefb..a3cdefb 100644
--- a/config/essentials/nvim/lua/tlast/zk.lua
+++ b/config/essentials/nvim/lua/user/zk.lua