feat: remove scope + small refactor

Author: SystematicError

flake.lock

@@ -204,10 +204,6 @@
       url = "github:lewis6991/satellite.nvim";
       flake = false;
     };
-    "scope.nvim" = {
-      url = "github:tiagovla/scope.nvim";
-      flake = false;
-    };
     "snacks.nvim" = {
       url = "github:folke/snacks.nvim";
       flake = false;

flake.nix

@@ -43,13 +43,15 @@ map("n", "<s-tab>", "<cmd>bprevious<cr>", { desc = "Previous buffer" })
 map("n", "]b", "<cmd>bnext<cr>", { desc = "Next buffer" })
 map("n", "[b", "<cmd>bprevious<cr>", { desc = "Previous buffer" })
 map("n", "<leader>bl", "<cmd>e #<cr>", { desc = "Last buffer" })
-map("n", "<leader>x", "<cmd>bd<cr>", { desc = "Delete buffer" })
 map("n", "<leader>bd", "<cmd>bd<cr>", { desc = "Delete buffer" })
+map("n", "<leader>x", "<cmd>bd<cr>", { desc = "Delete buffer" })
 
 map("n", "<c-tab>", "<cmd>tabnext<cr>", { desc = "Next tab" })
 map("n", "<c-s-tab>", "<cmd>tabprevious<cr>", { desc = "Previous tab" })
 map("n", "]<tab>", "<cmd>tabnext<cr>", { desc = "Next tab" })
 map("n", "[<tab>", "<cmd>tabprevious<cr>", { desc = "Previous tab" })
+map("n", "<c-a-l>", "<cmd>+tabmove<cr>", { desc = "Move tab right" })
+map("n", "<c-a-h>", "<cmd>-tabmove<cr>", { desc = "Move tab left" })
 map("n", "<leader><tab><tab>", "<cmd>tabnew<cr>", { desc = "New tab" })
 map("n", "<leader><tab>l", "<cmd>tabnext #<cr>", { desc = "Last tab" })
 map("n", "<leader><tab>d", "<cmd>tabclose<cr>", { desc = "Delete tab" })

lua/keymaps.lua

@@ -1,50 +1,4 @@
--- TODO: Remove catppuccin dependency
 -- TODO: Modularise snacks integration
--- TODO: Modularise scope integration
-
--- Close orphan buffers when deleting current tab
--- BUG: Cancelling the closing of an unwritten buffer still causes ghosting
--- BUG: Scope cache not instantly updating when making a new tab
-
-local function delete_current_tab()
-    local tab_list = require("scope.core").cache
-    local current_tab = vim.api.nvim_get_current_tabpage()
-
-    local other_buffers = {}
-
-    for tab, buffer_list in pairs(tab_list) do
-        if tab ~= current_tab then
-            for _, buffer in ipairs(buffer_list) do
-                table.insert(other_buffers, buffer)
-            end
-        end
-    end
-
-    for _, buffer in ipairs(tab_list[current_tab]) do
-        if not vim.tbl_contains(other_buffers, buffer) then
-            Snacks.bufdelete.delete(buffer)
-        end
-    end
-
-    vim.cmd "tabclose"
-end
-
-local function delete_other_tabs()
-    local tab_list = require("scope.core").cache
-    local current_tab = vim.api.nvim_get_current_tabpage()
-
-    for tab, buffer_list in pairs(tab_list) do
-        if tab ~= current_tab then
-            for _, buffer in ipairs(buffer_list) do
-                if not vim.tbl_contains(tab_list[current_tab], buffer) then
-                    Snacks.bufdelete.delete(buffer)
-                end
-            end
-        end
-    end
-
-    vim.cmd "tabonly"
-end
 
 local default_opts = {
     options = {
@@ -64,22 +18,14 @@ local function config(_, opts)
         opts.options = opts.options or {}
         opts.options.close_command = "lua Snacks.bufdelete.delete(%d)"
         opts.options.right_mouse_command = opts.options.close_command
-
-        vim.keymap.set("n", "<leader><tab>d", delete_current_tab, { desc = "Delete tab" })
-        vim.keymap.set("n", "<leader><tab>o", delete_other_tabs, { desc = "Delete other tabs" })
     end
 
-    require("scope").setup()
     require("bufferline").setup(opts)
 end
 
 return {
     "akinsho/bufferline.nvim",
-    dependencies = {
-        "catppuccin/nvim",
-        "nvim-tree/nvim-web-devicons",
-        "tiagovla/scope.nvim",
-    },
+    dependencies = "nvim-tree/nvim-web-devicons",
 
     lazy = false,
     keys = {
@@ -91,14 +37,9 @@ return {
         { "<a-l>", "<cmd>BufferLineMoveNext<cr>", desc = "Move buffer right" },
         { "<a-h>", "<cmd>BufferLineMovePrev<cr>", desc = "Move buffer left" },
 
-        { "<c-a-l>", "<cmd>+tabmove<cr>", desc = "Move tab right" },
-        { "<c-a-h>", "<cmd>-tabmove<cr>", desc = "Move tab left" },
-
         { "<leader>bp", "<cmd>BufferLinePick<cr>", desc = "Pick buffer to move to" },
         { "<leader>bP", "<cmd>BufferLineTogglePin<cr>", desc = "Toggle pin" },
         { "<leader>bD", "<cmd>BufferLinePickClose<cr>", desc = "Pick buffer to delete" },
-
-        { "<leader><tab>m", "<cmd>ScopeMoveBuf<cr>", desc = "Move buffer to tab" },
     },
 
     opts = default_opts,

lua/plugins/bufferline.lua

@@ -64,7 +64,7 @@ local function config(_, opts)
 end
 
 local function bufferline_opts(_, opts)
-    opts.highlights = require("catppuccin.groups.integrations.bufferline").get()
+    opts.highlights = require("catppuccin.groups.integrations.bufferline").get_theme()
 end
 
 return {

lua/plugins/catppuccin.lua

@@ -1,31 +1,4 @@
--- TODO: Modularise opts table
--- TODO: Modularise scope integration
-
-local function config()
-    -- TODO: Scope persistence is funky
-    -- TODO: Don't persist neo-tree
-    if require("lazy.core.config").plugins["scope.nvim"] then
-        vim.api.nvim_create_autocmd("User", {
-            pattern = "PersistenceSavePre",
-            group = vim.api.nvim_create_augroup("frosty_tabpage_session", { clear = true }),
-            desc = "Save tabpage information with session",
-            callback = function()
-                vim.cmd "ScopeSaveState"
-            end,
-        })
-
-        vim.api.nvim_create_autocmd("User", {
-            pattern = "PersistenceLoadPost",
-            group = vim.api.nvim_create_augroup("frosty_tabpage_session", { clear = true }),
-            desc = "Load tabpage information from session",
-            callback = function()
-                vim.cmd "ScopeLoadState"
-            end,
-        })
-    end
-
-    require("persistence").setup()
-end
+-- TODO: Don't persist neo-tree
 
 return {
     "folke/persistence.nvim",
@@ -62,5 +35,5 @@ return {
         },
     },
 
-    config = config,
+    opts = {},
 }