diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua new file mode 100644 index 00000000..8ccb9689 --- /dev/null +++ b/after/plugin/harpoon.lua @@ -0,0 +1,18 @@ +local mark = require 'harpoon.mark' +local ui = require 'harpoon.ui' + +vim.keymap.set('n', 'a', mark.add_file, { desc = 'Mark [A] file for Harpoon' }) +vim.keymap.set('n', '', ui.toggle_quick_menu) + +vim.keymap.set('n', '', function() + ui.nav_file(1) +end) +vim.keymap.set('n', '', function() + ui.nav_file(2) +end) +vim.keymap.set('n', '', function() + ui.nav_file(3) +end) +vim.keymap.set('n', '', function() + ui.nav_file(4) +end) diff --git a/init.lua b/init.lua index 776c6873..b7ecbafc 100644 --- a/init.lua +++ b/init.lua @@ -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' @@ -180,10 +180,10 @@ vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagn vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) -- 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!!"') --- vim.keymap.set('n', '', 'echo "Use k to move!!"') --- vim.keymap.set('n', '', 'echo "Use j to move!!"') +vim.keymap.set('n', '', 'echo "Use h to move!!"') +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!!"') -- Keybinds to make split navigation easier. -- Use CTRL+ to switch between windows @@ -200,6 +200,16 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the upper win -- vim.keymap.set("n", "", "J", { desc = "Move window to the lower" }) -- vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) +-- Custom keybinds from Blake +vim.keymap.set('i', 'jj', '', { desc = 'Exit insert mode using jj' }) +vim.keymap.set('n', 'e', ':Explore', { desc = 'Go into [E]xplore mode' }) +vim.opt.hlsearch = true +vim.opt.incsearch = true +vim.opt.smartindent = true +vim.opt.signcolumn = 'yes' +vim.opt['tabstop'] = 4 +vim.opt['shiftwidth'] = 4 + -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -686,7 +696,7 @@ require('lazy').setup({ callSnippet = 'Replace', }, -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings - -- diagnostics = { disable = { 'missing-fields' } }, + diagnostics = { disable = { 'missing-fields' } }, }, }, }, @@ -791,12 +801,12 @@ require('lazy').setup({ -- `friendly-snippets` contains a variety of premade snippets. -- See the README about individual language/framework/plugin snippets: -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, + { + 'rafamadriz/friendly-snippets', + config = function() + require('luasnip.loaders.from_vscode').lazy_load() + end, + }, }, opts = {}, }, @@ -827,7 +837,7 @@ require('lazy').setup({ -- : Toggle signature help -- -- See :h blink-cmp-config-keymap for defining your own keymap - preset = 'default', + preset = 'super-tab', -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps @@ -878,8 +888,11 @@ require('lazy').setup({ config = function() ---@diagnostic disable-next-line: missing-fields require('tokyonight').setup { + transparent = true, styles = { - comments = { italic = false }, -- Disable italics in comments + sidebars = 'transparent', + floats = 'transparent', + comments = { italic = true }, -- Disable italics in comments }, } @@ -965,18 +978,18 @@ 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.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + require 'kickstart.plugins.debug', + require 'kickstart.plugins.indent_line', + require 'kickstart.plugins.lint', + require 'kickstart.plugins.autopairs', + require 'kickstart.plugins.neo-tree', + require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps -- 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. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua new file mode 100644 index 00000000..3d1640e2 --- /dev/null +++ b/lua/custom/plugins/harpoon.lua @@ -0,0 +1,3 @@ +return { + { 'thePrimeagen/harpoon' }, +} diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/vimbegood.lua similarity index 81% rename from lua/custom/plugins/init.lua rename to lua/custom/plugins/vimbegood.lua index be0eb9d8..132d1102 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/vimbegood.lua @@ -2,4 +2,6 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return {} +return { + { 'thePrimeagen/vim-be-good' }, +}