feat(nvim): add preview to the Abolish S command

.config/aerospace/aerospace.toml

@@ -74,6 +74,10 @@ run = 'layout tiling'
 if.app-id = 'eu.opencloud.desktop'
 run = 'layout tiling'
 
+[[on-window-detected]]
+if.app-id = 'info.sioyek.sioyek'
+run = 'layout tiling'
+
 [[on-window-detected]]
 if.app-id = 'org.darktable'
 if.window-title-regex-substring = 'preferences'

.config/ghostty/config

@@ -12,6 +12,7 @@ font-feature = -dlig
 # Misc
 window-padding-color = background
 macos-titlebar-style = hidden
+confirm-close-surface = false
 
 quit-after-last-window-closed = true
 auto-update = download

.config/nvim/init.lua

@@ -1,28 +1,30 @@
 -- Set the leader key
 vim.g.mapleader = " "
 -- Appearance
-vim.opt.termguicolors = true  -- Enable 24-bit colors
+vim.opt.termguicolors = true     -- Enable 24-bit colors
-vim.opt.number = true         -- Show line numbers
+vim.opt.number = true            -- Show line numbers
-vim.opt.relativenumber = true -- Show relative line numbers
+vim.opt.relativenumber = true    -- Show relative line numbers
-vim.opt.wrap = false          -- Disable line wrapping
+vim.opt.wrap = false             -- Disable line wrapping
-vim.opt.conceallevel = 2      -- Hide Org mode links (assuming you use Org mode)
+vim.opt.conceallevel = 2         -- Hide Org mode links
-vim.opt.concealcursor = 'nc'  -- Conceal text in normal mode only
+vim.opt.concealcursor = 'nc'     -- Conceal text in normal mode only
-vim.opt.signcolumn = "yes"    -- Always show the sign column
+vim.opt.cursorline = true        -- Show current line
-vim.o.laststatus = 1          -- Always show the status line
+vim.opt.cursorlineopt = 'number' -- Only show the number in bold, not a line highlight
-vim.o.winborder = nil         -- Use default border for floating windows
+vim.opt.signcolumn = "yes"       -- Always show the sign column
-vim.o.foldlevelstart = 99     -- Start with all folds closed
+vim.o.laststatus = 1             -- Always show the status line
+vim.o.winborder = nil            -- Use default border for floating windows
+vim.o.foldlevelstart = 99        -- Start with all folds closed
 -- Indentation
-vim.opt.tabstop = 4           -- Number of spaces a tab represents
+vim.opt.tabstop = 4              -- Number of spaces a tab represents
-vim.opt.softtabstop = 4       -- Number of spaces a <Tab> in Insert mode equals
+vim.opt.softtabstop = 4          -- Number of spaces a <Tab> in Insert mode equals
-vim.opt.shiftwidth = 4        -- Number of spaces to use for autoindent
+vim.opt.shiftwidth = 4           -- Number of spaces to use for autoindent
-vim.opt.expandtab = true      -- Use spaces instead of tabs
+vim.opt.expandtab = true         -- Use spaces instead of tabs
-vim.opt.smartindent = true    -- Smart auto-indenting
+vim.opt.smartindent = true       -- Smart auto-indenting
 -- Searching
-vim.opt.hlsearch = false      -- Disable highlighting of search matches
+vim.opt.hlsearch = false         -- Disable highlighting of search matches
-vim.opt.incsearch = true      -- Show partial matches while typing
+vim.opt.incsearch = true         -- Show partial matches while typing
 -- Behavior and Navigation
-vim.opt.iskeyword:append("_") -- Add '_' to the list of keyword characters
+vim.opt.iskeyword:append("_")    -- Add '_' to the list of keyword characters
-vim.opt.scrolloff = 10        -- Keep 10 lines above/below cursor when scrolling
+vim.opt.scrolloff = 10           -- Keep 10 lines above/below cursor when scrolling
 vim.opt.sidescrolloff = 10
 vim.opt.smoothscroll = true
 -- File Management
@@ -35,6 +37,14 @@ vim.opt.swapfile = false                                             -- Disable
 -- Formatting
 vim.opt.formatoptions:remove("ro")                                   -- Remove 'ro' from formatoptions
 vim.opt.completeopt = { 'menuone', 'noinsert', 'popup', 'fuzzy' }
