Lots of tweaks and changes, yolo

Set up with https://github.com/nvim-lua/kickstart.nvim

.editorconfig

@@ -3,27 +3,10 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
-# indent_size = 4
+indent_size = 2
 indent_style = space
 insert_final_newline = true
-# max_line_length = 160
-# tab_width = 4
 trim_trailing_whitespace = true
 
-[{*.yaml,*.yml}]
-indent_size = 2
-
-[*.sh]
-indent_size = 2
-tab_width = 2
-
-shell_variant = posix # like -ln=posix
-binary_next_line = true # like -bn
-switch_case_indent = true # like -ci
-space_redirects = true # like -sr
-keep_padding = false # like -kp
-function_next_line = true # like -fn
-never_split = true # like -ns
-
 [local/bin/antigen.zsh]
 ignore = true

Brewfile

@@ -7,13 +7,13 @@ tap "github/gh"
 tap "homebrew/autoupdate"
 tap "homebrew/bundle"
 tap "homebrew/cask"
+tap "homebrew/cask-fonts"
 tap "homebrew/core"
 tap "homebrew/services"
+tap "mongodb/brew"
 tap "shivammathur/extensions"
 tap "shivammathur/php"
 tap "teamookla/speedtest"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.10"
 # Automate deployment, configuration, and upgrading
 brew "ansible"
 # Zstandard is a real-time compression algorithm
@@ -34,6 +34,8 @@ brew "glib"
 brew "pkg-config"
 # Open source suite of directory software
 brew "openldap"
+# Get a file from an HTTP, HTTPS or FTP server
+brew "curl"
 # Libraries to talk to Microsoft SQL Server and Sybase databases
 brew "freetds"
 # C/C++ and Java libraries for Unicode and globalization
@@ -46,6 +48,8 @@ brew "php"
 brew "composer"
 # GNU File, Shell, and Text utilities
 brew "coreutils"
+# Get, unpack, build, and install modules from CPAN
+brew "cpanminus"
 # Diff that understands syntax
 brew "difftastic"
 # Tool for exploring each layer in a docker image
@@ -56,6 +60,8 @@ brew "dog"
 brew "eg-examples"
 # CLI for templating and/or deploying FaaS functions
 brew "faas-cli"
+# Simple, fast and user-friendly alternative to find
+brew "fd"
 # Monitor a directory for changes and run a shell command
 brew "fswatch"
 # GitHub command-line tool
@@ -68,6 +74,8 @@ brew "git-extras"
 brew "git-flow-avh"
 # See your latest local git branches, formatted real fancy
 brew "git-recent"
+# Open-source GitLab command-line tool
+brew "glab"
 # GNU implementation of the famous stream editor
 brew "gnu-sed"
 # Validating, recursive, caching DNS resolver
@@ -76,6 +84,8 @@ brew "unbound"
 brew "gnutls"
 # GNU Pretty Good Privacy (PGP) package
 brew "gnupg"
+# Open source programming language to build simple/reliable/efficient software
+brew "go"
 # Image manipulation
 brew "netpbm"
 # OpenType text shaping engine
@@ -108,6 +118,8 @@ brew "m-cli"
 brew "mas"
 # Terminal-based visual file manager
 brew "midnight-commander"
+# Ambitious Vim-fork focused on extensibility and agility
+brew "neovim"
 # Port scanning utility for large networks
 brew "nmap"
 # Manage multiple Node.js versions
@@ -116,6 +128,10 @@ brew "nvm"
 brew "openjdk"
 # Generate clients, server & docs from an OpenAPI spec (v2, v3)
 brew "openapi-generator"
+# Highly capable, feature-rich programming language
+brew "perl"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.10"
 # Interpreted, interactive, object-oriented programming language
 brew "python@3.8"
 # RC file (dotfile) management
@@ -128,6 +144,8 @@ brew "ruby"
 brew "shellcheck"
 # Autoformat shell script source code
 brew "shfmt"
+# Version control system designed to be a better CVS
+brew "subversion"
 # Send macOS User Notifications from the command-line
 brew "terminal-notifier", link: false
 # Tool to build, change, and version infrastructure
@@ -154,6 +172,8 @@ brew "watch"
 brew "wget"
 # Personal information dashboard for your terminal
 brew "wtfutil"
+# JavaScript package manager
+brew "yarn"
 # Tracks most-used directories to make cd smarter
 brew "z"
 # A vulnerability scanner for container images and filesystems
@@ -162,6 +182,8 @@ brew "anchore/grype/grype"
 brew "ddosify/tap/ddosify"
 # lets you quickly switch between multiple git user profiles
 brew "gesquive/tap/git-user"
+# High-performance, schema-free, document-oriented database
+brew "mongodb/brew/mongodb-community"
 # Xdebug PHP extension
 brew "shivammathur/extensions/xdebug@7.4"
 # Xdebug PHP extension
@@ -186,6 +208,18 @@ cask "docker"
 cask "fig"
 # Unofficial overcast.fm podcast app
 cask "fog"
+# Typeface made for developers
+cask "font-jetbrains-mono"
+# Developer targeted fonts with a high number of glyphs
+cask "font-jetbrains-mono-nerd-font"
+cask "font-lato"
+cask "font-open-sans"
+# Font with a mechanical skeleton and the forms are largely geometric
+cask "font-roboto"
+cask "font-source-code-pro"
+cask "font-source-code-pro-for-powerline"
+cask "font-source-sans-pro"
+cask "font-source-serif-pro"
 # Open Source Webfont Converter
 cask "fontplop"
 # GIT client
@@ -198,8 +232,12 @@ cask "insomnia"
 cask "jetbrains-toolbox"
 # Kubernetes IDE
 cask "lens"
+# Neovim Client
+cask "neovide"
 # Reverse proxy, secure introspectable tunnels to localhost
 cask "ngrok"
+# Collaboration platform for API development
+cask "postman"
 # Display image info and preview unsupported formats in QuickLook
 cask "qlimagesize"
 # QuickLook generator for Markdown files

README.md

@@ -1,39 +1,58 @@
 # .dotfiles
 
