Merge branch 'Windows'

after/ftplugin/cpp.lua

@@ -0,0 +1,5 @@
+local tab_spacing = 2
+vim.opt.tabstop = tab_spacing
+vim.opt.softtabstop = tab_spacing
+vim.opt.shiftwidth = tab_spacing
+vim.opt_local.makeprg = 'msbuild .\\game.vcxproj /p:Configuration=Release /p:Platform=x64'

after/ftplugin/php.lua

@@ -0,0 +1,4 @@
+vim.keymap.set("n", "<space>pa", function()
+  package.loaded["php.artisan"] = nil
+  require("php.artisan").telescope_select_artisan()
+end)

after/plugin/colors.lua

@@ -0,0 +1,10 @@
+function ColorMyPencils(color)
+    color = color or "catppuccin"
+    vim.cmd.colorscheme(color)
+
+    -- make transparent BG
+    vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+    vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+end
+
+ColorMyPencils()

lua/barink/after/plugin/colors.lua

@@ -1,10 +0,0 @@
-function ColorMyPencils(color)
-    color = color or "tokyonight"
-    vim.cmd.colorscheme(color)
-
-    -- make transparent BG
-     vim.api.nvim_set_hl(0, "Normal", {bg = "none"})
-     vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none"})
-end
-
-ColorMyPencils()

lua/barink/init.lua

@@ -1,5 +1,4 @@
 require("barink.vim")
-require("barink.keys")
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
 	vim.fn.system({
@@ -12,13 +11,14 @@ if not vim.loop.fs_stat(lazypath) then
 	})
 end
 vim.opt.rtp:prepend(lazypath)
-local opts = {
+require("barink.keys")
-	defaults = {
+require("lazy").setup("barink.plugins" , {
-		lazy = false,
+    root = vim.fn.stdpath("data") .. "/lazy", -- directory where plugins will be installed
-	},
+    -- leave nil when passing the spec as the first argument to setup()
     change_detection = {
-		enabled = true,
+      -- automatically check for config file changes and reload the ui
-		notify = false,
+      enabled = false,
+      notify = true, -- get a notification when changes are found
     },
-}
+
-require("lazy").setup("barink.plugins", opts)
+})

lua/barink/keys.lua

@@ -13,35 +13,62 @@ vim.keymap.set('v', '<A-S-j>', ':m \'>+1<CR>gv=gv', {noremap = true})
 vim.keymap.set('v', '<A-S-k>', ':m \'<-2<CR>gv=gv', { noremap = true })
 
 -- Move lines while in normal mode
-vim.keymap.set("n", "<A-S-j>", ":m .+1<CR>==", { noremap = true })
+vim.keymap.set('n', '<A-S-j>', ':m .+1<CR>==', { noremap = true })
-vim.keymap.set("n", "<A-S-k>", ":m .-2<CR>==", { noremap = true })
+vim.keymap.set('n', '<A-S-k>', ':m .-2<CR>==', { noremap = true })
 
 -- Move line in edit mode
-vim.keymap.set("i", "<A-j>", ":m .+1<CR>==gi", { noremap = true })
+vim.keymap.set('i', '<A-j>', ':m .+1<CR>==gi', { noremap = true })
-vim.keymap.set("i", "<A-k>", ":m .-2<CR>==gi", { noremap = true })
+vim.keymap.set('i', '<A-k>', ':m .-2<CR>==gi', { noremap = true })
 
+-- Simplified split navigation
+vim.keymap.set('n', '<C-h>', '<C-w><C-h>')
+vim.keymap.set('n', '<C-j>', '<C-w><C-j>')
+vim.keymap.set('n', '<C-k>', '<C-w><C-k>')
+vim.keymap.set('n', '<C-l>', '<C-w><C-l>')
 -- Diagnostics !
-vim.keymap.set('n', '<C-T>', function() require('trouble').toggle() end )
+vim.keymap.set('n', '<C-T>', function() require('trouble').toggle('diagnostics') end)
 vim.keymap.set('n', '<leader>d', function() vim.diagnostic.open_float() end)
 vim.keymap.set('n', '<leader>dn', function() vim.diagnostic.goto_next() end)
 vim.keymap.set('n', '<leader>dp', function() vim.diagnostic.goto_prev() end)
-vim.keymap.set('n', '<C-d>', function () vim.lsp.buf.code_action() end)
+vim.keymap.set('n', '<leader>ca', function() vim.lsp.buf.code_action() end)
-
 -- Debugging
