backup old nvim vim

.gitmodules

@@ -1,21 +1,21 @@
 [submodule "nvim/pack/bundle/start/nvim-treesitter"]
-	path = nvim/pack/bundle/start/nvim-treesitter
+	path = nvim.bak/pack/bundle/start/nvim-treesitter
 	url = https://github.com/nvim-treesitter/nvim-treesitter
 [submodule "nvim/pack/bundle/start/nvim-lspconfig"]
-	path = nvim/pack/bundle/start/nvim-lspconfig
+	path = nvim.bak/pack/bundle/start/nvim-lspconfig
 	url = https://github.com/neovim/nvim-lspconfig
 [submodule "nvim/pack/bundle/start/projectionist"]
-	path = nvim/pack/bundle/start/projectionist
+	path = nvim.bak/pack/bundle/start/projectionist
 	url = https://tpope.io/vim/projectionist.git
 [submodule "nvim/pack/bundle/start/dispatch"]
-	path = nvim/pack/bundle/start/dispatch
+	path = nvim.bak/pack/bundle/start/dispatch
 	url = https://tpope.io/vim/dispatch.git
 [submodule "nvim/pack/bundle/start/copilot.vim"]
-	path = nvim/pack/bundle/start/copilot.vim
+	path = nvim.bak/pack/bundle/start/copilot.vim
 	url = https://github.com/github/copilot.vim.git
 [submodule "nvim/pack/bundle/start/conform.nvim"]
-	path = nvim/pack/bundle/start/conform.nvim
+	path = nvim.bak/pack/bundle/start/conform.nvim
 	url = https://github.com/stevearc/conform.nvim.git
 [submodule "nvim/pack/bundle/start/nvim-lint"]
-	path = nvim/pack/bundle/start/nvim-lint
+	path = nvim.bak/pack/bundle/start/nvim-lint
 	url = https://github.com/mfussenegger/nvim-lint.git

Makefile

@@ -9,7 +9,6 @@
 	install-git \
 	install-sh \
 	install-tmux \
-	install-vim \
 	install-work \
 	lint \
 	lint-bash \
@@ -38,6 +37,11 @@ check-lua:
 check-prettier:
 	npm run format:check
 
+clean: clean-nvim
+
+clean-nvim:
+	rm -r -- $(XDG_CONFIG_HOME)/nvim
+
 format: format-bash \
 	format-lua \
 	format-prettier \
@@ -68,13 +72,12 @@ dump-brew:
 
 install: install-bash \
 	install-bin \
-	install-espanso \
 	install-git \
+	install-ghostty \
 	install-mise \
 	install-npm \
 	install-nvim \
-	install-tmux \
-	install-vim
+	install-tmux
 
 install-bash: lint-bash install-sh
 	cp -p -- bash/bash_profile $(HOME)/.bash_profile
@@ -96,6 +99,10 @@ install-git: git/config
 	cp -p -- git/config $(XDG_CONFIG_HOME)/git/config
 	cp -p -- git/ignore $(XDG_CONFIG_HOME)/git/ignore
 
