Update telescope bindings

Switching neogit branch to main

.luarc.json

@@ -0,0 +1,13 @@
+{
+  "runtime.version": "LuaJIT",
+  "runtime.path": [
+    "lua/?.lua",
+    "lua/?/init.lua"
+  ],
+  "diagnostics.globals": ["vim"],
+  "workspace.checkThirdParty": false,
+  "workspace.library": [
+    "$VIMRUNTIME",
+    "./lua"
+  ]
+}

after/plugin/harpoon.lua

@@ -28,20 +28,17 @@ vim.keymap.set("n", "<leader>H", function() toggle_telescope(harpoon:list()) end
 
 vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end,
     { desc = "Harpoon: Add current buffer" })
-vim.keymap.set("n", "<leader>h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
+vim.keymap.set("n", "<leader>hh", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
     { desc = "Harpoon: Toggle quick menu" })
 
 vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
 vim.keymap.set("n", "<C-j>", function() harpoon:list():select(2) end)
 vim.keymap.set("n", "<C-k>", function() harpoon:list():select(3) end)
 vim.keymap.set("n", "<C-l>", function() harpoon:list():select(4) end)
-vim.keymap.set("n", "<C-y>", function() harpoon:list():select(5) end)
-vim.keymap.set("n", "<C-u>", function() harpoon:list():select(6) end)
-vim.keymap.set("n", "<C-i>", function() harpoon:list():select(7) end)
-vim.keymap.set("n", "<C-o>", function() harpoon:list():select(8) end)
 
 -- Toggle previous & next buffers stored within Harpoon list
-vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end,
+vim.keymap.set("n", "<leader>hp", function() harpoon:list():prev() end,
     { desc = "Harpoon: Previous buffer" })
-vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end,
+vim.keymap.set("n", "<leader>hn", function() harpoon:list():next() end,
     { desc = "Harpoon: Next buffer" })
+

after/plugin/telescope.lua

@@ -1,7 +1,7 @@
 -- finding files in working dir and repo
 local builtin = require('telescope.builtin')
 vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>pf', builtin.git_files, {})
-vim.keymap.set('n', '<leader>ps', function()
-	builtin.grep_string({ search = vim.fn.input("Grep > ") });
-end)
+vim.keymap.set('n', '<leader>fp', builtin.git_files, {})
+vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
+vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })

after/plugin/treesitter.lua

@@ -1,8 +1,8 @@
 -- parsing and highlighting
 require'nvim-treesitter.configs'.setup {
   -- A list of parser names, or "all" (the five listed parsers should always be installed)
-  ensure_installed = { "python", "javascript", "php", "typescript", "bash", "lua", "vim", "vimdoc", "query" },
 
+  ensure_installed = 'all',
   -- Install parsers synchronously (only applied to `ensure_installed`)
   sync_install = false,
 
@@ -14,6 +14,7 @@ require'nvim-treesitter.configs'.setup {
     enable = true,
   },
 
+  -- Needed because treesitter highlight turns off autoindent for php files
   indent = {
       enable = true,
   },

init.lua

@@ -1,6 +1,6 @@
 require("sevi-kun")
 
-local lazypath = vim.fn.stdpath("data") .. "\\lazy\\lazy.nvim"
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
   vim.fn.system({
     "git",

lua/sevi-kun/plugins.lua

@@ -24,18 +24,15 @@ return {
 
     { "ThePrimeagen/harpoon",
     	branch = "harpoon2",
-        dependencies = { 
-            "nvim-lua/plenary.nvim",
-            "nvim-telescope/telescope.nvim"
-        },
+        dependencies = { "nvim-lua/plenary.nvim" },
     },
 
     { "NeogitOrg/neogit",
-        branch = "nightly",
+        branch = "master",
         dependencies = {
             "nvim-lua/plenary.nvim",
-            "sindrets/diffview.nvim",        -- optional - Diff integration
-            "nvim-telescope/telescope.nvim", -- optional
+            "sindrets/diffview.nvim",
+            "nvim-telescope/telescope.nvim",
         }
     },
 
@@ -69,11 +66,11 @@ return {
 
     -- pretty
 
-    { "loctvl842/monokai-pro.nvim",
+    { "navarasu/onedark.nvim",
         lazy = false,
         priority = 1000,
         config = function()
-            vim.cmd("colorscheme monokai-pro")
+            vim.cmd("colorscheme onedark")
         end
     },
 
@@ -99,10 +96,12 @@ return {
 
     -- lsp
 
-    { "github/copilot.vim" },
+    {
+        "Exafunction/codeium.vim",
+        event = "BufEnter"
+    },
 
     {"williamboman/mason.nvim",
-        lazy = false,
         config = function()
             require("mason").setup({})
         end

lua/sevi-kun/remap.lua

@@ -22,3 +22,6 @@ vim.keymap.set("v", "<leader>y", "\"+y")
 vim.keymap.set("n", "<leader>Y", "\"+Y")
 
 vim.keymap.set("n", "<F5>", ":make")
+
+vim.keymap.set("n", "<leader>vs", ":vs #<CR>")
+vim.keymap.set("n", "<leader>sp", ":sp #<CR>")

lua/sevi-kun/set.lua

@@ -16,7 +16,7 @@ vim.opt.wrap = false
 
 vim.opt.swapfile = false
 vim.opt.backup = false
-vim.opt.undodir = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\undodir"
+vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
 vim.opt.undofile = true
 
 vim.opt.hlsearch = true
@@ -30,7 +30,7 @@ vim.opt.isfname:append("@-@")
 
 vim.opt.updatetime = 50
 
-vim.opt.colorcolumn = "95"
+vim.opt.colorcolumn = "80"
 
 vim.g.netrw_preview   = 1
 vim.g.netrw_liststyle = 3