From dd54e7e7456755580cc996c6c1ec8eab66823372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jona=20L=C3=B6ffler?= <> Date: Mon, 22 Apr 2024 15:40:45 +0200 Subject: [PATCH] Update with own configuration, nvimtree --- init.lua | 15 +++-- lua/custom/plugins/nvim-tree.lua | 100 +++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 lua/custom/plugins/nvim-tree.lua diff --git a/init.lua b/init.lua index 256da5b8..fa6da7c8 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.opt` @@ -102,7 +102,7 @@ vim.g.have_nerd_font = false vim.opt.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true +vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a' @@ -189,6 +189,10 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the left wind vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +vim.keymap.set('n', 'h', '', { desc = 'Move focus to the left window' }) +vim.keymap.set('n', 'l', '', { desc = 'Move focus to the right window' }) +vim.keymap.set('n', 'j', '', { desc = 'Move focus to the lower window' }) +vim.keymap.set('n', 'k', '', { desc = 'Move focus to the upper window' }) -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -767,13 +771,14 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', + 'wuelnerdotexe/vim-enfocado', priority = 1000, -- Make sure to load this before all the other start plugins. init = function() -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' + vim.cmd.colorscheme 'enfocado' + vim.g.enfocado_style = 'nature' -- You can configure highlights by doing something like: vim.cmd.hi 'Comment gui=none' @@ -874,7 +879,7 @@ require('lazy').setup({ -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, }, { ui = { -- If you are using a Nerd Font: set icons to an empty table which will use the diff --git a/lua/custom/plugins/nvim-tree.lua b/lua/custom/plugins/nvim-tree.lua new file mode 100644 index 00000000..e210fba6 --- /dev/null +++ b/lua/custom/plugins/nvim-tree.lua @@ -0,0 +1,100 @@ +return { + 'nvim-tree/nvim-tree.lua', + init = function() + local opts = function(desc) + return { desc = 'NvimTree: ' .. desc, noremap = true, silent = true, nowait = true } + end + + local open = function() + require('nvim-tree.api').tree.open { current_window = true, find_file = true } + end + + vim.keymap.set('n', '-', open, opts 'Open and find file') + end, + opts = { + renderer = { + group_empty = true, + }, + actions = { + open_file = { + quit_on_open = true, + }, + }, + on_attach = function(bufnr) + local api = require 'nvim-tree.api' + + local function opts(desc) + return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true } + end + + vim.keymap.set('n', '', api.tree.change_root_to_node, opts 'CD') + -- vim.keymap.set("n", "", api.node.open.replace_tree_buffer, opts "Open: In Place") + vim.keymap.set('n', '', api.node.show_info_popup, opts 'Info') + vim.keymap.set('n', '', api.fs.rename_sub, opts 'Rename: Omit Filename') + vim.keymap.set('n', '', api.node.open.tab, opts 'Open: New Tab') + vim.keymap.set('n', '', api.node.open.vertical, opts 'Open: Vertical Split') + vim.keymap.set('n', '', api.node.open.horizontal, opts 'Open: Horizontal Split') + vim.keymap.set('n', '', api.node.navigate.parent_close, opts 'Close Directory') + -- vim.keymap.set("n", "", api.node.open.edit, opts "Open") + vim.keymap.set('n', '', api.node.open.replace_tree_buffer, opts 'Open: In Place') + vim.keymap.set('n', '', api.node.open.preview, opts 'Open Preview') + vim.keymap.set('n', '>', api.node.navigate.sibling.next, opts 'Next Sibling') + vim.keymap.set('n', '<', api.node.navigate.sibling.prev, opts 'Previous Sibling') + vim.keymap.set('n', '.', api.node.run.cmd, opts 'Run Command') + vim.keymap.set('n', '-', api.tree.change_root_to_parent, opts 'Up') + vim.keymap.set('n', 'a', api.fs.create, opts 'Create') + vim.keymap.set('n', 'bmv', api.marks.bulk.move, opts 'Move Bookmarked') + vim.keymap.set('n', 'B', api.tree.toggle_no_buffer_filter, opts 'Toggle No Buffer') + vim.keymap.set('n', 'c', api.fs.copy.node, opts 'Copy') + vim.keymap.set('n', 'C', api.tree.toggle_git_clean_filter, opts 'Toggle Git Clean') + vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts 'Prev Git') + vim.keymap.set('n', ']c', api.node.navigate.git.next, opts 'Next Git') + vim.keymap.set('n', 'd', api.fs.remove, opts 'Delete') + vim.keymap.set('n', 'D', api.fs.trash, opts 'Trash') + vim.keymap.set('n', 'E', api.tree.expand_all, opts 'Expand All') + vim.keymap.set('n', 'e', api.fs.rename_basename, opts 'Rename: Basename') + vim.keymap.set('n', ']e', api.node.navigate.diagnostics.next, opts 'Next Diagnostic') + vim.keymap.set('n', '[e', api.node.navigate.diagnostics.prev, opts 'Prev Diagnostic') + vim.keymap.set('n', 'F', api.live_filter.clear, opts 'Clean Filter') + vim.keymap.set('n', 'f', api.live_filter.start, opts 'Filter') + vim.keymap.set('n', 'g?', api.tree.toggle_help, opts 'Help') + vim.keymap.set('n', 'gy', api.fs.copy.absolute_path, opts 'Copy Absolute Path') + vim.keymap.set('n', 'H', api.tree.toggle_hidden_filter, opts 'Toggle Dotfiles') + vim.keymap.set('n', 'I', api.tree.toggle_gitignore_filter, opts 'Toggle Git Ignore') + vim.keymap.set('n', 'J', api.node.navigate.sibling.last, opts 'Last Sibling') + vim.keymap.set('n', 'K', api.node.navigate.sibling.first, opts 'First Sibling') + vim.keymap.set('n', 'm', api.marks.toggle, opts 'Toggle Bookmark') + vim.keymap.set('n', 'o', api.node.open.edit, opts 'Open') + vim.keymap.set('n', 'O', api.node.open.no_window_picker, opts 'Open: No Window Picker') + vim.keymap.set('n', 'p', api.fs.paste, opts 'Paste') + vim.keymap.set('n', 'P', api.node.navigate.parent, opts 'Parent Directory') + vim.keymap.set('n', 'q', api.tree.close, opts 'Close') + vim.keymap.set('n', 'r', api.fs.rename, opts 'Rename') + vim.keymap.set('n', 'R', api.tree.reload, opts 'Refresh') + vim.keymap.set('n', 's', api.node.run.system, opts 'Run System') + vim.keymap.set('n', 'S', api.tree.search_node, opts 'Search') + vim.keymap.set('n', 'U', api.tree.toggle_custom_filter, opts 'Toggle Hidden') + vim.keymap.set('n', 'W', api.tree.collapse_all, opts 'Collapse') + vim.keymap.set('n', 'x', api.fs.cut, opts 'Cut') + vim.keymap.set('n', 'y', api.fs.copy.filename, opts 'Copy Name') + vim.keymap.set('n', 'Y', api.fs.copy.relative_path, opts 'Copy Relative Path') + vim.keymap.set('n', '<2-LeftMouse>', api.node.open.edit, opts 'Open') + vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts 'CD') + + local function change_root_to_global_cwd() + local global_cwd = vim.fn.getcwd(-1, -1) + api.tree.change_root(global_cwd) + end + + vim.keymap.set('n', '', change_root_to_global_cwd) + + local function toggle_replace() + if api.tree.is_visible() then + api.tree.close() + else + api.node.open.replace_tree_buffer() + end + end + end, + }, +}