-The folder structure follows [XDG Base Directory Specification][xdg] where possible.
+Welcome to [ivuorinen](https://github.com/ivuorinen)'s .dotfiles repository. It's a hodgepodge of scripts
+and configurations, tests and mistakes I'm not aware of yet. As I find more interesting tools, configs and
+other stuff, this repository will live accordingly.
+
+Please for the love of everything good do not use these 1:1 as your own dotfiles,
+fork or download the repo as a zip and go from there with your own configs.
 
 ## Setup
 
-## rcrc
+### First time setup
 
-Update install script
+1. Clone this repository to `$HOME/.dotfiles`
+2. `bash $HOME/.dotfiles/scripts/settler.sh`
+3. ???
+4. Profit
 
-```bash
-rcup -B 0 -g > ~/.dotfiles/install.sh | shfmt -w -l ~/.dotfiles/install.sh
-```
+Note: there's a bit chicken/egg situation, because settler assumes you don't have git,
+and you need git to clone the repo. This will change soon™.
 
-## brew
+## Interesting files and locations
 
-Install everything described in `Brewfile`
+### Special folders
 
-```bash
-brew bundle install --force --file=~/.dotfiles/Brewfile
-```
+| Path               | Description                                                                         |
+|--------------------|-------------------------------------------------------------------------------------|
+| `.github`          | GitHub Repository configuration files. Not part of the dotfiles per se.             |
+| `host-{hostname}/` | Host specific dotfiles. Configurations that should apply to that host only.         |
+| `local/bin`        | Helper scripts that I've collected or wrote to make life easier.                    |
+| `scripts`          | Setup scripts. Some can be run many times, some are meant only for the first round. |
 
+### dotfile folders
 
-Update `Brewfile`
+| Repo      | Destination | Description                                                      |
+|-----------|-------------|------------------------------------------------------------------|
+| `config/` | `.config/`  | Configurations for applications.                                 |
+| `local/`  | `.local/`   | XDG Base folder, contains `bin`, `share` and `state` for example |
+| `ssh/`    | `.ssh/`     | SSH Configurations.                                              |
 
-```bash
-brew bundle dump --force --file=~/.dotfiles/Brewfile --describe
-```
+### dfm - the dotfiles manager
 
-Enable automatic brew updates and upgrades.
+`.local/bin/dfm` is a shell script that has some tools that help with dotfiles management.
 
-```bash
-brew autoupdate start 43200 --upgrade --cleanup --immediate
-```
+### `scripts/install-dotfiles.sh` - dotfiles linker
 
-## XDG Variables
+The `scripts/install-dotfiles.sh` is a `rcm` generated shell script that does all the necessary linking.
+
+To refresh the file, you can run `dfm dotfiles update`
+
+## Configuration
+
+The folder structure follows [XDG Base Directory Specification][xdg] where possible.
+
+### XDG Variables
 
 | Var                | Default              |
 |--------------------|----------------------|
@@ -42,15 +61,36 @@ brew autoupdate start 43200 --upgrade --cleanup --immediate
 | `$XDG_STATE_HOME`  | `$HOME/.local/state` |
 | `$XDG_CONFIG_HOME` | `$HOME/.config`      |
 
-
-- `$XDG_DATA_HOME` defines the base directory relative to which user-specific data files should be stored. If `$XDG_DATA_HOME` is either not set or empty, a default equal to ` $HOME/.local/share` should be used.
-- `$XDG_CONFIG_HOME` defines the base directory relative to which user-specific configuration files should be stored. If `$XDG_CONFIG_HOME` is either not set or empty, a default equal to `$HOME/.config` should be used.
-- `$XDG_STATE_HOME` defines the base directory relative to which user-specific state files should be stored. If `$XDG_STATE_HOME` is either not set or empty, a default equal to `$HOME/.local/state` should be used.
-- The `$XDG_STATE_HOME` contains state data that should persist between (application) restarts, but that is not important or portable enough to the user that it should be stored in `$XDG_DATA_HOME`. It may contain:
-  - actions history (logs, history, recently used files, …)
-  - current state of the application that can be reused on a restart (view, layout, open files, undo history, …)
-- User-specific executable files may be stored in `$HOME/.local/bin`. Distributions should ensure this directory shows up in the UNIX `$PATH` environment variable, at an appropriate place.
-- `$XDG_DATA_DIRS` defines the preference-ordered set of base directories to search for data files in addition to the `$XDG_DATA_HOME` base directory. The directories in `$XDG_DATA_DIRS` should be seperated with a colon ':'.
-
+- `$XDG_DATA_HOME` defines the base directory relative to which user-specific data
+  files should be stored. If `$XDG_DATA_HOME` is either not set or empty,
+  a default equal to `$HOME/.local/share` should be used.
+- `$XDG_CONFIG_HOME` defines the base directory relative to which user-specific configuration
+  files should be stored. If `$XDG_CONFIG_HOME` is either not set or empty,
+  a default equal to `$HOME/.config` should be used.
+- `$XDG_STATE_HOME` defines the base directory relative to which user-specific state files should be stored.
+  If `$XDG_STATE_HOME` is either not set or empty, a default equal to `$HOME/.local/state` should be used.
+- The `$XDG_STATE_HOME` contains state data that should persist between (application) restarts,
+  but that is not important or portable enough to the user that it should be stored in `$XDG_DATA_HOME`.
+  It may contain:
+    - actions history (logs, history, recently used files, …)
+    - current state of the application that can be reused on a restart (view, layout, open files, undo history, …)
+- User-specific executable files may be stored in `$HOME/.local/bin`. Distributions should ensure this
+  directory shows up in the UNIX `$PATH` environment variable, at an appropriate place.
+- `$XDG_DATA_DIRS` defines the preference-ordered set of base directories to search for data files in addition
+  to the `$XDG_DATA_HOME` base directory. The directories in `$XDG_DATA_DIRS` should be seperated with a colon ':'.
 
 [xdg]: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+
+## Interesting links
+
+### Interesting dotfiles repos
+
+- https://dotfiles.github.io/inspiration/
+- https://github.com/frdmn/dotfiles - Ansible-based dotfile setup for macOS
+- https://github.com/mvdan/dotfiles - Here be dragons
+- https://github.com/vsouza/dotfiles - 🏡 My dotfiles
+- https://github.com/freekmurze/dotfiles - My personal dotfiles
+
+### Interesting dotfiles tools
+
+- https://github.com/zero-sh/zero.sh - Radically simple personal bootstrapping tool for macOS.

config/alias

@@ -58,19 +58,20 @@ alias zapds='find . -name ".DS_Store" -print -delete'
 alias t='tail -f'   # tail with follow flag on
 alias dn='du -chd1' # directory usage, return only the total
 
-alias code_scanner='docker run \
-  --env SOURCE_CODE="$PWD" \
-  --volume "$PWD":/code \
+alias code_scanner="docker run \
+  --env SOURCE_CODE='${PWD}' \
+  --volume '${PWD}':/code \
   --volume /var/run/docker.sock:/var/run/docker.sock \
   registry.gitlab.com/gitlab-org/ci-cd/codequality:${CODEQUALITY_VERSION:-latest} \
-  /code'
+  /code"
 
 alias composerUp='composer global update'
 alias npmUp='npm -g up'
 
-alias zedit='code ~/.zshrc ~/.alias'
+alias zedit='$EDITOR ~/.dotfiles'
 
 if [[ -f "$HOME/.aliases.local" ]]; then
   # shellcheck disable=SC1091
   source "$HOME/.aliases.local"
 fi
+

config/flipperdevices.com/qFlipper.ini

@@ -0,0 +1,6 @@
+[General]
+ApplicationUpdateChannel=release
+CheckApplicatonUpdates=true
+FirmwareUpdateChannel=release
+LastFolderUrl=/Users/ivuorinen
+ShowHiddenFiles=false

config/git/gitignore

@@ -16,3 +16,4 @@ cachegrind.out.*
 composer.phar
 wp_*.sh
 auth.json
+dfm.sh

config/nvim/init.lua

@@ -0,0 +1,729 @@
+-- Install packer
+local install_path = vim.fn.stdpath 'data' .. '/site/pack/packer/start/packer.nvim'
+local is_bootstrap = false
+if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
+  is_bootstrap = true
+  vim.fn.system {
+    'git', 'clone', '--depth', '1',
+    'https://github.com/wbthomason/packer.nvim',
+    install_path
+  }
+  vim.cmd [[packadd packer.nvim]]
+end
+
+require('packer').startup(function(use)
+  -- Package manager
+  use 'wbthomason/packer.nvim'
+
+  use { -- LSP Configuration & Plugins
+    'neovim/nvim-lspconfig',
+    requires = {
+      -- Automatically install LSPs to stdpath for neovim
+      'williamboman/mason.nvim',
+      'williamboman/mason-lspconfig.nvim',
+
+      -- Useful status updates for LSP
+      'j-hui/fidget.nvim',
+    },
+  }
+
+  use { -- Autocompletion
+    'hrsh7th/nvim-cmp',
+    requires = {
+      'hrsh7th/cmp-nvim-lsp',
+      'L3MON4D3/LuaSnip',
+      'saadparwaiz1/cmp_luasnip',
+    },
+  }
+
+  use { -- Highlight, edit, and navigate code
+    'nvim-treesitter/nvim-treesitter',
+    run = function()
+      pcall(require('nvim-treesitter.install').update { with_sync = true })
+    end,
+  }
+
+  use { -- Additional text objects via treesitter
+    'nvim-treesitter/nvim-treesitter-textobjects',
+    after = 'nvim-treesitter',
+  }
+
+  -- Git related plugins
+  use 'tpope/vim-fugitive'
+  use 'tpope/vim-rhubarb'
+  use 'lewis6991/gitsigns.nvim'
+
+  -- Theme based off the Material Pale Night
+  use 'drewtempelmeyer/palenight.vim'
+  -- Fancier statusline
+  use 'nvim-lualine/lualine.nvim'
+  -- Add indentation guides even on blank lines.
+  use 'lukas-reineke/indent-blankline.nvim'
+  -- "gc" to comment visual regions/lines
+  use 'numToStr/Comment.nvim'
+  -- Detect tabstop and shiftwidth automatically.
+  use 'tpope/vim-sleuth'
+
+  -- Fuzzy Finder (files, lsp, etc)
+  use { 'nvim-telescope/telescope.nvim',
+        branch = '0.1.x', requires = { 'nvim-lua/plenary.nvim' } }
+
+  -- Fuzzy Finder Algorithm which requires local dependencies to be built.
+  -- Only load if `make` is available
+  use { 'nvim-telescope/telescope-fzf-native.nvim',
+        run = 'make', cond = vim.fn.executable 'make' == 1 }
+
+  -- Add custom plugins to packer from
+  -- ~/.config/nvim/lua/custom/plugins.lua
+  local has_plugins, plugins = pcall(require, 'custom.plugins')
+  if has_plugins then
+    plugins(use)
+  end
+
+  if is_bootstrap then
+    require('packer').sync()
+  end
+end)
+
+-- When we are bootstrapping a configuration, it doesn't
+-- make sense to execute the rest of the init.lua.
+--
+-- You'll need to restart nvim, and then it will work.
+if is_bootstrap then
+  print '=================================='
+  print '    Plugins are being installed'
+  print '    Wait until Packer completes,'
+  print '       then restart nvim'
+  print '=================================='
+  return
+end
+
+-- Automatically source and re-compile packer
+-- whenever you save this init.lua, or packages.lua
+local packer_group = vim.api.nvim_create_augroup('Packer', { clear = true })
+vim.api.nvim_create_autocmd('BufWritePost', {
+  command = 'source <afile> | PackerCompile',
+  group = packer_group,
+  pattern = { vim.fn.expand '$MYVIMRC' },
+})
+-- Automatically run PackerSync for plugins.lua files.
+vim.api.nvim_create_autocmd('BufWritePost', {
+  command = 'source <afile> | PackerSync | PackerCompile',
+  group = packer_group,
+  pattern = { '~/.dotfiles/config/nvim/**/plugins.lua' },
+})
+
+-- [[ Setting options ]]
+-- See `:help vim.o`
+
+-- Set highlight on search
+vim.o.hlsearch = false
+
+-- Make line numbers default, enabled relative line numbers
+vim.wo.number = true
+vim.opt.relativenumber = true
+
+-- Enable mouse mode
+vim.o.mouse = 'a'
+
+-- Enable break indent
+vim.o.breakindent = true
+
+-- Save undo history
+vim.o.undofile = true
+
+-- Case insensitive searching UNLESS /C or capital in search
+vim.o.ignorecase = true
+vim.o.smartcase = true
+
+-- Decrease update time
+vim.o.updatetime = 250
+vim.wo.signcolumn = 'yes'
+
+-- Set colorscheme
+vim.o.termguicolors = true
+vim.cmd.colorscheme('palenight')
+
+-- Set completeopt to have a better completion experience
+vim.o.completeopt = 'menuone,noselect'
+
+-- Configure and disable providers.
+vim.g.python3_host_prog = '/opt/homebrew/bin/python3'
+vim.g.loaded_ruby_provider = 0
+
+-- Setup winbar
+-- See :h statusline
+vim.o.winbar = '%=%m %f'
+
+-- [[ Basic Keymaps ]]
+-- Set <space> as the leader key
+-- See `:help mapleader`
+--  NOTE: Must happen before plugins are required
+--  (otherwise wrong leader will be used)
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+
+-- Keymaps for better default experience
+-- See `:help vim.keymap.set()`
+vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
+
+-- Misc options.
+vim.o.incsearch = true
+
+-- Keymap settings, etc.
+-- ~/.config/nvim/lua/custom/keymaps.lua
+local map = vim.api.nvim_set_keymap
+local default_options_table = {
+  expr = true,
+  silent = true,
+  noremap = true,
+}
+
+-- normal mode keymap setter
+---@param keys string Trigger keys
+---@param func string Function or command to run
+---@param opts table Optional table of vim.keymap.set options.
+---@param desc string Optional description
+local nmap = function(keys, func, opts, desc)
+  if desc then
+    desc = 'keymaps.nmap: ' .. desc
+  end
+
+  local options = default_options_table
+
+  -- If we have options, merge them to the local options table
+  if opts then
+    for k, v in pairs(opts) do
+      options[k] = v
+    end
+  end
+
+  vim.keymap.set('n', keys, func, options)
+end
+
+-- visual mode keymap setter
+---@param keys string Trigger keys
+---@param func string Function or command to run
+---@param opts table Optional table of vim.keymap.set options.
+---@param desc string Optional description
+local vmap = function(keys, func, opts, desc)
+  if desc then
+    desc = 'keymaps.vmap: ' .. desc
+  end
+
+  local options = default_options_table
+
+  -- If we have options, merge them to the local options table
+  if opts then
+    for k, v in pairs(opts) do
+      options[k] = v
+    end
+  end
+
+  vim.keymap.set('v', keys, func, options)
+end
+
+-- Format document
+nmap("<leader>D", ":Format")
+
+-- Deal with word wrap
+nmap('k', "v:count == 0 ? 'gk' : 'k'")
+nmap('j', "v:count == 0 ? 'gj' : 'j'")
+
+-- Diagnostic keymaps
+nmap('dz', vim.diagnostic.goto_prev)
+nmap('dx', vim.diagnostic.goto_next)
+nmap('<leader>e', vim.diagnostic.open_float)
+nmap('<leader>q', vim.diagnostic.setloclist)
+
+--
+-- ThePrimeagen/refactoring.nvim
+-- https://github.com/ThePrimeagen/refactoring.nvim
+--
+
+-- Remaps for the refactoring operations currently offered by the plugin
+local rf = { noremap = true, silent = true, expr = false }
+vmap("<leader>re", [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function')<CR>]], rf)
+vmap("<leader>rf", [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]], rf)
+vmap("<leader>rv", [[ <Esc><Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]], rf)
+vmap("<leader>ri", [[ <Esc><Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]], rf)
+
+-- Extract block doesn't need visual mode
+nmap("<leader>rb", [[ <Cmd>lua require('refactoring').refactor('Extract Block')<CR>]], rf)
+nmap("<leader>rbf", [[ <Cmd>lua require('refactoring').refactor('Extract Block To File')<CR>]], rf)
+
+-- Inline variable can also pick up the identifier currently under the cursor without visual mode
+nmap("<leader>ri", [[ <Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]], rf)
+
+-- prompt for a refactor to apply when the remap is triggered
+vmap("<leader>rr", ":lua require('refactoring').select_refactor()<CR>", rf)
+
+--
+--
+--
+
+-- barbar keymaps
+local barbar_opts = { noremap = true, silent = true }
+
+-- Move to previous/next
+map('n', '<C-,>', '<Cmd>BufferPrevious<CR>', barbar_opts)
+map('n', '<C-.>', '<Cmd>BufferNext<CR>', barbar_opts)
+-- Re-order to previous/next
+map('n', '<C-<>', '<Cmd>BufferMovePrevious<CR>', barbar_opts)
+map('n', '<C->>', '<Cmd>BufferMoveNext<CR>', barbar_opts)
+-- Goto buffer in position...
+map('n', '<leader>b1', '<Cmd>BufferGoto 1<CR>', barbar_opts)
+map('n', '<leader>b2', '<Cmd>BufferGoto 2<CR>', barbar_opts)
+map('n', '<leader>b3', '<Cmd>BufferGoto 3<CR>', barbar_opts)
+map('n', '<leader>b4', '<Cmd>BufferGoto 4<CR>', barbar_opts)
+map('n', '<leader>b5', '<Cmd>BufferGoto 5<CR>', barbar_opts)
+map('n', '<leader>b6', '<Cmd>BufferGoto 6<CR>', barbar_opts)
+map('n', '<leader>b7', '<Cmd>BufferGoto 7<CR>', barbar_opts)
+map('n', '<leader>b8', '<Cmd>BufferGoto 8<CR>', barbar_opts)
+map('n', '<leader>b9', '<Cmd>BufferGoto 9<CR>', barbar_opts)
+map('n', '<leader>b0', '<Cmd>BufferLast<CR>', barbar_opts)
+-- Pin/unpin buffer
+map('n', '<A-p>', '<Cmd>BufferPin<CR>', barbar_opts)
+-- Close buffer
+map('n', '<A-c>', '<Cmd>BufferClose<CR>', barbar_opts)
+-- Wipeout buffer
+--                 :BufferWipeout
+-- Close commands
+--                 :BufferCloseAllButCurrent
+--                 :BufferCloseAllButPinned
+--                 :BufferCloseAllButCurrentOrPinned
+--                 :BufferCloseBuffersLeft
+--                 :BufferCloseBuffersRight
+-- Magic buffer-picking mode
+map('n', '<C-p>', '<Cmd>BufferPick<CR>', barbar_opts)
+-- Sort automatically by...
+map('n', '<Space>bb', '<Cmd>BufferOrderByBufferNumber<CR>', barbar_opts)
+map('n', '<Space>bd', '<Cmd>BufferOrderByDirectory<CR>', barbar_opts)
+map('n', '<Space>bl', '<Cmd>BufferOrderByLanguage<CR>', barbar_opts)
+map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', barbar_opts)
+
+-- Other:
+-- :BarbarEnable - enables barbar (enabled by default)
+-- :BarbarDisable - very bad command, should never be used
+
+
+local highlight_group = vim.api.nvim_create_augroup(
+  'YankHighlight', { clear = true }
+)
+vim.api.nvim_create_autocmd('TextYankPost', {
+  callback = function()
+    vim.highlight.on_yank()
+  end,
+  group = highlight_group,
+  pattern = '*',
+})
+
+-- Set lualine as statusline
+-- See `:help lualine.txt`
+require('lualine').setup {
+  options = {
+    icons_enabled = true,
+    theme = 'auto',
+    component_separators = '|',
+    section_separators = '',
+  },
+}
+
+-- Enable Comment.nvim
+require('Comment').setup()
+
+-- Enable `lukas-reineke/indent-blankline.nvim`
+-- See `:help indent_blankline.txt`
+require('indent_blankline').setup {
+  -- char = '┊',
+  show_trailing_blankline_indent = true,
+  space_char_blankline = " ",
+  show_current_context = true,
+  show_current_context_start = true,
+}
+
+-- Gitsigns
+-- See `:help gitsigns.txt`
+require('gitsigns').setup {
+  signs = {
+    add = { text = '+' },
+    change = { text = '~' },
+    delete = { text = '_' },
+    topdelete = { text = '‾' },
+    changedelete = { text = '~' },
+  },
+}
+
+-- [[ Configure Telescope ]]
+-- See `:help telescope` and `:help telescope.setup()`
+require('telescope').setup {
+  defaults = {
+    mappings = {
+      i = {
+        ['<C-u>'] = false,
+        ['<C-d>'] = false,
+      },
+    },
+  },
+}
+
+-- Enable telescope fzf native, if installed
+pcall(require('telescope').load_extension, 'fzf')
+
+local ks = vim.keymap.set
+local tl = require('telescope.builtin')
+
+-- See `:help telescope.builtin`
+ks('n', '<leader>?', tl.oldfiles, { desc = '[?] Find recently opened files' })
+ks('n', '<leader><space>', tl.buffers, { desc = '[ ] Find existing buffers' })
+ks('n', '<leader>/', function()
+  -- You can pass additional configuration to telescope to
+  -- change theme, layout, etc.
+  tl.current_buffer_fuzzy_find(
+    require('telescope.themes').get_dropdown {
+      winblend = 10,
+      previewer = false,
+    })
+end, { desc = '[/] Fuzzily search in current buffer]' })
+
+ks('n', '<leader>sf', tl.find_files, { desc = '[S]earch [F]iles' })
+ks('n', '<leader>sh', tl.help_tags, { desc = '[S]earch [H]elp' })
+ks('n', '<leader>sw', tl.grep_string, { desc = '[S]earch current [W]ord' })
+ks('n', '<leader>sg', tl.live_grep, { desc = '[S]earch by [G]rep' })
+ks('n', '<leader>sd', tl.diagnostics, { desc = '[S]earch [D]iagnostics' })
+
+-- [[ Configure Treesitter ]]
+-- See `:help nvim-treesitter`
+require('nvim-treesitter.configs').setup {
+  -- Add languages to be installed here that you want
+  -- installed for treesitter
+  ensure_installed = {
+    'bash',
+    'c', 'comment', 'cpp',
+    'diff', 'dockerfile',
+    'gitattributes', 'gitignore', 'go',
+    'html', 'http',
+    'javascript', 'jq', 'jsdoc', 'json',
+    'lua',
+    'markdown',
+    'org',
+    'php', 'phpdoc', 'python',
+    'regex', 'rust',
+    'scss', 'sql',
+    'typescript',
+    'vim', 'vue',
+    'yaml',
+    'help',
+  },
+
+  highlight = {
+    enable = true,
+    -- Required for spellcheck, some LaTex highlights and
+    -- code block highlights that do not have ts grammar
+    additional_vim_regex_highlighting = { 'org' },
+  },
+
+  indent = { enable = true, disable = { 'python' } },
+
+  incremental_selection = {
+    enable = true,
+    keymaps = {
+      init_selection = '<c-space>',
+      node_incremental = '<c-space>',
+      scope_incremental = '<c-s>',
+      node_decremental = '<c-backspace>',
+    },
+  },
+
+  textobjects = {
+    select = {
+      enable = true,
+      -- Automatically jump forward to textobj, similar to targets.vim
+      lookahead = true,
+      keymaps = {
+        -- You can use the capture groups defined in textobjects.scm
+        ['aa'] = '@parameter.outer',
+        ['ia'] = '@parameter.inner',
+        ['af'] = '@function.outer',
+        ['if'] = '@function.inner',
+        ['ac'] = '@class.outer',
+        ['ic'] = '@class.inner',
+      },
+    },
+    move = {
+      enable = true,
+      set_jumps = true, -- whether to set jumps in the jumplist
+      goto_next_start = {
+        [']m'] = '@function.outer',
+        [']]'] = '@class.outer',
+      },
+      goto_next_end = {
+        [']M'] = '@function.outer',
+        [']['] = '@class.outer',
+      },
+      goto_previous_start = {
+        ['[m'] = '@function.outer',
+        ['[['] = '@class.outer',
+      },
+      goto_previous_end = {
+        ['[M'] = '@function.outer',
+        ['[]'] = '@class.outer',
+      },
+    },
+    swap = {
+      enable = true,
+      swap_next = {
+        ['<leader>a'] = '@parameter.inner',
+      },
+      swap_previous = {
+        ['<leader>A'] = '@parameter.inner',
+      },
+    },
+  },
+}
+
+-- Load custom treesitter grammar for org filetype
+require('orgmode').setup_ts_grammar()
+require('orgmode').setup({
+  org_agenda_files = {
+    vim.fn.expand '~/.local/share/_nvalt/**/*',
+    vim.fn.expand '~/.dotfiles/local/org/**/*'
+  },
+  org_default_notes_file = vim.fn.expand '~/.local/share/_nvalt/refile.org',
+})
+
+-- LSP settings.
+--  This function gets run when an LSP connects to a particular buffer.
+local on_attach = function(_, bufnr)
+  -- NOTE: Remember that lua is a real programming language,
+  -- and as such it is possible to define small helper and
+  -- utility functions so you don't have to repeat yourself
+  -- many times.
+  --
+  -- In this case, we create a function that lets us more
+  -- easily define mappings specific for LSP related items.
+  -- It sets the mode, buffer and description for us each time.
+  local nm = function(keys, func, desc)
+    if desc then
+      desc = 'LSP: ' .. desc
+    end
+
+    vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
+  end
+
+  local t = require('telescope.builtin')
+  local vbuf = vim.lsp.buf
+
+  nm('<leader>rn', vbuf.rename, '[R]e[n]ame')
+  nm('<leader>ca', vbuf.code_action, '[C]ode [A]ction')
+
+  nm('gd', vbuf.definition, '[G]oto [D]efinition')
+  nm('gr', t.lsp_references, '[G]oto [R]eferences')
+  nm('gI', vbuf.implementation, '[G]oto [I]mplementation')
+  nm('<leader>D', vbuf.type_definition, 'Type [D]efinition')
+  nm('<leader>ds', t.lsp_document_symbols, '[D]ocument [S]ymbols')
+  nm('<leader>ws', t.lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+
+  -- See `:help K` for why this keymap
+  nm('K', vbuf.hover, 'Hover Documentation')
+  nm('<C-k>', vbuf.signature_help, 'Signature Documentation')
+
+  -- Lesser used LSP functionality
+  nm('gD', vbuf.declaration, '[G]oto [D]eclaration')
+  nm('<leader>wa', vbuf.add_workspace_folder, '[W]orkspace [A]dd Folder')
+  nm('<leader>wr', vbuf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
+  nm('<leader>wl', function()
+    print(vim.inspect(vbuf.list_workspace_folders()))
+  end, '[W]orkspace [L]ist Folders')
+
+  -- Create a command `:Format` local to the LSP buffer
+  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
+    if vim.lsp.buf.format then
+      vim.lsp.buf.format()
+    elseif vim.lsp.buf.formatting then
+      vim.lsp.buf.formatting()
+    end
+  end, { desc = 'Format current buffer with LSP' })
+end
+
+-- Setup mason so it can manage external tooling
+require('mason').setup()
+require("null-ls").setup()
+
+-- Enable the following language servers.
+-- Feel free to add/remove any LSPs that you want here.
+-- They will automatically be installed.
+-- https://github.com/williamboman/mason-lspconfig.nvim#available-lsp-servers
+local servers = {
+  -- a
+  'angularls',
+  'ansiblels',
+  -- b
+  'bashls',
+  -- c
+  'clangd',
+  'cssls',
+  -- d
+  'dockerls',
+  -- e
+  'eslint',
+  'emmet_ls',
+  -- f
+  -- g
+  'gopls',
+  'graphql',
+  -- h
+  'html',
+  -- i
+  -- j
+  'quick_lint_js', -- js
+  'jsonls',
+  -- k
+  -- l
+  'sumneko_lua', -- lua
+  -- m
+  'marksman', -- markdown
+  -- n
+  -- o
+  -- p
+  'intelephense', 'phpactor', 'psalm',
+  'pyright',
+  -- q
+  -- r
+  'rust_analyzer',
+  -- s
+  'sqlls',
+  'stylelint_lsp',
+  -- t
+  'tailwindcss',
+  'terraformls',
+  'tflint',
+  'tsserver',
+  -- u
+  -- v / w
+  'volar', -- vue
+  'vuels', -- vue
+  -- x / y / z
+  'lemminx', -- xml
+  'yamlls', -- yaml
+}
+
+-- Ensure the servers above are installed
+require('mason-lspconfig').setup {
+  ensure_installed = servers,
+}
+
+require("mason-lspconfig").setup_handlers {
+  -- The first entry (without a key) will be the default handler
+  -- and will be called for each installed server that doesn't have
+  -- a dedicated handler.
+  function(server_name)
+    -- default handler (optional)
+    require("lspconfig")[server_name].setup {}
+  end,
+}
+
+-- nvim-cmp supports additional completion capabilities
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
+
+for _, lsp in ipairs(servers) do
+  require('lspconfig')[lsp].setup {
+    on_attach = on_attach,
+    capabilities = capabilities,
+  }
+end
+
+-- Turn on lsp status information
+require('fidget').setup()
+
+-- Example custom configuration for lua.
+-- Make runtime files discoverable to the server
+local runtime_path = vim.split(package.path, ';')
+table.insert(runtime_path, 'lua/?.lua')
+table.insert(runtime_path, 'lua/?/init.lua')
+
+require('lspconfig').sumneko_lua.setup {
+  on_attach = on_attach,
+  capabilities = capabilities,
+  settings = {
+    Lua = {
+      runtime = {
+        -- Tell the language server which version of Lua you're
+        -- using (most likely LuaJIT)
+        version = 'LuaJIT',
+        -- Setup your lua path
+        path = runtime_path,
+      },
+      diagnostics = {
+        globals = { 'vim' },
+      },
+      workspace = {
+        library = vim.api.nvim_get_runtime_file('', true),
+        checkThirdParty = false,
+      },
+      -- Do not send telemetry data containing a randomized
+      -- but unique identifier
+      telemetry = { enable = false },
+    },
+  },
+}
+
+-- nvim-cmp setup
+local cmp = require 'cmp'
+local luasnip = require 'luasnip'
+
+cmp.setup {
+  snippet = {
+    expand = function(args)
+      luasnip.lsp_expand(args.body)
+    end,
+  },
+  mapping = cmp.mapping.preset.insert {
+    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
+    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+    ['<C-Space>'] = cmp.mapping.complete(),
+    ['<CR>'] = cmp.mapping.confirm {
+      behavior = cmp.ConfirmBehavior.Replace,
+      select = true,
+    },
+    ['<Tab>'] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_next_item()
+      elseif luasnip.expand_or_jumpable() then
+        luasnip.expand_or_jump()
+      else
+        fallback()
+      end
+    end, { 'i', 's' }),
+    ['<S-Tab>'] = cmp.mapping(function(fallback)
+      if cmp.visible() then
+        cmp.select_prev_item()
+      elseif luasnip.jumpable(-1) then
+        luasnip.jump(-1)
+      else
+        fallback()
+      end
+    end, { 'i', 's' }),
+  },
+  sources = {
+    { name = 'nvim_lsp' },
+    { name = 'luasnip' },
+  },
+}
+
+
+
+vim.api.nvim_create_autocmd("BufWritePost",
+  { pattern = "plugins.lua", command = "source <afile> | PackerSync" })
+vim.api.nvim_create_autocmd("BufRead",
+  { pattern = "*/node_modules/*", command = "lua vim.diagnostic.disable(0)" })
+vim.api.nvim_create_autocmd("BufNewFile",
+  { pattern = "*/node_modules/*", command = "lua vim.diagnostic.disable(0)" })
+-- Enable spell checking for certain file types
+vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" },
+  { pattern = { "*.txt", "*.md", "*.tex" },
+    command = "setlocal spell" })
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et

config/nvim/lua/custom/plugins.lua

@@ -0,0 +1,200 @@
+return function(use)
+
+  -- 💥 Create key bindings that stick.
+  -- WhichKey is a lua plugin that displays a popup with
+  -- possible keybindings of the command you started typing.
+  -- https://github.com/folke/which-key.nvim
+  use({
+    "folke/which-key.nvim",
+    config = function()
+      require("which-key").setup({})
+    end
+  })
+
+  -- 🍨 Soothing pastel theme for (Neo)vim
+  -- https://github.com/catppuccin/nvim
+  -- use { "catppuccin/nvim", as = "catppuccin" }
+  -- vim.cmd.colorscheme('catppuccin-latte')
+
+  -- markdown preview plugin for (neo)vim
+  -- https://github.com/iamcco/markdown-preview.nvim
+  use({
+    "iamcco/markdown-preview.nvim",
+    run = function()
+      vim.fn["mkdp#util#install"]()
+    end,
+  })
+
+  -- The neovim tabline plugin.
+  -- https://github.com/romgrk/barbar.nvim
+  use 'nvim-tree/nvim-web-devicons'
+  use { 'romgrk/barbar.nvim', wants = 'nvim-web-devicons' }
+
+  --
+  -- Pretty UI
+  --
+
+  -- Neovim plugin to improve the default vim.ui interfaces
+  use 'stevearc/dressing.nvim'
+  -- A fancy, configurable, notification manager for NeoVim
+  use 'rcarriga/nvim-notify'
+  -- Non-intrusive notification system for neovim
+  use 'vigoux/notifier.nvim'
+  -- ✅ Highlight, list and search todo comments in your projects
+  use {
+    'folke/todo-comments.nvim',
+    requires = 'nvim-lua/plenary.nvim',
+    config = function()
+      require('todo-comments').setup {}
+    end,
+  }
+
+  -- The Refactoring library based off the Refactoring book by Martin Fowler
+  -- https://github.com/ThePrimeagen/refactoring.nvim
+  use {
+    "ThePrimeagen/refactoring.nvim",
+    requires = {
+      { "nvim-lua/plenary.nvim" },
+      { "nvim-treesitter/nvim-treesitter" }
+    }
+  }
+
+  -- An asynchronous linter plugin for Neovim complementary to
+  -- the built-in Language Server Protocol support.
+  -- https://github.com/mfussenegger/nvim-lint
+  use 'mfussenegger/nvim-lint'
+  vim.api.nvim_create_autocmd({ "BufWritePost" }, {
+    callback = function()
+      require("lint").try_lint()
+    end,
+  })
+
+  -- nvim orgmode, to get me use nvim even more.
+  use({
+    "nvim-orgmode/orgmode",
+    config = function()
+      require('orgmode').setup_ts_grammar()
+    end,
+  })
+
+  -- Markdown support
+  use 'preservim/vim-markdown'
+  use 'godlygeek/tabular'
+
+  -- obsidian plugin for nvim
+  -- https://github.com/epwalsh/obsidian.nvim
+  use({
+    "epwalsh/obsidian.nvim",
+    config = function()
+      require("obsidian").setup({
+        dir = '~/.local/share/_nvalt',
+        notes_subdir = "notes",
+        daily_notes = {
+          folder = "_daily"
+        },
+        completion = {
+          nvim_cmp = true, -- if using nvim-cmp, otherwise set to false
+        }
+      })
+    end
+  })
+
+  -- Creates missing folders on save
+  -- https://github.com/jghauser/mkdir.nvim
+  use { 'jghauser/mkdir.nvim' }
+
+  -- Neovim plugin for dimming the highlights of unused
+  -- functions, variables, parameters, and more
+  -- https://github.com/zbirenbaum/neodim
+  use {
+    "zbirenbaum/neodim",
+    event = "LspAttach",
+    config = function()
+      require("neodim").setup({
+        alpha = 0.75,
+        blend_color = "#000000",
+        update_in_insert = {
+          enable = true,
+          delay = 100,
+        },
+        hide = {
+          virtual_text = true,
+          signs = true,
+          underline = true,
+        }
+      })
+    end
+  }
+
+  -- EditorConfig plugin for Neovim
+  -- https://github.com/gpanders/editorconfig.nvim
+  use { 'gpanders/editorconfig.nvim' }
+
+  -- Use Neovim as a language server to inject LSP diagnostics, code actions, and more via Lua.
+  -- https://github.com/jose-elias-alvarez/null-ls.nvim
+  use {
+    "jose-elias-alvarez/null-ls.nvim",
+    config = function()
+      local n = require("null-ls")
+      local b = n.builtins
+      require("null-ls").setup({
+        b.code_actions.eslint,
+        b.code_actions.shellcheck,
+        b.code_actions.xo,
+        b.completion.luasnip,
+        b.completion.spell,
+        b.diagnostics.actionlint,
+        b.diagnostics.alex,
+        b.diagnostics.ansiblelint,
+        b.diagnostics.codespell,
+        b.diagnostics.dotenv_linter,
+        b.diagnostics.editorconfig_checker,
+        b.diagnostics.eslint,
+        b.diagnostics.hadolint,
+        b.diagnostics.jsonlint,
+        b.diagnostics.luacheck,
+        b.diagnostics.markdownlint,
+        b.diagnostics.php,
+        b.diagnostics.phpcs,
+        b.diagnostics.phpstan,
+        b.diagnostics.psalm,
+        b.diagnostics.shellcheck,
+        b.diagnostics.spectral,
+        b.diagnostics.stylelint,
+        b.diagnostics.todo_comments,
+        b.diagnostics.trail_space,
+        b.diagnostics.xo,
+        b.diagnostics.yamllint,
+        b.formatting.blade_formatter,
+        b.formatting.eslint,
+        b.formatting.fixjson,
+        b.formatting.lua_format,
+        b.formatting.markdownlint,
+        b.formatting.prettier,
+        b.formatting.shfmt,
+        b.formatting.stylelint,
+        -- b.formatting.stylua,
+        b.formatting.terraform_fmt,
+        b.formatting.trim_whitespace,
+        b.formatting.yamlfmt,
+      })
+    end,
+    requires = { "nvim-lua/plenary.nvim" }
+  }
+
+  -- mason-null-ls bridges mason.nvim with the null-ls plugin
+  -- - making it easier to use both plugins together.
+  -- https://github.com/jay-babu/mason-null-ls.nvim
+  use {
+    "jayp0521/mason-null-ls.nvim",
+    config = function()
+      require("mason-null-ls").setup({
+        ensure_installed = nil,
+        automatic_installation = true,
+        automatic_setup = false,
+      })
+    end,
+    requires = { "jose-elias-alvarez/null-ls.nvim" }
+  }
+
+end

config/nvim/plugin/.gitignore

@@ -0,0 +1 @@
+packer_compiled.lua

config/tmux/tmux.conf

@@ -0,0 +1,53 @@
+# ~/.config/tmux/tmux.conf, or .dotfiles/config/tmux/tmux.conf
+#
+# Contains configuration from the follwing sources:
+# - https://tmuxguide.readthedocs.io/en/latest/tmux/tmux.html
+# - 
+
+# unbind default prefix and set it to ctrl-a
+unbind C-b
+set -g prefix C-a
+bind C-a send-prefix
+
+# make delay shorter
+set -sg escape-time 0
+
+
+
+#### key bindings ####
+
+# reload config file
+bind r source-file ~/.dotfiles/config/tmux/tmux.conf \; display "tmux.conf reloaded!"
+
+# quickly open a new window
+bind N new-window
+
+# synchronize all panes in a window
+bind y setw synchronize-panes
+
+# pane movement shortcuts (same as vim)
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# enable mouse support for switching panes/windows
+#set -g mouse-utf8 on
+#set -g mouse on
+
+#### copy mode : vim ####
+
+# set vi mode for copy mode
+setw -g mode-keys vi
+
+# copy mode using 'Esc'
+unbind [
+bind Escape copy-mode
+
+# start selection with 'space' and copy using 'y'
+#bind -t vi-copy 'y' copy-selection
+
+# paste using 'p'
+unbind p
+bind p paste-buffer
+

local/bin/README.md

@@ -0,0 +1,33 @@
+# Scripts
+
+All scripts have been normalized to same code standard using `shfmt`.
+Some problematic code has been fixed per `shellcheck` suggestions.
+
+## Homegrown
+
+- dfm
+- x-backup-mysql-with-prefix
+- x-check-git-attributes
+- x-open-ports
+
+## Sourced
+
+| Script                  | Source            |
+|-------------------------|-------------------|
+| `x-dupes`               | skx/sysadmin-util |
+| `x-foreach`             | mvdan/dotfiles    |
+| `x-multi-ping`          | skx/sysadmin-util |
+| `x-ssl-expiry-date`     | skx/sysadmin-util |
+| `x-until-error`         | skx/sysadmin-util |
+| `x-until-success`       | skx/sysadmin-util |
+| `x-validate-sha256-sum` | onnimonni         |
+| `x-when-down`           | skx/sysadmin-util |
+| `x-when-up`             | skx/sysadmin-util |
+
+- Sources:
+    - [skx/sysadmin-utils](https://github.com/skx/sysadmin-util/)
+        - Tools for Linux/Unix sysadmins.
+        - [Licence](https://github.com/skx/sysadmin-util/blob/master/LICENSE)
+    - onnimonni
+        - https://gist.github.com/onnimonni/b49779ebc96216771a6be3de46449fa1
+    - [mvdan/dotfiles](https://github.com/mvdan/dotfiles)

local/bin/dfm

@@ -9,40 +9,59 @@
 # Helper variables, override with ENVs like `VERBOSE=1 dfm help`
 : "${VERBOSE:=0}"
 : "${DOTFILES:=$HOME/.dotfiles}"
-: "${INSTALL_SCRIPT:=$DOTFILES/scripts/install.sh}"
+: "${INSTALL_SCRIPT:=$DOTFILES/scripts/install-dotfiles.sh}"
 : "${BREWFILE:=$DOTFILES/Brewfile}"
 
 SCRIPT=$(basename "$0")
 
+source "$DOTFILES/scripts/shared.sh"
+
 function section_install
 {
-  USAGE_PREFIX="-> $SCRIPT install"
+  USAGE_PREFIX="$SCRIPT install"
 
   case "$1" in
     all)
-      bash "$DOTFILES/scripts/settler.sh" && echo "🎉 Done!"
+      $0 install antigen && msg_done "New antigen installed"
+      $0 install macos && msg_done "macOS Defaults set"
+      $0 install brew && msg_done "Brewfile defined apps has been installed"
+      $0 install ext_gh && msg_done "Extensions for GitHub CLI have been installed"
+      $0 install ext_go && msg_done "Go packages have been installed"
       ;;
     antigen)
-      curl -L git.io/antigen > "$DOTFILES/local/bin/antigen.zsh" && echo "🎉 Done!"
+      curl -L git.io/antigen > "$DOTFILES/local/bin/antigen.zsh" && msg_done "🎉 Done!"
       ;;
-    defaults)
-      bash "$DOTFILES/scripts/set-defaults.sh" && echo "🎉 Done!"
+    brew)
+      brew bundle install --file="$BREWFILE" && msg_done "🎉 Done!"
       ;;
-    gh-extensions)
-      bash "$DOTFILES/scripts/gh-extensions.sh" && echo "🎉 Done!"
+    macos)
+      bash "$DOTFILES/scripts/set-macos-defaults.sh" && msg_done "🎉 Done!"
+      ;;
+    ext_go)
+      bash "$DOTFILES/scripts/install-go-packages.sh" && msg_done "🎉 Done!"
+      ;;
+    ext_gh)
+      bash "$DOTFILES/scripts/install-gh-extensions.sh" && msg_done "🎉 Done!"
+      ;;
+    settler)
+      bash "$DOTFILES/scripts/settler.sh" && msg_done "🎉 Done!"
       ;;
     *)
