Chore(scripts): Simplification and documentation

.editorconfig

@@ -8,6 +8,18 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.php]
+indent_size = 4
+
 [.git{ignore,modules}]
 indent_style = tab
 indent_size = 1
+
+[local/bin/*]
+shell_variant      = bash # --language-variant
+binary_next_line   = true
+switch_case_indent = true # --case-indent
+space_redirects    = true
+keep_padding       = true
+function_next_line = true # --func-next-line
+

.gitignore

@@ -5,3 +5,7 @@ Brewfile.lock.json
 .idea
 .vscode
 config/fzf
+config/cheat/cheatsheets/pure-bash-bible/*
+config/cheat/cheatsheets/tldr/*
+!.gitkeep
+

.gitmodules

@@ -1,16 +1,16 @@
 # vim: set expandtab:
 [submodule "dotbot"]
-	path = dotbot
+	path = tools/dotbot
 	url = https://github.com/anishathalye/dotbot.git
 	ignore = dirty
 
 [submodule "dotbot-brew"]
-	path = dotbot-brew
+	path = tools/dotbot-brew
 	url = https://github.com/wren/dotbot-brew.git
 	ignore = dirty
 
 [submodule "dotbot-include"]
-	path = dotbot-include
+	path = tools/dotbot-include
 	url = https://gitlab.com/gnfzdz/dotbot-include.git
 	ignore = dirty
 

.markdownlint.json

@@ -0,0 +1,19 @@
+{
+  "extends": "markdownlint/style/prettier",
+  "code-block-style": {
+    "style": "fenced"
+  },
+  "code-fence-style": {
+    "style": "backtick"
+  },
+  "heading-style": {
+    "style": "atx"
+  },
+  "no-duplicate-heading": {
+    "siblings_only": true
+  },
+  "required-headings": false,
+  "ul-style": {
+    "style": "dash"
+  }
+}

.markdownlintignore

@@ -0,0 +1,5 @@
+config/cheat/cheatsheets/community/
+config/tmux/
+config/nvim/
+tools/
+

add-submodules.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
-git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git dotbot-brew
-git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git dotbot-include
+git submodule add --name dotbot -f https://github.com/anishathalye/dotbot.git tools/dotbot
+git submodule add --name dotbot-brew -f https://github.com/wren/dotbot-brew.git tools/dotbot-brew
+git submodule add --name dotbot-include -f https://gitlab.com/gnfzdz/dotbot-include.git tools/dotbot-include
 git submodule add --name cheat-community -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
 git submodule add --name tmux/tpm -f https://github.com/tmux-plugins/tpm.git config/tmux/plugins/tpm
 

base/nbrc

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+###############################################################################
+# .nbrc
+#
+# Configuration file for `nb`, a command line note-taking, bookmarking,
+# and knowledge base application with encryption, search, Git-backed syncing,
+# and more in a single portable script.
+#
+# Edit this file manually or manage settings using the `nb settings`
+# subcommand. Configuration options are set as environment variables, eg:
+#   export NB_ENCRYPTION_TOOL=gpg
+#
+# https://github.com/xwmx/nb
+###############################################################################
+
+export NB_DIR="${NB_DIR:-$HOME/.local/state/nb}" # Set by `nb` • Mon May  8 15:25:12 EEST 2023
+
+export NB_COLOR_THEME="${NB_COLOR_THEME:-unicorn}" # Set by `nb` • Mon May  8 15:41:22 EEST 2023

base/zshrc

@@ -5,6 +5,10 @@ autoload -U colors zsh/terminfo
 colors
 setopt correct
 
+# Add completion scripts to zsh path
+fpath=(~/.config/zsh/completion $fpath)
+autoload -Uz compinit && compinit -i
+
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
 # shellcheck source=shared.sh
@@ -43,4 +47,6 @@ have antigen && {
 # starship is present
 have starship && eval "$(starship init zsh)"
 
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
+[ -f "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh ] \
+  && source "${XDG_CONFIG_HOME:-$HOME/.config}"/fzf/fzf.zsh
+

config/astronvim/lua/user/plugins/community.lua

@@ -6,7 +6,7 @@ return {                      -- Add the community repository of plugin specific
     import = "astrocommunity.colorscheme.catppuccin",
     opts = {
       flavour = "mocha",
-      transparent_background = false,
+      transparent_background = true,
       dim_inactive = {
         enabled = true,
         shade = "dark",
@@ -23,8 +23,7 @@ return {                      -- Add the community repository of plugin specific
       disabled_filetypes = { "help", "text", "markdown" },
     },
   },
-  { import = "astrocommunity.code-runner.overseer-nvim" },
-  --- { import = "astrocommunity.diagnostics.lsp_lines-nvim" },
+  { import = "astrocommunity.diagnostics.lsp_lines-nvim" },
   { import = "astrocommunity.diagnostics.trouble-nvim" },
   { import = "astrocommunity.editing-support.refactoring-nvim" },
   { import = "astrocommunity.editing-support.neogen" },
@@ -32,9 +31,14 @@ return {                      -- Add the community repository of plugin specific
   { import = "astrocommunity.editing-support.todo-comments-nvim" },
   { import = "astrocommunity.indent.mini-indentscope" },
   { import = "astrocommunity.markdown-and-latex.glow-nvim" },
+  { import = "astrocommunity.motion.harpoon" },
   { import = "astrocommunity.pack.php" },
   { import = "astrocommunity.pack.typescript" },
   { import = "astrocommunity.project.neoconf-nvim" },
+  { import = "astrocommunity.project.nvim-spectre" },
+  { import = "astrocommunity.project.project-nvim" },
   { import = "astrocommunity.test.neotest" },
   { import = "astrocommunity.utility.neodim" },
+  { import = "astrocommunity.utility.transparent-nvim" },
 }
+

config/astronvim/lua/user/plugins/mason.lua

@@ -13,16 +13,13 @@ return { -- use mason-lspconfig to configure LSP installations
         "diagnosticls",
         "docker_compose_language_service",
         "dockerls",
-        "emmet_ls",
         "eslint",
         "graphql",
         "html",
         "intelephense",
         "jsonls",
-        "marksman",
         "psalm",
         "stylelint_lsp",
-        "sqlls",
         "tailwindcss",
         "tsserver",
         "vuels",

config/astronvim/lua/user/plugins/null-ls.lua

@@ -12,7 +12,6 @@ return {
       null_ls.builtins.code_actions.eslint,
       null_ls.builtins.code_actions.refactoring,
       null_ls.builtins.code_actions.shellcheck,
-      null_ls.builtins.code_actions.xo,
       null_ls.builtins.diagnostics.actionlint,
       null_ls.builtins.diagnostics.alex,
       null_ls.builtins.diagnostics.ansiblelint,
@@ -21,13 +20,10 @@ return {
       null_ls.builtins.diagnostics.eslint,
       null_ls.builtins.diagnostics.jsonlint,
       null_ls.builtins.diagnostics.luacheck,
-      null_ls.builtins.diagnostics.markdownlint,
-      null_ls.builtins.diagnostics.mypy,
       null_ls.builtins.diagnostics.php,
       null_ls.builtins.diagnostics.phpcs,
       null_ls.builtins.diagnostics.phpstan,
       null_ls.builtins.diagnostics.psalm,
-      null_ls.builtins.diagnostics.pydocstyle,
       null_ls.builtins.diagnostics.semgrep,
       null_ls.builtins.diagnostics.shellcheck,
       null_ls.builtins.diagnostics.standardjs,
@@ -38,26 +34,16 @@ return {
       null_ls.builtins.diagnostics.vacuum,
       null_ls.builtins.diagnostics.vint,
       null_ls.builtins.diagnostics.vulture,
-      null_ls.builtins.diagnostics.xo,
       null_ls.builtins.diagnostics.yamllint,
       null_ls.builtins.diagnostics.zsh,
-      null_ls.builtins.formatting.black,
       null_ls.builtins.formatting.blade_formatter,
-      null_ls.builtins.formatting.cbfmt,
       null_ls.builtins.formatting.clang_format,
       null_ls.builtins.formatting.eslint,
       null_ls.builtins.formatting.fixjson,
       null_ls.builtins.formatting.isort,
       null_ls.builtins.formatting.jq,
-      null_ls.builtins.formatting.markdownlint,
-      null_ls.builtins.formatting.nginx_beautifier,
-      null_ls.builtins.formatting.pg_format,
       null_ls.builtins.formatting.phpcsfixer,
-      null_ls.builtins.formatting.prettier_eslint,
-      null_ls.builtins.formatting.prettier,
-      null_ls.builtins.formatting.puppet_lint,
-      null_ls.builtins.formatting.rome,
-      null_ls.builtins.formatting.rustfmt,
+      null_ls.builtins.formatting.prettierd,
       null_ls.builtins.formatting.shfmt.with {
         args = { "-i", "1", "-bn", "-ci", "-sr", "-kb", "-fn" },
       },

config/cheat/conf.yml

@@ -1,6 +1,6 @@
 ---
 # The editor to use with 'cheat -e <sheet>'. Defaults to $EDITOR or $VISUAL.
-editor: $EDITOR
+# editor: $EDITOR
 
 # Should 'cheat' always colorize output?
 colorize: true
@@ -8,7 +8,7 @@ colorize: true
 # Which 'chroma' colorscheme should be applied to the output?
 # Options are available here:
 #   https://github.com/alecthomas/chroma/tree/master/styles
-style: catppuccin-mocha
+style: "catppuccin"
 
 # Which 'chroma' "formatter" should be applied?
 # One of: "terminal", "terminal256", "terminal16m"
@@ -63,14 +63,22 @@ cheatpaths:
   #   'readonly': shall user-created ('cheat -e') cheatsheets be saved here?
   - name: community
     path: ~/.config/cheat/cheatsheets/community
-    tags: [community]
+    tags: [ community ]
     readonly: true
   # If you have personalized cheatsheets, list them last. They will take
   # precedence over the more global cheatsheets.
   - name: personal
-    path: ~/.config/cheat/cheatsheets/personal
-    tags: [personal]
+    path: ~/.dotfiles/config/cheat/cheatsheets/personal
+    tags: [ personal ]
     readonly: false
+  - name: pure-bash-bible
+    path: ~/.dotfiles/config/cheat/cheatsheets/pure-bash-bible
+    tags: [ pure-bash-bible ]
+    readonly: true
+  - name: tldr
+    path: ~/.dotfiles/config/cheat/cheatsheets/tldr
+    tags: [ tldr ]
+    readonly: true
 
 # While it requires no configuration here, it's also worth noting that
 # cheat will automatically append directories named '.cheat' within the

config/exports-apps

@@ -72,6 +72,12 @@ have irssi && {
   x-dc "$IRSSI_CONFIG_HOME"
 }
 
+# nb, https://xwmx.github.io/nb/
+have nb && {
+  export NB_DIR="$XDG_STATE_HOME/nb"
+  x-dc "$NB_DIR"
+}
+
 # nvm, the node version manager
 export NVM_LAZY_LOAD=true
 export NVM_COMPLETION=true
@@ -80,6 +86,12 @@ export NVM_DIR="$XDG_CONFIG_HOME/nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"                   # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
 
+# Add npm packages to path
+have node && {
+  NVM_NODE_BIN_DIR="$(dirname "$(which node)")"
+  path_append "$NVM_NODE_BIN_DIR"
+}
+
 # op (1Password cli) is present
 have op && {
   export OP_CACHE="$XDG_STATE_HOME/1password"
@@ -109,3 +121,7 @@ export _Z_DATA="$XDG_STATE_HOME/z"
 export ANDROID_HOME="$XDG_DATA_HOME/android"
 export GNUPGHOME="$XDG_DATA_HOME/gnupg"
 export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
+export TMUX_CONF="$DOTFILES/config/tmux/tmux.conf"
+export BAT_THEME="ansi"
+export CHEAT_USE_FZF=true
+

config/iterm2/com.googlecode.iterm2.plist

@@ -10,6 +10,8 @@
 	<true/>
 	<key>AlternateMouseScroll</key>
 	<true/>
+	<key>AutoHideTmuxClientSession</key>
+	<true/>
 	<key>Custom Color Presets</key>
 	<dict>
 		<key>catppuccin-mocha</key>
@@ -1039,13 +1041,17 @@
 			<key>Non-ASCII Anti Aliased</key>
 			<true/>
 			<key>Normal Font</key>
-			<string>JetBrainsMonoNerdFontCompleteM-Light 15</string>
+			<string>JetBrainsMonoNFM-Regular 13</string>
 			<key>Only The Default BG Color Uses Transparency</key>
 			<true/>
+			<key>Open Password Manager Automatically</key>
+			<true/>
 			<key>Option Key Sends</key>
 			<integer>0</integer>
 			<key>Prompt Before Closing 2</key>
 			<false/>
+			<key>Reduce Flicker</key>
+			<true/>
 			<key>Right Option Key Sends</key>
 			<integer>0</integer>
 			<key>Rows</key>
@@ -1082,12 +1088,77 @@
 			</dict>
 			<key>Send Code When Idle</key>
 			<false/>
+			<key>Set Local Environment Vars</key>
+			<false/>
 			<key>Shortcut</key>
-			<string></string>
+			<string>T</string>
+			<key>Show Status Bar</key>
+			<true/>
+			<key>Show Timestamps</key>
+			<integer>2</integer>
 			<key>Silence Bell</key>
 			<false/>
 			<key>Smart Cursor Color</key>
 			<true/>
+			<key>Status Bar Layout</key>
+			<dict>
+				<key>advanced configuration</key>
+				<dict>
+					<key>algorithm</key>
+					<integer>0</integer>
+					<key>auto-rainbow style</key>
+					<integer>3</integer>
+					<key>font</key>
+					<string>.AppleSystemUIFont 12</string>
+					<key>remove empty components</key>
+					<false/>
+				</dict>
+				<key>components</key>
+				<array>
+					<dict>
+						<key>class</key>
+						<string>iTermStatusBarJobComponent</string>
+						<key>configuration</key>
+						<dict>
+							<key>knobs</key>
+							<dict>
+								<key>base: compression resistance</key>
+								<integer>1</integer>
+								<key>base: priority</key>
+								<real>5</real>
+								<key>maxwidth</key>
+								<real>+infinity</real>
+								<key>minwidth</key>
+								<integer>0</integer>
+								<key>shared text color</key>
+								<dict>
+									<key>Alpha Component</key>
+									<real>1</real>
+									<key>Blue Component</key>
+									<real>0.63</real>
+									<key>Color Space</key>
+									<string>sRGB</string>
+									<key>Green Component</key>
+									<real>0.63</real>
+									<key>Red Component</key>
+									<real>0.90000000000000002</real>
+								</dict>
+							</dict>
+							<key>layout advanced configuration dictionary value</key>
+							<dict>
+								<key>algorithm</key>
+								<integer>0</integer>
+								<key>auto-rainbow style</key>
+								<integer>3</integer>
+								<key>font</key>
+								<string>.AppleSystemUIFont 12</string>
+								<key>remove empty components</key>
+								<false/>
+							</dict>
+						</dict>
+					</dict>
+				</array>
+			</dict>
 			<key>Sync Title</key>
 			<false/>
 			<key>Tags</key>
@@ -1159,6 +1230,8 @@
 			<string>kNextWindowPointerAction</string>
 		</dict>
 	</dict>
+	<key>PromptOnQuit</key>
+	<false/>
 	<key>SmartPlacement</key>
 	<true/>
 	<key>SoundForEsc</key>

config/tmux/tmux.conf

@@ -51,17 +51,35 @@ bind N new-window
 
 # Plugins related configurations
 
+## https://github.com/jaclu/tmux-menus
+set -g @menus_trigger 'm'
+
 ## https://github.com/catppuccin/tmux
 set -g @catppuccin_flavour 'mocha' # latte/frappe/macchiato/mocha
 set -g @catppuccin_window_tabs_enabled on # or off to disable window_tabs
 
+## https://github.com/tmux-plugins/tmux-continuum
+set -g @continuum-restore 'on'
+set -g @continuum-boot 'on'
+set -g @continuum-boot-options 'iterm'
+
+## https://github.com/tmux-plugins/tmux-resurrect
+set -g @resurrect-strategy-nvim 'session'
+
+## https://github.com/sainnhe/tmux-fzf
+TMUX_FZF_LAUNCH_KEY="l"
+
+## Install plugins, starting with plugin manager
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'jaclu/tmux-menus'
 set -g @plugin 'christoomey/vim-tmux-navigator'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'catppuccin/tmux'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
+set -g @plugin 'tmux-plugins/tmux-sessionist'
+set -g @plugin 'sainnhe/tmux-fzf'
 
 # set vi-mode
 set-window-option -g mode-keys vi

config/zsh/completion/_nb

@@ -0,0 +1,174 @@
+#compdef nb
+###############################################################################
+# __          _
+# \ \   _ __ | |__
+#  \ \ | '_ \| '_ \
+#  / / | | | | |_) |
+# /_/  |_| |_|_.__/
+#
+# [nb] Command line and local web note-taking, bookmarking, and archiving with
+# plain text data storage, encryption, filtering and search, pinning, #tagging,
+# Git-backed versioning and syncing, Pandoc-backed conversion, global and local
+# notebooks, customizable color themes, [[wiki-style linking]], plugins, and
+# more in a single portable, user-friendly script.
+#
+# https://github.com/xwmx/nb
+###############################################################################
+_nb_subcommands() {
+  # _nb_cache_completions()
+  #
+  # Usage:
+  #   _nb_cache_completions <path>
+  #
+  # Description:
+  #   Cache completions for `nb`. Generating completions can be slow and
+  #   native shell caching doesn't appear to help.
+  _nb_cache_completions() {
+    local _cache_path="${1:-}"
+
+    [[ -z "${_cache_path:-}" ]] && return 0
+
+    # Remove outdated cache files.
+
+    local _base_cache_path="${_cache_path%-*}"
+
+    local __suffix=
+    for   __suffix in "zsh" "v1"
+    do
+      if [[ -e "${_base_cache_path:?}-${__suffix:?}" ]]
+      then
+        rm -f  "${_base_cache_path:?}-${__suffix:?}"
+      fi
+    done
+
+    # Rebuild completion cache.
+
+    local _commands=
+    IFS=$'\n' _commands=($(nb subcommands))
+
+    local _notebooks=
+    IFS=$'\n' _notebooks=($(nb notebooks --names --no-color --unarchived))
+
+    local _completions=()
+    IFS=$'\n' _completions=(${_commands[@]})
+
+    local _commands_cached=
+    local _notebooks_cached=
+
+    if [[ -e "${_cache_path}"       ]]
+    then
+      local _counter=0
+
+      local               __line=
+      while IFS= read -r  __line
+      do
+        _counter=$((_counter+1))
+
+        if [[   "${_counter}" == 1  ]]
+        then
+          _commands_cached="${__line}"
+        elif [[ "${_counter}" == 2  ]]
+        then
+          _notebooks_cached="${__line}"
+        else
+          break
+        fi
+      done < "${_cache_path}"
+    fi
+
+    if [[ "${_commands_cached}"  != "${_commands[*]:-}"   ]] ||
+       [[ "${_notebooks_cached}" != "${_notebooks[*]:-}"  ]]
+    then
+      # Construct <notebook>:<subcommand> completions.
+      local __notebook=
+      for   __notebook in "${_notebooks[@]}"
+      do
+        local __command=
+        for   __command in "${_commands[@]}"
+        do
+          if [[ -n "${__notebook:-}"  ]] &&
+             [[ -n "${__command:-}"   ]]
+          then
+            _completions+=("${__notebook}:${__command}")
+          fi
+        done
+      done
+
+      local _directory_path=
+      _directory_path="$(dirname "${_cache_path}")"
+
+      mkdir -p "${_directory_path}"
+
+      if [[ -f "${_cache_path:?}" ]]
+      then
+        rm -f "${_cache_path:?}"
+      fi
+
+      touch "${_cache_path:?}"
+
+      {
+        (IFS=$' '; printf "%s\\n" "${_commands[*]}")
+        (IFS=$' '; printf "%s\\n" "${_notebooks[*]}")
+        printf "%s\\n" "${_completions[@]}"
+      } >> "${_cache_path}"
+    fi
+  }
+
+  local _nb_dir=
+  _nb_dir="$(nb env | grep 'NB_DIR' | cut -d = -f 2)"
+
+  if [[ -z "${_nb_dir:?}" ]] ||
+     [[ ! -e "${_nb_dir}" ]]
+  then
+    return 0
+  elif [[ -L "${_nb_dir}" ]]
+  then
+    if hash "realpath" 2>/dev/null
+    then
+      _nb_dir="$(realpath "${_nb_dir}")"
+    else
+      _nb_dir="$(readlink "${_nb_dir}")"
+    fi
+  fi
+
+  if [[ ! -d "${_nb_dir}" ]]
+  then
+    return 0
+  fi
+
+  local _cache_path="${_nb_dir:?}/.cache/nb-completion-cache-v2"
+  local _completions_cached=()
+
+  if [[ ! -e "${_cache_path}" ]]
+  then
+    _nb_cache_completions "${_cache_path}"
+  fi
+
+  if [[ -e "${_cache_path}"   ]]
+  then
+    local _counter=0
+
+    local               __line=
+    while IFS= read -r  __line
+    do
+      _counter=$((_counter+1))
+
+      if [[ "${_counter}" -gt 2 ]]
+      then
+        _completions_cached+=("${__line}")
+      fi
+    done < "${_cache_path}"
+
+    (_nb_cache_completions "${_cache_path}" &)
+  fi
+
+  if [[ "${?}" -eq 0            ]]
+  then
+    compadd -- "${_completions_cached[@]}"
+    return 0
+  else
+    return 1
+  fi
+}
+
+_nb_subcommands "$@"

hosts/air/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: 'hosts/defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring air"
 - brewfile:

hosts/lakka/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: 'hosts/defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring lakka"
 - link:

hosts/tunkki/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: 'hosts/defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring tunkki"
 - link:

hosts/v/install.conf.yaml

@@ -1,4 +1,4 @@
-- include: 'hosts/defaults.yaml'
+- include: "tools/dotbot-defaults.yaml"
 - shell:
     - echo "Configuring v"
 - brewfile:

install

@@ -3,12 +3,12 @@
 set -e
 
 CONFIG="install.conf.yaml"
-DOTBOT_DIR="dotbot"
+DOTBOT_DIR="tools/dotbot"
 
 DOTBOT_BIN="bin/dotbot"
 BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 DOTBOT_BIN_PATH="${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}"
-DOTBOT_HOST="$(hostname -s)" || ''
+DOTBOT_HOST="$(hostname -s)"
 
 cd "$BASEDIR"
 git submodule sync --quiet --recursive
@@ -16,8 +16,8 @@ git submodule update --init --recursive
 
 "${DOTBOT_BIN_PATH}" \
   -d "${BASEDIR}" \
-  --plugin-dir=dotbot-brew \
-  --plugin-dir=dotbot-include \
+  --plugin-dir=tools/dotbot-brew \
+  --plugin-dir=tools/dotbot-include \
   -c "${CONFIG}" \
   "${@}"
 
@@ -28,8 +28,8 @@ if [ "${DOTBOT_HOST}" != "" ]; then
     && echo "(!) Found $DOTBOT_HOST_CONFIG" \
     && "$DOTBOT_BIN_PATH" \
       -d "$BASEDIR" \
-      --plugin-dir=dotbot-brew \
-      --plugin-dir=dotbot-include \
+      --plugin-dir=tools/dotbot-brew \
+      --plugin-dir=tools/dotbot-include \
       -c "$DOTBOT_HOST_CONFIG" \
       "${@}"
 fi

install.conf.yaml

@@ -1,4 +1,4 @@
-- include: "hosts/defaults.yaml"
+- include: "tools/dotbot-defaults.yaml"
 - clean:
     ~/:
     ~/.config:
@@ -10,6 +10,8 @@
     ~/.cache/git:
     ~/.config:
     ~/.config/cheat/cheatsheets/personal:
+    ~/.config/cheat/cheatsheets/pure-bash-bible:
+    ~/.config/cheat/cheatsheets/tldr:
     ~/.local:
     ~/.local/run:
     ~/.local/share:

local/bin/dfm

@@ -28,6 +28,7 @@ function section_install
   MENU=(
     "all:Installs everything in the correct order"
     "antigen:Updates the antigen.zsh file"
+    "cheat-databases:Install cheat external cheatsheet databases"
     "composer:Install composer"
     "dotenv:Install dotenv-linter"
     "gh:Install GitHub CLI Extensions"
@@ -53,6 +54,7 @@ function section_install
       $0 install fzf
       $0 install gh
       $0 install go
+      $0 install cheat-databases
       $0 install imagick
       $0 install neofetch
       $0 install nvm
@@ -64,6 +66,12 @@ function section_install
       curl -sSfL git.io/antigen -o "$DOTFILES/local/bin/antigen.zsh" \
         && msg_yay "New antigen installed!"
       ;;
+    cheat-databases)
+      for database in "$DOTFILES"/scripts/install-cheat-*; do
+        bash "$database" \
+          && msg_yay "Cheat: $database run"
+      done
+      ;;
     composer)
       bash "$DOTFILES/scripts/install-composer.sh" \
         && msg_yay "composer installed!"
@@ -164,7 +172,9 @@ function section_brew
         menu_usage "$USAGE_PREFIX" "${MENU[@]}"
         ;;
     esac
-  } || menu_section "$USAGE_PREFIX" "brew not available on this system"
+  }
+
+  ! have brew && menu_section "$USAGE_PREFIX" "brew not available on this system"
 }
 
 function section_dotfiles
@@ -198,8 +208,8 @@ function section_dotfiles
         ~/.config/astronvim \
         ~/.config/nvim
       msg_ok "Deleted old nvim files"
-      ln -s $DOTFILES/config/astronvim ~/.config/astronvim
-      ln -s $DOTFILES/config/nvim ~/.config/nvim
+      ln -s "$DOTFILES/config/astronvim" ~/.config/astronvim
+      ln -s "$DOTFILES/config/nvim" ~/.config/nvim
       msg_ok "Linked nvim and astronvim"
       have npm && $0 install npm
       msg_ok "Installed packages"
@@ -207,7 +217,8 @@ function section_dotfiles
       ;;
     yamlfmt)
       # format yaml files
-      have yamlfmt && yamlfmt -conf "$DOTFILES/.yamlfmt" || msg_err "yamlfmt not found"
+      have yamlfmt && yamlfmt -conf "$DOTFILES/.yamlfmt"
+      ! have yamlfmt && msg_err "yamlfmt not found"
       ;;
     shfmt)
       # Format shell scripts according to following rules.
@@ -215,6 +226,7 @@ function section_dotfiles
         -type f -perm +111 \
         -not -path '*/.git/*' \
         -not -path '*dotbot*' \
+        -not -path '*tmux*' \
         -not -name '*.pl' \
         -not -name '*.py' \
         -not -name '*.php' \

local/bin/x-backup-folder.sh

@@ -13,11 +13,13 @@ if [ -z "${FILENAME}" ]; then
   FILENAME=$DIRECTORY
 fi
 
-FILENAME=${FILENAME} \
-  | tr '/' _ \
-  | iconv -t ascii//TRANSLIT \
-  | sed -r s/[^a-zA-Z0-9]+/_/g \
-  | sed -r s/^_+\|-+$//g
+FILENAME=$(
+  ${FILENAME} \
+    | tr '/' _ \
+    | iconv -t ascii//TRANSLIT \
+    | sed -r s/[^a-zA-Z0-9]+/_/g \
+    | sed -r s/^_+\|-+$//g
+)
 
 TIMESTAMP=$(date "+%Y%m%d_%H%M%S")
 FILENAME_TIMESTAMP="${FILENAME}_${TIMESTAMP}"

local/bin/x-quota-usage.php

@@ -8,24 +8,24 @@ $quota = '';
 $output = [];
 $fsCharLenght = 0;
 
-if ($debug) {
-    $quota = "Disk quotas for user viir (uid 2913):
-         Filesystem  blocks   quota   limit   grace   files   quota   limit   grace
-    10.0.0.89:/www/webroots/2 8277615  52428800 52428800               0       0       0
-    10.0.0.179:/users1/users/2 1999431  52428800 52428800               0       0       0
-    10.0.0.90:/siilo/2 24835106  524288000 524288000               0       0       0";
-} else {
-    // $quota = system("quota -w");
-    $quota = shell_exec("quota -w");
-}
+$quota = shell_exec("quota -w");
 
-function pad($i, $n = 3, $p = ' ') {
+/**
+ * Pad string
+ *
+ * @param string $i Input string
+ * @param int    $n Length
+ * @param string $p Padding string
+ * @return string
+ */
+function pad($i, $n = 3, $p = ' ')
+{
     return str_pad($i, $n, $p, STR_PAD_LEFT);
 }
 
 if (empty($quota)) {
-   var_dump($quota);
-   die("quota was empty\n");
+    var_dump($quota);
+    die("quota was empty\n");
 }
 
 $quota = explode("\n", $quota);
@@ -41,34 +41,34 @@ foreach ($quota as $lineNum => $line) {
     if (count($values) != 4) {
         continue;
     }
-    
+
     $result = array_combine(['fs', 'used', 'quota', 'limit'], $values);
-    
+
     $result['used_percentage'] = round($result['used'] / $result['quota'] * 100, 3);
     $result['used_gb'] = round($result['used'] / 1024 / 1024, 2);
     $result['quota_gb'] = round($result['quota'] / 1024 / 1024, 2);
-    
+
     $char = strlen($result['fs']);
     if ($char > $fsCharLenght) {
         $fsCharLenght = $char;
     }
-    
+
     $output[] = $result;
 }
 
 if (!empty($output)) {
-    
-    $header = sprintf("%s | %s | %s | %s",
+    $header = sprintf(
+        "%s | %s | %s | %s",
         str_pad("Mount", $fsCharLenght),
         'Usage%',
         'Used/Total',
         'Bar'
     );
     $headerWidth = strlen($header);
-    
+
     echo "\n" . $header . "\n";
     echo str_repeat('-', $headerWidth + 24) . "\n";
-    
+
     foreach ($output as $i) {
         $barUsed = round($i['used_percentage']) / 4;
         echo sprintf(
@@ -82,4 +82,3 @@ if (!empty($output)) {
 
     echo "\n\n";
 }
-

phpcs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset name="PHP_CodeSniffer">
+  <description>PHP_CodeSniffer configuration</description>
+  <rule ref="PSR12">
+    <exclude name="PSR12.Operators.OperatorSpacing"/>
+    <exclude name="PSR1.Files.SideEffects.FoundWithSymbols"/>
+  </rule>
+</ruleset>

scripts/install-cheat-purebashbible.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2231,SC2034,SC2181,SC2068
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+PBB_REQUIRED_TOOLS=(basename git mkdir cheat ls grep head awk cp echo rm)
+for t in ${PBB_REQUIRED_TOOLS[@]}; do
+  ! have "$t" && echo "(!) $t is missing, can't continue..." && exit 1
+done
+
+PBB_GIT="https://github.com/dylanaraps/pure-bash-bible.git"
+PBB_SOURCE="source: $PBB_GIT"
+PBB_SYNTAX="syntax: bash"
+PBB_TAGS="tags: [bash]"
+
+PBB_TEMP_PREFIX=$(basename "$0")
+PBB_TEMP_DIR="/tmp/pbb-$(rnd)"
+
+# If there's no .git, clone the folder
+if [ ! -d "$PBB_TEMP_DIR/.git" ]; then
+  msg_run "Starting to clone $PBB_GIT"
+  git clone --depth 1 --single-branch -q "$PBB_GIT" "$PBB_TEMP_DIR" \
+    && msg_yay "Cloned $PBB_GIT"
+fi
+
+PBB_CHAPTERS=$(ls -1v "$PBB_TEMP_DIR"/manuscript/chapter*)
+CHEAT_DEST="$(cheat -d | grep pure-bash-bible | head -1 | awk '{print $2}')"
+
+if [ ! -d "$CHEAT_DEST" ]; then
+  mkdir -p "$CHEAT_DEST"
+fi
+
+for f in ${PBB_CHAPTERS[@]}; do
+  # get all headers, take the first one, strip the # and return the first word in lowercase
+  HEADER=$(grep -e '^[#] ' "$f" | head -1 | awk '{print tolower($2)}')
+  CHEAT_FILE="$CHEAT_DEST/${HEADER}"
+
+  if [ ! -f "$CHEAT_FILE" ]; then
+    cp "$f" "$CHEAT_FILE" && msg_run "$CHEAT_FILE"
+  fi
+
+  LC_ALL=C perl -pi.bak -e 's/\<\!-- CHAPTER END --\>//' "$CHEAT_FILE"
+  rm "$CHEAT_FILE.bak"
+
+  # add tags if the file doesn't have them
+  if [ '---' != "$(head -1 < "$CHEAT_FILE")" ]; then
+    T="$PBB_SYNTAX\n$PBB_TAGS\n$PBB_SOURCE\n"
+    echo -e "---\n$T---\n$(cat "$CHEAT_FILE")" > "$CHEAT_FILE"
+  fi
+done
+
+# Cleanup
+if [ -d "$PBB_TEMP_DIR" ]; then
+  rm -rf "$PBB_TEMP_DIR"
+fi

scripts/install-cheat-tldr.sh

@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2231,SC2034,SC2181,SC2068
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+TLDR_REQUIRED_TOOLS=(basename git mkdir cheat ls grep head awk cp echo rm)
+for t in ${TLDR_REQUIRED_TOOLS[@]}; do
+  ! have "$t" && echo "(!) $t is missing, can't continue..." && exit 1
+done
+
+TLDR_GIT="https://github.com/tldr-pages/tldr.git"
+TLDR_SOURCE="source: $TLDR_GIT"
+TLDR_SYNTAX="syntax: markdown"
+
+TLDR_TEMP_PREFIX=$(basename "$0")
+TLDR_TEMP_DIR="/tmp/cheat-tldr-$(rnd)"
+
+# If there's no .git, clone the folder
+if [ ! -d "$TLDR_TEMP_DIR/.git" ]; then
+  msg_run "Starting to clone $TLDR_GIT"
+  git clone --depth 1 --single-branch -q "$TLDR_GIT" "$TLDR_TEMP_DIR" \
+    && msg_done "Cloned $TLDR_GIT"
+fi
+
+# Fetch the destination directory from cheat defined directories.
+TLDR_CHEAT_DEST="$(cheat -d | grep tldr | head -1 | awk '{print $2}')"
+
+[ "$TLDR_CHEAT_DEST" = "" ] \
+  && msg_err "cheat doesn't know about the destination" \
+  && exit 1
+
+if [ ! -d "$TLDR_CHEAT_DEST" ]; then
+  mkdir -p "$TLDR_CHEAT_DEST"
+fi
+
+for d in "$TLDR_TEMP_DIR"/pages/*; do
+  DIRNAME=$(basename "$d")
+  # echo "-> $DIRNAME ($d)"
+
+  SECTION_DIR="${TLDR_CHEAT_DEST}/$DIRNAME"
+  TLDR_TAGS="tags: [$DIRNAME]"
+
+  if [ ! -d "$SECTION_DIR" ]; then
+    mkdir -p "$SECTION_DIR"
+  fi
+
+  for FILE in $d/*.md; do
+    BASENAME=$(basename "$FILE" .md)
+    FILENAME="${BASENAME%%.*}"
+    # echo "-> $FILE = $FILENAME"
+    TLDR_FILE="$SECTION_DIR/${FILENAME}"
+    # echo "-> dest: $TLDR_FILE"
+
+    if [ ! -f "$TLDR_FILE" ]; then
+      cp "$FILE" "$TLDR_FILE" && msg_run "$TLDR_FILE"
+    fi
+
+    if [ -f "$TLDR_FILE" ] && [ '---' != "$(head -1 < "$TLDR_FILE")" ]; then
+      echo -e "---\n$TLDR_SYNTAX\n$TLDR_TAGS\n$TLDR_SOURCE\n---\n$(cat "$TLDR_FILE")" > "$TLDR_FILE"
+    fi
+
+  done
+done
+
+# Cleanup
+if [ -d "$TLDR_TEMP_DIR" ]; then
+  rm -rf "$TLDR_TEMP_DIR"
+fi

scripts/install-composer.sh

@@ -4,20 +4,21 @@
 # shellcheck source="shared.sh"
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-have php && {
-  EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
-  php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-  ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
+! have php && msg_err "PHP Not Available, cannot install composer" && exit 0;
 
-  if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
-    echo >&2 'ERROR: Invalid installer checksum'
-    rm composer-setup.php
-    exit 1
-  fi
+EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')"
+php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")"
 
-  php composer-setup.php --quiet
-  RESULT=$?
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]; then
+  echo >&2 'ERROR: Invalid installer checksum'
   rm composer-setup.php
-  mv composer.phar ~/.local/bin/composer
-  exit $RESULT
-} || msg_err "PHP Not Available, cannot install composer"
+  exit 1
+fi
+
+php composer-setup.php --quiet
+RESULT=$?
+rm composer-setup.php
+mv composer.phar ~/.local/bin/composer
+exit $RESULT
+

scripts/install-fzf.sh

@@ -10,7 +10,7 @@ FZF_PATH="${XDG_CONFIG_HOME}/fzf"
 
 if [ ! -d "$FZF_PATH" ]; then
   git clone --depth 1 "$FZF_GIT" "$FZF_PATH"
-  $FZF_PATH/install --xdg --all --no-update-rc
+  "$FZF_PATH/install" --xdg --all --no-update-rc
 else
   msg_done "fzf ($FZF_PATH/) already installed"
 fi

scripts/install-gh-extensions.sh

@@ -4,39 +4,42 @@
 # shellcheck source="shared.sh"
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-have gh && {
-  extensions=(
-    # GitHub CLI extension for generating a report on repository dependencies.
-    andyfeller/gh-dependency-report
-    # GitHub CLI extension to generate montage from GitHub user avatars
-    andyfeller/gh-montage
-    # An opinionated GitHub Cli extension for creating
-    # changelogs that adhere to the keep a changelog specification.
-    chelnak/gh-changelog
-    # Safely deletes local branches with no upstream and no un-pushed commits
-    davidraviv/gh-clean-branches
-    # A beautiful CLI dashboard for GitHub 🚀
-    dlvhdr/gh-dash
-    # A github-cli extension script to clone all repositories
-    # in an organization, optionally filtering by topic.
-    matt-bartel/gh-clone-org
-    # being an extension to view the overall health of
-    # an organization's use of actions
-    rsese/gh-actions-status
-  )
+! have gh \
+  && msg_err "gh (GitHub Client) could not be found, please install it first" \
+  && exit 0;
 
-  msg "Starting to install GitHub CLI extensions..."
+extensions=(
+  # GitHub CLI extension for generating a report on repository dependencies.
+  andyfeller/gh-dependency-report
+  # GitHub CLI extension to generate montage from GitHub user avatars
+  andyfeller/gh-montage
+  # An opinionated GitHub Cli extension for creating
+  # changelogs that adhere to the keep a changelog specification.
+  chelnak/gh-changelog
+  # Safely deletes local branches with no upstream and no un-pushed commits
+  davidraviv/gh-clean-branches
+  # A beautiful CLI dashboard for GitHub 🚀
+  dlvhdr/gh-dash
+  # A github-cli extension script to clone all repositories
+  # in an organization, optionally filtering by topic.
+  matt-bartel/gh-clone-org
+  # being an extension to view the overall health of
+  # an organization's use of actions
+  rsese/gh-actions-status
+)
 
-  for ext in "${extensions[@]}"; do
-    # Trim spaces
-    ext=${ext// /}
-    # Skip comments
-    if [[ ${ext:0:1} == "#" ]]; then continue; fi
+msg "Starting to install GitHub CLI extensions..."
 
-    msg_run "Installing $ext"
-    gh extensions install "$ext"
-    echo ""
-  done
+for ext in "${extensions[@]}"; do
+  # Trim spaces
+  ext=${ext// /}
+  # Skip comments
+  if [[ ${ext:0:1} == "#" ]]; then continue; fi
+
+  msg_run "Installing $ext"
+  gh extensions install "$ext"
+  echo ""
+done
+
+msg_ok "Done"
 
-  msg_ok "Done"
-} || msg_err "gh (GitHub Client) could not be found, please install it first"

scripts/install-go-packages.sh

@@ -4,34 +4,37 @@
 # shellcheck source=shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-have go && {
-  packages=(
-    # sysadmin/scripting utilities, distributed as a single binary
-    github.com/skx/sysbox@latest
-    # Git Profile allows you to switch between user profiles in git repos
-    github.com/dotzero/git-profile@latest
-    # An extensible command line tool or library to format yaml files.
-    github.com/google/yamlfmt/cmd/yamlfmt@latest
-    # Parsing HTML at the command line
-    github.com/ericchiang/pup@latest
-    # HTML to Markdown converter
-    github.com/suntong/html2md@latest
-    # cheat allows you to create and view interactive cheatsheets on the cli.
-    github.com/cheat/cheat/cmd/cheat@latest
-    # Render markdown on the CLI, with pizzazz! 💅
-    github.com/charmbracelet/glow@latest
-  )
+! have go && msg "go hasn't been installed yet." && exit 0;
 
-  for pkg in "${packages[@]}"; do
-    # Trim spaces
-    pkg=${pkg// /}
-    # Skip comments
-    if [[ ${pkg:0:1} == "#" ]]; then continue; fi
+packages=(
+  # sysadmin/scripting utilities, distributed as a single binary
+  github.com/skx/sysbox@latest
+  # Git Profile allows you to switch between user profiles in git repos
+  github.com/dotzero/git-profile@latest
+  # An extensible command line tool or library to format yaml files.
+  github.com/google/yamlfmt/cmd/yamlfmt@latest
+  # Parsing HTML at the command line
+  github.com/ericchiang/pup@latest
+  # HTML to Markdown converter
+  github.com/suntong/html2md@latest
+  # cheat allows you to create and view interactive cheatsheets on the cli.
+  github.com/cheat/cheat/cmd/cheat@latest
+  # Render markdown on the CLI, with pizzazz! 💅
+  github.com/charmbracelet/glow@latest
+  # Static checker for GitHub Actions workflow files
+  github.com/rhysd/actionlint/cmd/actionlint@latest
+)
 
-    msg_run "Installing go package:" "$pkg"
-    go install "$pkg"
-    echo ""
-  done
+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"
 
-  msg_ok "Done"
-} || msg "go hasn't been installed yet."

scripts/install-npm-packages.sh

@@ -4,36 +4,41 @@
 # shellcheck source=shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
 
-have npm && {
-  packages=(
-    # This is a tool to check if your files consider your .editorconfig rules.
-    "editorconfig-checker"
-    # Node module to create a release or a changelog from
-    # a tag and uses issues or commits to creating the release notes.
-    "github-release-notes"
-    "neovim"
-    "prettier"
-    "corepack"
-    "standardjs"
-  )
+! have npm && msg_err "npm could not be found." && exit 0;
 
-  for pkg in "${packages[@]}"; do
-    # Trim spaces
-    pkg=${pkg// /}
-    # Skip comments
-    if [[ ${pkg:0:1} == "#" ]]; then continue; fi
+packages=(
+  # This is a tool to check if your files consider your .editorconfig rules.
+  "editorconfig-checker"
+  # Node module to create a release or a changelog from
+  # a tag and uses issues or commits to creating the release notes.
+  "github-release-notes"
+  "neovim"
+  "prettier"
+  "corepack"
+  "standardjs"
+  # CLI and local web plain text note‑taking, bookmarking, and archiving
+  # with linking, tagging, filtering, search, Git versioning & syncing,
+  # Pandoc conversion, + more, in a single portable script.
+  "nb.sh"
+)
 
-    if [[ $(npm ls -g -p "$pkg") != "" ]]; then
-      msg_run_done "$pkg" "already installed"
-    else
-      msg_run "Installing npm package:" "$pkg"
-      npm install -g --no-fund --no-progress --no-timing "$pkg"
-    fi
+for pkg in "${packages[@]}"; do
+  # Trim spaces
+  pkg=${pkg// /}
+  # Skip comments
+  if [[ ${pkg:0:1} == "#" ]]; then continue; fi
 
-    echo ""
-  done
+  if [[ $(npm ls -g -p "$pkg") != "" ]]; then
+    msg_run_done "$pkg" "already installed"
+  else
+    msg_run "Installing npm package:" "$pkg"
+    npm install -g --no-fund --no-progress --no-timing "$pkg"
+  fi
+
+  echo ""
+done
+
+msg_run "Upgrading all global packages"
+npm -g --no-progress --no-timing --no-fund outdated
+npm -g --no-timing --no-fund upgrade
 
-  msg_run "Upgrading all global packages"
-  npm -g --no-progress --no-timing --no-fund outdated
-  npm -g --no-timing --no-fund upgrade
-} || msg_err "npm could not be found."

scripts/install-ntfy.sh

@@ -6,32 +6,31 @@
 source "$HOME/.dotfiles/scripts/shared.sh"
 set -e
 
-have ntfy && {
-  msg "ntfy already installed"
-} || {
-  case $(dfm check arch) in
-    Linux)
-      NTFY_ARCH="linux_$(arch)"
-      ;;
-    Darwin)
-      NTFY_ARCH="macOS_all"
-      ;;
-  esac
+have ntfy && msg "ntfy already installed" && exit 0;
 
-  NTFY_VERSION=2.2.0
-  NTFY_URL="https://github.com/binwiederhier/ntfy"
-  NTFY_DEST="ntfy_${NTFY_VERSION}_${NTFY_ARCH}"
+case $(dfm check arch) in
+  Linux)
+    NTFY_ARCH="linux_$(arch)"
+    ;;
+  Darwin)
+    NTFY_ARCH="macOS_all"
+    ;;
+esac
 
-  curl -L "$NTFY_URL/releases/download/v${NTFY_VERSION}/${NTFY_DEST}.tar.gz" \
-    > "${NTFY_DEST}.tar.gz"
-  tar zxvf "${NTFY_DEST}.tar.gz"
-  cp -a "${NTFY_DEST}/ntfy" ~/.local/bin/ntfy
-  mkdir -p ~/.config/ntfy
+NTFY_VERSION=2.2.0
+NTFY_URL="https://github.com/binwiederhier/ntfy"
+NTFY_DEST="ntfy_${NTFY_VERSION}_${NTFY_ARCH}"
 
-  # copy config only if it does not exist
-  if [ ! -f "$HOME/.config/ntfy/client.yml" ]; then
-    cp "${NTFY_DEST}/client/client.yml" ~/.config/ntfy/client.yml
-  fi
+curl -L "$NTFY_URL/releases/download/v${NTFY_VERSION}/${NTFY_DEST}.tar.gz" \
+  > "${NTFY_DEST}.tar.gz"
+tar zxvf "${NTFY_DEST}.tar.gz"
+cp -a "${NTFY_DEST}/ntfy" ~/.local/bin/ntfy
+mkdir -p ~/.config/ntfy
+
+# copy config only if it does not exist
+if [ ! -f "$HOME/.config/ntfy/client.yml" ]; then
+  cp "${NTFY_DEST}/client/client.yml" ~/.config/ntfy/client.yml
+fi
+
+rm -rf "${NTFY_DEST}" "${NTFY_DEST}.tar.gz"
 
-  rm -rf "${NTFY_DEST}" "${NTFY_DEST}.tar.gz"
-}

scripts/install-xcode-cli-tools.sh

@@ -4,6 +4,12 @@
 # Ismo Vuorinen <https://github.com/ivuorinen> 2018
 #
 
+[ "$(uname)" != "Darwin" ] && echo "Not a macOS system" && exit 0
+
+! have xcode-select \
+  && msg_err "xcode-select could not be found, skipping" \
+  && exit 0
+
 # Ask for the administrator password upfront
 sudo -v
 
@@ -14,10 +20,12 @@ while true; do
   kill -0 "$$" || exit
 done 2> /dev/null &
 
-# https://unix.stackexchange.com/a/408305
-# check if user has git installed and propose to install if not installed
-if [ "$(which git)" ]; then
-  echo "You already have git. Continuing..."
+XCODE_TOOLS_PATH=$(xcode-select -p)
+XCODE_SWIFT_PATH="$XCODE_TOOLS_PATH/usr/bin/swift"
+
+# Modified from https://unix.stackexchange.com/a/408305
+if [ -a "$XCODE_SWIFT_PATH" ]; then
+  echo "You have swift from xcode-select. Continuing..."
 else
   XCODE_MESSAGE="$(
     osascript -e \
@@ -32,7 +40,7 @@ else
   fi
 fi
 
-until [ "$(which git)" ]; do
+until [ -f "$XCODE_SWIFT_PATH" ]; do
   echo -n "."
   sleep 1
 done

scripts/set-macos-defaults.sh

@@ -191,7 +191,8 @@ defaults write com.apple.finder FXInfoPanesExpanded -dict \
 ###############################################################################
 
 # Set default screenshot location
-#defaults write com.apple.screencapture "location" -string "~/Documents/Screenshots"
+mkdir -p "$HOME/Documents/Screenshots"
+defaults write com.apple.screencapture "location" -string "$HOME/Documents/Screenshots"
 
 # Exclude date and time in screenshot filenames
 defaults write com.apple.screencapture "include-date" -bool true
@@ -245,7 +246,10 @@ defaults write com.apple.Safari \
   -bool true
 
 # Don’t display the annoying prompt when quitting iTerm
-#defaults write com.googlecode.iterm2 PromptOnQuit -bool false
+defaults write com.googlecode.iterm2 PromptOnQuit -bool false
+# Use iTerm2 preferences from the .dotfiles folder.
+defaults write com.googlecode.iterm2 PrefsCustomFolder \
+  -string "$HOME/.dotfiles/config/iterm2"
 
 # Prevent Time Machine from prompting to use new hard drives as backup volume
 defaults write com.apple.TimeMachine DoNotOfferNewDisksForBackup -bool true

scripts/shared.sh

@@ -224,3 +224,9 @@ function path_prepend
   path_remove "$1"
   PATH="$1${PATH:+":$PATH"}"
 }
+
+# Creates a random string
+rnd()
+{
+  echo $RANDOM | md5sum | head -c 20
+}

tools/dotbot-defaults.yaml

@@ -4,6 +4,6 @@
     link:
       create: true
       relink: true
-      exclude: ["*.md", "*renovate*"]
+      exclude: [ "*.md", "*renovate*", "LICENSE" ]
     shell:
       stdout: true