cleanup (remove neorg + neo-tree + splitjoin, telescope changes, etc)

lazy-lock.json

@@ -1,6 +1,5 @@
 {
   "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
@@ -8,29 +7,26 @@
   "crates.nvim": { "branch": "main", "commit": "73d2c590c74a0c582144987a4decb4a642755859" },
   "diagflow.nvim": { "branch": "main", "commit": "b13321b517ff64bf42eeac2214085d3c76d83a0d" },
   "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "gitsigns.nvim": { "branch": "main", "commit": "02eafb1273afec94447f66d1a43fc5e477c2ab8a" },
+  "gitsigns.nvim": { "branch": "main", "commit": "2149fc2009d1117d58e86e56836f70c969f60a82" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lsp-zero.nvim": { "branch": "v3.x", "commit": "77550f2f6cbf0959ef1583d845661af075f3442b" },
   "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
   "lualine.nvim": { "branch": "master", "commit": "86fe39534b7da729a1ac56c0466e76f2c663dc42" },
-  "mini.bufremove": { "branch": "main", "commit": "66019ecebdc5bc0759e04747586994e2e3f98416" },
   "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
   "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" },
   "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" },
-  "mini.splitjoin": { "branch": "main", "commit": "70240d5d3881ff1b2b1d7902450f98a6fa303800" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
-  "neorg": { "branch": "main", "commit": "4cbedbbdd4ccb6f45a2045477f5658a1311dffa3" },
   "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
   "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b70b900fba6e3255a5a8113c76f213102564cb0d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "747de98ca607615f66af5864f3eeaa2eeeb3d2da" },
   "nvim-navic": { "branch": "master", "commit": "39231352aec0d1e09cebbffdd9dc20a5dc691ffe" },
   "nvim-treesitter": { "branch": "master", "commit": "684eeac91ed8e297685a97ef70031d19ac1de25a" },
   "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
+  "nvim-web-devicons": { "branch": "master", "commit": "855c97005c8eebcdd19846f2e54706bffd40ee96" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "ripgrep": { "branch": "master", "commit": "6dfaec03e830892e787686917509c17860456db1" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
   "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
   "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
@@ -38,6 +34,6 @@
   "vim-lumen": { "branch": "master", "commit": "97157aac9f0d24c144a3defdfe5057ee61e18dcb" },
   "vim-numbertoggle": { "branch": "main", "commit": "075b7478777e694fbac330ee34a74590dad0fee1" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
-  "vimtex": { "branch": "master", "commit": "bb4e401f97caf29873382c3b7dcb64369c928b3d" },
+  "vimtex": { "branch": "master", "commit": "cfd4e528b0b44804b51a2929ddcde0b99ebae52f" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }

lua/plugins/bufferline.lua

@@ -1,37 +0,0 @@
-return {
-  {
-    "echasnovski/mini.bufremove",
-    version = false,
-    event = "VeryLazy",
-    opts = {},
-  },
-  {
-    "akinsho/bufferline.nvim",
-    event = "VeryLazy",
-    keys = {
-      { "gn", "<Cmd>BufferLineCycleNext<cr>", desc = "Go to next buffer", },
-      { "gp", "<Cmd>BufferLineCyclePrev<cr>", desc = "Go to previous buffer", },
-    },
-    opts = {
-      options = {
-        -- fix bug with neotree causing closing tab to close editor
-        close_command = function(n) require("mini.bufremove").delete() end,
-        right_mouse_command = function(n) require("mini.bufremove").delete() end,
-        --always_show_bufferline = false,
-        diagnostics = "nvim_lsp",
-        offsets = { -- From LazyVim; don't show above NeoTree
-          {
-            filetype = "neo-tree",
-            text = "Neo-tree",
-            highlight = "Directory",
-            text_align = "left",
-          },
-        },
-      }
-    },
-  },
-  {
-    "nvim-tree/nvim-web-devicons",
-    lazy = true,
-  },
-}

lua/plugins/lualine.lua

@@ -5,6 +5,11 @@ return {
       "SmiteshP/nvim-navic",
     },
     opts = {
+      tabline = {
+        lualine_b = {
+          "filename",
+        },
+      },
       sections = {
         lualine_c = {
           { "navic" },

lua/plugins/neorg.lua

@@ -1,54 +0,0 @@
-return {
-  {
-    "nvim-neorg/neorg",
-    version = "v7.0.0", -- pin to pre-luarocks version
-    build = ":Neorg sync-parsers",
-    priority = 30, -- should load after treesitter
-    ft = "norg",
-    cmd = "Neorg",
-    keys = {
-      { "<leader>n", "<cmd>Neorg index<cr>", desc = "Open Neorg" },
-      { "<leader>N", "<cmd>Neorg return<cr>", desc = "Close Neorg" },
-    },
-    dependencies = {
-      "nvim-lua/plenary.nvim"
-    },
-    config = function()
-      require("neorg").setup({
-        load = {
-          ["core.defaults"] = {}, -- Loads default behaviour
-          ["core.concealer"] = {}, -- Adds pretty icons to your documents
-          ["core.dirman"] = { -- Manages Neorg workspaces
-            config = {
-              workspaces = {
-                notes = "~/notes",
-              },
-              default_workspace = "notes",
-            },
-          },
-        },
-      })
-
-      -- add neorg-specific options
-      vim.api.nvim_create_autocmd("FileType", {
-        pattern = "norg",
-        callback = function()
-          -- enable word wrap
-          vim.opt_local.wrap = true
-          vim.opt_local.linebreak = true
-
-          -- create localleader keybindings
-          local buf = vim.api.nvim_get_current_buf()
-          vim.keymap.set("n",
-            "<localleader>c",
-            "<cmd>Neorg toggle-concealer<cr>",
-            { desc = "Toggle concealer",
-              buffer = buf,
-              noremap = false
-            })
-        end,
-      })
-    end,
-  },
-}
-

lua/plugins/neotree.lua

@@ -1,41 +0,0 @@
-return {
-  {
-    "nvim-neo-tree/neo-tree.nvim",
-    branch = "v3.x",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
-      "MunifTanjim/nui.nvim",
-      -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
-    },
-    keys = {
-      {
-        "<leader>e",
-        function()
-          require("neo-tree.command").execute({ toggle = true, dir = vim.loop.cwd() })
-        end,
-        desc = "Open file explorer",
-      },
-    },
-    opts = {
-      open_files_do_not_replace_types = { "terminal", "Trouble", "trouble", }, -- From LazyVim
-      close_if_last_window = true,
-      window = {
-        width = 30,
-        mappings = {
-          ["<space>"] = "none",
-        },
-      },
-    },
-    init = function()
-      -- Load instead of netrw
-      if vim.fn.argc(-1) == 1 then
-        local stat = vim.loop.fs_stat(vim.fn.argv(0))
-        if stat and stat.type == "directory" then
-          require("neo-tree")
-        end
-      end
-    end,
-  },
-}
-

lua/plugins/splitjoin.lua

@@ -1,16 +0,0 @@
-return {
-  {
-    'echasnovski/mini.splitjoin',
-    version = false,
-    keys = {
-      { "gS", function() require("mini.splitjoin").toggle() end, desc = "Toggle splitjoin" },
-    },
-    opts = {
-      mappings = {
-        toggle = '',
-        split = '',
-        join = '',
-      },
-    },
-  },
-}

lua/plugins/telescope.lua

@@ -4,6 +4,7 @@ return {
     dependencies = {
       "nvim-lua/plenary.nvim",
       "BurntSushi/ripgrep",
+      "nvim-tree/nvim-web-devicons",
     },
     keys = {
       { "<leader>f", "<cmd>Telescope find_files<cr>", desc = "Open file picker", },
@@ -27,6 +28,10 @@ return {
         },
       },
       pickers = {
+        buffers = {
+          -- sort buffers in order of last-use
+          sort_lastused = true,
+        },
         diagnostics = {
           theme = "dropdown",
           layout_config = {
@@ -34,15 +39,33 @@ return {
           },
         },
       },
+      extensions = {
+        file_browser = {
+          mappings = {},
+        },
+      },
     },
     config = function(_, opts)
       local actions = require("telescope.actions")
+      -- close on esc
       opts.defaults.mappings = { i = { ["<esc>"] = actions.close } }
+      -- except for in the file browser
+      opts.extensions.file_browser.mappings = { i = { ["<esc>"] = function() vim.cmd("stopinsert") end } }
 
       local telescope = require("telescope")
       telescope.setup(opts)
     end,
   },
+  {
+    "nvim-telescope/telescope-file-browser.nvim",
+    keys = {
+      { "<leader>e", "<cmd>Telescope file_browser<cr>", desc = "Open file explorer", },
+    },
+    dependencies = { "nvim-telescope/telescope.nvim" },
+    config = function()
+      require("telescope").load_extension("file_browser")
+    end,
+  },
   {
     "folke/todo-comments.nvim",
     event = "VeryLazy",

lua/plugins/theme.lua

@@ -17,8 +17,8 @@ return {
         return {
           -- fixup telescope selection color
           TelescopeSelection = { fg = colors.text, bg = colors.surface0 },
-          -- make bufferline more readable
-          BufferlineFill = { bg = colors.mantle },
+          -- clearer delineation for which-key
+          WhichKeyNormal = { bg = colors.mantle },
         }
       end,
     },

lua/plugins/ui.lua

@@ -39,21 +39,6 @@ return {
       {
         "MunifTanjim/nui.nvim"
       },
-      --{
-      --  "rcarriga/nvim-notify",
-      --  keys = {
-      --    {
-      --      "<leader>u",
-      --      function()
-      --        require("notify").dismiss()
-      --      end,
-      --      desc = "Dismiss all notifications"
-      --    },
-      --  },
-      --  opts = {
-      --    top_down = false,
-      --  },
-      --},
     }
   }
 }