diff --git a/home/any/neovim/.config/nvim/lazy-lock.json b/home/any/neovim/.config/nvim/lazy-lock.json index 9ae09be..a93d37f 100644 --- a/home/any/neovim/.config/nvim/lazy-lock.json +++ b/home/any/neovim/.config/nvim/lazy-lock.json @@ -12,8 +12,9 @@ "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" }, "gopher.nvim": { "branch": "main", "commit": "f55c15ada8e02398000c04a96ef44d986cd01051" }, + "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "menu": { "branch": "main", "commit": "ee85b2e394fde354bd24e35ff7a688d10c9212fa" }, @@ -25,15 +26,14 @@ "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, "nvim-dap-python": { "branch": "master", "commit": "03fe9592409236b9121c03b66a682dfca15a5cac" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, - "nvim-lspconfig": { "branch": "master", "commit": "0d62a16429dba5fded93a076237079b81527e8f3" }, + "nvim-lspconfig": { "branch": "master", "commit": "ff69ecca55d83ffc70657f260a799f79a5637831" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-tree.lua": { "branch": "master", "commit": "2a268f631da85e83b7a95291be589bcddfc785d8" }, - "nvim-treesitter": { "branch": "master", "commit": "bab7b0f20bd3e805b77231a77f516c7d69382693" }, + "nvim-tree.lua": { "branch": "master", "commit": "5ad87620ec9d1190d15c88171a3f0122bc16b0fe" }, + "nvim-treesitter": { "branch": "master", "commit": "9b1e607298dd5fc2ee6549488324cc92dafb99c0" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, - "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "tagbar": { "branch": "master", "commit": "d55d454bd3d5b027ebf0e8c75b8f88e4eddad8d8" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "ui": { "branch": "v3.0", "commit": "81f5ff0fb2ce60cc3b2cfc9df928751c2ac4f7e9" }, "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, diff --git a/home/any/neovim/.config/nvim/lua/chadrc.lua b/home/any/neovim/.config/nvim/lua/chadrc.lua index 9b55689..224323f 100644 --- a/home/any/neovim/.config/nvim/lua/chadrc.lua +++ b/home/any/neovim/.config/nvim/lua/chadrc.lua @@ -15,6 +15,8 @@ M.base46 = { Special = { fg = "#D4ADB7" }, ["@string"] = { fg = "#EF2F27" }, Keyword = { fg = "#68A8E4" }, + Conditional = { fg = "#68A8E4" }, + Define = { fg = "#68A8E4" }, SpecialChar = { fg = "#68A8E4" }, Include = { fg = "#68A8E4" }, ["@keyword"] = { fg = "#68A8E4" }, @@ -37,6 +39,7 @@ M.base46 = { ["@comment"] = { fg = "#519F50" }, ["@string.documentation.python"] = { fg = "#519F50" }, ["@function"] = { fg = "#FED06E" }, + Function = { fg = "#FED06E" }, ["@function.call"] = { fg = "#FED06E" }, ["@function.method"] = { fg = "#FED06E" }, ["@function.method.call"] = { fg = "#FED06E" }, diff --git a/home/any/neovim/.config/nvim/lua/plugins/harpoon.lua b/home/any/neovim/.config/nvim/lua/plugins/harpoon.lua new file mode 100644 index 0000000..ad2d334 --- /dev/null +++ b/home/any/neovim/.config/nvim/lua/plugins/harpoon.lua @@ -0,0 +1,51 @@ +return { + { + "ThePrimeagen/harpoon", + branch = "harpoon2", + dependencies = { "nvim-lua/plenary.nvim" }, + lazy = false, + config = function() + local harpoon = require("harpoon") + local map = vim.keymap.set + + -- REQUIRED + harpoon:setup({}) + -- REQUIRED + + map("n", "a", function() harpoon:list():add() end) + map("n", "", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) + + map("n", "", function() harpoon:list():select(1) end) + map("n", "", function() harpoon:list():select(2) end) + map("n", "", function() harpoon:list():select(3) end) + map("n", "", function() harpoon:list():select(4) end) + + -- Toggle previous & next buffers stored within Harpoon list + map("n", "", function() harpoon:list():prev() end) + map("n", "", function() harpoon:list():next() end) + + -- -- 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 + -- + -- map( + -- "n", "", function() toggle_telescope(harpoon:list()) end, + -- { desc = "Open harpoon window" } + -- ) + end, + } +} diff --git a/home/any/neovim/.config/nvim/lua/plugins/rooter.lua b/home/any/neovim/.config/nvim/lua/plugins/rooter.lua index def8045..fc99f82 100644 --- a/home/any/neovim/.config/nvim/lua/plugins/rooter.lua +++ b/home/any/neovim/.config/nvim/lua/plugins/rooter.lua @@ -1,6 +1,7 @@ return { { "airblade/vim-rooter", + lazy = false, init = function() vim.g.rooter_cd_cmd = "lcd" vim.g.rooter_silent_chdir = 1 diff --git a/home/any/neovim/.config/nvim/lua/plugins/treesitter.lua b/home/any/neovim/.config/nvim/lua/plugins/treesitter.lua index 7f0bca6..d3ec4e3 100644 --- a/home/any/neovim/.config/nvim/lua/plugins/treesitter.lua +++ b/home/any/neovim/.config/nvim/lua/plugins/treesitter.lua @@ -3,24 +3,75 @@ return { "nvim-treesitter/nvim-treesitter", opts = { ensure_installed = { - "html", - "css", + "arduino", "bash", - "vimdoc", - "javascript", - "typescript", + "bibtex", "c", - "lua", - "rust", - "python", - "go", - "zig", + "cmake", + "commonlisp", + "cpp", + "css", + "csv", + "cuda", + "diff", + "doxygen", + "dockerfile", + "erlang", "fortran", + "gitcommit", + "git_config", + "gitignore", + "go", + "gomod", + "gosum", + "gotmpl", + "gowork", + "gpg", + "graphql", + "haskell", + "helm", + "html", + "ini", + "java", + "javascript", + "jq", + "json", + "latex", + "llvm", + "lua", + "make", + "markdown", + "markdown_inline", + "mermaid", + "muttrc", + "nginx", + "objc", + "ocaml", + "pascal", + "passwd", + "perl", + "php", + "powershell", + "promql", + "puppet", + "python", + "regex", + "rego", + "requirements", + "ruby", + "rust", + "scala", + "scss", + "sql", + "ssh_config", + "terraform", + "toml", + "typescript", + "vimdoc", + "yaml", + "xml", + "zig", } }, }, - { - "nvim-treesitter/playground", - lazy = false, - } }