-      echo "$USAGE_PREFIX [antigen | defaults | gh-extensions]"
-      echo " * antigen:       Updates the antigen.zsh file"
-      echo " * defaults:      Setup nice macOS defaults"
-      echo " * gh-extensions: Install GitHub CLI Extensions"
+      menu_section "$USAGE_PREFIX" "all | antigen | brew | macos | ext_go | ext_gh | settler"
+      menu_item "all"      "Installs antigen, macos, brew, ext_gh and ext_go"
+      menu_item "antigen"  "Updates the antigen.zsh file"
+      menu_item "brew"     "Install Brewfile contents"
+      menu_item "ext_gh"   "Install GitHub CLI Extensions"
+      menu_item "ext_go"   "Install Go Packages"
+      menu_item "macos"    "Setup nice macOS defaults"
+      menu_item "settler"  "Runs the WIP settler.sh"
       ;;
   esac
 }
 
 function section_brew
 {
-  USAGE_PREFIX="-> $SCRIPT brew"
+  USAGE_PREFIX="$SCRIPT brew"
 
   if ! command -v brew &> /dev/null; then
     echo "brew could not be found, please install it first"
@@ -51,45 +70,48 @@ function section_brew
 
   case "$1" in
     install)
-      brew bundle install --file="$BREWFILE"
-      echo "🎉 Done!"
+      brew bundle install --file="$BREWFILE" && msg_done "🎉 Done!"
       ;;
     update)
       brew update && brew outdated && brew upgrade && brew cleanup