+--Move between wrapped lines, but keep relative jumps working
+vim.keymap.set({ "n", "v" }, "k", function()
+    return vim.v.count == 0 and "gk" or "k"
+end, { expr = true })
+
+vim.keymap.set({ "n", "v" }, "j", function()
+    return vim.v.count == 0 and "gj" or "j"
+end, { expr = true })
 --Move lines
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
@@ -113,6 +123,8 @@ vim.pack.add({
     'https://github.com/mfussenegger/nvim-dap',
     'https://github.com/igorlfs/nvim-dap-view',
     'https://github.com/lervag/vimtex',
+    -- This needs universal-ctags on macos (can be installed from brew)
+    --'https://github.com/ludovicchabant/vim-gutentags',
     'https://github.com/micangl/cmp-vimtex',
     'https://github.com/tpope/vim-fugitive',
     'https://github.com/FabijanZulj/blame.nvim',
@@ -124,8 +136,8 @@ vim.pack.add({
 
 -- NVIM 0.12 EXPERIMENTAL
 vim.cmd.packadd('nvim.undotree')
-vim.o.cmdheight = 0
+vim.o.cmdheight = 1
-require('vim._core.ui2').enable()
+--require('vim._core.ui2').enable()
 
 local treesitter = require('nvim-treesitter')
 vim.api.nvim_create_autocmd('FileType', {
@@ -146,6 +158,21 @@ require('onedark').setup({ style = 'dark' })
 require('onedark').load()
 
 
+-- abolish --
+-- Add preview to the :S command
+local function subvert_preview(opts, preview_ns, preview_buf)
+    vim.cmd("silent! " .. opts.line1 .. "," .. opts.line2 .. "Subvert" .. opts.args)
+    return 2
+end
+
+vim.api.nvim_create_user_command("S", function(opts)
+    vim.cmd(opts.line1 .. "," .. opts.line2 .. "Subvert" .. opts.args)
+end, {
+    nargs = "*",
+    range = "%",
+    preview = subvert_preview,
+})
+
 -- mini --
 require('mini.icons').setup()
 require('mini.surround').setup()
@@ -353,21 +380,6 @@ vim.lsp.config["lua_ls"] = {
 }
 vim.lsp.enable('lua_ls')
 
-vim.lsp.config["ltex"] = {
-    capabilities = capabilities,
-    on_attach = function() require("ltex_extra").setup() end,
-    settings = {
-        ltex = {
-            language = "en-GB",
-            additionalRules = {
-                enablePickyRules = true,
-                languageModel = '~/Downloads/ngrams/',
-            },
-        },
-    },
-}
-vim.lsp.enable('ltex')
-
 vim.lsp.config["hls"] = {
     capabilities = capabilities,
     filetypes = { 'haskell', 'lhaskell', 'cabal' },
@@ -377,6 +389,16 @@ vim.lsp.enable('hls')
 vim.lsp.config["texlab"] = { capabilities = capabilities }
 vim.lsp.enable('texlab')
 
+vim.lsp.config["harper_ls"] = {
+    settings = {
+        ["harper-ls"] = {
+            dialect = "British",
+            excludePatterns = { "*acronyms.tex", "*.go" }
+        }
+    }
+}
+vim.lsp.enable('harper_ls')
+
 vim.lsp.config["bashls"] = { capabilities = capabilities }
 vim.lsp.enable('bashls')
 
@@ -397,7 +419,8 @@ vim.lsp.enable('pyright')
 
 -- vimtex --
 if vim.loop.os_uname().sysname == "Darwin" then
-    vim.g.vimtex_view_method = 'skim'
+    vim.g.vimtex_view_method = 'sioyek'
+    vim.g.vimtex_view_sioyek_options = '--reuse-window'
     -- vim.g.vimtex_view_method = 'zathura'
     -- vim.g.vimtex_view_zathura_use_synctex = 0
 else
@@ -418,6 +441,10 @@ vim.g.vimtex_compiler_latexmk = {
 }
 vim.g.vimtex_view_automatic = 1
 
+--  gutentags --
+if vim.loop.os_uname().sysname == "Darwin" then
+    vim.g.gutentags_ctags_executable = '/opt/homebrew/bin/ctags'
+end
 
 -- blink.cmp --
 if vim.g.vscode ~= 1 then
@@ -511,7 +538,7 @@ require('conform').setup({
 
 -- lint --
 local lint = require('lint')
-lint.linters_by_ft = { go = { "golangcilint" } }
+--lint.linters_by_ft = { go = { "golangcilint" } }
 
 vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost", "InsertLeave" }, {
     group = vim.api.nvim_create_augroup("lint", { clear = true }),

.config/nvim/nvim-pack-lock.json

@@ -19,7 +19,7 @@
       "src": "https://github.com/micangl/cmp-vimtex"
     },
     "conform.nvim": {
-      "rev": "9fd3b3a91b0981d60d2bc688c8cd1680320ee5de",
+      "rev": "619363c30309d29ffa631e67c8183f2a72caa373",
       "src": "https://github.com/stevearc/conform.nvim"
     },
     "friendly-snippets": {
@@ -27,7 +27,7 @@
       "src": "https://github.com/rafamadriz/friendly-snippets"
     },
     "fzf-lua": {
-      "rev": "23f71140754b9162551dc8ccc1d6346e4275ecc2",
+      "rev": "1c91f217f394b8c5c628f9e900fc52e923c850fa",
       "src": "https://github.com/ibhagwan/fzf-lua"
     },
     "harpoon": {
@@ -39,6 +39,10 @@
       "rev": "0074b551a17338ccdcd299bd86687cc651bcb33d",
       "src": "https://github.com/smjonas/inc-rename.nvim"
     },
+    "kulala.nvim": {
+      "rev": "5a2883ce52bc5feb6eb1f0ddd19de06bb4033144",
+      "src": "https://github.com/mistweaverco/kulala.nvim"
+    },
     "lazydev.nvim": {
       "rev": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d",
       "src": "https://github.com/folke/lazydev.nvim"
@@ -48,43 +52,43 @@
       "src": "https://github.com/barreiroleo/ltex-extra.nvim"
     },
     "mason.nvim": {
-      "rev": "8e921c2b68571e978db5d4d3fef9c9a7f8755473",
+      "rev": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d",
       "src": "https://github.com/williamboman/mason.nvim"
     },
     "mini.ai": {
-      "rev": "bfb26d9072670c3aaefab0f53024b2f3729c8083",
+      "rev": "d73c36349aa7b0bab5f77ad71701a1d42211a1df",
       "src": "https://github.com/echasnovski/mini.ai",
       "version": ">=0.0.0"
     },
     "mini.icons": {
-      "rev": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428",
+      "rev": "e56797f90192d81f1fda02e662fc3e8e3d775027",
       "src": "https://github.com/echasnovski/mini.icons",
       "version": ">=0.0.0"
     },
     "mini.pairs": {
-      "rev": "d5a29b6254dad07757832db505ea5aeab9aad43a",
+      "rev": "4a014143fcb4e9df26198ccb3ecff3b9e77a048c",
       "src": "https://github.com/echasnovski/mini.pairs",
       "version": ">=0.0.0"
     },
     "mini.surround": {
-      "rev": "88c52297ed3e69ecf9f8652837888ecc727a28ee",
+      "rev": "580e4cb98c5900d9fe743865fb5a5b2178b4ab18",
       "src": "https://github.com/echasnovski/mini.surround",
       "version": ">=0.0.0"
     },
     "nvim-dap": {
-      "rev": "45a69eba683a2c448dd9ecfc4de89511f0646b5f",
+      "rev": "9e848e09a697ee95302a3ef2dd43fd6eb709e570",
       "src": "https://github.com/mfussenegger/nvim-dap"
     },
     "nvim-dap-view": {
-      "rev": "b5cc6e1c4cd188478fdad2e0b58dbca08fd6d363",
+      "rev": "440ec66c2b26470ec97cd4d6667cdd4b51cbc7cb",
       "src": "https://github.com/igorlfs/nvim-dap-view"
     },
     "nvim-lint": {
-      "rev": "665525810630701b84181e4d9eefd24b49845b29",
+      "rev": "a219b2c9e5b4765e5c845aba119dad55806fcaf1",
       "src": "https://github.com/mfussenegger/nvim-lint"
     },
     "nvim-lspconfig": {
-      "rev": "8f7e64066e2641d5e7d494962a9c7051e3d38dd5",
+      "rev": "d224a1920728ba129880efc700d4a0180ac4ecbb",
       "src": "https://github.com/neovim/nvim-lspconfig"
     },
     "nvim-treesitter": {
@@ -96,11 +100,11 @@
       "src": "https://github.com/nvim-treesitter/nvim-treesitter-textobjects"
     },
     "nvim-web-devicons": {
-      "rev": "2795c26c916bb3c57dde308b82be51971fa92747",
+      "rev": "dad71387de386a946b123079d0e53f23028f3abd",
       "src": "https://github.com/nvim-tree/nvim-web-devicons"
     },
     "oil.nvim": {
-      "rev": "0fcc83805ad11cf714a949c98c605ed717e0b83e",
+      "rev": "b73018b75affd13fa38e2fc94ef753b465f770d7",
       "src": "https://github.com/stevearc/oil.nvim"
     },
     "onedark.nvim": {
@@ -112,15 +116,19 @@
       "src": "https://github.com/nvim-lua/plenary.nvim"
     },
     "smart-splits.nvim": {
-      "rev": "9053ebd394c38fe55fd2f4710daec27411c34fb9",
+      "rev": "ebf4d8bbc16570817c0f5275468466b9d00b8d7d",
       "src": "https://github.com/mrjones2014/smart-splits.nvim"
     },
     "snacks.nvim": {
-      "rev": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e",
+      "rev": "882c996cf28183f4d63640de0b4c02ec886d01f2",
       "src": "https://github.com/folke/snacks.nvim"
     },
+    "tabular": {
+      "rev": "12437cd1b53488e24936ec4b091c9324cafee311",
+      "src": "https://github.com/godlygeek/tabular"
+    },
     "tiny-glimmer.nvim": {
-      "rev": "cc285167914e947fc130523d02927fdaf24636a6",
+      "rev": "f26728abf811324d7ed6b035a11d7b76a27c06c3",
       "src": "https://github.com/rachartier/tiny-glimmer.nvim"
     },
     "todo-comments.nvim": {
@@ -135,8 +143,12 @@
       "rev": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0",
       "src": "https://github.com/tpope/vim-fugitive"
     },
+    "vim-gutentags": {
+      "rev": "aa47c5e29c37c52176c44e61c780032dfacef3dd",
+      "src": "https://github.com/ludovicchabant/vim-gutentags"
+    },
     "vimtex": {
-      "rev": "182ad387e3f3107699483606c9a2b6648f8437b2",
+      "rev": "a5949d2800c1866c878956d49c51fc8d003c6b99",
       "src": "https://github.com/lervag/vimtex"
     }
   }

.config/tmux/tmux.conf

@@ -45,13 +45,16 @@ set -g @fingers-key f
 # Binds
 bind-key 'x' kill-pane
 bind-key 'h' previous-window
+bind-key 'H' swap-window -t -1\; select-window -t -1
 bind-key 'j' switch-client -p
 bind-key 'k' switch-client -n
 bind-key 'l' next-window
+bind-key 'L' swap-window -t +1\; select-window -t +1
 bind-key 'n' new-window -c '#{pane_current_path}'
 bind-key 'N' new-window
 bind-key 'c' kill-window
 
+
 # Decide whether we're in a Vim process
 is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
     | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
@@ -66,7 +69,7 @@ unbind o
 bind-key 'o' if-shell "$is_vim" 'send-keys F8' 'select-pane -R'
 
 unbind s
-bind-key 's' display-popup -E -w 60% -h 40% "~/.local/bin/tms"
+bind-key 's' display-popup -E -w 60% -h 70% "~/.local/bin/tms"
 unbind t
 bind-key 't' display-popup -E -w 60% -h 40% "~/.local/bin/change-theme.sh"
 unbind g

.local/bin/macos.sh

@@ -30,6 +30,10 @@ defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool
 defaults write com.apple.AppleMultitouchTrackpad TrackpadThreeFingerDrag -bool true
 defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadThreeFingerDrag -bool true
 
+# Window corners
+defaults write -g NSConvolutionOverride1 -float 8
+defaults write -g NSSplitViewItemGlassMinimumCornerRadius -float 8
+
 echo "Restarting affected services..."
 killall Dock
 killall Finder