.config/nvim/init.lua

@@ -1,10 +1,23 @@
 vim.g.mapleader = " "
 require('options')
-require('lazy-plugins') -- Install plugins with Lazy
+require('plugins') -- Install plugins with Lazy
 require('completion') -- Completion
 require('lsp') -- LSP
 require('remap') -- Keymaps
 require('tree') -- Nvim-tree
 require('appearance') -- Appearance
 
-
+require('telescope').setup{
+  defaults = {
+    vimgrep_arguments = {
+      'rg',
+      '--color=never',
+      '--no-heading',
+      '--with-filename',
+      '--line-number',
+      '--column',
+      '--smart-case',
+      '--hidden',
+    }
+  }
+}

.config/nvim/lazy-lock.json

@@ -3,29 +3,31 @@
   "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
   "cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" },
+  "codeium.vim": { "branch": "main", "commit": "e0342fde9474fdd0a36ff9692fe0031b7611a19f" },
   "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
-  "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
+  "go.nvim": { "branch": "master", "commit": "033344ddfa3cd5cfd55037903264b2bb86691619" },
-  "go.nvim": { "branch": "master", "commit": "e66c3240d26936428cd0f320dc5ffa1eb01538b8" },
   "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" },
   "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
   "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
-  "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
+  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
-  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
-  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
-  "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" },
+  "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
   "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
   "nvim-html-css": { "branch": "main", "commit": "c514bd27ad560636ed39dea3e370b3103754e244" },