-      echo "🎉 Done!"
+      msg_done "🎉 Done!"
       ;;
     updatebundle)
       # Updates .dotfiles/Brewfile with descriptions
-      brew bundle dump --force --file="$BREWFILE" --describe && echo "🎉 Done!"
+      brew bundle dump \
+        --force \
+        --file="$BREWFILE" \
+        --describe && msg_done "🎉 Done!"
       ;;
     autoupdate)
       brew autoupdate start 43200 --upgrade --cleanup --immediate
       ;;
     *)
-      echo "$USAGE_PREFIX [install | update | updatebundle]"
-      echo " * install:      Installs items defined in Brewfile"
-      echo " * update:       Updates and upgrades brew packages"
-      echo " * updatebundle: Updates Brewfile with descriptions"
-      echo " * autoupdate:   Setups brew auto-update and runs it immediately"
+      menu_section "$USAGE_PREFIX" "install | update | updatebundle | autoupdate"
+      menu_item "install" "Installs items defined in Brewfile"
+      menu_item "update" "Updates and upgrades brew packages"
+      menu_item "updatebundle" "Updates Brewfile with descriptions"
+      menu_item "autoupdate" "Setups brew auto-update and runs it immediately"
       ;;
   esac
 }
 
 function section_dotfiles
 {
-  USAGE_PREFIX="-> $SCRIPT dotfiles"
+  USAGE_PREFIX="$SCRIPT dotfiles"
 
   case "$1" in
     link)
