diff options
Diffstat (limited to 'lua/plugins')
| -rw-r--r-- | lua/plugins/completition.lua | 19 | ||||
| -rw-r--r-- | lua/plugins/elixir.lua | 3 | ||||
| -rw-r--r-- | lua/plugins/lualine.lua | 22 | ||||
| -rw-r--r-- | lua/plugins/neotest.lua | 3 | ||||
| -rw-r--r-- | lua/plugins/noice.lua | 2 | ||||
| -rw-r--r-- | lua/plugins/nvim-html-css.lua | 9 | ||||
| -rw-r--r-- | lua/plugins/oil.lua | 359 |
7 files changed, 198 insertions, 219 deletions
diff --git a/lua/plugins/completition.lua b/lua/plugins/completition.lua index 480da46..173cb54 100644 --- a/lua/plugins/completition.lua +++ b/lua/plugins/completition.lua @@ -17,28 +17,19 @@ return { "zbirenbaum/copilot.lua", cmd = { "Copilot" }, event = { "VeryLazy" }, - opts = { - suggestion = { enabled = false }, - panel = { enabled = false }, - }, + opts = { suggestion = { enabled = false }, panel = { enabled = false } }, }, config = true, }, { "uga-rosa/cmp-dictionary", config = function() - local dict_fl = { - ["*"] = { "/usr/share/dict/words" }, - ft = { - foo = { "./../../spell/dict_es.dict" }, - }, - } - local dict = require("cmp_dictionary") - - dict.setup({ paths = dict_fl["*"], exact_length = 3, first_case_insensitive = false }) + local dict_fl = { ["*"] = { "/usr/share/dict/words" }, ft = { foo = { "./../../spell/dict_es_en.dict" } } } + local dict = require "cmp_dictionary" + dict.setup { paths = dict_fl["*"], exact_length = 3, first_case_insensitive = false } end, }, - + { "Jezda1337/nvim-html-css" }, }, event = "VeryLazy", config = function() diff --git a/lua/plugins/elixir.lua b/lua/plugins/elixir.lua index 6aabb08..925c493 100644 --- a/lua/plugins/elixir.lua +++ b/lua/plugins/elixir.lua @@ -1,8 +1,7 @@ return { "elixir-tools/elixir-tools.nvim", version = "*", - event = { "BufReadPre", "BufNewFile" }, - filetypes = { "elixir" }, + ft = { "elixir" }, config = function() local elixir = require("elixir") local elixirls = require("elixir.elixirls") diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 88a0fec..5873598 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -91,10 +91,10 @@ return { }, sections = process_sections { lualine_a = { - { 'mode', - -- icons_enabled = true, + { 'mode', + icons_enabled = true, icon = { - " ", + " ", color = { fg = colors.base4, bg = colors.base03, gui = 'bold'} }, -- color = { fg = colors.base0, bg = colors.green300, gui = 'bold' }, @@ -131,11 +131,11 @@ return { }, lualine_c = { { - 'filename', - on_click = function() + 'filename', + on_click = function() require('telescope.builtin').find_files() - -- print('file name clicked') - end, + -- print('file name clicked') + end, icon = ' ', color = { fg = colors.yellow100, bg = colors.base03, gui = 'bold'}, path = 4, @@ -175,7 +175,7 @@ return { -- Lsp server name . function() local msg = 'No LSP' - local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype') + local buf_ft = vim.api.nvim_get_option_value("filetype", { buf = 0 }) local clients = vim.lsp.get_clients() if next(clients) == nil then return msg @@ -208,13 +208,13 @@ return { } }, lualine_z = { - { - -- 'location', + { + -- 'location', -- function() -- return "Ln:%l Col:%c" -- end -- separator = { right = '' }, left_padding = 2 }, - } + } }, }, inactive_sections = { diff --git a/lua/plugins/neotest.lua b/lua/plugins/neotest.lua index 09e99b0..2afc490 100644 --- a/lua/plugins/neotest.lua +++ b/lua/plugins/neotest.lua @@ -7,7 +7,6 @@ return { "nvim-treesitter/nvim-treesitter", "antoinemadec/FixCursorHold.nvim", "nvim-neotest/neotest-go", - "rouge8/neotest-rust", "nvim-neotest/neotest-plenary", "nvim-neotest/neotest-vim-test", "anuvyklack/hydra.nvim", @@ -17,7 +16,7 @@ return { neotest.setup { adapters = { require "neotest-go", - require "neotest-rust", + require('rustaceanvim.neotest'), require "neotest-plenary", -- require "neotest-vim-test" { -- ignore_file_types = { "go", "lua", "rust", "php" }, diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua index 7cd5593..b8942be 100644 --- a/lua/plugins/noice.lua +++ b/lua/plugins/noice.lua @@ -168,7 +168,7 @@ return { markdown = { hover = { ["|(%S-)|"] = vim.cmd.help, -- vim help links - ["%[.-%]%((%S-)%)"] = require("noice.util").open, -- markdown links + -- ["%[.-%]%((%S-)%)"] = require("noice.util").open, -- markdown links }, highlights = { ["|%S-|"] = "@text.reference", diff --git a/lua/plugins/nvim-html-css.lua b/lua/plugins/nvim-html-css.lua deleted file mode 100644 index d755f75..0000000 --- a/lua/plugins/nvim-html-css.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { "Jezda1337/nvim-html-css", - dependencies = { - "nvim-treesitter/nvim-treesitter", - "nvim-lua/plenary.nvim" - }, - config = function() - require("html-css"):setup() - end -} diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua index 694fea9..b486c14 100644 --- a/lua/plugins/oil.lua +++ b/lua/plugins/oil.lua @@ -1,186 +1,185 @@ -return -{ - 'stevearc/oil.nvim', +return { + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts opts = {}, -- Optional dependencies dependencies = { - "nvim-tree/nvim-web-devicons", - {"ElvisClaros/oil-image-preview.nvim", lazy = false}, + { "echasnovski/mini.icons", opts = {} }, + { "ElvisClaros/oil-image-preview.nvim", lazy = false }, }, - config = function () - - local oip = require("oil-image-preview") - require('oil').setup({ - -- Oil will take over directory buffers (e.g. `vim .` or `:e src/`) - -- Set to false if you still want to use netrw. - default_file_explorer = true, - -- Id is automatically added at the beginning, and name at the end - -- See :help oil-columns - columns = { - "icon", - -- "permissions", - -- "size", - -- "mtime", - }, - -- Buffer-local options to use for oil buffers - buf_options = { - buflisted = false, - bufhidden = "hide", - }, - -- Window-local options to use for oil buffers - win_options = { - wrap = false, - signcolumn = "yes:3", - cursorcolumn = false, - foldcolumn = "0", - spell = false, - list = false, - conceallevel = 3, - concealcursor = "nvic", - }, - -- Send deleted files to the trash instead of permanently deleting them (:help oil-trash) - delete_to_trash = false, - -- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits) - skip_confirm_for_simple_edits = false, - -- Selecting a new/moved/renamed file or directory will prompt you to save changes first - -- (:help prompt_save_on_select_new_entry) - prompt_save_on_select_new_entry = true, - -- Oil will automatically delete hidden buffers after this delay - -- You can set the delay to false to disable cleanup entirely - -- Note that the cleanup process only starts when none of the oil buffers are currently displayed - cleanup_delay_ms = 2000, - lsp_file_methods = { - -- Time to wait for LSP file operations to complete before skipping - timeout_ms = 1000, - -- Set to true to autosave buffers that are updated with LSP willRenameFiles - -- Set to "unmodified" to only save unmodified buffers - autosave_changes = false, - }, - -- Constrain the cursor to the editable parts of the oil buffer - -- Set to `false` to disable, or "name" to keep it on the file names - constrain_cursor = "editable", - -- Set to true to watch the filesystem for changes and reload oil - experimental_watch_for_changes = true, - -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap - -- options with a `callback` (e.g. { callback = function() ... end, desc = "", mode = "n" }) - -- Additionally, if it is a string that matches "actions.<name>", - -- it will use the mapping at require("oil.actions").<name> - -- Set to `false` to remove a keymap - -- See :help oil-actions for a list of all available actions - keymaps = { - ["g?"] = "actions.show_help", - ["<CR>"] = "actions.select", - ["<C-s>"] = "actions.select_vsplit", - ["<C-h>"] = "actions.select_split", - ["<C-t>"] = "actions.select_tab", - ["<C-p>"] = "actions.preview", - ["<C-c>"] = "actions.close", - ["<C-l>"] = "actions.refresh", - ["-"] = "actions.parent", - ["_"] = "actions.open_cwd", - ["`"] = "actions.cd", - ["~"] = "actions.tcd", - ["gs"] = "actions.change_sort", - ["gx"] = "actions.open_external", - ["g."] = "actions.toggle_hidden", - ["g\\"] = "actions.toggle_trash", - ["g<leader>"] = oip.openWithQuickLook, - ["gp"] = oip.weztermPreview, - ["gdi"] = function() - require("oil").set_columns({ "icon", "", "", "" }) - end, - ["gdf"] = function() - require("oil").set_columns({ "icon", "permissions", "size", "mtime" }) - end, - ["g:"] = { - "actions.open_terminal", - desc = "Open terminal in current directory", - }, - - }, - -- Configuration for the floating keymaps help window - keymaps_help = { - border = "rounded", - }, - -- Set to false to disable all of the above keymaps - use_default_keymaps = true, - view_options = { - -- Show files and directories that start with "." - show_hidden = false, - -- This function defines what is considered a "hidden" file - is_hidden_file = function(name, bufnr) - return vim.startswith(name, ".") - end, - -- This function defines what will never be shown, even when `show_hidden` is set - is_always_hidden = function(name, bufnr) - return false - end, - sort = { - -- sort order can be "asc" or "desc" - -- see :help oil-columns to see which columns are sortable - { "type", "asc" }, - { "name", "asc" }, - }, - }, - -- Configuration for the floating window in oil.open_float - float = { - -- Padding around the floating window - padding = 2, - max_width = 0, - max_height = 0, - border = "rounded", - win_options = { - winblend = 0, - }, - -- This is the config that will be passed to nvim_open_win. - -- Change values here to customize the layout - override = function(conf) - return conf - end, - }, - -- Configuration for the actions floating preview window - preview = { - -- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - -- min_width and max_width can be a single value or a list of mixed integer/float types. - -- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total" - max_width = 0.9, - -- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total" - min_width = { 40, 0.4 }, - -- optionally define an integer/float for the exact width of the preview window - width = nil, - -- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - -- min_height and max_height can be a single value or a list of mixed integer/float types. - -- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total" - max_height = 0.9, - -- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total" - min_height = { 5, 0.1 }, - -- optionally define an integer/float for the exact height of the preview window - height = nil, - border = "rounded", - win_options = { - winblend = 0, - }, - -- Whether the preview window is automatically updated when the cursor is moved - update_on_cursor_moved = true, - }, - -- Configuration for the floating progress window - progress = { - max_width = 0.9, - min_width = { 40, 0.4 }, - width = nil, - max_height = { 10, 0.9 }, - min_height = { 5, 0.1 }, - height = nil, - border = "rounded", - minimized_border = "none", - win_options = { - winblend = 0, - }, - }, - -- Configuration for the floating SSH window - ssh = { - border = "rounded", - }, -}) + config = function() + local oip = require "oil-image-preview" + require("oil").setup { + -- Oil will take over directory buffers (e.g. `vim .` or `:e src/`) + -- Set to false if you still want to use netrw. + default_file_explorer = true, + -- Id is automatically added at the beginning, and name at the end + -- See :help oil-columns + columns = { + "icon", + -- "permissions", + -- "size", + -- "mtime", + }, + -- Buffer-local options to use for oil buffers + buf_options = { + buflisted = false, + bufhidden = "hide", + }, + -- Window-local options to use for oil buffers + win_options = { + wrap = false, + signcolumn = "yes:3", + cursorcolumn = false, + foldcolumn = "0", + spell = false, + list = false, + conceallevel = 3, + concealcursor = "nvic", + }, + -- Send deleted files to the trash instead of permanently deleting them (:help oil-trash) + delete_to_trash = false, + -- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits) + skip_confirm_for_simple_edits = false, + -- Selecting a new/moved/renamed file or directory will prompt you to save changes first + -- (:help prompt_save_on_select_new_entry) + prompt_save_on_select_new_entry = true, + -- Oil will automatically delete hidden buffers after this delay + -- You can set the delay to false to disable cleanup entirely + -- Note that the cleanup process only starts when none of the oil buffers are currently displayed + cleanup_delay_ms = 2000, + lsp_file_methods = { + -- Time to wait for LSP file operations to complete before skipping + timeout_ms = 1000, + -- Set to true to autosave buffers that are updated with LSP willRenameFiles + -- Set to "unmodified" to only save unmodified buffers + autosave_changes = false, + }, + -- Constrain the cursor to the editable parts of the oil buffer + -- Set to `false` to disable, or "name" to keep it on the file names + constrain_cursor = "editable", + -- Set to true to watch the filesystem for changes and reload oil + experimental_watch_for_changes = true, + -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap + -- options with a `callback` (e.g. { callback = function() ... end, desc = "", mode = "n" }) + -- Additionally, if it is a string that matches "actions.<name>", + -- it will use the mapping at require("oil.actions").<name> + -- Set to `false` to remove a keymap + -- See :help oil-actions for a list of all available actions + keymaps = { + ["g?"] = "actions.show_help", + ["<CR>"] = "actions.select", + ["<C-s>"] = "actions.select_vsplit", + ["<C-h>"] = "actions.select_split", + ["<C-t>"] = "actions.select_tab", + ["<C-p>"] = "actions.preview", + ["<C-c>"] = "actions.close", + ["<C-l>"] = "actions.refresh", + ["-"] = "actions.parent", + ["_"] = "actions.open_cwd", + ["`"] = "actions.cd", + ["~"] = "actions.tcd", + ["gs"] = "actions.change_sort", + ["gx"] = "actions.open_external", + ["g."] = "actions.toggle_hidden", + ["g\\"] = "actions.toggle_trash", + ["g<leader>"] = oip.openWithQuickLook, + ["gp"] = oip.weztermPreview, + ["gdi"] = function() + require("oil").set_columns { "icon", "", "", "" } + end, + ["gdf"] = function() + require("oil").set_columns { "icon", "permissions", "size", "mtime" } + end, + ["g:"] = { + "actions.open_terminal", + desc = "Open terminal in current directory", + }, + }, + -- Configuration for the floating keymaps help window + keymaps_help = { + border = "rounded", + }, + -- Set to false to disable all of the above keymaps + use_default_keymaps = true, + view_options = { + -- Show files and directories that start with "." + show_hidden = false, + -- This function defines what is considered a "hidden" file + is_hidden_file = function(name, bufnr) + return vim.startswith(name, ".") + end, + -- This function defines what will never be shown, even when `show_hidden` is set + is_always_hidden = function(name, bufnr) + return false + end, + sort = { + -- sort order can be "asc" or "desc" + -- see :help oil-columns to see which columns are sortable + { "type", "asc" }, + { "name", "asc" }, + }, + }, + -- Configuration for the floating window in oil.open_float + float = { + -- Padding around the floating window + padding = 2, + max_width = 0, + max_height = 0, + border = "rounded", + win_options = { + winblend = 0, + }, + -- This is the config that will be passed to nvim_open_win. + -- Change values here to customize the layout + override = function(conf) + return conf + end, + }, + -- Configuration for the actions floating preview window + preview = { + -- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) + -- min_width and max_width can be a single value or a list of mixed integer/float types. + -- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total" + max_width = 0.9, + -- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total" + min_width = { 40, 0.4 }, + -- optionally define an integer/float for the exact width of the preview window + width = nil, + -- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) + -- min_height and max_height can be a single value or a list of mixed integer/float types. + -- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total" + max_height = 0.9, + -- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total" + min_height = { 5, 0.1 }, + -- optionally define an integer/float for the exact height of the preview window + height = nil, + border = "rounded", + win_options = { + winblend = 0, + }, + -- Whether the preview window is automatically updated when the cursor is moved + update_on_cursor_moved = true, + }, + -- Configuration for the floating progress window + progress = { + max_width = 0.9, + min_width = { 40, 0.4 }, + width = nil, + max_height = { 10, 0.9 }, + min_height = { 5, 0.1 }, + height = nil, + border = "rounded", + minimized_border = "none", + win_options = { + winblend = 0, + }, + }, + -- Configuration for the floating SSH window + ssh = { + border = "rounded", + }, + } end, } |