diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/nvim/after/plugin/conform.lua | 9 | ||||
| -rw-r--r-- | .config/nvim/after/plugin/lsp.lua | 62 | ||||
| -rw-r--r-- | .config/nvim/after/plugin/neo-tree.lua | 679 | ||||
| -rw-r--r-- | .config/nvim/after/plugin/telescope.lua | 6 | ||||
| -rw-r--r-- | .config/nvim/lazy-lock.json | 13 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins.lua | 79 |
6 files changed, 5 insertions, 843 deletions
diff --git a/.config/nvim/after/plugin/conform.lua b/.config/nvim/after/plugin/conform.lua deleted file mode 100644 index f0318a8..0000000 --- a/.config/nvim/after/plugin/conform.lua +++ /dev/null @@ -1,9 +0,0 @@ -require("conform").setup({ - formatters_by_ft = { - lua = { "stylua" }, - -- Conform will run multiple formatters sequentially - python = { "isort", "black" }, - -- Use a sub-list to run only the first available formatter - javascript = { { "prettierd", "prettier" } }, - }, -}) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua deleted file mode 100644 index 86a4c6c..0000000 --- a/.config/nvim/after/plugin/lsp.lua +++ /dev/null @@ -1,62 +0,0 @@ -local lsp = require("lsp-zero") - -lsp.preset("recommended") - -lsp.ensure_installed({ - 'tsserver', - 'rust_analyzer', - 'lua_ls', - 'marksman', -}) - --- Fix Undefined global 'vim' -lsp.nvim_workspace() - - -local cmp = require('cmp') -local cmp_select = {behavior = cmp.SelectBehavior.Select} -local cmp_mappings = lsp.defaults.cmp_mappings({ - ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select), - ['<C-n>'] = cmp.mapping.select_next_item(cmp_select), - ['<C-y>'] = cmp.mapping.confirm({ select = true }), - ["<C-Space>"] = cmp.mapping.complete(), -}) - -cmp_mappings['<Tab>'] = nil -cmp_mappings['<S-Tab>'] = nil - -lsp.setup_nvim_cmp({ - mapping = cmp_mappings -}) - -lsp.set_preferences({ - suggest_lsp_servers = false, - sign_icons = { - error = 'E', - warn = 'W', - hint = 'H', - info = 'I' - } -}) - -lsp.on_attach(function(client, bufnr) - local opts = {buffer = bufnr, remap = false} - - vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) - vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) - vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts) - vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts) - vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) - vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) - vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts) - vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts) - vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts) - vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts) -end) - -lsp.setup() - -vim.diagnostic.config({ - virtual_text = true -}) - diff --git a/.config/nvim/after/plugin/neo-tree.lua b/.config/nvim/after/plugin/neo-tree.lua deleted file mode 100644 index 93d8a64..0000000 --- a/.config/nvim/after/plugin/neo-tree.lua +++ /dev/null @@ -1,679 +0,0 @@ - -local config = { - -- If a user has a sources list it will replace this one. - -- Only sources listed here will be loaded. - -- You can also add an external source by adding it's name to this list. - -- The name used here must be the same name you would use in a require() call. - sources = { - "filesystem", - "buffers", - "git_status", - -- "document_symbols", - }, - add_blank_line_at_top = false, -- Add a blank line at the top of the tree. - auto_clean_after_session_restore = false, -- Automatically clean up broken neo-tree buffers saved in sessions - close_if_last_window = false, -- Close Neo-tree if it is the last window left in the tab - -- popup_border_style is for input and confirmation dialogs. - -- Configurtaion of floating window is done in the individual source sections. - -- "NC" is a special style that works well with NormalNC set - default_source = "filesystem", -- you can choose a specific source `last` here which indicates the last used source - enable_diagnostics = true, - enable_git_status = true, - enable_modified_markers = true, -- Show markers for files with unsaved changes. - enable_opened_markers = true, -- Enable tracking of opened files. Required for `components.name.highlight_opened_files` - enable_refresh_on_write = true, -- Refresh the tree when a file is written. Only used if `use_libuv_file_watcher` is false. - enable_normal_mode_for_inputs = false, -- Enable normal mode for input dialogs. - git_status_async = true, - -- These options are for people with VERY large git repos - git_status_async_options = { - batch_size = 1000, -- how many lines of git status results to process at a time - batch_delay = 10, -- delay in ms between batches. Spreads out the workload to let other processes run. - max_lines = 10000, -- How many lines of git status results to process. Anything after this will be dropped. - -- Anything before this will be used. The last items to be processed are the untracked files. - }, - hide_root_node = false, -- Hide the root node. - retain_hidden_root_indent = false, -- IF the root node is hidden, keep the indentation anyhow. - -- This is needed if you use expanders because they render in the indent. - log_level = "info", -- "trace", "debug", "info", "warn", "error", "fatal" - log_to_file = false, -- true, false, "/path/to/file.log", use :NeoTreeLogs to show the file - open_files_in_last_window = true, -- false = open files in top left window - open_files_do_not_replace_types = { "terminal", "Trouble", "qf", "edgy" }, -- when opening files, do not use windows containing these filetypes or buftypes - popup_border_style = "NC", -- "double", "none", "rounded", "shadow", "single" or "solid" - resize_timer_interval = 500, -- in ms, needed for containers to redraw right aligned and faded content - -- set to -1 to disable the resize timer entirely - -- -- NOTE: this will speed up to 50 ms for 1 second following a resize - sort_case_insensitive = false, -- used when sorting files and directories in the tree - sort_function = nil , -- uses a custom function for sorting files and directories in the tree - use_popups_for_input = true, -- If false, inputs will use vim.ui.input() instead of custom floats. - use_default_mappings = true, - -- source_selector provides clickable tabs to switch between sources. - source_selector = { - winbar = false, -- toggle to show selector on winbar - statusline = false, -- toggle to show selector on statusline - show_scrolled_off_parent_node = false, -- this will replace the tabs with the parent path - -- of the top visible node when scrolled down. - sources = { - { source = "filesystem" }, - { source = "buffers" }, - { source = "git_status" }, - }, - content_layout = "start", -- only with `tabs_layout` = "equal", "focus" - -- start : |/ bufname \/... - -- end : |/ bufname \/... - -- center : |/ bufname \/... - tabs_layout = "equal", -- start, end, center, equal, focus - -- start : |/ a \/ b \/ c \ | - -- end : | / a \/ b \/ c \| - -- center : | / a \/ b \/ c \ | - -- equal : |/ a \/ b \/ c \| - -- active : |/ focused tab \/ b \/ c \| - truncation_character = "…", -- character to use when truncating the tab label - tabs_min_width = nil, -- nil | int: if int padding is added based on `content_layout` - tabs_max_width = nil, -- this will truncate text even if `text_trunc_to_fit = false` - padding = 0, -- can be int or table - -- padding = { left = 2, right = 0 }, - -- separator = "▕", -- can be string or table, see below - separator = { left = "▏", right= "▕" }, - -- separator = { left = "/", right = "\\", override = nil }, -- |/ a \/ b \/ c \... - -- separator = { left = "/", right = "\\", override = "right" }, -- |/ a \ b \ c \... - -- separator = { left = "/", right = "\\", override = "left" }, -- |/ a / b / c /... - -- separator = { left = "/", right = "\\", override = "active" },-- |/ a / b:active \ c \... - -- separator = "|", -- || a | b | c |... - separator_active = nil, -- set separators around the active tab. nil falls back to `source_selector.separator` - show_separator_on_edge = false, - -- true : |/ a \/ b \/ c \| - -- false : | a \/ b \/ c | - highlight_tab = "NeoTreeTabInactive", - highlight_tab_active = "NeoTreeTabActive", - highlight_background = "NeoTreeTabInactive", - highlight_separator = "NeoTreeTabSeparatorInactive", - highlight_separator_active = "NeoTreeTabSeparatorActive", - }, - -- - --event_handlers = { - -- { - -- event = "before_render", - -- handler = function (state) - -- -- add something to the state that can be used by custom components - -- end - -- }, - -- { - -- event = "file_opened", - -- handler = function(file_path) - -- --auto close - -- require("neo-tree.command").execute({ action = "close" }) - -- end - -- }, - -- { - -- event = "file_opened", - -- handler = function(file_path) - -- --clear search after opening a file - -- require("neo-tree.sources.filesystem").reset_search() - -- end - -- }, - -- { - -- event = "file_renamed", - -- handler = function(args) - -- -- fix references to file - -- print(args.source, " renamed to ", args.destination) - -- end - -- }, - -- { - -- event = "file_moved", - -- handler = function(args) - -- -- fix references to file - -- print(args.source, " moved to ", args.destination) - -- end - -- }, - -- { - -- event = "neo_tree_buffer_enter", - -- handler = function() - -- vim.cmd 'highlight! Cursor blend=100' - -- end - -- }, - -- { - -- event = "neo_tree_buffer_leave", - -- handler = function() - -- vim.cmd 'highlight! Cursor guibg=#5f87af blend=0' - -- end - -- }, - -- { - -- event = "neo_tree_window_before_open", - -- handler = function(args) - -- print("neo_tree_window_before_open", vim.inspect(args)) - -- end - -- }, - -- { - -- event = "neo_tree_window_after_open", - -- handler = function(args) - -- vim.cmd("wincmd =") - -- end - -- }, - -- { - -- event = "neo_tree_window_before_close", - -- handler = function(args) - -- print("neo_tree_window_before_close", vim.inspect(args)) - -- end - -- }, - -- { - -- event = "neo_tree_window_after_close", - -- handler = function(args) - -- vim.cmd("wincmd =") - -- end - -- } - --}, - default_component_configs = { - container = { - enable_character_fade = true, - width = "100%", - right_padding = 0, - }, - --diagnostics = { - -- symbols = { - -- hint = "H", - -- info = "I", - -- warn = "!", - -- error = "X", - -- }, - -- highlights = { - -- hint = "DiagnosticSignHint", - -- info = "DiagnosticSignInfo", - -- warn = "DiagnosticSignWarn", - -- error = "DiagnosticSignError", - -- }, - --}, - indent = { - indent_size = 2, - padding = 1, - -- indent guides - with_markers = true, - indent_marker = "│", - last_indent_marker = "└", - highlight = "NeoTreeIndentMarker", - -- expander config, needed for nesting files - with_expanders = nil, -- if nil and file nesting is enabled, will enable expanders - expander_collapsed = "", - expander_expanded = "", - expander_highlight = "NeoTreeExpander", - }, - icon = { - folder_closed = "", - folder_open = "", - folder_empty = "", - folder_empty_open = "", - -- The next two settings are only a fallback, if you use nvim-web-devicons and configure default icons there - -- then these will never be used. - default = "*", - highlight = "NeoTreeFileIcon" - }, - modified = { - symbol = "[+] ", - highlight = "NeoTreeModified", - }, - name = { - trailing_slash = false, - highlight_opened_files = false, -- Requires `enable_opened_markers = true`. - -- Take values in { false (no highlight), true (only loaded), - -- "all" (both loaded and unloaded)}. For more information, - -- see the `show_unloaded` config of the `buffers` source. - use_git_status_colors = true, - highlight = "NeoTreeFileName", - }, - git_status = { - symbols = { - -- Change type - added = "✚", -- NOTE: you can set any of these to an empty string to not show them - deleted = "✖", - modified = "", - renamed = "", - -- Status type - untracked = "", - ignored = "", - unstaged = "", - staged = "", - conflict = "", - }, - align = "right", - }, - -- If you don't want to use these columns, you can set `enabled = false` for each of them individually - file_size = { - enabled = true, - required_width = 64, -- min width of window required to show this column - }, - type = { - enabled = true, - required_width = 110, -- min width of window required to show this column - }, - last_modified = { - enabled = true, - required_width = 88, -- min width of window required to show this column - }, - created = { - enabled = false, - required_width = 120, -- min width of window required to show this column - }, - symlink_target = { - enabled = false, - }, - }, - renderers = { - directory = { - { "indent" }, - { "icon" }, - { "current_filter" }, - { - "container", - content = { - { "name", zindex = 10 }, - { - "symlink_target", - zindex = 10, - highlight = "NeoTreeSymbolicLinkTarget", - }, - { "clipboard", zindex = 10 }, - { "diagnostics", errors_only = true, zindex = 20, align = "right", hide_when_expanded = true }, - { "git_status", zindex = 10, align = "right", hide_when_expanded = true }, - { "file_size", zindex = 10, align = "right" }, - { "type", zindex = 10, align = "right" }, - { "last_modified", zindex = 10, align = "right" }, - { "created", zindex = 10, align = "right" }, - }, - }, - }, - file = { - { "indent" }, - { "icon" }, - { - "container", - content = { - { - "name", - zindex = 10 - }, - { - "symlink_target", - zindex = 10, - highlight = "NeoTreeSymbolicLinkTarget", - }, - { "clipboard", zindex = 10 }, - { "bufnr", zindex = 10 }, - { "modified", zindex = 20, align = "right" }, - { "diagnostics", zindex = 20, align = "right" }, - { "git_status", zindex = 10, align = "right" }, - { "file_size", zindex = 10, align = "right" }, - { "type", zindex = 10, align = "right" }, - { "last_modified", zindex = 10, align = "right" }, - { "created", zindex = 10, align = "right" }, - }, - }, - }, - message = { - { "indent", with_markers = false }, - { "name", highlight = "NeoTreeMessage" }, - }, - terminal = { - { "indent" }, - { "icon" }, - { "name" }, - { "bufnr" } - } - }, - nesting_rules = {}, - -- Global custom commands that will be available in all sources (if not overridden in `opts[source_name].commands`) - -- - -- You can then reference the custom command by adding a mapping to it: - -- globally -> `opts.window.mappings` - -- locally -> `opt[source_name].window.mappings` to make it source specific. - -- - -- commands = { | window { | filesystem { - -- hello = function() | mappings = { | commands = { - -- print("Hello world") | ["<C-c>"] = "hello" | hello = function() - -- end | } | print("Hello world in filesystem") - -- } | } | end - -- - -- see `:h neo-tree-custom-commands-global` - commands = {}, -- A list of functions - - window = { -- see https://github.com/MunifTanjim/nui.nvim/tree/main/lua/nui/popup for - -- possible options. These can also be functions that return these options. - position = "left", -- left, right, top, bottom, float, current - width = 40, -- applies to left and right positions - height = 15, -- applies to top and bottom positions - auto_expand_width = false, -- expand the window when file exceeds the window width. does not work with position = "float" - popup = { -- settings that apply to float position only - size = { - height = "80%", - width = "50%", - }, - position = "50%", -- 50% means center it - -- you can also specify border here, if you want a different setting from - -- the global popup_border_style. - }, - same_level = false, -- Create and paste/move files/directories on the same level as the directory under cursor (as opposed to within the directory under cursor). - insert_as = "child", -- Affects how nodes get inserted into the tree during creation/pasting/moving of files if the node under the cursor is a directory: - -- "child": Insert nodes as children of the directory under cursor. - -- "sibling": Insert nodes as siblings of the directory under cursor. - -- Mappings for tree window. See `:h neo-tree-mappings` for a list of built-in commands. - -- You can also create your own commands by providing a function instead of a string. - mapping_options = { - noremap = true, - nowait = true, - }, - mappings = { - ["<space>"] = { - "toggle_node", - nowait = false, -- disable `nowait` if you have existing combos starting with this char that you want to use - }, - ["<2-LeftMouse>"] = "open", - ["<cr>"] = "open", - -- ["<cr>"] = { "open", config = { expand_nested_files = true } }, -- expand nested file takes precedence - ["<esc>"] = "cancel", -- close preview or floating neo-tree window - ["P"] = { "toggle_preview", config = { use_float = true, use_image_nvim = false } }, - ["l"] = "focus_preview", - ["S"] = "open_split", - -- ["S"] = "split_with_window_picker", - ["s"] = "open_vsplit", - -- ["s"] = "vsplit_with_window_picker", - ["t"] = "open_tabnew", - -- ["<cr>"] = "open_drop", - -- ["t"] = "open_tab_drop", - ["w"] = "open_with_window_picker", - ["C"] = "close_node", - ["z"] = "close_all_nodes", - --["Z"] = "expand_all_nodes", - ["R"] = "refresh", - ["a"] = { - "add", - -- some commands may take optional config options, see `:h neo-tree-mappings` for details - config = { - show_path = "none", -- "none", "relative", "absolute" - } - }, - ["A"] = "add_directory", -- also accepts the config.show_path and config.insert_as options. - ["d"] = "delete", - ["r"] = "rename", - ["y"] = "copy_to_clipboard", - ["x"] = "cut_to_clipboard", - ["p"] = "paste_from_clipboard", - ["c"] = "copy", -- takes text input for destination, also accepts the config.show_path and config.insert_as options - ["m"] = "move", -- takes text input for destination, also accepts the config.show_path and config.insert_as options - ["e"] = "toggle_auto_expand_width", - ["q"] = "close_window", - ["?"] = "show_help", - ["<"] = "prev_source", - [">"] = "next_source", - }, - }, - filesystem = { - window = { - mappings = { - ["H"] = "toggle_hidden", - ["/"] = "fuzzy_finder", - ["D"] = "fuzzy_finder_directory", - --["/"] = "filter_as_you_type", -- this was the default until v1.28 - ["#"] = "fuzzy_sorter", -- fuzzy sorting using the fzy algorithm - -- ["D"] = "fuzzy_sorter_directory", - ["f"] = "filter_on_submit", - ["<C-x>"] = "clear_filter", - ["<bs>"] = "navigate_up", - ["."] = "set_root", - ["[g"] = "prev_git_modified", - ["]g"] = "next_git_modified", - ["i"] = "show_file_details", - ["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }}, - ["oc"] = { "order_by_created", nowait = false }, - ["od"] = { "order_by_diagnostics", nowait = false }, - ["og"] = { "order_by_git_status", nowait = false }, - ["om"] = { "order_by_modified", nowait = false }, - ["on"] = { "order_by_name", nowait = false }, - ["os"] = { "order_by_size", nowait = false }, - ["ot"] = { "order_by_type", nowait = false }, - }, - fuzzy_finder_mappings = { -- define keymaps for filter popup window in fuzzy_finder_mode - ["<down>"] = "move_cursor_down", - ["<C-n>"] = "move_cursor_down", - ["<up>"] = "move_cursor_up", - ["<C-p>"] = "move_cursor_up", - }, - }, - async_directory_scan = "auto", -- "auto" means refreshes are async, but it's synchronous when called from the Neotree commands. - -- "always" means directory scans are always async. - -- "never" means directory scans are never async. - scan_mode = "shallow", -- "shallow": Don't scan into directories to detect possible empty directory a priori - -- "deep": Scan into directories to detect empty or grouped empty directories a priori. - bind_to_cwd = true, -- true creates a 2-way binding between vim's cwd and neo-tree's root - cwd_target = { - sidebar = "tab", -- sidebar is when position = left or right - current = "window" -- current is when position = current - }, - check_gitignore_in_search = true, -- check gitignore status for files/directories when searching - -- setting this to false will speed up searches, but gitignored - -- items won't be marked if they are visible. - -- The renderer section provides the renderers that will be used to render the tree. - -- The first level is the node type. - -- For each node type, you can specify a list of components to render. - -- Components are rendered in the order they are specified. - -- The first field in each component is the name of the function to call. - -- The rest of the fields are passed to the function as the "config" argument. - filtered_items = { - visible = false, -- when true, they will just be displayed differently than normal items - force_visible_in_empty_folder = false, -- when true, hidden files will be shown if the root folder is otherwise empty - show_hidden_count = true, -- when true, the number of hidden items in each folder will be shown as the last entry - hide_dotfiles = true, - hide_gitignored = true, - hide_hidden = true, -- only works on Windows for hidden files/directories - hide_by_name = { - ".DS_Store", - "thumbs.db" - --"node_modules", - }, - hide_by_pattern = { -- uses glob style patterns - --"*.meta", - --"*/src/*/tsconfig.json" - }, - always_show = { -- remains visible even if other settings would normally hide it - --".gitignored", - }, - never_show = { -- remains hidden even if visible is toggled to true, this overrides always_show - --".DS_Store", - --"thumbs.db" - }, - never_show_by_pattern = { -- uses glob style patterns - --".null-ls_*", - }, - }, - find_by_full_path_words = false, -- `false` means it only searches the tail of a path. - -- `true` will change the filter into a full path - -- search with space as an implicit ".*", so - -- `fi init` - -- will match: `./sources/filesystem/init.lua - --find_command = "fd", -- this is determined automatically, you probably don't need to set it - --find_args = { -- you can specify extra args to pass to the find command. - -- fd = { - -- "--exclude", ".git", - -- "--exclude", "node_modules" - -- } - --}, - ---- or use a function instead of list of strings - --find_args = function(cmd, path, search_term, args) - -- if cmd ~= "fd" then - -- return args - -- end - -- --maybe you want to force the filter to always include hidden files: - -- table.insert(args, "--hidden") - -- -- but no one ever wants to see .git files - -- table.insert(args, "--exclude") - -- table.insert(args, ".git") - -- -- or node_modules - -- table.insert(args, "--exclude") - -- table.insert(args, "node_modules") - -- --here is where it pays to use the function, you can exclude more for - -- --short search terms, or vary based on the directory - -- if string.len(search_term) < 4 and path == "/home/cseickel" then - -- table.insert(args, "--exclude") - -- table.insert(args, "Library") - -- end - -- return args - --end, - group_empty_dirs = false, -- when true, empty folders will be grouped together - search_limit = 50, -- max number of search results when using filters - follow_current_file = { - enabled = false, -- This will find and focus the file in the active buffer every time - -- -- the current file is changed while the tree is open. - leave_dirs_open = false, -- `false` closes auto expanded dirs, such as with `:Neotree reveal` - }, - hijack_netrw_behavior = "open_default", -- netrw disabled, opening a directory opens neo-tree - -- in whatever position is specified in window.position - -- "open_current",-- netrw disabled, opening a directory opens within the - -- window like netrw would, regardless of window.position - -- "disabled", -- netrw left alone, neo-tree does not handle opening dirs - use_libuv_file_watcher = false, -- This will use the OS level file watchers to detect changes - -- instead of relying on nvim autocmd events. - }, - buffers = { - bind_to_cwd = true, - follow_current_file = { - enabled = true, -- This will find and focus the file in the active buffer every time - -- -- the current file is changed while the tree is open. - leave_dirs_open = false, -- `false` closes auto expanded dirs, such as with `:Neotree reveal` - }, - group_empty_dirs = true, -- when true, empty directories will be grouped together - show_unloaded = false, -- When working with sessions, for example, restored but unfocused buffers - -- are mark as "unloaded". Turn this on to view these unloaded buffer. - terminals_first = false, -- when true, terminals will be listed before file buffers - window = { - mappings = { - ["<bs>"] = "navigate_up", - ["."] = "set_root", - ["bd"] = "buffer_delete", - ["i"] = "show_file_details", - ["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }}, - ["oc"] = { "order_by_created", nowait = false }, - ["od"] = { "order_by_diagnostics", nowait = false }, - ["om"] = { "order_by_modified", nowait = false }, - ["on"] = { "order_by_name", nowait = false }, - ["os"] = { "order_by_size", nowait = false }, - ["ot"] = { "order_by_type", nowait = false }, - }, - }, - }, - git_status = { - window = { - mappings = { - ["A"] = "git_add_all", - ["gu"] = "git_unstage_file", - ["ga"] = "git_add_file", - ["gr"] = "git_revert_file", - ["gc"] = "git_commit", - ["gp"] = "git_push", - ["gg"] = "git_commit_and_push", - ["i"] = "show_file_details", - ["o"] = { "show_help", nowait=false, config = { title = "Order by", prefix_key = "o" }}, - ["oc"] = { "order_by_created", nowait = false }, - ["od"] = { "order_by_diagnostics", nowait = false }, - ["om"] = { "order_by_modified", nowait = false }, - ["on"] = { "order_by_name", nowait = false }, - ["os"] = { "order_by_size", nowait = false }, - ["ot"] = { "order_by_type", nowait = false }, - }, - }, - }, - document_symbols = { - follow_cursor = false, - client_filters = "first", - renderers = { - root = { - {"indent"}, - {"icon", default="C" }, - {"name", zindex = 10}, - }, - symbol = { - {"indent", with_expanders = true}, - {"kind_icon", default="?" }, - {"container", - content = { - {"name", zindex = 10}, - {"kind_name", zindex = 20, align = "right"}, - } - } - }, - }, - window = { - mappings = { - ["<cr>"] = "jump_to_symbol", - ["o"] = "jump_to_symbol", - ["A"] = "noop", -- also accepts the config.show_path and config.insert_as options. - ["d"] = "noop", - ["y"] = "noop", - ["x"] = "noop", - ["p"] = "noop", - ["c"] = "noop", - ["m"] = "noop", - ["a"] = "noop", - ["/"] = "filter", - ["f"] = "filter_on_submit", - }, - }, - custom_kinds = { - -- define custom kinds here (also remember to add icon and hl group to kinds) - -- ccls - -- [252] = 'TypeAlias', - -- [253] = 'Parameter', - -- [254] = 'StaticMethod', - -- [255] = 'Macro', - }, - kinds = { - Unknown = { icon = "?", hl = "" }, - Root = { icon = "", hl = "NeoTreeRootName" }, - File = { icon = "", hl = "Tag" }, - Module = { icon = "", hl = "Exception" }, - Namespace = { icon = "", hl = "Include" }, - Package = { icon = "", hl = "Label" }, - Class = { icon = "", hl = "Include" }, - Method = { icon = "", hl = "Function" }, - Property = { icon = "", hl = "@property" }, - Field = { icon = "", hl = "@field" }, - Constructor = { icon = "", hl = "@constructor" }, - Enum = { icon = "", hl = "@number" }, - Interface = { icon = "", hl = "Type" }, - Function = { icon = "", hl = "Function" }, - Variable = { icon = "", hl = "@variable" }, - Constant = { icon = "", hl = "Constant" }, - String = { icon = "", hl = "String" }, - Number = { icon = "", hl = "Number" }, - Boolean = { icon = "", hl = "Boolean" }, - Array = { icon = "", hl = "Type" }, - Object = { icon = "", hl = "Type" }, - Key = { icon = "", hl = "" }, - Null = { icon = "", hl = "Constant" }, - EnumMember = { icon = "", hl = "Number" }, - Struct = { icon = "", hl = "Type" }, - Event = { icon = "", hl = "Constant" }, - Operator = { icon = "", hl = "Operator" }, - TypeParameter = { icon = "", hl = "Type" }, - - -- ccls - -- TypeAlias = { icon = ' ', hl = 'Type' }, - -- Parameter = { icon = ' ', hl = '@parameter' }, - -- StaticMethod = { icon = ' ', hl = 'Function' }, - -- Macro = { icon = ' ', hl = 'Macro' }, - } - }, - example = { - renderers = { - custom = { - {"indent"}, - {"icon", default="C" }, - {"custom"}, - {"name"} - } - }, - window = { - mappings = { - ["<cr>"] = "toggle_node", - ["<C-e>"] = "example_command", - ["d"] = "show_debug_info", - }, - }, - }, - } diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua deleted file mode 100644 index 293b74c..0000000 --- a/.config/nvim/after/plugin/telescope.lua +++ /dev/null @@ -1,6 +0,0 @@ -local builtin = require('telescope.builtin') -vim.keymap.set('n', '<leader>ff', builtin.find_files, {}) -vim.keymap.set('n', '<leader>fg', builtin.git_files, {}) -vim.keymap.set('n', '<leader>fr', builtin.live_grep, {}) -vim.keymap.set('n', '<leader>fb', builtin.buffers, {}) -vim.keymap.set('n', '<leader>fh', builtin.help_tags, {}) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index d6f6528..0c50b58 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,13 +1,13 @@ { "LuaSnip": { "branch": "master", "commit": "57c9f5c31b3d712376c704673eac8e948c82e9c1" }, - "better-escape.nvim": { "branch": "master", "commit": "7031dc734add47bb71c010e0551829fa5799375f" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "8b407bb6175846cdc4c499e2a8d28109615a2089" }, - "copilot.vim": { "branch": "release", "commit": "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f" }, + "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "harpoon": { "branch": "harpoon2", "commit": "31701337377991c66eebb57ebd23ef01eb587352" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lsp-zero.nvim": { "branch": "v2.x", "commit": "ffebf6f7b0649f1eb81b37c37b75552f8ff96337" }, - "lspsaga.nvim": { "branch": "main", "commit": "335805d4f591f5bb71cabb6aa4dc58ccef8e8617" }, + "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, @@ -17,10 +17,7 @@ "nvim-treesitter": { "branch": "master", "commit": "454c3a9ba86f841dc3b5bb17d150a873a16b77b4" }, "nvim-web-devicons": { "branch": "master", "commit": "aff5f50b34754335a312c9b3dc5b245f605ce437" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, - "rose-pine": { "branch": "main", "commit": "92762f4fa2144c05db760ea254f4c399a56a7ef5" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" }, - "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" }, - "vim-norway": { "branch": "main", "commit": "f4da8c89bdd234fe04e0c37f2fd5406677070894" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" } }
\ No newline at end of file diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 39d5130..505cf76 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -1,11 +1,5 @@ return { "ThePrimeagen/vim-be-good", - "gauteh/vim-norway", - { - "nvim-telescope/telescope.nvim", - tag = "0.1.5", - dependencies = { "nvim-lua/plenary.nvim" }, - }, { "rose-pine/neovim", name = "rose-pine", @@ -13,21 +7,6 @@ return { vim.cmd("colorscheme rose-pine") end, }, - { - "VonHeikemen/lsp-zero.nvim", - branch = "v2.x", - dependencies = { - -- LSP Support - { "neovim/nvim-lspconfig" }, -- Required - { "williamboman/mason.nvim" }, -- Optional - { "williamboman/mason-lspconfig.nvim" }, -- Optional - - -- Autocompletion - { "hrsh7th/nvim-cmp", event = "InsertEnter" }, -- Required - { "hrsh7th/cmp-nvim-lsp" }, -- Required - { "L3MON4D3/LuaSnip" }, -- Required - }, - }, "github/copilot.vim", "nvim-lua/plenary.nvim", { @@ -49,62 +28,4 @@ return { require("better_escape").setup() end, }, - { - "nvimdev/lspsaga.nvim", - config = function() - require("lspsaga").setup({}) - end, - dependencies = { - "nvim-treesitter/nvim-treesitter", -- optional - "nvim-tree/nvim-web-devicons", -- optional - }, - }, - { - "stevearc/conform.nvim", - event = { "BufWritePre" }, - cmd = { "ConformInfo" }, - keys = { - { - -- Customize or remove this keymap to your liking - "<leader>f", - function() - require("conform").format({ async = true, lsp_fallback = true }) - end, - mode = "", - desc = "Format buffer", - }, - }, - -- Everything in opts will be passed to setup() - opts = { - -- Define your formatters - formatters_by_ft = { - lua = { "stylua" }, - python = { "isort", "black" }, - javascript = { { "prettierd", "prettier" } }, - markdown = { "deno_fmt", "prettierd" }, - }, - -- Set up format-on-save - format_on_save = { timeout_ms = 500, lsp_fallback = true }, - -- Customize formatters - formatters = { - shfmt = { - prepend_args = { "-i", "2" }, - }, - }, - }, - init = function() - -- If you want the formatexpr, here is the place to set it - vim.o.formatexpr = "v:lua.require'conform'.formatexpr()" - end, - }, - { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended - "MunifTanjim/nui.nvim", - -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information - }, - }, } |