-      rcup -B "$HOSTNAME" -v && echo "🎉 Done!"
+      rcup -B "$HOSTNAME" -f -v && msg_done "🎉 Done!"
       ;;
     update)
       # Updates .dotfiles/scripts/install.sh and formats it
       rcup -B 0 -g \
         | tee "$INSTALL_SCRIPT" 1> /dev/null \
-        && shfmt -w -l "$INSTALL_SCRIPT" \
         && sed -i '' "s|$HOME|\$HOME|g" "$INSTALL_SCRIPT" \
-        && echo "🎉 Done!"
+        && sed -i '' "s|install.sh|$(basename "$INSTALL_SCRIPT")|g" "$INSTALL_SCRIPT"
+      $0 dotfiles shfmt
+      msg_done "🎉 Done!"
       ;;
     shfmt)
       # Format shell scripts according to following rules.
@@ -99,7 +121,6 @@ function section_dotfiles
         --write \
         --diff \
         --simplify \
-        --language-dialect bash \
         --indent 2 \
         --binary-next-line \
         --case-indent \
@@ -108,18 +129,44 @@ function section_dotfiles
         "$DOTFILES"
       ;;
     *)
-      echo "$USAGE_PREFIX [link | update | shfmt]"
-      echo " * link:         Use rcrc to update dotfile links"
-      echo " * update:       Updates dotfile links, installs host specific overrides automatically"
-      echo " * shfmt:        Run shfmt to all dotfiles"
+      menu_section "$USAGE_PREFIX" "link | update | shfmt"
+      menu_item "link"    "Use rcrc to update dotfile links"
+      menu_item "update"  "Updates dotfile links, installs host specific overrides automatically"
+      menu_item "shfmt"   "Run shfmt to all dotfiles"
+      ;;
+  esac
+}
+
+# Secret menu for visual tests
+function section_tests
+{
+  USAGE_PREFIX="$SCRIPT tests"
+
+  case "$1" in
+    msg)
+      msg "msg"
+      msg_done "msg_done"
+      msg_prompt "msg_prompt"
+      msg_prompt_done "msg_prompt_done"
+      msg_nested "msg_nested"
+      msg_nested_done "msg_nested_done"
+      msg_run "msg_run" "second_param"
+      msg_ok "msg_ok"
+      msg_warn "msg_warn"
+      msg_err "msg_err"
+      ;;
+    *)
+      menu_section "$USAGE_PREFIX" "msg"
+      menu_item "msg" "List all log functions from shared.sh"
       ;;
   esac
 }
 
 function usage
 {
-  echo $"Usage: $SCRIPT [install | brew | dotfiles]"
-  echo $" All commands have their own subcommands."
+  echo ""
+  menu_section "Usage: $SCRIPT" "install | brew | dotfiles"
+  echo $"   All commands have their own subcommands."
   echo ""
   section_install
   echo ""
@@ -133,5 +180,7 @@ case "$1" in
   install) section_install "$2" ;;
   brew) section_brew "$2" ;;
   dotfiles) section_dotfiles "$2" ;;
