From 1d40dc0924d7b1baf2d4a3543eaefb34483a3e22 Mon Sep 17 00:00:00 2001
From: Prajakt Shastry <prajakt.shastry@gmail.com>
Date: Wed, 3 Jan 2024 14:42:30 -0500
Subject: [PATCH] A few more changes

---
 init.lua                        | 23 +----------------------
 lua/custom/leader_shortcuts.lua | 14 +++++++++++++-
 lua/custom/plugins.lua          | 13 ++++++++++++-
 lua/custom/prettier.lua         | 21 +++++++++++++++++++++
 lua/custom/treesitter.lua       |  2 --
 lua/custom/which_key.lua        |  6 ++++++
 6 files changed, 53 insertions(+), 26 deletions(-)
 create mode 100644 lua/custom/prettier.lua

diff --git a/init.lua b/init.lua
index 676fa0e4..220e84a2 100644
--- a/init.lua
+++ b/init.lua
@@ -64,6 +64,7 @@ require('custom.leader_shortcuts')
 require('custom.treesitter')
 require('custom.which_key')
 require('custom.lsp')
+require('custom.prettier')
 
 -- [[ Setting options ]]
 -- See `:help vim.o`
@@ -156,28 +157,6 @@ require 'cmp'.setup {
   }
 }
 
--- Configure prettier
-local prettier = require("prettier")
-
-prettier.setup({
-  bin = 'prettier', -- or `'prettierd'` (v0.23.3+)
-  filetypes = {
-    "css",
-    "graphql",
-    "html",
-    "javascript",
-    "javascriptreact",
-    "json",
-    "less",
-    "markdown",
-    "scss",
-    "typescript",
-    "typescriptreact",
-    "yaml",
-  },
-})
-
-
 -- nvim-cmp setup
 local cmp = require 'cmp'
 local luasnip = require 'luasnip'
diff --git a/lua/custom/leader_shortcuts.lua b/lua/custom/leader_shortcuts.lua
index e70fff34..50a4b837 100644
--- a/lua/custom/leader_shortcuts.lua
+++ b/lua/custom/leader_shortcuts.lua
@@ -17,9 +17,21 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
 
 -- [[ Configure NvimTree ]]
 require("nvim-tree").setup()
-vim.keymap.set('n', '<leader>e', ":NvimTreeToggle<cr>", { desc = 'Toggle NvimTree' })
+vim.keymap.set('n', '<leader>e', ":NvimTreeToggle<cr>", { desc = 'NvimTree' })
+vim.keymap.set('n', '<leader>ee', ":NvimTreeToggle<cr>", { desc = 'NvimTree Toggle' })
 vim.keymap.set('n', '<leader>ef', ':NvimTreeFindFile<cr>', { desc = 'Find file' })
 vim.keymap.set('n', '<C-h>', '<C-n><left>')
 vim.keymap.set('n', '<C-j>', '<C-n><up>')
 vim.keymap.set('n', '<C-k>', '<C-n><down>')
 vim.keymap.set('n', '<C-l>', '<C-n><right>')
+
+vim.keymap.set('n', '<leader>d', vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
+vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
+
+-- [[ Configuring vim tests ]]
+vim.keymap.set('n', '<leader>t', ":VimTest<cr>", { desc = 'VimTest' })
+vim.keymap.set('n', '<leader>tn', ":TestNearest", { desc = "Run Nearest test" })
+vim.keymap.set('n', '<leader>tf', ":TestFile", { desc = "Run Current file" })
+vim.keymap.set('n', '<leader>ts', ":TestSuite", { desc = "Run Test suite" })
+vim.keymap.set('n', '<leader>tl', ":TestLast", { desc = "Runs the last test" })
+vim.keymap.set('n', '<leader>tv', ":TestVisit", { desc = "Visit the file that was last run" })
diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua
index 8064ab24..d85ba51b 100644
--- a/lua/custom/plugins.lua
+++ b/lua/custom/plugins.lua
@@ -94,7 +94,17 @@ require('lazy').setup({
   { 'numToStr/Comment.nvim',               opts = {} },
 
   -- Fuzzy Finder (files, lsp, etc)
-  { 'nvim-telescope/telescope.nvim',       version = '*', dependencies = { 'nvim-lua/plenary.nvim' } },
+  { 'nvim-telescope/telescope.nvim',
+    version = '*',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      "nvim-telescope/telescope-live-grep-args.nvim",
+    },
+
+    config = function ()
+      require("telescope").load_extension("live_grep_args")
+    end
+  },
 
   -- Fuzzy Finder Algorithm which requires local dependencies to be built.
   -- Only load if `make` is available. Make sure you have the system
@@ -179,4 +189,5 @@ require('lazy').setup({
       },
     }
   },
+  { "vim-test/vim-test" }
 }, {})
diff --git a/lua/custom/prettier.lua b/lua/custom/prettier.lua
new file mode 100644
index 00000000..0139848a
--- /dev/null
+++ b/lua/custom/prettier.lua
@@ -0,0 +1,21 @@
+-- Configure prettier
+local prettier = require("prettier")
+
+prettier.setup({
+  bin = 'prettier', -- or `'prettierd'` (v0.23.3+)
+  filetypes = {
+    "css",
+    "graphql",
+    "html",
+    "javascript",
+    "javascriptreact",
+    "json",
+    "less",
+    "markdown",
+    "scss",
+    "typescript",
+    "typescriptreact",
+    "yaml",
+    "ruby"
+  },
+})
diff --git a/lua/custom/treesitter.lua b/lua/custom/treesitter.lua
index 3eba85c6..3a6b3566 100644
--- a/lua/custom/treesitter.lua
+++ b/lua/custom/treesitter.lua
@@ -67,6 +67,4 @@ require('nvim-treesitter.configs').setup {
 -- Diagnostic keymaps
 vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic message" })
 vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = "Go to next diagnostic message" })
-vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = "Open floating diagnostic message" })
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = "Open diagnostics list" })
 
diff --git a/lua/custom/which_key.lua b/lua/custom/which_key.lua
index 42ea8429..1c262e67 100644
--- a/lua/custom/which_key.lua
+++ b/lua/custom/which_key.lua
@@ -4,6 +4,12 @@ wk.register({
     name = "+Git",
     h = {
       name = "+Github",
+      o = {
+        name = "+OpenInGithub",
+        f = { "<cmd>OpenInGHFile", "Open File" },
+        l = { "<cmd>OpenInGHFileLines", "Open Lines" },
+        r = { "<cmd>OpenInGHRepo", "Open Repo" },
+      },
       c = {
         name = "+Commits",
         c = { "<cmd>GHCloseCommit<cr>", "Close" },