Still shuffling neovim config around

Author: notahat

.nvim.lua

@@ -4,6 +4,9 @@ local lspconfig = require("lspconfig")
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
 -- See https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#lua_ls
+--
+-- This overrides what's in the .laurc.json file, and extends it with Neovim's
+-- library directories for better completion and hover docs.
 local lua_settings = {
     Lua = {
         runtime = {

config/nvim/lazy-lock.json

@@ -10,7 +10,7 @@
   "file-line": { "branch": "main", "commit": "559088afaf10124ea663ee0f4f73b1de48fb1632" },
   "friendly-snippets": { "branch": "main", "commit": "e11b09bf10706bb74e16e4c3d11b2274d62e687f" },
   "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" },
-  "lazy.nvim": { "branch": "main", "commit": "fafe1f7c640aed75e70a10e6649612cd96f39149" },
+  "lazy.nvim": { "branch": "main", "commit": "eb4957442e3182f051b0ae11da32e06d22c190e3" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
@@ -19,20 +19,20 @@
   "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" },
   "none-ls.nvim": { "branch": "main", "commit": "8691504118b252d64fc5023a104aedd100ab754a" },
   "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
-  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
   "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" },
   "nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" },
   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
-  "nvim-surround": { "branch": "main", "commit": "ae876ab0f8d41213131c3ed4eeb4c48328f45e12" },
-  "nvim-treesitter": { "branch": "master", "commit": "c5cbd3ec74f6f5ddbac939e6f24b99fe78262b4c" },
+  "nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" },
+  "nvim-treesitter": { "branch": "master", "commit": "9ebc589329083522f9594f408fc2652090b41139" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
   "nvim-ts-autotag": { "branch": "main", "commit": "6eb4120a1aadef07ac312f1c4bc6456712220007" },
-  "nvim-web-devicons": { "branch": "master", "commit": "b4b302d6ae229f67df7a87ef69fa79473fe788a9" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
   "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" },
+  "telescope.nvim": { "branch": "master", "commit": "3a743491e5c6be0ed0aa8c31c6905df8f66179ba" },
   "treesj": { "branch": "main", "commit": "f98deb33805485b56a8d44d1a27d16874af00d7f" },
   "vim-rails": { "branch": "master", "commit": "8972461e64c7c4bf049f2f86ea1bc571e8077b55" },
   "vim-slim": { "branch": "master", "commit": "a0a57f75f20a03d5fa798484743e98f4af623926" },

config/nvim/lua/actions.lua

@@ -3,6 +3,10 @@ local neo_tree = require("neo-tree.command")
 local telescope = require("telescope.builtin")
 
 return {
+    browse_on_github = function()
+        vim.cmd("silent !gh browse")
+    end,
+
     choose_git_base = function()
         local callback = function(git_base)
             if git_base ~= nil then
@@ -29,7 +33,7 @@ return {
         -- Neo-tree buffers don't restore correctly, so close it first.
         neo_tree.execute({ action = "close" })
         vim.cmd.wall()
-        vim.cmd("mksession!")
+        vim.cmd.mksession({ bang = true })
         vim.cmd.quit()
     end,
 

config/nvim/lua/key-mappings.lua

@@ -41,8 +41,9 @@ local function map_global_keys()
 
     which_key.register({ ["<leader>g"] = { name = "git" } })
     map("", "<leader>gb", gitsigns.blame_line, { desc = "git blame" })
-    map("", "<leader>gp", gitsigns.preview_hunk_inline, { desc = "preview hunk" })
     map("", "<leader>gc", actions.choose_git_base, { desc = "change git base" })
+    map("", "<leader>gh", actions.browse_on_github, { desc = "browse on github" })
+    map("", "<leader>gp", gitsigns.preview_hunk_inline, { desc = "preview hunk" })
 
     which_key.register({ ["<leader>t"] = { name = "telescope" } })
     map("", "<leader>t.", telescope.resume, { desc = "repeat last find" })
@@ -89,7 +90,6 @@ local function map_lsp_keys(args)
     map("", "<leader>ca", vim.lsp.buf.code_action, { buffer = buffer, desc = "code actions" })
     map("", "<leader>cr", vim.lsp.buf.rename, { buffer = buffer, desc = "rename symbol under cursor" })
 
-    map("", "<leader>td", telescope.diagnostics, { buffer = buffer, desc = "find diagnostics" })
     map("", "<leader>ts", telescope.lsp_document_symbols, { buffer = buffer, desc = "find document symbols" })
 end
 

config/nvim/lua/plugins/editing.lua

@@ -15,4 +15,10 @@ return {
 
     -- https://github.com/kylechui/nvim-surround
     { "kylechui/nvim-surround", config = true },
+
+    -- https://github.com/tpope/vim-rails
+    "tpope/vim-rails",
+
+    -- https://github.com/slim-template/vim-slim
+    "slim-template/vim-slim",
 }

config/nvim/lua/plugins/languages.lua

@@ -2,15 +2,17 @@ return function()
     local lspconfig = require("lspconfig")
     local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
-    if os.getenv("DOTFILES_ENV") == "home" then
+    local dotfiles_env = os.getenv("DOTFILES_ENV")
+
+    if dotfiles_env == "home" then
         lspconfig.bashls.setup({ capabilities = capabilities })
         lspconfig.eslint.setup({ capabilities = capabilities })
         lspconfig.solargraph.setup({ capabilities = capabilities })
         lspconfig.standardrb.setup({ capabilities = capabilities })
         lspconfig.tsserver.setup({ capabilities = capabilities })
     end
 
-    if os.getenv("DOTFILES_ENV") == "work" then
+    if dotfiles_env == "work" then
         lspconfig.bashls.setup({ capabilities = capabilities })
         lspconfig.eslint.setup({ capabilities = capabilities })
         lspconfig.relay_lsp.setup({ capabilities = capabilities })

config/nvim/lua/plugins/lsp/lspconfig-config.lua

@@ -3,8 +3,9 @@ return function()
     local formatting = null_ls.builtins.formatting
 
     local sources = {}
+    local dotfiles_env = os.getenv("DOTFILES_ENV")
 
-    if os.getenv("DOTFILES_ENV") == "home" then
+    if dotfiles_env == "home" then
         sources = {
             formatting.prettierd.with({
                 disabled_filetypes = { "ruby" },
@@ -13,7 +14,7 @@ return function()
         }
     end
 
-    if os.getenv("DOTFILES_ENV") == "work" then
+    if dotfiles_env == "work" then
         sources = {
             formatting.prettierd.with({
                 disabled_filetypes = { "yaml" },

config/nvim/lua/plugins/lsp/null-ls-config.lua

@@ -49,30 +49,4 @@ local neo_tree_file_operations_spec = {
     dependencies = { "nvim-lua/plenary.nvim", neo_tree_spec },
 }
 
--- telescope does fuzzy finding over all sorts of things.
-local telescope_spec = {
-    -- https://github.com/nvim-telescope/telescope.nvim
-    "nvim-telescope/telescope.nvim",
-    dependencies = {
-        "nvim-lua/plenary.nvim",
-        "nvim-tree/nvim-web-devicons",
-        "nvim-telescope/telescope-ui-select.nvim",
-    },
-    config = function()
-        local telescope = require("telescope")
-        telescope.setup({
-            defaults = { layout_strategy = "vertical" },
-            extensions = {
-                ["ui-select"] = {
-                    require("telescope.themes").get_dropdown(),
-                },
-            },
-        })
-        require("telescope").load_extension("ui-select")
-    end,
-}
-
-return {
-    neo_tree_file_operations_spec,
-    telescope_spec,
-}
+return { neo_tree_file_operations_spec }

config/nvim/lua/plugins/navigation.lua config/nvim/lua/plugins/neo-tree.luaconfig/nvim/lua/plugins/navigation.lua renamed to config/nvim/lua/plugins/neo-tree.lua

@@ -0,0 +1,22 @@
+-- telescope does fuzzy finding over all sorts of things.
+return {
+    -- https://github.com/nvim-telescope/telescope.nvim
+    "nvim-telescope/telescope.nvim",
+    dependencies = {
+        "nvim-lua/plenary.nvim",
+        "nvim-tree/nvim-web-devicons",
+        "nvim-telescope/telescope-ui-select.nvim",
+    },
+    config = function()
+        local telescope = require("telescope")
+        telescope.setup({
+            defaults = { layout_strategy = "vertical" },
+            extensions = {
+                ["ui-select"] = {
+                    require("telescope.themes").get_dropdown(),
+                },
+            },
+        })
+        require("telescope").load_extension("ui-select")
+    end,
+}