+  tests) section_tests "$2" ;;
   *) usage && exit 1 ;;
 esac
+

local/bin/x-dupes

@@ -0,0 +1,208 @@
+#!/usr/bin/env perl
+
+=head1 NAME
+
+dupes - Report on files with duplicate contents, via SHA1 hash.
+
+=cut
+
+=head1 SYNOPSIS
+
+  dupes [options] directory
+
+  General Options:
+
+   --help      Show the help information for this script.
+   --verbose   Show useful debugging information.
+
+=cut
+
+
+=head1 ABOUT
+
+dupes is a simple script to report upon files that are identical,
+recursively.
+
+The process involves calculating the SHA1 hash of the file contents
+and reporting on anything collisions we see.
+
+Note that a collision might be caused by a symbolic link, or hardlink,
+so blindly deleting duplicates without investigation is almost certainly
+a mistake.
+
+=cut
+
+=head1 AUTHOR
+
+ Steve
+ --
+ http://www.steve.org.uk/
+
+=cut
+
+
+=head1 LICENSE
+
+Copyright (c) 2013 by Steve Kemp.  All rights reserved.
+
+This script is free software;you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+The LICENSE file contains the full text of the license.
+
+=cut
+
+
+
+use strict;
+use warnings;
+
+use File::Find;
+use Getopt::Long;
+use Pod::Usage;
+
+
+#
+#  Parse the arguments
+#
+my %config = parsedOptions();
+
+
+#
+#  The path to examine.
+#
+my $path = $ARGV[0] || '.';
+
+
+#
+#  Get the hashing object, dynamically.
+#
+my $ctx = getHashObject();
+my %digest;
+
+
+#
+#  Find files and store the hash of their contents.
+#
+find( {
+       'wanted' => sub {
+           if ( -f $_ )
+           {
+               lstat;
+               if ( ( -r _ ) && ( !-l _ ) )
+               {
+                   $ctx->reset;
+                   $ctx->addfile($_);
+                   my $md5 = $ctx->hexdigest;
+                   if ( exists $digest{ $md5 } )
+                   {
+                       push @{ $digest{ $md5 }->{ 'dupes' } }, $_;
+                   }
+                   else
+                   {
+                       $digest{ $md5 } = { 'file'  => $_,
+                                           'dupes' => [] };
+                   }
+               }
+           }
+           else
+           {
+               $config{ 'verbose' } && print "Entering $_\n";
+           }
+       },
+       'no_chdir' => 1
+    },
+    $path
+    );
+
+
+#
+#  Report upon collisions.
+#
+foreach my $hash ( keys %digest )
+{
+    my $dupes = $digest{ $hash }->{ 'dupes' };
+    my $src   = $digest{ $hash }->{ 'file' };
+
+    if (@$dupes)
+    {
+        print $src . "\n";
+        foreach my $dupe (@$dupes)
+        {
+            print "\t$dupe\n";
+        }
+    }
+}
+
+
+#
+#  All done.
+#
+exit(0);
+
+
+=begin doc
+
+Load one of M<Digest::SHA> and M<Digest::SHA1>, depending on what is available.
+
+=end doc
+
+=cut
+
+sub getHashObject
+{
+    my $hash = undef;
+
+    foreach my $module (qw! Digest::SHA Digest::SHA1 !)
+    {
+
+        # If we succeeded in calculating the hash we're done.
+        next if ( defined($hash) );
+
+        # Attempt to load the module
+        my $eval = "use $module;";
+
+        ## no critic (Eval)
+        eval($eval);
+        ## use critic
+
+        if ( !$@ )
+        {
+            $hash = $module->new;
+        }
+
+    }
+
+    if ($hash)
+    {
+        return ($hash);
+    }
+    else
+    {
+        print "Failed to load either DIgest::SHA or Digest::SHA1\n";
+        exit(1);
+    }
+}
+
+=begin doc
+
+Parse the options and return suitable values.
+
+=end doc
+
+=cut
+
+sub parsedOptions
+{
+    my %vars;
+
+    exit
+      if (
+           !GetOptions( "help"    => \$vars{ 'help' },
+                        "verbose" => \$vars{ 'verbose' } ) );
+
+    pod2usage(1) if ( $vars{ 'help' } );
+
+    return (%vars);
+
+}

local/bin/x-foreach

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#
+# foreach <folder> <commands that should be run to each file>
+#
+# Source: https://github.com/mvdan/dotfiles/blob/master/.bin/foreach
+
+cmd=$1
+shift
+
+for dir in $($cmd); do
+  (
+    echo "$dir"
+    cd "$dir" || exit 1
+    eval "$@" # allow multiple commands like "foo && bar"
+  )
+done

local/bin/x-multi-ping

@@ -0,0 +1,228 @@
+#!/usr/bin/env perl
+
+=head1 NAME
+
+multi-ping - Multi-protocol ping wrapper
+
+=head1 SYNOPSIS
+
+  multi-ping [--loop|--forever] [--sleep=N]  hostname1 hostname2 .. hostnameN
+
+=cut
+
+=head1 DESCRIPTION
+
+This wrapper script will invoke one of 'ping' or 'ping6', as appropriate,
+to test the connectivity of a remote host and your route to it.
+
+=cut
+
+=head1 AUTHOR
+
+ Steve
+ --
+ http://www.steve.org.uk/
+
+=cut
+
+=head1 LICENSE
+
+Copyright (c) 2013-2014 by Steve Kemp.  All rights reserved.
+
+This script is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
+
+The LICENSE file contains the full text of the license.
+
+=cut
+
+
+use strict;
+use warnings;
+
+use Getopt::Long;
+use Pod::Usage;
+
+
+#
+#  Check the dependencies.
+#
+checkSystem();
+
+#
+#  Parse the command-line.
+#
+my %config = parsedOptions();
+
+
+#
+#  We could parse arguments here, for the moment we will hard-wire
+# a timeout of five seconds.
+#
+my $timeout = 5;
+
+
+#
+# If we didn't get any arguments then we should complain.
+#
+if ( scalar @ARGV < 1 )
+{
+    print "Usage: multi-ping hostname1 hostname2 .. hostnameN\n";
+    exit(1);
+}
+
+
+#
+# Process each hostname specified upon the command-line.
+#
+# Looping if applicable.
+#
+do
+{
+    foreach my $host (@ARGV)
+    {
+        pingHost($host);
+    }
+
+    sleep( $config{ 'sleep' } );
+
+} until ( !$config{ 'loop' } );
+
+
+
+
+=begin doc
+
+Given a hostname lookup both the AAAA & A records. For each result
+perform the appropriate ping request.
+
+=end doc
+
+=cut
+
+sub pingHost
+{
+    my ($hostname) = (@_);
+
+    #
+    #  If we've been given an URI then we'll remove the leading-scheme
+    # and use the hostname only.
+    #
+    if ( $hostname =~ m!^([a-z]+:\/\/)([^/]+)/?!i )
+    {
+        $hostname = $2;
+
+        #
+        #  Port might be specified too, drop that if present.
+        #
+        if ( $hostname =~ /^(.*):([0-9]+)$/ )
+        {
+            $hostname = $1;
+        }
+    }
+
+    #
+    #  Lookup the IP for the name specified
+    #
+    my $res = Net::DNS::Resolver->new;
+
+    #
+    #  The two types we'll lookup.
+    #
+    #  NOTE: This shouldn't be required but my laptop resolver seems to
+    # struggle with lookups of the type "ANY".  Sigh.
+    #
+    #
+    foreach my $type (qw! A AAAA !)
+    {
+        my $query = $res->query( $hostname, $type );
+
+        if ($query)
+        {
+            foreach my $rr ( $query->answer )
+            {
+                my $ping_binary =
+                  $rr->type eq "A"    ? "ping" :
+                  $rr->type eq "AAAA" ? "ping6" :
+                                        "";
+                if ($ping_binary)
+                {
+                    my $result = system(
+                        "$ping_binary -c1 -w$timeout -W$timeout $hostname >/dev/null 2>/dev/null"
+                    );
+
+                    print "Host $hostname - " . $rr->address() .
+                      ( ( $result == 0 ) ? " - alive" : " - FAILED"  ) . "\n";
+                }
+            }
+        }
+        else
+        {
+            print "WARNING: Failed to resolve $hostname [$type]\n";
+        }
+    }
+}
+
+
+
+=begin doc
+
+Test that we have the required perl dependencies present.
+
+=end doc
+
+=cut
+
+sub checkSystem
+{
+    my $eval = "use Net::DNS;";
+
+    ## no critic (Eval)
+    eval($eval);
+    ## use critic
+
+    #
+    #  If we don't have Net::DNS we're out of luck.
+    #
+    if ($@)
+    {
+        print "The required Net::DNS module is missing.  Aborting.\n";
+        exit(1);
+    }
+
+}
+
+
+
+=begin doc
+
+Parse the options and return suitable values.
+
+=end doc
+
+=cut
+
+sub parsedOptions
+{
+    my %vars;
+
+    #
+    # Defaults
+    #
+    $vars{ 'loop' }  = 0;
+    $vars{ 'sleep' } = 1;
+
+    exit
+      if (
+           !GetOptions( "help"    => \$vars{ 'help' },
+                        "verbose" => \$vars{ 'verbose' },
+                        "forever" => \$vars{ 'loop' },
+                        "loop"    => \$vars{ 'loop' },
+                        "sleep=i" => \$vars{ 'sleep' },
+                      ) );
+
+    pod2usage(1) if ( $vars{ 'help' } );
+
+    return (%vars);
+
+}

