diff --git a/init.lua b/init.lua index 3bdb5e36..9965f63b 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 -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, for 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' @@ -172,6 +172,19 @@ vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagn -- or just use to exit terminal mode vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) +-- Add ThePrimeAgen's commands +vim.keymap.set('n', 'pv', vim.cmd.Ex, { desc = '[V]iew Workspace' }) + +-- Remap blockwise Visual mode +vim.keymap.set('n', 'v', '', { desc = '[V]isual Block Mode' }) + +-- Neotree keymaps +vim.keymap.set('n', 'w/', ':Neotree toggle current reveal_force_cwd', { desc = '[/] toggle current (Neotree)' }) +vim.keymap.set('n', 'wr', ':Neotree toggle reveal', { desc = 'Toggle [R]eveal (Neotree)' }) +vim.keymap.set('n', 'wd', ':Neotree float reveal_file= reveal_force_cwd', { desc = '[D] float reveal file (Neotree)' }) +vim.keymap.set('n', 'wb', ':Neotree toggle show buffers right', { desc = 'Toggle [B]uffers (Neotree)' }) +vim.keymap.set('n', 'gs', ':Neotree float git_status', { desc = 'Show Git [S]tatus (Neotree)' }) + -- TIP: Disable arrow keys in normal mode -- vim.keymap.set('n', '', 'echo "Use h to move!!"') -- vim.keymap.set('n', '', 'echo "Use l to move!!"') @@ -283,6 +296,7 @@ require('lazy').setup({ ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, + ['p'] = { name = '[P]lugins', _ = 'which_key_ignore' }, } end, }, @@ -810,15 +824,15 @@ require('lazy').setup({ -- Here are some example plugins that I've included in the kickstart repository. -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.debug', + require 'kickstart.plugins.indent_line', -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. -- -- 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 have a Nerd Font, set icons to an empty table which will use the diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua new file mode 100644 index 00000000..bec15faa --- /dev/null +++ b/lua/custom/plugins/filetree.lua @@ -0,0 +1,15 @@ +-- Unless you are still migrating, remove the deprecated commands from v1.x +vim.cmd [[ let g:neo_tree_remove_legacy_commands = 1 ]] + +return { + 'nvim-neo-tree/neo-tree.nvim', + version = '*', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended + 'MunifTanjim/nui.nvim', + }, + config = function() + require('neo-tree').setup {} + end, +}