From d296370b1ea7c6969a64a2c02e1eca84db223880 Mon Sep 17 00:00:00 2001
From: "Simen A. W. Olsen" <so@bjerk.io>
Date: Sat, 27 Jul 2024 16:37:06 +0200
Subject: Refactor shell and Neovim configurations, update aliases, plugins,
 and settings.

---
 .config/nvim/lazy-lock.json                     |  3 +++
 .config/nvim/lua/simenandre/plugins/dap.lua     |  4 ++++
 .config/nvim/lua/simenandre/plugins/oil.lua     | 21 +++++++++++++++++++++
 .config/nvim/lua/simenandre/plugins/plugins.lua | 23 +++++++++++++++++++----
 4 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 .config/nvim/lua/simenandre/plugins/dap.lua
 create mode 100644 .config/nvim/lua/simenandre/plugins/oil.lua

(limited to '.config/nvim')

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 0f99e38..372f8e0 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -16,6 +16,8 @@
   "mini.nvim": { "branch": "main", "commit": "2d0f10540efdbb1f5c480ebe19ce4de451936a5d" },
   "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
   "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" },
+  "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
+  "nvim-dap-go": { "branch": "main", "commit": "5030d53097fed7b75524a04048d8dbf417fa0140" },
   "nvim-lspconfig": { "branch": "master", "commit": "9619e53d3f99f0ca4ea3b88f5d97fce703131820" },
   "nvim-treesitter": { "branch": "master", "commit": "11a3584b81c3249d2b6279305aee1c7ad273985a" },
   "oil.nvim": { "branch": "master", "commit": "9e3a02252dc5686f374f79f50a13cfe7547c05af" },
@@ -26,5 +28,6 @@
   "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
   "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }
\ No newline at end of file
diff --git a/.config/nvim/lua/simenandre/plugins/dap.lua b/.config/nvim/lua/simenandre/plugins/dap.lua
new file mode 100644
index 0000000..686e535
--- /dev/null
+++ b/.config/nvim/lua/simenandre/plugins/dap.lua
@@ -0,0 +1,4 @@
+return {
+  "mfussenegger/nvim-dap",
+  "leoluz/nvim-dap-go",
+}
diff --git a/.config/nvim/lua/simenandre/plugins/oil.lua b/.config/nvim/lua/simenandre/plugins/oil.lua
new file mode 100644
index 0000000..1861543
--- /dev/null
+++ b/.config/nvim/lua/simenandre/plugins/oil.lua
@@ -0,0 +1,21 @@
+return {
+  "stevearc/oil.nvim",
+  opts = {},
+  -- Optional dependencies
+  dependencies = { "nvim-tree/nvim-web-devicons" },
+  config = function()
+    require("oil").setup({
+      columns = { "icon" },
+      keymaps = {
+        ["<C-h>"] = false,
+        ["<M-h>"] = "actions.select_split",
+      },
+      view_options = {
+        show_hidden = true,
+      },
+    })
+
+    -- Open parent directory in current window
+    vim.keymap.set("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" })
+  end,
+}
diff --git a/.config/nvim/lua/simenandre/plugins/plugins.lua b/.config/nvim/lua/simenandre/plugins/plugins.lua
index e502cca..d1bb456 100644
--- a/.config/nvim/lua/simenandre/plugins/plugins.lua
+++ b/.config/nvim/lua/simenandre/plugins/plugins.lua
@@ -137,7 +137,6 @@ return {
       vim.keymap.set("n", "<leader>/", function()
         -- You can pass additional configuration to Telescope to change the theme, layout, etc.
         builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({
-          winblend = 10,
           previewer = false,
         }))
       end, { desc = "[/] Fuzzily search in current buffer" })
@@ -320,7 +319,7 @@ return {
       --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
       local servers = {
         -- clangd = {},
-        -- gopls = {},
+        gopls = {},
         -- pyright = {},
         -- rust_analyzer = {},
         -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
@@ -594,7 +593,23 @@ return {
     "nvim-treesitter/nvim-treesitter",
     build = ":TSUpdate",
     opts = {
-      ensure_installed = { "bash", "c", "diff", "html", "lua", "luadoc", "markdown", "vim", "vimdoc" },
+      ensure_installed = {
+        "bash",
+        "c",
+        "diff",
+        "html",
+        "lua",
+        "luadoc",
+        "markdown",
+        "vim",
+        "vimdoc",
+        "go",
+        "json",
+        "yaml",
+        "toml",
+        "gomod",
+        "gosum",
+      },
       -- Autoinstall languages that are not installed
       auto_install = true,
       highlight = {
@@ -604,7 +619,7 @@ return {
         --  the list of additional_vim_regex_highlighting and disabled languages for indent.
         additional_vim_regex_highlighting = { "ruby" },
       },
-      indent = { enable = true, disable = { "ruby" } },
+      indent = { enable = true, disable = { "ruby", "go" } },
     },
     config = function(_, opts)
       -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
-- 
cgit v1.2.3