move to lazy.nvim

init.lua

@@ -1,3 +1 @@
-vim.g.mapleader = ","
-
-require('flovilmart')
+require('config.lazy')

lazy-lock.json

@@ -0,0 +1,38 @@
+{
+  "ale": { "branch": "master", "commit": "65b49c1b8172d0ab1b08ffe8fdcabb93fc1328df" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "codecompanion.nvim": { "branch": "main", "commit": "f20ebfbaf64a1c6d2a3268a80431df697a4d2bbe" },
+  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "neosolarized.nvim": { "branch": "master", "commit": "bdfcdd056c4c73b10fc6f42f0c2d0df839ff49ae" },
+  "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
+  "nvim-dap": { "branch": "master", "commit": "04ce47fc5a6ef2b717f33c320fc003091cebac40" },
+  "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
+  "nvim-dap-vscode-js": { "branch": "main", "commit": "e7c05495934a658c8aa10afd995dacd796f76091" },
+  "nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" },
+  "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" },
+  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-treesitter": { "branch": "master", "commit": "2405274937718d520a40e03df92030dca6b4f0fd" },
+  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
+  "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
+  "tslime.vim": { "branch": "main", "commit": "9b2b99e409336584103b83c597fdb6234875ae25" },
+  "vim-airline": { "branch": "master", "commit": "7a552f415c48aed33bf7eaa3c50e78504d417913" },
+  "vim-airline-themes": { "branch": "master", "commit": "a9aa25ce323b2dd04a52706f4d1b044f4feb7617" },
+  "vim-colors-solarized": { "branch": "master", "commit": "528a59f26d12278698bb946f8fb82a63711eec21" },
+  "vim-fugitive": { "branch": "master", "commit": "fcb4db52e7f65b95705aa58f0f2df1312c1f2df2" },
+  "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" },
+  "vim-rails": { "branch": "master", "commit": "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0" },
+  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
+  "vim-test": { "branch": "master", "commit": "5de3bfff03a36d88608d94dba69266f3a48238f2" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "424b5caa154bff34dc258ee53cec5a8e36cf7ea8" },
+  "vim-tmuxify": { "branch": "master", "commit": "1146dd67a5d565f0e620a74614dae87a091b0491" },
+  "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
+  "vim-wombat-scheme": { "branch": "master", "commit": "8bddabafb47dc84870cc20ffe887326883190997" },
+  "vimux": { "branch": "master", "commit": "7db6b2f79d432ee3820668b1d4625311dbe1d0ad" }
+}

lua/config/lazy.lua

@@ -0,0 +1,35 @@
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out, "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
+end
+vim.opt.rtp:prepend(lazypath)
+
+-- Make sure to setup `mapleader` and `maplocalleader` before
+-- loading lazy.nvim so that mappings are correct.
+-- This is also a good place to setup other settings (vim.opt)
+vim.g.mapleader = ","
+vim.g.maplocalleader = "\\"
+
+-- Setup lazy.nvim
+require("lazy").setup({
+  spec = {
+    -- import your plugins
+    { import = "plugins" },
+  },
+  -- Configure any other settings here. See the documentation for more details.
+  -- colorscheme that will be used when installing plugins.
+  install = { colorscheme = { "habamax" } },
+  -- automatically check for plugin updates
+  checker = { enabled = true },
+})

lua/plugins/ale.lua

