From dae86208aef1ec7499f17a7b86d3cc5d909aad52 Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Wed, 14 Aug 2024 13:31:08 +0100
Subject: [PATCH] config cleanup

---
 .config/nvim/init.lua                       | 15 +----------
 .config/nvim/lazy-lock.json                 | 26 +++++++++---------
 .config/nvim/lua/tsv/plugins/lspconfig.lua  | 25 +++--------------
 .config/nvim/lua/tsv/plugins/telescope.lua  | 30 +++++++++++++++------
 .config/nvim/lua/tsv/plugins/treesitter.lua |  1 +
 .config/pgcli/config                        |  4 +++
 6 files changed, 43 insertions(+), 58 deletions(-)
 create mode 100644 .config/pgcli/config

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c99e131..5b615f4 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -7,17 +7,4 @@ 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',
-    }
-  }
-}
+
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index c6e3f2b..2ac796a 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -3,30 +3,28 @@
   "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" },
+  "codeium.vim": { "branch": "main", "commit": "0b74f274b82c00eaad4b5b5cd8b2e76f872d19f1" },
   "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" },
-  "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": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" },
   "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
-  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
-  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
-  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
-  "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
+  "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
+  "nvim-dap": { "branch": "master", "commit": "2b428ff2632e73295e9decbcf1c40d8e26213305" },
   "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" },
   "nvim-html-css": { "branch": "main", "commit": "c514bd27ad560636ed39dea3e370b3103754e244" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9c762dcd457d2ab99edb3f3433cea9865ded47ad" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-tree.lua": { "branch": "master", "commit": "4e396b26244444c911b73e9f2f40ae0115351fd1" },
-  "nvim-treesitter": { "branch": "master", "commit": "63be47f203d3e9174fdac3872fb9766e5bcc5a11" },
+  "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" },
+  "nvim-treesitter": { "branch": "master", "commit": "047ce49ccf9a2dce22e1cf3843bef3b5682a8144" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
-  "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
-  "orgmode": { "branch": "master", "commit": "de02a0cfbe3484accb73025b6dd71b2cc4ae3eff" },
+  "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },
+  "orgmode": { "branch": "master", "commit": "7ee1f13e87e9fdf270075eb4ed2bf8880ebe939d" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "repl.nvim": { "branch": "master", "commit": "ec202eb5786b305c7d73b8cab5ee8fe69a2534a7" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
diff --git a/.config/nvim/lua/tsv/plugins/lspconfig.lua b/.config/nvim/lua/tsv/plugins/lspconfig.lua
index 88bae1f..a4897d9 100644
--- a/.config/nvim/lua/tsv/plugins/lspconfig.lua
+++ b/.config/nvim/lua/tsv/plugins/lspconfig.lua
@@ -1,28 +1,9 @@
+local util = require "lspconfig/util"
+
 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
-    })
+    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, {})
diff --git a/.config/nvim/lua/tsv/plugins/telescope.lua b/.config/nvim/lua/tsv/plugins/telescope.lua
index 9de31bb..6359ac3 100644
--- a/.config/nvim/lua/tsv/plugins/telescope.lua
+++ b/.config/nvim/lua/tsv/plugins/telescope.lua
@@ -2,6 +2,20 @@ 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
@@ -30,28 +44,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,
 }
diff --git a/.config/nvim/lua/tsv/plugins/treesitter.lua b/.config/nvim/lua/tsv/plugins/treesitter.lua
index 3714b4c..a024888 100644
--- a/.config/nvim/lua/tsv/plugins/treesitter.lua
+++ b/.config/nvim/lua/tsv/plugins/treesitter.lua
@@ -24,6 +24,7 @@ return {
         "lua",
         "gitignore",
         "yaml",
+        "embedded_template",
       }
     })
   end
diff --git a/.config/pgcli/config b/.config/pgcli/config
new file mode 100644
index 0000000..03c9653
--- /dev/null
+++ b/.config/pgcli/config
@@ -0,0 +1,4 @@
+[main]
+enable_pager = True
+multi_line = True
+pager = /usr/bin/pspg