diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua index 70c0998..3ec9754 100644 --- a/configs/nvim/init.lua +++ b/configs/nvim/init.lua @@ -23,6 +23,13 @@ now(function() add("https://github.com/nvim-telescope/telescope.nvim") add("https://github.com/nvim-lua/plenary.nvim") add("https://github.com/nvim-lualine/lualine.nvim") + add("https://github.com/hiattp/splitwise.nvim") + add("https://github.com/swaits/lazyjj.nvim") + add("https://github.com/kdheepak/lazygit.nvim") + add("https://github.com/neovim/nvim-lspconfig") + add("https://github.com/stevearc/conform.nvim") + add("https://github.com/nvim-lua/plenary.nvim") + add("https://github.com/windwp/nvim-autopairs") local hour = tonumber(os.date("%H")) local is_dark = (hour < 6 or hour >= 19) @@ -43,10 +50,6 @@ now(function() end) later(function() - add("https://github.com/swaits/lazyjj.nvim") - add("https://github.com/kdheepak/lazygit.nvim") - add("https://github.com/neovim/nvim-lspconfig") - add("https://github.com/stevearc/conform.nvim") require("config.keymaps") require("plugins.telescope") require("config.lsp") @@ -131,9 +134,11 @@ later(function() }, }) - add("https://github.com/nvim-lua/plenary.nvim") - add("https://github.com/windwp/nvim-autopairs") require("nvim-autopairs").setup({ check_ts = true }) + require("splitwise").setup({ + max_columns = 3, -- Default:2 + max_rows = 1, -- Default:2 + }) add("https://github.com/wakatime/vim-wakatime") add("https://github.com/vyfor/cord.nvim") diff --git a/configs/nvim/lua/config/autocmds.lua b/configs/nvim/lua/config/autocmds.lua index 098e30e..12ee1e7 100644 --- a/configs/nvim/lua/config/autocmds.lua +++ b/configs/nvim/lua/config/autocmds.lua @@ -18,7 +18,7 @@ local function open_folder(data) vim.cmd.cd(data.file) -- open the picker - Snacks.picker.files({ cwd = true }) + require("telescope.builtin").find_files() end end diff --git a/configs/nvim/lua/config/keymaps.lua b/configs/nvim/lua/config/keymaps.lua index 0ce7776..2a032e1 100644 --- a/configs/nvim/lua/config/keymaps.lua +++ b/configs/nvim/lua/config/keymaps.lua @@ -28,8 +28,13 @@ map("v", "", "w", { desc = "Save and go to normal mode" }) map("n", "", "w", { desc = "Save and stay in normal mode" }) -- Splitting -map("n", "\\", "vsplit", { desc = "Vertical split" }) -map("n", "-", "split", { desc = "Horizontal split" }) +map("n", "\\", "botright vsplit", { desc = "Vertical split" }) +map("n", "-", "botright split", { desc = "Horizontal split" }) +map("n", "", "botright split term://zshi", { desc = "Split down into term" }) + +-- exit :term +map("t", "", [[]]) +map("t", "", "q", { desc = "Close term split" }) -- Pickers/Telescope and LSP actions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ wk.add({