vim -> nvim migration

bashrc.d/070-environment.sh

@@ -27,28 +27,22 @@ export FZF_CTRL_R_OPTS=" \
     )\" \
 "
 
-# Use vim as my MANPAGER. Has folding, ability to follow links.
-MANPAGER="vim -M +MANPAGER -"
-MANWIDTH=100
+# Use nvim as my MANPAGER. Has folding, ability to follow links.
+export MANPAGER='nvim +Man!'
+export MANWIDTH=100
 
 # Add local header files to gcc include path
-C_INCLUDE_PATH="$HOME/.local/include${C_INCLUDE_PATH:+:${C_INCLUDE_PATH}}"
-CPLUS_INCLUDE_PATH="$HOME/.local/include${CPLUS_INCLUDE_PATH:+:${CPLUS_INCLUDE_PATH}}"
+export C_INCLUDE_PATH="$HOME/.local/include${C_INCLUDE_PATH:+:${C_INCLUDE_PATH}}"
+export CPLUS_INCLUDE_PATH="$HOME/.local/include${CPLUS_INCLUDE_PATH:+:${CPLUS_INCLUDE_PATH}}"
 
 # Add local libraries to library path.
-LIBRARY_PATH="$HOME/.local/lib${LIBRARY_PATH:+:${LIBRARY_PATH}}"
+export LIBRARY_PATH="$HOME/.local/lib${LIBRARY_PATH:+:${LIBRARY_PATH}}"
 
 # Setting LIBRARY_PATH is for linking, setting LD_LIBRARY_PATH is for running
-LD_LIBRARY_PATH="$LIBRARY_PATH"
+export LD_LIBRARY_PATH="$LIBRARY_PATH"
 
-export C_INCLUDE_PATH
-export CPLUS_INCLUDE_PATH
-export LIBRARY_PATH
-export LD_LIBRARY_PATH
-export MANPAGER
-export MANWIDTH
-export EDITOR=vim
-export BAT_THEME=base16
+export EDITOR=nvim
+export BAT_THEME=gruvbox-light
 # Fix less not rendering control characters with git-log on the Opp lab machines.
 export LESS=FRX
 

setup