@@ -0,0 +1,39 @@
+return {
+  "dense-analysis/ale",
+  config = function()
+    -- nmap <silent> <leader>a <Plug>(ale_next_wrap)
+    vim.g.ale_linters = {
+      ['javascript'] = {'eslint', 'prettier'},
+      ['typescript'] = {'eslint', 'prettier'},
+      ['typescriptreact'] = {'eslint', 'prettier'},
+      ['python'] = {'flake8'},
+      ['ruby'] = {}, -- no need for rubocop so we dont report issues twice {'rubocop'},
+      ['go'] = {'gopls'},
+    }
+
+    vim.g.ale_fixers = {
+      ['*'] = {'remove_trailing_lines', 'trim_whitespace'},
+      ['javascript'] = {'prettier', 'eslint'},
+      ['typescript'] = {'prettier', 'eslint'},
+      ['typescriptreact'] = {'prettier', 'eslint'},
+      ['go'] = {'gofmt'},
+      ['rust'] = {'rustfmt'},
+      ['ruby'] = {'rubocop'},
+    }
+
+    -- " Disabling highlighting
+    vim.g.ale_set_highlights = 0
+    vim.g.ale_sign_column_always = 1
+    vim.g.ale_open_list = 0
+    vim.g.ale_disable_lsp = 'auto'
+
+    -- " Only run linting when saving the file
+    vim.g.ale_lint_on_text_changed = 'never'
+    vim.g.ale_lint_on_enter = 0
+    vim.g.ale_lint_on_save = 0
+    vim.g.ale_linters_explicit = 1
+    vim.g.ale_fix_on_save = 1
+    vim.g.ale_javascript_eslint_use_global = 1
+    vim.g.ale_javascript_tsserver_use_global = 1
+  end
+}

lua/plugins/cmp.lua

@@ -0,0 +1,60 @@
+-- Setup nvim-cmp.
+return {
+  {
+    'hrsh7th/nvim-cmp',
+    dependencies = {
+      "neovim/nvim-lspconfig",
+      'hrsh7th/cmp-buffer',
+      'hrsh7th/cmp-path',
+      'hrsh7th/cmp-cmdline',
+      'hrsh7th/vim-vsnip',
+    },
+    config = function ()
+      local cmp = require'cmp'
+
+      cmp.setup({
+        snippet = {
+          expand = function(args)
+            vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+          end,
+        },
+        mapping = {
+          ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+          ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
+          ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
+          ['<Down>'] = cmp.mapping(cmp.mapping.select_next_item(), { 'i', 'c' }),
+          ['<Up>'] = cmp.mapping(cmp.mapping.select_prev_item(), { 'i', 'c' }),
+          ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
+          ['<C-e>'] = cmp.mapping({
+            i = cmp.mapping.abort(),
+            c = cmp.mapping.close(),
+          }),
+          -- Accept currently selected item. If none selected, `select` first item.
+          -- Set `select` to `false` to only confirm explicitly selected items.
+          ['<CR>'] = cmp.mapping.confirm({ select = true }),
+        },
+        sources = cmp.config.sources({
+          { name = 'nvim_lsp' },
+        }, {
+          { name = 'buffer' },
+        })
+      })
+
+      -- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
+      cmp.setup.cmdline('/', {
+        sources = {
+          { name = 'buffer' }
+        }
+      })
+
+      -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+      cmp.setup.cmdline(':', {
+        sources = cmp.config.sources({
+          { name = 'path' }
+        }, {
+          { name = 'cmdline' }
+        })
+      })
+    end
+  }
+}

lua/plugins/codecompanion.lua

@@ -0,0 +1,24 @@
+return {
+  {
+    "olimorris/codecompanion.nvim",
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      "nvim-treesitter/nvim-treesitter",
+    },
+    config = function()
+      require("codecompanion").setup({
+        strategies = {
+          chat = {
+            adapter = "gemini",
+          },
+          inline = {
+            adapter = "gemini",
+          },
+          agent = {
+            adapter = "gemini",
+          },
+        },
+      })
+    end,
+  }
+}

plugin/after/copilot.lua → lua/plugins/copilot.lua

@@ -2,5 +2,7 @@
 -- #   bufopts.desc = desc
 -- #   vim.keymap.set("i", rhs, lhs, bufopts)
 -- # end
--- # 
+-- #
 -- # inoremap("<C-n>", "<Plug>(copilot-next)", { silent = true }, "Copilot next")
+
+return {}

lua/plugins/debugger.lua