local/bin/x-open-ports

@@ -6,14 +6,15 @@
 # Originally from: https://www.commandlinefu.com/commands/view/8951
 # Original author: https://www.commandlinefu.com/commands/by/wickedcpj
 #
-echo 'User:                Command:                  Port:'
-echo '====================================================='
+echo 'User:           Command:                  PID:     Port:'
+echo '========================================================='
 
 lsof -i 4 -P -n +c 0 \
   | grep -i 'listen' \
-  | awk '{print $3, $1, $9}' \
+  | awk '{print $3, $1, $2, $9}' \
   | sed 's/ [a-z0-9\.\*]*:/ /' \
   | sort -k 3 -n \
-  | xargs printf '%-20s %-25s %-5s\n' | uniq
+  | xargs printf '%-15s %-25s %-8s %-5s\n' \
+  | uniq
 
 echo ""

local/bin/x-ssl-expiry-date

@@ -0,0 +1,133 @@
+#!/bin/sh
+#
+# About
+# -----
+# Check the expiry date of the SSL certificate on the given host.
+#
+#
+# License
+# -------
+#
+# Copyright (c) 2013-2015 by Steve Kemp.  All rights reserved.
+#
+# This script is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself.
+#
+# The LICENSE file contains the full text of the license.
+#
+#
+
+#
+#  Simple function to show usage information, and exit.
+#
+usage() {
+    echo "Usage: $0 [-d] [-p 443] domain1.org domain2.com .. domainN"
+    exit 0
+}
+
+#
+#  Default settings for flags set by the command-line arguments
+#
+days=0
+port=443
+
+#
+#  Parse the argument(s) - i.e. look for "-d" / "-p 443".
+#
+while getopts "h?dp:" opt; do
+    case $opt in
+        h)
+            usage
+            ;;
+        \?)
+            usage
+            ;;
+        d)
+            days=1
+            ;;
+        p)
+            port=$OPTARG
+            ;;
+  esac
+done
+shift $((OPTIND - 1))
+
+#
+#  Ensure we have some arguments
+#
+if [ "$#" = "0" ]; then
+    usage
+fi
+
+#
+# For each domain-name on the command-line.
+#
+for name in "$@"; do
+
+    #
+    #  Make a temporary file
+    #
+    # Test if we have BSD or GNU version of mktemp
+    if ( strings "$(which mktemp)" | grep -q GNU); then
+        # We have the GNU version
+        tmp=$(mktemp)
+  else
+        # We have the BSD version
+        tmp=$(mktemp -t tmp)
+  fi
+
+    #
+    #  Download the certificate
+    #
+    if ( ! echo "" | openssl s_client -connect $name:$port > $tmp 2> /dev/null); then
+        echo "Failed to get cert from https://$name:$port/"
+        exit 3
+  fi
+
+    #
+    #  Get the expiry date
+    #
+    date=$(openssl x509 -in "$tmp" -noout -enddate | awk -F= '{print $2}')
+
+    #
+    #  Remove the temporary file
+    #
+    rm -f "$tmp"
+
+    #
+    #  Convert the expiry date + todays date to seconds-past epoch
+    #
+    # Check if we have the BSD or the GNU version of date
+    if (strings "$(which date)" | grep -q GNU); then
+        # We have GNU this is easy
+        then=$(date --date "$date" +%s)
+  else
+        # We have BSD now it is getting complicated
+        year=$(echo "$date" | awk '{print $4}')
+        month=$(echo "$date" | awk '{print $1}')
+        day=$(echo "$date" | awk '{print $2}')
+        hour=$(echo "$date" | awk '{print $3}' | awk -F: '{print $1}')
+        minute=$(echo "$date" | awk '{print $3}' | awk -F: '{print $2}')
+        second=$(echo "$date" | awk '{print $3}' | awk -F: '{print $3}')
+        then=$(date -v${year}y -v${month} -v${day}d -v${hour}H -v${minute}M -v${second}S -u +%s)
+  fi
+
+    now=$(date +%s)
+
+    #
+    #  Day diff
+    #
+    diff=$(("$then" - "$now"))
+    diff=$($diff / 86400)
+
+    #
+    #  All done
+    #
+    if [ "$days" = "1" ]; then
+        echo "${name}: ${diff}"
+  else
+        echo "$name"
+        echo "    Expires: ${date}"
+        echo "    Days: ${diff}"
+  fi
+done

local/bin/x-until-error

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# About
+# -----
+# Repeat the command until it fails - always run at least once.
+#
+
+"$@"
+
+#
+#  If the status code was zero then repeat.
+#
+while [ $? -eq 0 ]; do
+    "$@"
+done

local/bin/x-until-success

@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# About
+# -----
+# Repeat the command until it succeeds - always run at least once.
+#
+#
+# License
+# -------
+#
+# Copyright (c) 2013 by Steve Kemp.  All rights reserved.
+#
+# This script is free software; you can redistribute it and/or modify it under
+# the same terms as Perl itself.
+#
+# The LICENSE file contains the full text of the license.
+#
+#
+
+#
+#  Run the first time.
+#
+"$@"
+
+#
+#  If the status code was not zero then repeat.
+#
+while [ $? -ne 0 ]; do
+    "$@"
+done

local/bin/x-when-down