@@ -42,21 +42,38 @@ prompt_default_yes() {
 
 github_latest_release_tag() {
     local repo="$1"
+    local response
+    local tag
 
-    curl --silent --fail "https://api.github.com/repos/$repo/releases/latest" |
-        grep --only-matching --perl-regexp '"tag_name": "\K(.*)(?=")'
+    if ! response=$(curl --silent --show-error --fail "https://api.github.com/repos/$repo/releases/latest" 2>&1); then
+        error "Failed to fetch latest release for $repo: $response"
+        return 1
+    fi
+
+    if ! tag=$(printf '%s' "$response" | grep --only-matching --perl-regexp '"tag_name": "\K(.*)(?=")'); then
+        error "Could not parse tag_name from GitHub response for $repo"
+        return 1
+    fi
+
+    printf '%s\n' "$tag"
 }
 
 github_download_release() {
     local repo="$1"
     local version="$2"
     local artifact="$3"
     local output="${4:-$artifact}"
+    local url="https://github.com/$repo/releases/download/$version/$artifact"
 
-    curl \
+    if ! curl \
+        --fail \
+        --show-error \
         --location \
         --output "$output" \
-        --remote-name "https://github.com/$repo/releases/download/$version/$artifact"
+        --remote-name "$url"; then
+        error "Failed to download release artifact $artifact from $repo ($url)"
+        return 1
+    fi
 }
 
 debug() {

setup.d/020-fancy-tools.sh

@@ -49,4 +49,41 @@ if prompt_default_yes "Install/update fancy shell tools?"; then
             download_and_install_delta "$latest_version"
         fi
     fi
+
+    download_and_install_nvim() {
+        local -r artifact="nvim-linux-x86_64.tar.gz"
+        pushd /tmp || exit 1
+
+        debug "downloading $artifact ..."
+        github_download_release "neovim/neovim" "stable" "$artifact"
+
+        debug "installing ..."
+        tar -C ~/.local/ --strip-components=1 -xzvf "$artifact"
+
+        popd || exit 1
+    }
+
+    if prompt_default_yes "Install/update nvim from GitHub?"; then
+        latest_version=$(github_latest_release_tag "neovim/neovim")
+        info "Found latest version: $latest_version"
+
+        if command -v nvim &>/dev/null; then
+            installed_version=$(nvim --version | sed -En 's/^NVIM (v[0-9]+\.[0-9]+\.[0-9]+).*$/\1/p')
+            debug "Found installed version: $installed_version"
+
+            if [[ "$installed_version" != "$latest_version" ]]; then
+                info "Updating nvim..."
+                download_and_install_nvim
+            else
+                info "nvim $installed_version already installed."
+                if prompt_default_no "Reinstall nvim?"; then
+                    info "Reinstalling nvim..."
+                    download_and_install_nvim
+                fi
+            fi
+        else
+            info "Installing nvim for the first time..."
+            download_and_install_nvim
+        fi
+    fi
 fi

setup.d/031-development-packages.sh

@@ -3,7 +3,7 @@ if prompt_default_no "Install Python development packages?"; then
     if prompt_default_no "Install Pip?"; then
         if ! command -v pip &>/dev/null; then
             info "Pip not installed. Installing..."
-            curl https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
+            curl --fail --show-error https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py
             python3 /tmp/get-pip.py --user
         else
             info "Pip $(pip --version | grep -o '(.*)') already installed"
@@ -15,20 +15,6 @@ if prompt_default_no "Install Python development packages?"; then
         info "${YELLOW}Modifying $(which pylint) to use environment python instead of system python..."
         sed -i 's|/usr/bin/python3|/usr/bin/env python3|' "$(which pylint)"
     fi
-
-    if prompt_default_yes "Install/update colout?"; then
-        mkdir -p "$HOME/src/"
-        if [[ -d "$HOME/src/colout/" ]]; then
-            pushd "$HOME/src/colout/" || exit 1
-            git pull
-        else
-            git clone https://github.com/nojhan/colout.git "$HOME/src/colout/"
-            pushd "$HOME/src/colout/" || exit 1
-            python setup.py install --user
-        fi
-
-        popd || exit 1
-    fi
 fi # Python
 
 download_and_install_shellcheck() {
@@ -150,6 +136,7 @@ if prompt_default_no "Install/update Rust?"; then
             dump_syms \
             minidump-stackwalk \
             rustfilt \
+            tree-sitter-cli \
             ;
     fi
 fi # Rust
@@ -214,7 +201,7 @@ if prompt_default_no "Install nvm?"; then
         popd || exit 1
     else
         debug "nvm not found. Installing nvm..."
-        curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$latest_version/install.sh" | bash
+        curl --fail --show-error -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$latest_version/install.sh" | bash
     fi
 
     # Source nvm so we can use it in following setup steps

setup.d/032-sysworxx-can-drivers.sh

@@ -11,7 +11,7 @@ fi
 if [[ ! -f /tmp/driver.tar.bz2 ]]; then
     debug "Downloading driver ..."
     pushd /tmp/
-    curl --location "$SYSWORXX_SOCKETCAN_DRIVER_DOWNLOAD_LINK" --output /tmp/driver.tar.bz2
+    curl --fail --show-error --location "$SYSWORXX_SOCKETCAN_DRIVER_DOWNLOAD_LINK" --output /tmp/driver.tar.bz2
     tar -xjvf /tmp/driver.tar.bz2
     popd
 fi

setup.d/050-apps-ubuntu.sh

@@ -11,17 +11,17 @@ if prompt_default_no "Install base GUI packages?"; then
 fi
 
 if prompt_default_no "Install VS Code?"; then
-    curl --location https://go.microsoft.com/fwlink/?LinkID=760868 --output /tmp/code.deb
+    curl --fail --show-error --location https://go.microsoft.com/fwlink/?LinkID=760868 --output /tmp/code.deb
     sudo apt install /tmp/code.deb
 fi
 
 if prompt_default_no "Install Discord?"; then
-    curl --location "https://discordapp.com/api/download?platform=linux&format=deb" --output /tmp/discord.deb
+    curl --fail --show-error --location "https://discordapp.com/api/download?platform=linux&format=deb" --output /tmp/discord.deb
     sudo apt install /tmp/discord.deb
 fi
 
 if prompt_default_no "Install Spotify?"; then
-    curl -sS https://download.spotify.com/debian/pubkey_0D811D58.gpg | sudo apt-key add -
+    curl --fail -sS https://download.spotify.com/debian/pubkey_0D811D58.gpg | sudo apt-key add -
     echo "deb http://repository.spotify.com stable non-free" | sudo tee /etc/apt/sources.list.d/spotify.list
     sudo apt update
     sudo apt install spotify-client

setup.d/060-customizations.sh

@@ -14,7 +14,7 @@ fi
 if prompt_default_no "Install Pointfree font?"; then
     # https://docs.fedoraproject.org/en-US/quick-docs/fonts/
     mkdir -p ~/.local/share/fonts
-    curl --location --output /tmp/pointfree.zip "https://dl.dafont.com/dl/?f=pointfree"
+    curl --fail --show-error --location --output /tmp/pointfree.zip "https://dl.dafont.com/dl/?f=pointfree"
     unzip -d /tmp/ /tmp/pointfree.zip
     mkdir -p ~/.local/share/fonts/
     mv /tmp/pointfree.ttf ~/.local/share/fonts/

stowdir/.config/nvim/init.lua

@@ -0,0 +1,34 @@
+vim.g.mapleader = "\\"
+vim.g.maplocalleader = "\\"
+
+-- Auto-load every lua/config/*.lua module in alphabetical order
+for _, path in ipairs(vim.api.nvim_get_runtime_file("lua/config/*.lua", true)) do
+    require("config." .. path:match("lua/config/(.+)%.lua$"))
+end
+
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.uv.fs_stat(lazypath) then
+    local out = vim.fn.system({
+        "git",
+        "clone",
+        "--filter=blob:none",
+        "--branch=stable",
+        "https://github.com/folke/lazy.nvim.git",
+        lazypath,
+    })
+    if vim.v.shell_error ~= 0 then
+        vim.api.nvim_echo({
+            { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+            { out, "WarningMsg" },
+        }, true, {})
+        os.exit(1)
+    end
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup({
+    spec = { { import = "plugins" } },
+    checker = { enabled = true },
+    ui = { border = "single" },
+})

stowdir/.config/nvim/lazy-lock.json

@@ -0,0 +1,30 @@
+{
+  "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" },
+  "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
+  "conform.nvim": { "branch": "master", "commit": "dca1a190aa85f9065979ef35802fb77131911106" },
+  "copilot.lua": { "branch": "master", "commit": "78c638293f0ea6a2245eca46e9933ee271792d7e" },
+  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
+  "kanagawa.nvim": { "branch": "master", "commit": "8ad3b4cdcc804b332c32db8f9743667e1bb82b99" },
+  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" },
+  "marks.nvim": { "branch": "master", "commit": "f353e8c08c50f39e99a9ed474172df7eddd89b72" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "0c2823e0418f3d9230ff8b201c976e84de1cb401" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
+  "mason.nvim": { "branch": "main", "commit": "cb8445f8ce85d957416c106b780efd51c6298f89" },
+  "nvim-lint": { "branch": "master", "commit": "eab58b48eb11d7745c11c505e0f3057165902461" },
+  "nvim-lspconfig": { "branch": "master", "commit": "31026a13eefb20681124706a79fc1df6bf11ab27" },
+  "nvim-surround": { "branch": "main", "commit": "2e93e154de9ff326def6480a4358bfc149d5da2c" },
+  "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e" },
+  "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
+  "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" },
+  "telescope.nvim": { "branch": "master", "commit": "f04ab730b8f9c6bf3f54a206d0dcddfd70c52d59" },
+  "vim-bitbake": { "branch": "master", "commit": "e75f8ea12b4a0bcfe46c564a3a78ff7361b0a1c6" },
+  "vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" },
+  "vim-flatbuffers": { "branch": "master", "commit": "ecd75c33576d982f3c83545dff7b3c9245285e75" },
+  "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432" }
+}

stowdir/.config/nvim/lua/config/clipboard.lua

@@ -0,0 +1,7 @@
+-- System-clipboard bindings via the `clip` script. By using `clip`, I get x11, wayland, and sshclip support
+vim.keymap.set("i", "<C-S-p>", [[<C-r><C-o>=system('clip --paste')<cr>]], { silent = true })
+vim.keymap.set("i", "<C-y>", [[<Esc>"cyy:call system('clip --copy', @c)<cr>]], { silent = true })
+vim.keymap.set("v", "<C-y>", [["cy:call system('clip --copy', @c)<cr>]], { silent = true })
+vim.keymap.set("v", "<C-S-p>", [[:<C-u>let @c=system('clip --paste')<cr>gv"cP]], { silent = true })
+vim.keymap.set("n", "<C-S-p>", [[:let @c=system('clip --paste')<cr>"cP]], { silent = true })
+vim.keymap.set("n", "<C-y>", [["cyy:call system('clip --copy', @c)<cr>]], { silent = true })

stowdir/.config/nvim/lua/config/diagnostics.lua

@@ -0,0 +1,7 @@
+vim.diagnostic.config({
+    virtual_text = { current_line = true },
+    severity_sort = true,
+    float = { border = "rounded", source = true },
+})
+
+vim.keymap.set("n", "gl", vim.diagnostic.open_float, { desc = "Show line diagnostics" })

stowdir/.config/nvim/lua/config/editing.lua

@@ -0,0 +1,70 @@
+vim.opt.number = true
+vim.opt.cursorline = true
+vim.opt.colorcolumn = "100"
+vim.opt.textwidth = 100
+vim.opt.scrolloff = 6
+vim.opt.sidescrolloff = 6
+vim.opt.virtualedit = "all"
+vim.opt.display = "truncate"
+
+vim.opt.lazyredraw = true
+vim.opt.showmatch = true
+
+vim.api.nvim_create_autocmd("FileType", {
+    group = vim.api.nvim_create_augroup("editing_gitcommit", { clear = true }),
+    pattern = "gitcommit",
+    callback = function()
+        vim.opt_local.colorcolumn = "72"
+    end,
+})
+
+-- Reselect visual block after indent.
+vim.keymap.set("v", "<", "<gv")
+vim.keymap.set("v", ">", ">gv")
+
+-- Move by visual line so wrapped lines feel like arrow-key movement.
+vim.keymap.set("n", "j", "gj")
+vim.keymap.set("n", "k", "gk")
+
+-- Defeat smartindent's habit of yanking `#` to column 0.
+vim.keymap.set("i", "#", "X<BS>#")
+
+-- New empty buffer.
+vim.keymap.set("n", "<C-t>", "<cmd>enew<cr>")
+
+-- Buffer and quickfix navigation (replaces vim-unimpaired's ]b/[b/]q/[q).
+vim.keymap.set("n", "]b", "<cmd>bnext<cr>")
+vim.keymap.set("n", "[b", "<cmd>bprevious<cr>")
+vim.keymap.set("n", "]q", "<cmd>cnext<cr>")
+vim.keymap.set("n", "[q", "<cmd>cprevious<cr>")
+
+-- :bd / :bd! delete the current buffer but keep the window open by switching to another buffer first.
+vim.api.nvim_create_user_command("Bd", function(opts)
+    local current = vim.api.nvim_get_current_buf()
+
+    -- Surface "no write since last change" before switching, so the user
+    -- stays on the modified buffer rather than ending up on the alternate.
+    if not opts.bang and vim.bo[current].modified then
+        vim.notify(
+            ("E89: No write since last change for buffer %d (use :Bd!)"):format(current),
+            vim.log.levels.ERROR
+        )
+        return
+    end
+
+    local has_others = false
+    for _, info in ipairs(vim.fn.getbufinfo({ buflisted = 1 })) do
+        if info.bufnr ~= current then
+            has_others = true
+            break
+        end
+    end
+    if has_others then
+        vim.cmd("bprevious")
+    else
+        vim.cmd("enew")
+    end
+    vim.cmd(("bdelete%s %d"):format(opts.bang and "!" or "", current))
+end, { bang = true })
+
+vim.cmd([[cnoreabbrev <expr> bd getcmdtype() == ':' && getcmdline() == 'bd' ? 'Bd' : 'bdelete']])