@@ -0,0 +1,78 @@
+function config()
+  dap = require('dap')
+  -- Set keymaps to control the debugger
+  vim.keymap.set('n', '<leader>c', dap.continue)
+  vim.keymap.set('n', '<leader>s', dap.step_over)
+  vim.keymap.set('n', '<leader>d', dap.step_into)
+  vim.keymap.set('n', '<leader>a', dap.step_out)
+  vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint)
+  vim.keymap.set('n', '<leader>B', function()
+    dap.set_breakpoint(vim.fn.input('Breakpoint condition: '))
+  end)
+
+  require("dap-vscode-js").setup({
+    -- node_path = "node", -- Path of node executable. Defaults to $NODE_PATH, and then "node"
+    -- debugger_path = "(runtimedir)/site/pack/packer/opt/vscode-js-debug", -- Path to vscode-js-debug installation.
+    -- debugger_cmd = { "extension" }, -- Command to use to launch the debug server. Takes precedence over `node_path` and `debugger_path`.
+    adapters = { 'chrome', 'pwa-node', 'pwa-chrome', 'pwa-msedge', 'node-terminal', 'pwa-extensionHost', 'node', 'chrome' }, -- which adapters to register in nvim-dap
+    -- log_file_path = "(stdpath cache)/dap_vscode_js.log" -- Path for file logging
+    -- log_file_level = false -- Logging level for output to file. Set to false to disable file logging.
+    -- log_console_level = vim.log.levels.ERROR -- Logging level for output to console. Set to false to disable console output.
+  })
+
+  local js_based_languages = { "typescript", "javascript", "typescriptreact" }
+
+  for _, language in ipairs(js_based_languages) do
+    dap.configurations[language] = {
+      {
+        type = "pwa-node",
+        request = "launch",
+        name = "Launch file",
+        program = "${file}",
+        cwd = "${workspaceFolder}",
+      },
+      {
+        type = "pwa-node",
+        request = "attach",
+        name = "Attach",
+        processId = require 'dap.utils'.pick_process,
+        cwd = "${workspaceFolder}",
+      },
+      {
+        type = "pwa-chrome",
+        request = "launch",
+        name = "Start Chrome with \"localhost\"",
+        url = "http://localhost:3000",
+        webRoot = "${workspaceFolder}",
+        userDataDir = "${workspaceFolder}/.vscode/vscode-chrome-debug-userdatadir"
+      }
+    }
+  end
+  dapui = require('dapui')
+
+  dapui.setup()
+
+  dap.listeners.after.event_initialized["dapui_config"] = function()
+    dapui.open({})
+  end
+  dap.listeners.before.event_terminated["dapui_config"] = function()
+    dapui.close({})
+  end
+  dap.listeners.before.event_exited["dapui_config"] = function()
+    dapui.close({})
+  end
+
+  vim.keymap.set('n', '<leader>ui', require 'dapui'.toggle)
+end
+
+return {
+  {
+    'mfussenegger/nvim-dap',
+    dependencies = {
+      'rcarriga/nvim-dap-ui',
+      'mfussenegger/nvim-dap-vscode-js',
+      'nvim-neotest/nvim-nio',
+    },
+    config = config
+  }
+}

plugin/after/fugitive.lua → lua/plugins/fugitive.lua

@@ -11,3 +11,9 @@ vim.api.nvim_create_user_command(
 )
 
 vim.keymap.set("v", "<leader>g", ":GBrowse<CR>", { silent = true }, "Git browse")
+
+return {
+  "tpope/vim-fugitive",
+  "tpope/vim-rhubarb",
+  "airblade/vim-gitgutter",
+}

plugin/after/keymaps.lua → lua/plugins/keymaps.lua

@@ -6,3 +6,5 @@ end
 nmap("<leader>=", "gg=G", { silent = true }, "Reindent")
 nmap("<leader>w", ":w!<cr>", { silent = true }, "Save")
 nmap("<leader>q", ":q<cr>", { silent = true }, "Close buffer")
+
+return {}