diff --git a/stowers/nvim/dot-config/nvim/after/plugin/harpoon.lua b/stowers/nvim/dot-config/nvim/after/plugin/harpoon.lua new file mode 100644 index 0000000..6a19011 --- /dev/null +++ b/stowers/nvim/dot-config/nvim/after/plugin/harpoon.lua @@ -0,0 +1,26 @@ +local harpoon = require("harpoon") + +harpoon:setup() + +-- basic telescope configuration +local conf = require("telescope.config").values +local function toggle_telescope(harpoon_files) + local file_paths = {} + for _, item in ipairs(harpoon_files.items) do + table.insert(file_paths, item.value) + end + + require("telescope.pickers").new({}, { + prompt_title = "Harpoon", + finder = require("telescope.finders").new_table({ + results = file_paths, + }), + previewer = conf.file_previewer({}), + sorter = conf.generic_sorter({}), + }):find() +end + +vim.keymap.set("n", "fh", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) +vim.keymap.set("n", "ha", function() harpoon:list():add() end) +vim.keymap.set("n", "hd", function() harpoon:list():remove() end) +vim.keymap.set("n", "hc", function() harpoon:list():clear() end) diff --git a/stowers/nvim/dot-config/nvim/after/plugin/nvim-tree.lua b/stowers/nvim/dot-config/nvim/after/plugin/nvim-tree.lua index d4af864..07f20f0 100644 --- a/stowers/nvim/dot-config/nvim/after/plugin/nvim-tree.lua +++ b/stowers/nvim/dot-config/nvim/after/plugin/nvim-tree.lua @@ -6,4 +6,14 @@ vim.g.loaded_netrwPlugin = 1 vim.opt.termguicolors = true -- Use defaults -require('nvim-tree').setup() +require('nvim-tree').setup({ + actions = { + open_file = { + quit_on_open = true, + }, + }, + view = { + side = "right", + width = 50, + } +}) diff --git a/stowers/nvim/dot-config/nvim/after/plugin/treesitter.lua b/stowers/nvim/dot-config/nvim/after/plugin/treesitter.lua index 380857b..a477bec 100644 --- a/stowers/nvim/dot-config/nvim/after/plugin/treesitter.lua +++ b/stowers/nvim/dot-config/nvim/after/plugin/treesitter.lua @@ -1,6 +1,6 @@ require'nvim-treesitter.configs'.setup { - -- A list of parser names, or "all" (the five listed parsers should always be installed) - ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "elixir", "go", "bash", "javascript", "typescript", "rust", "graphql" }, + -- A list of parser names, or "all" + ensure_installed = {}, -- Install parsers synchronously (only applied to `ensure_installed`) sync_install = false, diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/packer.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/packer.lua index 5e92b7c..8ce2493 100644 --- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/packer.lua +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/packer.lua @@ -14,9 +14,9 @@ local ensure_packer = function() }) vim.cmd [[packadd packer.nvim]] return true - else - return false end + + return false end local packer_bootstrap = ensure_packer() @@ -75,18 +75,20 @@ return require("packer").startup(function(use) "nvim-tree/nvim-web-devicons" } + -- Harpoon + use { + "ThePrimeagen/harpoon", + branch = "harpoon2", + requires = { { "nvim-lua/plenary.nvim" } } + } + -- Git BLAME use { "APZelos/blamer.nvim", tag = "v1.3.0", } - -- Tab support use { - "romgrk/barbar.nvim", tag = "v1.7.0", - requires = { - { "lewis6991/gitsigns.nvim" }, -- Git status - { "nvim-tree/nvim-web-devicons" }, -- Icons - } + "airblade/vim-gitgutter", branch = "main", } -- Automatically set indent values diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/remap.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/remap.lua index 882c5b8..735bb91 100644 --- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/remap.lua +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/remap.lua @@ -13,6 +13,7 @@ vim.keymap.set('n', 'q', function() end, {}) vim.keymap.set('n', 'fv', vim.cmd.NvimTreeToggle, {}) +vim.keymap.set('n', 'l', function() vim.opt.list = not(vim.opt.list:get()) end) vim.keymap.set('n', '|', wrap_args(vim.cmd.wincmd, 'v'), {}) vim.keymap.set('n', '-', wrap_args(vim.cmd.wincmd, 's'), {}) @@ -23,5 +24,3 @@ vim.keymap.set('n', '', wrap_args(vim.cmd.wincmd, 'k'), {}) vim.keymap.set('n', '', wrap_args(vim.cmd.wincmd, 'l'), {}) vim.keymap.set('n', '', wrap_args(vim.cmd.wincmd, 'p'), {}) - - diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/settings.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/settings.lua index 04ed2c5..2474b0e 100644 --- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/settings.lua +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/settings.lua @@ -1,6 +1,14 @@ -- Line numbers vim.opt.nu = true vim.opt.relativenumber = true +vim.opt.ruler = true +vim.opt.wrap = true +vim.opt.textwidth = 79 +vim.opt.fillchars = { eob = " " } +vim.opt.showmode = true +vim.opt.showcmd = true +vim.opt.list = true +vim.opt.listchars = "tab:▸ ,eol:¬" -- Indent settings vim.opt.tabstop = 4