@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# Wait until a given host is down (determined by ping) then execute the
+# given command
+#
+# Usage:
+# ./when-down HOST COMMAND...
+#
+# Example
+# ./when-down 1.2.3.4 ssh 1.2.3.4
+#
+
+#
+#  Ensure we received the correct number of arguments.
+#
+if [ $# -lt 2 ]; then
+    echo "Usage: $0 HOST COMMAND..."
+    exit 1
+fi
+
+HOST=$1
+
+echo "Waiting for $HOST to get down..."
+
+true
+while [ $? -ne 1 ]; do
+    ping -c 1 -W 1 $HOST > /dev/null
+done
+
+shift
+
+"$@"

local/bin/x-when-up

@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# Wait until a given host is online (determined by ping) then execute the
+# given command
+#
+# Usage:
+# ./when-up HOST COMMAND...
+#
+# Example
+# ./when-up 1.2.3.4 ssh 1.2.3.4
+#
+# Special case:
+# when using when-up to ssh to a host, this host does not need to be given twice
+# ./when-up ssh 1.2.3.4
+#
+
+#
+#  Ensure we received the correct number of arguments.
+#
+if [ $# -lt 2 ]; then
+    echo "Usage: $0 HOST COMMAND..."
+    exit 1
+fi
+
+if [ $1 = "ssh" ]; then
+  HOST=$2
+else
+  HOST=$1
+fi
+
+echo "Waiting for $HOST to come online..."
+
+ping -c 1 -W 1 $HOST > /dev/null
+while [ $? -ne 0 ]; do
+    sleep 1
+    ping -c 1 -W 1 $HOST > /dev/null
+done
+
+# By the time we reach here the ping-command has completed successfully
+# so we can launch the command we were given - along with any arguments.
+if [ $1 != "ssh" ]; then
+  shift
+fi
+
+"$@"

scripts/install-dotfiles.sh

@@ -2,11 +2,11 @@
 #
 # Usage:
 #
-#    sh install.sh
+#    sh install-dotfiles.sh
 #
 # Environment variables: VERBOSE, CP, LN, MKDIR, RM, DIRNAME.
 #
-#    env VERBOSE=1 sh install.sh
+#    env VERBOSE=1 sh install-dotfiles.sh
 #
 # DO NOT EDIT THIS FILE
 #
@@ -70,17 +70,31 @@ handle_file_ln "$HOME/.dotfiles/bash_profile" "$HOME/.bash_profile"
 handle_file_ln "$HOME/.dotfiles/bashrc" "$HOME/.bashrc"
 handle_file_ln "$HOME/.dotfiles/config/alias" "$HOME/.config/alias"
 handle_file_ln "$HOME/.dotfiles/config/exports" "$HOME/.config/exports"
+handle_file_ln "$HOME/.dotfiles/config/flipperdevices.com/qFlipper.ini" "$HOME/.config/flipperdevices.com/qFlipper.ini"
 handle_file_ln "$HOME/.dotfiles/config/functions" "$HOME/.config/functions"
 handle_file_ln "$HOME/.dotfiles/config/gh/config.yml" "$HOME/.config/gh/config.yml"
 handle_file_ln "$HOME/.dotfiles/config/git/config" "$HOME/.config/git/config"
 handle_file_ln "$HOME/.dotfiles/config/git/gitignore" "$HOME/.config/git/gitignore"
+handle_file_ln "$HOME/.dotfiles/config/nvim/after/plugin/defaults.lua" "$HOME/.config/nvim/after/plugin/defaults.lua"
+handle_file_ln "$HOME/.dotfiles/config/nvim/init.lua" "$HOME/.config/nvim/init.lua"
+handle_file_ln "$HOME/.dotfiles/config/nvim/lua/custom/plugins.lua" "$HOME/.config/nvim/lua/custom/plugins.lua"
+handle_file_ln "$HOME/.dotfiles/config/nvim/plugin/packer_compiled.lua" "$HOME/.config/nvim/plugin/packer_compiled.lua"
+handle_file_ln "$HOME/.dotfiles/config/tmux/tmux.conf" "$HOME/.config/tmux/tmux.conf"
 handle_file_ln "$HOME/.dotfiles/config/wtf/config.yml" "$HOME/.config/wtf/config.yml"
 handle_file_ln "$HOME/.dotfiles/git_profiles" "$HOME/.git_profiles"
 handle_file_ln "$HOME/.dotfiles/huskyrc" "$HOME/.huskyrc"
 handle_file_ln "$HOME/.dotfiles/local/bin/antigen.zsh" "$HOME/.local/bin/antigen.zsh"
 handle_file_ln "$HOME/.dotfiles/local/bin/dfm" "$HOME/.local/bin/dfm"
 handle_file_ln "$HOME/.dotfiles/local/bin/x-check-git-attributes" "$HOME/.local/bin/x-check-git-attributes"
+handle_file_ln "$HOME/.dotfiles/local/bin/x-dupes" "$HOME/.local/bin/x-dupes"
+handle_file_ln "$HOME/.dotfiles/local/bin/x-foreach" "$HOME/.local/bin/x-foreach"
+handle_file_ln "$HOME/.dotfiles/local/bin/x-multi-ping" "$HOME/.local/bin/x-multi-ping"
 handle_file_ln "$HOME/.dotfiles/local/bin/x-open-ports" "$HOME/.local/bin/x-open-ports"
+handle_file_ln "$HOME/.dotfiles/local/bin/x-ssl-expiry-date" "$HOME/.local/bin/x-ssl-expiry-date"
+handle_file_ln "$HOME/.dotfiles/local/bin/x-until-error" "$HOME/.local/bin/x-until-error"
+handle_file_ln "$HOME/.dotfiles/local/bin/x-until-success" "$HOME/.local/bin/x-until-success"
+handle_file_ln "$HOME/.dotfiles/local/bin/x-when-down" "$HOME/.local/bin/x-when-down"
+handle_file_ln "$HOME/.dotfiles/local/bin/x-when-up" "$HOME/.local/bin/x-when-up"
 handle_file_ln "$HOME/.dotfiles/rcrc" "$HOME/.rcrc"
 handle_file_ln "$HOME/.dotfiles/ssh/allowed_signers" "$HOME/.ssh/allowed_signers"
 handle_file_ln "$HOME/.dotfiles/ssh/config" "$HOME/.ssh/config"

scripts/install-gh-extensions.sh

@@ -1,8 +1,10 @@
 #!/usr/bin/env bash
 # Install GitHub CLI extensions
 
+source "$HOME/.dotfiles/scripts/shared.sh"
+
 if ! command -v gh &> /dev/null; then
-  echo "gh (GitHub Client) could not be found, please install it first"
+  msg_run "gh (GitHub Client) could not be found, please install it first"
   exit 1
 fi
 
@@ -35,10 +37,17 @@ extensions=(
   stoe/gh-report
 )
 
+msg "Starting to install GitHub CLI extensions..."
+
 for ext in "${extensions[@]}"; do
+  # Trim spaces
+  ext=${ext// /}
   # Skip comments
   if [[ ${ext:0:1} == "#" ]]; then continue; fi
 
-  echo "-> Installing $ext"
+  msg_run "Installing $ext"
   gh extensions install "$ext"
+  echo ""
 done
+
+msg_ok "Done"

scripts/install-go-packages.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env zsh
+# Install Go packages
+
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+if ! command -v go &> /dev/null; then
+  msg "go hasn't been installed yet."
+  exit 0
+fi
+
+packages=(
+  # sysadmin/scripting utilities, distributed as a single binary
+  github.com/skx/sysbox@latest
+)
+
+for pkg in "${packages[@]}"; do
+  # Trim spaces
+  pkg=${pkg// /}
+  # Skip comments
+  if [[ ${pkg:0:1} == "#" ]]; then continue; fi
+
+  msg_run "Installing go package:" "$pkg"
+  go install "$pkg"
+  echo ""
+done
+
+msg_ok "Done"

scripts/set-macos-defaults.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
-echo 'start osx/set-defaults.sh'
+#
+# set-macos-defaults.sh - Sets macOS Defaults that I like
+#
+# This script contains large portions from following scripts:
+# - https://github.com/freekmurze/dotfiles/blob/main/macos/set-defaults.sh
+#
 
 # Ask for the administrator password upfront
 sudo -v
@@ -226,8 +231,11 @@ defaults write com.apple.Safari IncludeInternalDebugMenu -bool true
 
 # Enable the Develop menu and the Web Inspector in Safari
 defaults write com.apple.Safari IncludeDevelopMenu -bool true
-defaults write com.apple.Safari WebKitDeveloperExtrasEnabledPreferenceKey -bool true
-defaults write com.apple.Safari com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled -bool true
+defaults write com.apple.Safari \
+  WebKitDeveloperExtrasEnabledPreferenceKey -bool true
+defaults write com.apple.Safari \
+  com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled \
+  -bool true
 
 # Don’t display the annoying prompt when quitting iTerm
 #defaults write com.googlecode.iterm2 PromptOnQuit -bool false
@@ -268,10 +276,16 @@ defaults write com.apple.TextEdit PlainTextEncodingForWrite -int 4
 ###############################################################################
 
 # Disable smart quotes as it’s annoying for messages that contain code
-defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "automaticQuoteSubstitutionEnabled" -bool false
+defaults write com.apple.messageshelper.MessageController \
+  SOInputLineSettings \
+  -dict-add "automaticQuoteSubstitutionEnabled" \
+  -bool false
 
 # Disable continuous spell checking
-defaults write com.apple.messageshelper.MessageController SOInputLineSettings -dict-add "continuousSpellCheckingEnabled" -bool false
+defaults write com.apple.messageshelper.MessageController \
+  SOInputLineSettings \
+  -dict-add "continuousSpellCheckingEnabled" \
+  -bool false
 
 ###############################################################################
 # Kill affected applications                                                  #

scripts/settler.sh

@@ -2,6 +2,7 @@
 #
 # Settler - my macOS setup automator
 # Ismo Vuorinen <https://github.com/ivuorinen> 2018
+#
 
 # Ask for the administrator password upfront
 sudo -v
@@ -43,8 +44,8 @@ else
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 fi
 
-bash ../local/bin/dfm brew install && "Installed Brewfile contents"
-bash ../local/bin/dfm dotfiles link && "Linked all dotfiles"
+bash "$HOME/.dotfiles/local/bin/dfm" brew install && "Installed Brewfile contents"
+bash "$HOME/.dotfiles/local/bin/dfm" dotfiles link && "Linked all dotfiles"
 
 read -r -p "Do you want to set macOS defaults? (y/N) " yn
 

scripts/shared.sh

@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+#
+# Shared bash functions and helpers
+# that can be sourced to other scripts.
+#
+
+# -- Colors -- #
+CLR_RED="\033[1;31m"
+CLR_YELLOW='\033[1;33m'
+CLR_GREEN="\033[1;32m"
+CLR_BLUE='\033[1;34m'
+CLR_RESET="\033[0m"
+
+# -- Helpers -- #
+function __log_marker() {
+  echo -e "${CLR_BLUE}➜${CLR_RESET}"
+}
+
+function __log_marker_ok() {
+  echo -e "${CLR_GREEN}✔${CLR_RESET}"
+}
+
+function __log_marker_ok_blue() {
+  echo -e "${CLR_BLUE}✔${CLR_RESET}"
+}
+
+function __log_marker_warn() {
+  echo -e "${CLR_YELLOW}⁕${CLR_RESET}"
+}
+
+function __log_marker_err() {
+  echo -e "${CLR_RED}⛌${CLR_RESET}"
+}
+
+function __log_indent() {
+  echo "    "
+}
+
+# -- Log -- #
+function msg() {
+  echo -e "$(__log_marker) $1"
+}
+
+function msg_done() {
+  echo -e "$(__log_marker) $1 ...$(__log_marker_ok)"
+}
+
+function msg_prompt() {
+  echo -e "$(__log_marker) $1"
+}
+
+function msg_prompt_done() {
+  echo -e "$(__log_marker) $1 ...$(__log_marker_ok)"
+}
+
+function msg_nested() {
+  echo -e "$(__log_indent)$(__log_marker) $1"
+}
+
+function msg_nested_done() {
+  echo -e "$(__log_indent)$(__log_marker) $1 ...$(__log_marker_ok)"
+}
+
+function msg_run() {
+  echo -e "${CLR_GREEN}➜ $1${CLR_RESET} $2"
+}
+
+function msg_ok() {
+  echo -e "$(__log_marker_ok) $1"
+}
+
+function msg_warn() {
+  echo -e "$(__log_marker_warn) $1"
+}
+
+function msg_err() {
+  echo -e "$(__log_marker_err) $1"
+}
+
+# -- Menu builder -- #
+function menu_section() {
+  LINE=$(printf '%-18s [ %-15s ]\n' "$1" "$2")
+  echo -e " $(__log_marker) $LINE"
+}
+function menu_item() {
+  LINE=$(printf '%-15s %-30s\n' "$1" "$2")
+  echo -e "$(__log_indent)$(__log_marker) $LINE"
+}

ssh/config

@@ -1,2 +1,16 @@
+Host github.com
+ User git
+ HostName github.com
+ IdentityFile ~/.ssh/id_rsa
+
+Host bitbucket.com
+ Hostname bitbucket.com
+ IdentityFile ~/.ssh/id_rsa
+
+Host gitlab.com
+ Hostname gitlab.com
+ IdentityFile ~/.ssh/id_rsa
+
 Host *
-	IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+ IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
+

vuerc

@@ -20,4 +20,5 @@
       "cssPreprocessor": "dart-sass"
     }
   }
-}
+}
+

zshrc

@@ -2,7 +2,10 @@
 [[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
 # shellcheck shell=bash
 
-export PATH="/opt/homebrew/bin:/usr/local/sbin:$PATH"
+autoload -U colors zsh/terminfo
+colors
+
+export PATH="/opt/homebrew/opt/ruby/bin:/opt/homebrew/bin:/usr/local/sbin:$PATH"
 
 if [ command -v brew &> /dev/null ]; then
     BREW_BIN=$(brew --prefix)/bin
@@ -16,6 +19,18 @@ if [ command -v brew &> /dev/null ]; then
     export PATH="$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$BREW_BIN:$BREW_SBIN:$PATH"
 fi
 
+# If we have go packages, include them to the PATH
+if command -v go &> /dev/null; then
+    export GOPATH=$(go env GOPATH);
+    if [ -d "$GOPATH/bin" ]; then
+        export PATH="$GOPATH/bin:$PATH"
+    fi
+fi
+
+if command -v nvim &> /dev/null; then
+    export EDITOR="nvim"
+fi
+
 LOCAL_BIN="$HOME/.local/bin"
 COMPOSER_DIR="$HOME/.composer/vendor/bin"
 export PATH="$LOCAL_BIN:$COMPOSER_DIR:$PATH"
@@ -57,13 +72,13 @@ if command -v antigen &> /dev/null; then
     antigen bundle zsh-users/zsh-completions
     antigen bundle MichaelAquilina/zsh-you-should-use
     antigen bundle unixorn/autoupdate-antigen.zshplugin
+    antigen bundle Sparragus/zsh-auto-nvm-use
     # antigen bundle git-auto-fetch
 
     hash php 2>/dev/null && antigen bundle php
     hash nvm 2>/dev/null && antigen bundle nvm
     hash docker 2>/dev/null && antigen bundle docker
-
-    hash nvm 2>/dev/null && antigen bundle Sparragus/zsh-auto-nvm-use
+    hash ruby 2>/dev/null && antigen bundle ruby
     hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
     hash jq 2>/dev/null && antigen bundle reegnz/jq-zsh-plugin
     hash docker-compose 2>/dev/null && antigen bundle sroze/docker-compose-zsh-plugin