diff --git a/init.lua b/init.lua index 5edbf00..085f9bc 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,5 @@ +vim.g.mapleader = "" + require("config.lazy") vim.cmd.colorscheme("catppuccin-mocha") @@ -16,14 +18,17 @@ vim.keymap.set("n", "", 'echo "Use l to move!!"') vim.keymap.set("n", "", 'echo "Use k to move!!"') vim.keymap.set("n", "", 'echo "Use j to move!!"') -vim.keymap.set("n", "", "") -vim.keymap.set("n", "d", "lua Snacks.dashboard()") -vim.keymap.set("n", "d", "lua Snacks.dashboard()") -vim.keymap.set("n", "", "bnext") -vim.keymap.set("n", "", "lua MiniFiles.open()") +vim.keymap.set("n", "w", "") +vim.keymap.set("n", "wd", "lua Snacks.dashboard()") +vim.keymap.set("n", "l", "bnext") +vim.keymap.set("n", "h", "bprev") +vim.keymap.set("n", "j", "lua MiniFiles.open()") +vim.keymap.set("n", "u", "lua Snacks.picker.undo()") -vim.keymap.set("n", "", "FloatermNew lazygit") -vim.keymap.set("n", "", "FloatermKill") +vim.keymap.set("n", "k", "FloatermNew lazygit") +vim.keymap.set("n", "x", "FloatermKill") + +vim.keymap.set("i", "jj", "") vim.lsp.set_log_level("debug") diff --git a/lua/plugins/correction.lua b/lua/plugins/correction.lua index aa409af..c239d29 100644 --- a/lua/plugins/correction.lua +++ b/lua/plugins/correction.lua @@ -9,7 +9,7 @@ return { config = function() require("mason").setup() require("mason-lspconfig").setup({ - ensure_installed = { "lua_ls", "pyright", "rust_analyzer", "eslint" }, -- Add your desired LSPs + ensure_installed = { "ts_ls", "lua_ls", "pyright", "rust_analyzer", "eslint" }, -- Add your desired LSPs automatic_installation = true, }) diff --git a/lua/plugins/fzf-lua.lua b/lua/plugins/fzf-lua.lua deleted file mode 100644 index 6feeb1a..0000000 --- a/lua/plugins/fzf-lua.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - { - "ibhagwan/fzf-lua", - -- optional for icon support - dependencies = { "nvim-tree/nvim-web-devicons" }, - -- or if using mini.icons/mini.nvim - -- dependencies = { "echasnovski/mini.icons" }, - opts = {}, - }, -} diff --git a/lua/plugins/jabs.lua b/lua/plugins/jabs.lua deleted file mode 100644 index 7ab8242..0000000 --- a/lua/plugins/jabs.lua +++ /dev/null @@ -1,59 +0,0 @@ -return { - { - "matbme/JABS.nvim", - config = function() - require("jabs").setup({ - -- Options for the main window - position = { "center", "top" }, -- position = {'', ''} | left, center, right, - -- top, center, bottom - -- Default {'right', 'bottom'} - - relative = "editor", -- win, editor, cursor. Default win - clip_popup_size = false, -- clips the popup size to the win (or editor) size. Default true - - width = 80, -- default 50 - height = 20, -- default 10 - border = "single", -- none, single, double, rounded, solid, shadow, (or an array or chars). Default shadow - - offset = { -- window position offset - top = 4, -- default 0 - bottom = 2, -- default 0 - left = 2, -- default 0 - right = 2, -- default 0 - }, - - sort_mru = true, -- Sort buffers by most recently used (true or false). Default false - split_filename = true, -- Split filename into separate components for name and path. Default false - split_filename_path_width = 20, -- If split_filename is true, how wide the column for the path is supposed to be, Default 0 (don't show path) - - -- Options for preview window - preview_position = "left", -- top, bottom, left, right. Default top - preview = { - width = 40, -- default 70 - height = 60, -- default 30 - border = "rounded", -- none, single, double, rounded, solid, shadow, (or an array or chars). Default double - }, - - -- Default highlights (must be a valid :highlight) - highlight = { - current = "Title", -- default StatusLine - hidden = "StatusLineNC", -- default ModeMsg - split = "WarningMsg", -- default StatusLine - alternate = "StatusLine", -- default WarningMsg - }, - - -- Default symbols - keymap = { - close = "", -- Close buffer. Default D - jump = "", -- Jump to buffer. Default - h_split = "h", -- Horizontally split buffer. Default s - v_split = "v", -- Vertically split buffer. Default v - preview = "p", -- Open buffer preview. Default P - }, - - -- Whether to use nvim-web-devicons next to filenames - use_devicons = true, -- true or false. Default true - }) - end, - }, -} diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua index e841e41..2df363c 100644 --- a/lua/plugins/mini.lua +++ b/lua/plugins/mini.lua @@ -10,7 +10,6 @@ return { }) require("mini.pairs").setup() require("mini.files").setup() - require("mini.statusline").setup() require("mini.cursorword").setup({ content = { active = true, diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua index 1cd4304..58fdd23 100644 --- a/lua/plugins/snacks.lua +++ b/lua/plugins/snacks.lua @@ -6,6 +6,7 @@ return { opts = { bigfile = { enabled = true }, + picker = {}, dashboard = { enabled = true, width = 100,