-vim.keymap.set("n", "<leader>sb", function()
+vim.keymap.set('n', '<leader>b', function() require('dap').toggle_breakpoint() end)
-	require("dap").toggle_breakpoint()
+vim.keymap.set('n', '<F5>', function()
+    print("Start debug session")
+    require('dap').continue()
 end)
-vim.keymap.set("n", "<leader>db", function()
+vim.keymap.set('n', '<F6>', function() require('dap').step_over() end)
-	require("dapui").toggle()
+vim.keymap.set('n', '<F7>', function() require('dap').step_into() end)
-end)
+
-vim.keymap.set("n", "<F5>", function()
+vim.keymap.set('n', '<leader>=', ":Gen Generate<CR>")
-	require("dap").continue()
+
-end)
+-- Easily hit escape in terminal mode.
-vim.keymap.set("n", "<F6>", function()
+vim.keymap.set("t", "<esc><esc>", "<c-\\><c-n>")
-	require("dap").step_over()
+
-end)
+-- Open a terminal at the bottom of the screen with a fixed height.
-vim.keymap.set("n", "<F7>", function()
+vim.keymap.set("n", ",st", function()
-	require("dap").step_into()
+    vim.cmd.new()
+    vim.cmd.wincmd "J"
+    vim.api.nvim_win_set_height(0, 12)
+    vim.wo.winfixheight = true
+    vim.cmd.term()
 end)
 
-vim.keymap.set("n", "<leader>=", ":Gen Generate<CR>")
+-- Open quickfix list
+vim.keymap.set("n", "<M-k>", "<cmd>cnext<CR>zz")
+vim.keymap.set("n", "<M-j>", "<cmd>cprev<CR>zz")
+
+
+-- Go to next in location list
+vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
+vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
+
+
+-- Highlight on yank
+vim.api.nvim_create_autocmd("TextYankPost", {
+    desc = "Highlight when yanking text ",
+    group = vim.api.nvim_create_augroup('barink', { clear = true }),
+    callback = function()
+        vim.highlight.on_yank()
+    end
+})

lua/barink/plugins/Oil.lua

@@ -2,7 +2,7 @@ return {
     {
         "stevearc/oil.nvim",
         opt = {
-            default_file_explorer = false
+            default_file_explorer = true
         },
         dependencies = {
             'nvim-tree/nvim-web-devicons'

lua/barink/plugins/conform.lua

@@ -1,21 +1,20 @@
 return {
     "stevearc/conform.nvim",
-    event = { "BufWritePre"},
+    config = function()
-    cmd = { "ConformInfo"},
+        require("conform").setup(
-    opts = {
+            {
                 formatters_by_ft = {
                     php = { "pint" },
                     lua = { "stylua" },
                     javascript = { "prettierd", "prettier", stop_after_first = true },
                     typescript = { "prettierd", "prettier", stop_after_first = true },
+                    java = { "clang-format", },
+                    cpp = { "clang-format", },
                 },
-        format_on_save = { timeout_ms = 500 },
+                format_on_save = {
-        default_format_ops = {
+                    lsp_fallback = true,
-            lsp_format = "fallback"
                 },
-    },
+            })
-    config = function ()
-       require("conform").setup()
         -- Command to run async formatting
         vim.api.nvim_create_user_command("Format", function(args)
             local range = nil
@@ -28,8 +27,5 @@ return {
             end
             require("conform").format({ async = true, lsp_format = "fallback", range = range })
         end, { range = true })
-
-
     end
 }
-

lua/barink/plugins/dap.lua

@@ -22,21 +22,38 @@ return {
         },
         config = function ()
             local dap = require('dap')
+            -- Godot Config
+            dap.adapters.godot = {
+                type = "server",
+                host = "127.0.0.1",
+                port = 6006
+            }
+            --dap.configurations.gdscript{
+            --    type = "godot",
+            --    request = "launch",
+            --    name = "launch scene",
+            --    project = "${workspaceFolder}"
+            --}
+            -- C/C++ Config 
             dap.configurations.cpp = {
                 {
                 name = "Launch",
-                type= "codelldb",
+                type= "lldb",
                 request = "launch",
                 program = function ()
                     return vim.fn.input('Path to executable: ', vim.fn.getcwd() , 'file')
                 end,
-                cwd = '${workspaceFolder}/Framework',
                 stopOnEntry = false,
+                runInTerminal = false,
                 }
             }
             dap.adapters.lldb = {
-                type = 'executable',
+                type = 'server',
-                command = "C:\\Program Files\\LLVM\\bin\\lldb-dap.exe",
+                port= "${port}",
+                executable = {
+                    command = "C:\\Users\\nigel\\AppData\\Local\\nvim-data\\mason\\bin\\codelldb.cmd",
+                    args = { "--port", "${port}"}
+                },
                 name = 'lldb'
             }
 
@@ -57,17 +74,7 @@ return {
                 name = "Launch file",
                 program = "java ${file}",
               }}
-           dap.configurations.cpp = {{
+            -- Golang config
-                name="launch",
-                type="lldb",
-                request="launch",
-                program = function ()
-                    return vim.fn.input('Path to executable: ', vim.fn.getcwd() ..'/', 'file')
-                end,
-                cwd = '${workspaceFolder}',
-                stopOnEntry = false,
-                args = {},
-            }}
             dap.configurations.go = {
               {
                 type = "delve",
@@ -99,14 +106,20 @@ return {
                     args = {'dap', '-l', '127.0.0.1:${port}'},
                   }
                 }
-            dap.adapters.codelldb = {
+                local dap = require("dap")
-                type= 'server',
+                local ui = require("dapui")
-                port = '${port}',
+                dap.listeners.before.attach.dapui_config = function()
-                executable = {
+                    ui.open()
-                    command = 'C:/Users/Nigel/Appdata/Local/nvim-data/mason/bin/codelldb.cmd',
+                end
-                    args = {"--port", "${port}"}
+                dap.listeners.before.launch.dapui_config = function()
-                }
+                    ui.open()
-            }
+                end
+                dap.listeners.before.event_terminated.dapui_config = function()
+                    ui.close()
+                end
+                dap.listeners.before.event_exited.dapui_config = function()
+                    ui.close()
+                end
         end
     }
 }

lua/barink/plugins/fidget.lua

@@ -0,0 +1,8 @@
+return {
+    "j-hui/fidget.nvim",
+    config = function()
+        local opts = {
+        }
+        require("fidget").setup(opts)
+    end
+}

lua/barink/plugins/gitsigns.lua

@@ -1,4 +1,29 @@
 return {
     'lewis6991/gitsigns.nvim',
-    opt = {}
+    config = function()
+        local opts = {
+            signs = {
+                add          = { text = '+' },
+                change       = { text = "~" },
+                delete       = { text = "_" },
+                topdelete    = { text = "-" },
+                changedelete = { text = "~" }
+            },
+            signs_staged = {
+                add          = { text = '+' },
+                change       = { text = "~" },
+                delete       = { text = "_" },
+                topdelete    = { text = "-" },
+                changedelete = { text = "~" },
+                untracked    = { text = "*" },
+            },
+            signs_staged_enable = true,
+            signcolumn = true,
+            watch_gitdir = {
+                follow_files = true
+            },
+            auto_attach = true
+        }
+        require("gitsigns").setup(opts)
+    end,
 }

lua/barink/plugins/harpoon.lua

@@ -1,18 +1,37 @@
 return {
     "ThePrimeagen/harpoon",
     branch= "harpoon2",
-    dependencies = {{"nvim-lua/plenary.nvim"}},
+    dependencies = {
+        {"nvim-lua/plenary.nvim"},
+        {"nvim-telescope/telescope.nvim"}
+    },
     config = function()
         local harpoon = require("harpoon")
         harpoon.setup()
 
         vim.keymap.set("n", "ha", function() harpoon:list():add() end)
         vim.keymap.set("n", "hh", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+        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
 
-        vim.keymap.set("n", "<leader>1", function() harpoon:list():select(1) end)
+            require("telescope.pickers").new({}, {
-        vim.keymap.set("n", "<leader>2", function() harpoon:list():select(2) end)
+                result = file_paths,
-        vim.keymap.set("n", "<leader>3", function() harpoon:list():select(3) end)
+                previewer = conf.file_previewer({}),
-        vim.keymap.set("n", "<leader>4", function() harpoon:list():select(4) end)
+                sorter = conf.generic_sorter({}),
+            }):find()
+        end
+
+        vim.keymap.set("n", "<leader>ha", function() harpoon:list():add() end)
+        vim.keymap.set("n", "<leader>hh", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+        vim.keymap.set("n", "<leader>fe", function () toggle_telescope(harpoon:list()) end, { desc = "Open harpoon window"} )
+        vim.keymap.set("n", "C-1", function() harpoon:list():select(1) end)
+        vim.keymap.set("n", "C-2", function() harpoon:list():select(2) end)
+        vim.keymap.set("n", "C-3", function() harpoon:list():select(3) end)
+        vim.keymap.set("n", "C-4", function() harpoon:list():select(4) end)
 
 
         vim.keymap.set("n", "<C-,>", function() harpoon:list():prev() end)

lua/barink/plugins/lsp.lua

@@ -15,18 +15,39 @@ return
         "hrsh7th/nvim-cmp",
         {
             'L3MON4D3/LuaSnip',
-                 dependencies = 'hrsh7th/nvim-cmp',
+            dependencies = {
+                'hrsh7th/nvim-cmp',
+                'rafamadriz/friendly-snippets',
+            },
             version = "v2.*",
         },
         { 'mfussenegger/nvim-jdtls', dependencies = { 'nvim-dap' } },
+        "onsails/lspkind.nvim",
     },
     config = function()
+        vim.opt.completeopt = { "menu", "menuone", "noselect", "preview" }
+        require("lspkind").init({})
         require("mason").setup()
         require("mason-lspconfig").setup({
             ensure_installed = { "lua_ls", "bashls", "rust_analyzer" }
         })
+        local ls = require("luasnip")
+        ls.config.set_config({
+            history = true,
+            updateevents = "TextChanged, TextChangedI",
+            enable_autosnippets = true,
+        })
         local cmp = require('cmp')
+        local lspkind = require("lspkind")
         cmp.setup({
+            formatting = {
+                format = lspkind.cmp_format({
+                    mode = 'symbol',
+                    maxwidth = 60,
+                    ellipsis_char = '...',
+                    show_labelDetails = true,
+                }),
+            },
             snippet = {
                 expand = function(args)
                     require('luasnip').lsp_expand(args.body)
@@ -35,15 +56,14 @@ return
             mapping = cmp.mapping.preset.insert({
                 ['<C-b>'] = cmp.mapping.scroll_docs(-4),
                 ['<C-f>'] = cmp.mapping.scroll_docs(4),
-                    ['<C-Space>'] = cmp.mapping.complete(),
+                ['<C-space>'] = cmp.mapping.complete(),
                 ['<C-e>'] = cmp.mapping.abort(),
-                    ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+                ['<C-y>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
             }),
             sources = cmp.config.sources({
                 { name = 'nvim_lsp', keyword_length = 1 },
-                    { name = 'luasnip', option = { show_autosnippets = true}},
+                { name = 'luasnip' },
                 { name = 'path' },
-                }, {
                 { name = 'buffer',   keyword_length = 2 },
             }),
             window = {
@@ -61,35 +81,29 @@ return
             })
         })
 
-            -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
+        cmp.setup.filetype({ "sql" }, {
-            cmp.setup.cmdline({ '/', '?' }, {
-                mapping = cmp.mapping.preset.cmdline(),
             sources = {
-                    { name = 'buffer' }
+                { name = "vim-dadbod-completion" },
+                { name = "buffer" },
             }
         })
-
+        -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
         -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
         cmp.setup.cmdline(':', {
             mapping = cmp.mapping.preset.cmdline(),
             sources = cmp.config.sources({
-                    { name = 'path' }
+                { name = 'path' },
+                { name = 'buffer' }
             }, {
                 { name = 'cmdline' }
             }),
             matching = { disallow_symbol_nonprefix_matching = false }
         })
 
-            local ls = require("luasnip")
-            ls.config.set_config({
-                history = true,
-                updateevents = "TextChanged, TextChangedI",
-                enable_autosnippets = true,
-            })
 
         vim.keymap.set({ "i", "s" }, "<C-K>", function() ls.expand() end, { silent = true })
-            vim.keymap.set({"i", "s"}, "<C-L>", function() ls.jump(1) end, {silent = true })
+        vim.keymap.set({ "i", "s" }, "<C-n>", function() ls.jump(1) end, { silent = true })
-            vim.keymap.set({"i", "s"}, "<C-J>", function() ls.jump(-1) end, {silent = true})
+        vim.keymap.set({ "i", "s" }, "<C-p>", function() ls.jump(-1) end, { silent = true })
         vim.keymap.set({ "i", "s" }, "<C-E>", function()
             if ls.choice_active() then
                 ls.change_choice(1)
@@ -97,18 +111,18 @@ return
         end, { silent = true })
 
         require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/barink/snippets" })
-
+        require("luasnip.loaders.from_vscode").lazy_load()
-
         -- Set up lspconfig.
         local capabilities = require("cmp_nvim_lsp").default_capabilities()
         local lsp = require("lspconfig")
 
         local language_server = {
             asm_lsp = true,
+            mojo = true,
             zls = true,
-                kotlin_language_server = true,
             emmet_language_server = true,
             rust_analyzer = true,
+            --gdtoolkit = { flags = { debounce_text_changes = 150 }},
             jdtls = true,
             pylsp = true,
             phpactor = {
@@ -132,13 +146,24 @@ return
             gopls = true,
             intelephense = true,
             lua_ls = {
+                config = {
                     settings = {
                         Lua = {
+                            runtime = {
+                                version = 'LuaJIT',
+                            },
+                            workspace = {
+                                checkThirdParty = false,
+                                library = {
+                                    vim.env.VIMRUNTIME
+                                }
+                            },
                             diagnostics = {
                                 globals = { 'vim' }
                             }
                         }
                     }
+                }
             },
         }
 
@@ -170,8 +195,6 @@ return
                 vim.keymap.set("n", "<LEADER>cr", vim.lsp.buf.rename, { buffer = -1 })
                 vim.keymap.set("n", "<LEADER>ca", vim.lsp.buf.code_action, { buffer = -1 })
                 vim.keymap.set("n", "<LEADER>wd", builtin.lsp_document_symbols, { buffer = -1 })
-
-
             end
         })
     end,

lua/barink/plugins/oil.lua

@@ -2,7 +2,7 @@ return {
     {
         "stevearc/oil.nvim",
         opt = {
-            default_file_explorer = false
+            default_file_explorer = true
         },
         dependencies = {
             'nvim-tree/nvim-web-devicons'

lua/barink/plugins/telescope.lua

@@ -21,7 +21,7 @@ return {
                 vim.keymap.set('n', '<leader>/', builtin.current_buffer_fuzzy_find)
                 vim.keymap.set('n', '<leader>gw', builtin.grep_string)
                 vim.keymap.set('n', '<leader>fp',function () 
-                    builtin.find_files { cwd = "~/AppData/Local/nvim/lua/barink/"}
+                    builtin.find_files { cwd = "~/.config/nvim/lua/barink/"}
                 end)
             end
         }

lua/barink/plugins/theme.lua

@@ -1,23 +1,20 @@
--- return {
---         "folke/tokyonight.nvim",
---         lazy = false,
---         priority = 1000,
---         opts = {},
---         config = function()
---             require("tokyonight").setup({
---                 style = "night",
---                 light_style = "day",
---                 transparent = true,
---                 terminal_colors = true,
---                 dim_inactive = false,
---                 lualine_bold = false,
---             })
--- 
---             vim.cmd [[colorscheme tokyonight]]
---         end
---     }
-
 return {
+    {
+        "folke/tokyonight.nvim",
+        lazy = false,
+        priority = 1000,
+        opts = {},
+        config = function()
+            require("tokyonight").setup({
+                style = "night",
+                light_style = "day",
+                transparent = true,
+                terminal_colors = true,
+                dim_inactive = false,
+                lualine_bold = false,
+            })
+        end
+    },
     {
         "catppuccin/nvim",
         name = "catppuccin",

lua/barink/plugins/which-key.lua

@@ -1,15 +0,0 @@
-return {
-    "folke/which-key.nvim",
-    event = "VeryLazy",
-    opts = {
-    },
-    keys = {
-        {
-            "<leader>?",
-            function()
-                require("which-key").show({global = false})
-            end,
-            desc = "Buffer Local Keymaps (which-key)",
-        }
-    }
-}

lua/barink/vim.lua

@@ -21,11 +21,8 @@ vim.opt.termguicolors = true
 
 vim.opt.scrolloff = 8
 
-vim.g.netrw_browse_split = 0
-vim.g.netrw_winsize = 25
-
 vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
-
+vim.opt.inccommand = 'split'
 vim.api.nvim_create_autocmd('LspAttach', {
     callback = function(args)
         local client = vim.lsp.get_client_by_id(args.data.client_id)
@@ -35,6 +32,10 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end,
 })
 
+vim.g.netrw_browse_split = 0
+vim.g.netrw_winsize = 25
+
+
 --[[
 -- Run zig test on save
 -- TODO: fix vim.cmd call
@@ -44,6 +45,3 @@ vim.api.nvim_create_autocmd('BufWritePost' , {
         vim.cmd{cmd = '!zig' , args= {'test', vim.fn.expand('%')} }
     end
 })]] --
-
-
-