-  "nvim-lspconfig": { "branch": "master", "commit": "ad32182cc4a03c8826a64e9ced68046c575fdb7d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" },
+  "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" },
-  "nvim-treesitter": { "branch": "master", "commit": "3de418e73d5b912096229aaeea8bb7aef5094e0d" },
+  "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
-  "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
+  "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
-  "orgmode": { "branch": "master", "commit": "e365b85b4a5bfea507d77a16a7b66d8c6860e9b7" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "repl.nvim": { "branch": "master", "commit": "ec202eb5786b305c7d73b8cab5ee8fe69a2534a7" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
   "vim-cool": { "branch": "master", "commit": "662e7b11064cbeedad17c45d2fe926e78d3cd0b6" },
   "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },

.config/nvim/lua/lsp.lua

@@ -1,3 +1,6 @@
+
+
+
 --Enable (broadcasting) snippet capability for completion
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
@@ -14,15 +17,14 @@ dap.listeners.before.event_exited["dapui_config"] = function()
 end
 
 require("dapui").setup()
-
 dap.adapters.ruby = function(callback, config)
   callback {
     type = "server",
     host = "127.0.0.1",
-    port = "3030",
+    port = "${port}",
     executable = {
       command = "bundle",
-      args = { "exec", "rdbg", "-n", "--open", "--nonstop", "--port", "3030",
+      args = { "exec", "rdbg", "-n", "--open", "--port", "${port}",
         "-c", "--", "bundle", "exec", config.command, config.script,
       },
     },
@@ -30,13 +32,6 @@ dap.adapters.ruby = function(callback, config)
 end
 
 dap.configurations.ruby = {
-  {
-    type = "ruby",
-    name = "Start Rails server",
-    request = "attach",
-    localfs = true,
-    command = "rails s",
-  },
   {
     type = "ruby",
     name = "debug current file",
@@ -54,3 +49,4 @@ dap.configurations.ruby = {
     script = "${file}",
   },
 }
+

.config/nvim/lua/plugins.lua

@@ -11,4 +11,4 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("lazy").setup({ { import = "plugins" } })
+require("lazy").setup({ { import = "tsv.plugins" } })

.config/nvim/lua/plugins/git-worktree.lua

@@ -1,9 +0,0 @@
-return {
-  "ThePrimeagen/git-worktree.nvim",
-  dependencies = { "nvim-telescope/telescope.nvim" },
-  config = function()
-    require('telescope').load_extension("git_worktree")
-    vim.keymap.set('n', '<leader>tw', require('telescope').extensions.git_worktree.git_worktrees, {})
-    vim.keymap.set('n', '<leader>tc', require('telescope').extensions.git_worktree.create_git_worktree, {})
-  end
-}

.config/nvim/lua/plugins/lspconfig.lua

@@ -1,15 +0,0 @@
-local util = require "lspconfig/util"
-
-return {
-  "neovim/nvim-lspconfig",
-  config = function()
-    require("lspconfig").ruby_lsp.setup({})
-    vim.keymap.set('n', '<leader>ld', function() vim.lsp.buf.definition() end, bufopts)
-    vim.keymap.set('n', '<leader>la', function() vim.lsp.buf.code_action() end, bufopts)
-    vim.keymap.set('n', '<leader>lK', vim.lsp.buf.signature_help, {})
-    vim.keymap.set('n', '<leader>lq', vim.diagnostic.setloclist, {})
-    vim.keymap.set('n', 'E', vim.diagnostic.open_float, {})
-    vim.keymap.set('n', 'H', function() vim.lsp.buf.hover() end, opts)
-    vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format) -- Format code
-  end
-}

.config/nvim/lua/plugins/orgmode.lua

@@ -1,11 +0,0 @@
-return {
-  "nvim-orgmode/orgmode",
-  event = "VeryLazy",
-  ft = { "org" },
-  config = function()
-    require("orgmode").setup({
-      org_agenda_files = "~/org/**/*",
-      org_default_notes_file = "~/org/refile.org",
-    })
-  end
-}

.config/nvim/lua/tsv/plugins/codeium.lua

@@ -0,0 +1,10 @@
+return {
+  "Exafunction/codeium.vim",
+  config = function ()
+    vim.keymap.set('i', '<C-g>', function () return vim.fn['codeium#Accept']() end, { expr = true })
+    vim.keymap.set('i', '<c-;>', function() return vim.fn['codeium#CycleCompletions'](1) end, { expr = true })
+    vim.keymap.set('i', '<c-,>', function() return vim.fn['codeium#CycleCompletions'](-1) end, { expr = true })
+    vim.keymap.set('i', '<c-x>', function() return vim.fn['codeium#Clear']() end, { expr = true })
+    vim.keymap.set("n", "<leader>cc", "<cmd>call codeium#Chat()<CR>")
+  end,
+}

.config/nvim/lua/tsv/plugins/lspconfig.lua

@@ -0,0 +1,34 @@
+return {
+  "neovim/nvim-lspconfig",
+  dependencies = {
+    "williamboman/mason.nvim",
+    "williamboman/mason-lspconfig.nvim",
+  },
+  config = function()
+    require("mason").setup()
+    require("mason-lspconfig").setup({
+      automatic_installation = true,
+    })
+    require("mason-lspconfig").setup_handlers({
+      function(server_name)
+        require("lspconfig")[server_name].setup({})
+      end,
+      ["ruby_lsp"] = function()
+        require("lspconfig").ruby_lsp.setup({
+          cmd = {"/home/tsv/.rbenv/shims/ruby-lsp"},
+          on_attach = function(client, buffer)
+            setup_diagnostics(client, buffer)
+            add_ruby_deps_command(client, buffer)
+          end,
+        })
+      end
+    })
+    vim.keymap.set('n', '<leader>ld', function() vim.lsp.buf.definition() end, bufopts)
+    vim.keymap.set('n', '<leader>la', function() vim.lsp.buf.code_action() end, bufopts)
+    vim.keymap.set('n', '<leader>lK', vim.lsp.buf.signature_help, {})
+    vim.keymap.set('n', '<leader>lq', vim.diagnostic.setloclist, {})
+    vim.keymap.set('n', 'E', vim.diagnostic.open_float, {})
+    vim.keymap.set('n', 'H', function() vim.lsp.buf.hover() end, opts)
+    vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format) -- Format code
+  end
+}

.config/nvim/lua/tsv/plugins/repl.lua

@@ -0,0 +1,3 @@
+return {
+  "https://gitlab.com/HiPhish/repl.nvim",
+}

.config/nvim/lua/tsv/plugins/telescope.lua

@@ -2,20 +2,6 @@ return {
   'nvim-telescope/telescope.nvim', tag = '0.1.4',
   dependencies = { 'nvim-lua/plenary.nvim' },
   config = function()
-    require('telescope').setup{
-      defaults = {
-        vimgrep_arguments = {
-          'rg',
-          '--color=never',
-          '--no-heading',
-          '--with-filename',
-          '--line-number',
-          '--column',
-          '--smart-case',
-          '--hidden',
-        }
-      }
-    }
     local builtin = require('telescope.builtin')
     local telescope = require('telescope')
     vim.keymap.set('n', '<leader>tf', "<cmd>Telescope find_files hidden=true<cr>", {}) -- Open files
@@ -44,28 +30,28 @@ return {
 
     -- Custom Rails shortcuts
     vim.keymap.set('n', '<leader>trj', function()
-      builtin.find_files({ search_dirs = { "app/javascript", "app/assets/javascripts" } })
+        builtin.find_files({ search_dirs = { "app/javascript", "app/assets/javascripts" } })
     end, { desc = "Open Rails Javascripts" } )
     vim.keymap.set('n', '<leader>trsj', function()
-      builtin.live_grep({ search_dirs = { "app/javascript", "app/assets/javascripts" } })
+        builtin.live_grep({ search_dirs = { "app/javascript", "app/assets/javascripts" } })
     end, { desc = "Grep Rails Javascripts" } )
     vim.keymap.set('n', '<leader>trm', function()
-      builtin.find_files({ search_dirs = { "app/models" } })
+        builtin.find_files({ search_dirs = { "app/models" } })
     end, { desc = "Open Rails Models" } )
     vim.keymap.set('n', '<leader>trsm', function()
-      builtin.live_grep({ search_dirs = { "app/models" } })
+        builtin.live_grep({ search_dirs = { "app/models" } })
     end, { desc = "Grep Rails Models" } )
     vim.keymap.set('n', '<leader>trc', function()
-      builtin.find_files({ search_dirs = { "app/controllers" } })
+        builtin.find_files({ search_dirs = { "app/controllers" } })
     end, { desc = "Open Rails Controllers" } )
     vim.keymap.set('n', '<leader>trsc', function()
-      builtin.live_grep({ search_dirs = { "app/controllers" } })
+        builtin.live_grep({ search_dirs = { "app/controllers" } })
     end, { desc = "Grep Rails Controllers" } )
     vim.keymap.set('n', '<leader>trv', function()
-      builtin.find_files({ search_dirs = { "app/views" } })
+        builtin.find_files({ search_dirs = { "app/views" } })
     end, { desc = "Open Rails Views" } )
     vim.keymap.set('n', '<leader>trsv', function()
-      builtin.live_grep({ search_dirs = { "app/views" } })
+        builtin.live_grep({ search_dirs = { "app/views" } })
     end, { desc = "Grep Rails Views" } )
   end,
 }

.config/nvim/lua/tsv/plugins/treesitter.lua

@@ -24,7 +24,6 @@ return {
         "lua",
         "gitignore",
         "yaml",
-        "embedded_template",
       }
     })
   end

.config/pgcli/config

@@ -1,4 +0,0 @@
-[main]
-enable_pager = True
-multi_line = True
-pager = /usr/bin/pspg