+install-ghostty:
+	mkdir -p -- $(XDG_CONFIG_HOME)/ghostty
+	cp -p -- ghostty/config $(XDG_CONFIG_HOME)/ghostty/config
+
 install-mise: install-bash
 	cp -p -- mise/bashrc.d/* $(HOME)/.bashrc.d/
 

ghostty/config

@@ -0,0 +1,3 @@
+font-family = JetBrainsMono Nerd Font Mono
+theme = light:catppuccin-latte,dark:catppuccin-mocha
+window-theme = auto

homebrew/work.Brewfile

@@ -3,6 +3,16 @@ tap "espanso/espanso"
 tap "homebrew/bundle"
 tap "homebrew/cask-fonts"
 tap "reainternal/stable", "[email protected]:cowbell/homebrew-stuff"
+# Macro processing language
+brew "m4", link: true
+# Automatic configure script builder
+brew "autoconf"
+# Cryptography and SSL/TLS Toolkit
+brew "openssl@3"
+# YAML Parser
+brew "libyaml"
+# Library for command-line editing
+brew "readline"
 # CLI tool to build, test, debug, and deploy Serverless applications using AWS SAM
 brew "aws-sam-cli"
 # Official Amazon AWS command-line interface
@@ -11,16 +21,34 @@ brew "awscli"
 brew "bash"
 # Programmable completion for Bash 4.2+
 brew "bash-completion@2"
+# Clone of cat(1) with syntax highlighting and Git integration
+brew "bat"
+# Versatile and fast Unicode/ASCII/ANSI graphics renderer
+brew "chafa"
 # Create and view interactive cheat sheets for *nix commands
 brew "cheat"
 # Statistics utility to count lines of code
 brew "cloc"
+# Diff that understands syntax
+brew "difftastic"
 # Docker Credential Helper for Amazon ECR
 brew "docker-credential-helper-ecr"
+# Pluggable and configurable code formatting platform written in Rust
+brew "dprint"
+# Simple, fast and user-friendly alternative to find
+brew "fd"
+# Command-line fuzzy finder written in Go
+brew "fzf"
 # GitHub command-line tool
 brew "gh"
 # Distributed revision control system
 brew "git"
+# Syntax-highlighting pager for git and diff output
+brew "git-delta"
+# GNU multiple precision arithmetic library
+brew "gmp"
+# GNU Pretty Good Privacy (PGP) package
+brew "gnupg"
 # Smarter Dockerfile linter to validate best practices
 brew "hadolint"
 # Post-modern modal text editor
@@ -31,14 +59,16 @@ brew "htop"
 brew "hyperfine"
 # Lightweight and flexible command-line JSON processor
 brew "jq"
+# Simple terminal UI for git commands
+brew "lazygit"
 # Postgres C API library
 brew "libpq", link: true
 # Language Server for the Lua language
 brew "lua-language-server"
 # Tool for linting and static analysis of Lua code
 brew "luacheck"
-# Macro processing language
-brew "m4", link: true
+# Package manager for the Lua programming language
+brew "luarocks"
 # Mac App Store command-line interface
 brew "mas"
 # Polyglot runtime manager (asdf rust clone)
@@ -47,6 +77,8 @@ brew "mise"
 brew "neovim", args: ["HEAD"]
 # Search tool like grep and The Silver Searcher
 brew "ripgrep"
+# Safe, concurrent, practical language
+brew "rust"
 # Static analysis and lint tool, for (ba)sh scripts
 brew "shellcheck"
 # Autoformat shell script source code
@@ -61,6 +93,8 @@ brew "tldr"
 brew "tmux"
 # Display directories as trees (with optional color/HTML output)
 brew "tree"
+# Syntax-aware linter for prose
+brew "vale"
 # Vi 'workalike' with many additional features
 brew "vim"
 # Vim script Language Lint
@@ -69,8 +103,6 @@ brew "vint"
 brew "yt-dlp"
 # Login to REA AWS console by switching roles
 brew "reainternal/stable/aws-switch"
-# Authenticate to REA AWS accounts
-brew "reainternal/stable/rea-as"
 # Password manager that keeps all passwords secure behind one password
 cask "1password"
 # Professional graphic design software
@@ -79,6 +111,8 @@ cask "affinity-designer"
 cask "affinity-photo"
 # Professional desktop publishing software
 cask "affinity-publisher"
+# GPU-accelerated terminal emulator
+cask "alacritty"
 # Application launcher and productivity software
 cask "alfred"
 # Application uninstaller
@@ -93,18 +127,18 @@ cask "bbedit"
 cask "betterdisplay"
 # Record and process your ideas
 cask "bike"
+# Opensource IDE for exploring and testing api's
+cask "bruno"
 # Free and open-source web browser
 cask "chromium"
 # Screen capturing tool
 cask "cleanshot"
-# The Ultimate Homebrew Companion
+# GUI companion app for Homebrew
 cask "cork"
 # API documentation browser and code snippet manager
 cask "dash"
 # App to build and share containerised applications and microservices
 cask "docker"
-# Cross-platform Text Expander written in Rust
-cask "espanso"
 # Web browser
 cask "firefox"
 cask "font-fira-mono"
@@ -114,11 +148,14 @@ cask "font-ibm-plex-mono"
 cask "font-input"
 cask "font-intel-one-mono"
 cask "font-jetbrains-mono"
+cask "font-jetbrains-mono-nerd-font"
 cask "font-monaspace"
 cask "font-roboto-mono"
 cask "font-source-code-pro"
 # GIT client
 cask "fork"
+# Terminal emulator that uses platform-native UI and GPU acceleration
+cask "ghostty"
 # Web browser
 cask "google-chrome"
 # Create presentation slides from a Markdown document
@@ -127,20 +164,30 @@ cask "ia-presenter"
 cask "iina"
 # Tool to optimise images to a smaller size
 cask "imageoptim"
+# System monitoring app
+cask "istat-menus"
+# Terminal emulator as alternative to Apple's Terminal app
+cask "iterm2"
 # JetBrains tools manager
 cask "jetbrains-toolbox"
 # Menu bar manager
 cask "jordanbaird-ice"
+# Spot and merge differences in text and image files or folders
+cask "kaleidoscope@2"
 # Automation software
 cask "keyboard-maestro"
+# GPU-based terminal emulator
+cask "kitty"
 # Software for Logitech devices
-cask "logi-options-plus"
+cask "logi-options+"
 # Optimise your webcam, headset, and Logi Dock for video meetings
 cask "logitune"
-# Web browser
+# Multi-platform web browser
 cask "microsoft-edge"
 # Tool to create text-based art
 cask "monodraw"
+# Utility to move and zoom windows—on one display
+cask "moom"
 # Native code editor
 cask "nova"
 # WebKit based web browser
@@ -153,31 +200,53 @@ cask "postico"
 cask "rapidapi"
 # Move and resize windows using keyboard shortcuts or snap areas
 cask "rectangle"
+# Drag-and-drop Git history editor
+cask "retcon"
 # Sound and audio controller
 cask "soundsource"
+# Window and tab manager
+cask "tabtab"
+# Tool to automate the insertion of frequently used text and graphics
+cask "typinator"
 # Open-source code editor
 cask "visual-studio-code"
+# GPU-accelerated cross-platform terminal emulator and multiplexer
+cask "wezterm"
+# REST, GraphQL and gRPC client
+cask "yaak"
 # Application for configuring any YubiKey
 cask "yubico-yubikey-manager"
 # Multiplayer code editor
 cask "zed"
 mas "1Password for Safari", id: 1569813296
+mas "Actions", id: 1586435171
+mas "Aiko", id: 1672085276
 mas "Bear", id: 1091189122
 mas "Boop", id: 1518425043
-mas "com.kagimacOS.Kagi-Search", id: 1622835804
+mas "Color Picker", id: 1545870783
 mas "Dato", id: 1470584107
+mas "GoodLinks", id: 1474335294
+mas "Hand Mirror", id: 1502839586
+mas "HEIC Converter", id: 1294126402
 mas "Hush", id: 1544743900
 mas "iA Writer", id: 775737590
+mas "Kagi for Safari", id: 1622835804
 mas "Microsoft To Do", id: 1274495053
 mas "NepTunes", id: 1006739057
+mas "NotePlan", id: 1505432629
+mas "One Thing", id: 1604176982
+mas "Online Check", id: 6504709660
 mas "Pixelmator Pro", id: 1289583905
 mas "Play", id: 1596506190
-mas "Save to Reader", id: 1640236961
+mas "Shareful", id: 1522267256
+mas "Shortery", id: 1594183810
+mas "Sofa", id: 1276554886
+mas "Speediness", id: 1596706466
 mas "TestFlight", id: 899247664
 mas "Things", id: 904280696
 mas "Trello", id: 1278508951
 mas "Velja", id: 1607635845
-mas "Wipr", id: 1320666476
+mas "Wipr", id: 1662217862
 mas "Xcode", id: 497799835
 vscode "github.copilot"
 vscode "github.copilot-chat"

nvim.bak/after/ftplugin/lua.lua

@@ -0,0 +1,5 @@
+-- Tabs should have 4 space width.
+vim.opt_local.tabstop = 4
+
+-- Use luacheck as compiler for sh files.
+vim.cmd([[compiler luacheck]])

nvim.bak/init.lua

@@ -0,0 +1,12 @@
+-- This is my personal Neovim config.
+--
+-- It is intentionally very bare bones and using the features of Neovim that
+-- are missing from Vim, i.e. LSP and treesitter.
+
+-- Enable experimental lua-loader to byte-compile and cache lua files.
+vim.loader.enable()
+
+-- The configuration is located in the dcp module (located in the lua
+-- directory). It is then split up based on the type of configuration to make
+-- small files rather than a single large file (vimrc).
+require("dcp")

nvim.bak/lua/dcp/init.lua

@@ -0,0 +1,6 @@
+-- The majority of my custom configuration lies within this module. The order
+-- that these modules are loaded is important.
+
+require("dcp.set-background")
+require("dcp.keymaps")
+require("dcp.options")