Add docker config, fix glob paths

.gitmodules

@@ -13,21 +13,11 @@
 	url = https://github.com/wonderbeyond/dotbot-if.git
 	ignore = dirty
 
-[submodule "dotbot-ifplatform"]
-	path = dotbot-ifplatform
-	url = https://github.com/ssbanerje/dotbot-ifplatform.git
-	ignore = dirty
-
 [submodule "dotbot-gh-extension"]
 	path = dotbot-gh-extension
 	url = https://github.com/fundor333/dotbot-gh-extension.git
 	ignore = dirty
 
-[submodule "dotbot-golang"]
-	path = dotbot-golang
-	url = https://github.com/delicb/dotbot-golang.git
-	ignore = dirty
-
 [submodule "config/nvim"]
 	path = config/nvim
 	url = https://github.com/AstroNvim/AstroNvim.git

base/angular-config.json

@@ -0,0 +1,6 @@
+{
+  "version": 1,
+  "cli": {
+    "analytics": false
+  }
+}

base/zshrc

@@ -25,15 +25,12 @@ export PATH="$XDG_BIN_HOME:$HOMEBREW_BIN:$HOMEBREW_SBIN:/usr/local/sbin:$PATH"
 
 # brew, https://brew.sh
 if [ command -v brew &> /dev/null ]; then
-  BREW_BIN=$(brew --prefix)/bin
-  BREW_SBIN=$(brew --prefix)/sbin
-
   BREW_PYTHON=$(brew --prefix python)/bin
   GNUBIN_DIR=$(brew --prefix coreutils)/libexec/gnubin
   BREW_RUBY=$(brew --prefix ruby)/bin
   BREW_GEMS=$(gem environment gemdir)/bin
 
-  export PATH="$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$BREW_BIN:$BREW_SBIN:$PATH"
+  export PATH="$BREW_PYTHON:$GNUBIN_DIR:$BREW_GEMS:$BREW_RUBY:$PATH"
 fi
 
 # nvm, the node version manager
@@ -55,6 +52,12 @@ if command -v nvim &> /dev/null; then
     export EDITOR="nvim"
 fi
 
+# docker, https://docs.docker.com/engine/reference/commandline/cli/
+if command -v docker &> /dev/null; then
+    export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
+    mkdir -p "$DOCKER_CONFIG"
+fi
+
 # z, https://github.com/rupa/z
 export _Z_DATA="$XDG_STATE_HOME/z"
 
@@ -69,6 +72,7 @@ fi
 if command -v gem &>/dev/null; then
     export GEM_HOME="$XDG_STATE_HOME/gem"
     export GEM_PATH="$XDG_STATE_HOME/gem"
+    export PATH="$GEM_HOME/bin:$PATH"
 fi
 
 

config/starship.toml

@@ -4,6 +4,9 @@
 # Inserts a blank line between shell prompts
 add_newline = true
 
+# Timeout for commands executed by starship (in milliseconds).
+command_timeout = 750
+
 # Replace the '❯' symbol in the prompt with '➜'
 [character] # The name of the module we are configuring is 'character'
 success_symbol = '[➜](bold green)' # The 'success_symbol' segment is being set to '➜' with the color 'bold green'

install

@@ -15,9 +15,7 @@ git submodule update --init --recursive
 "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" \
   -d "${BASEDIR}" \
   --plugin-dir=dotbot-brew \
-  --plugin-dir=dotbot-gh-extension \
-  --plugin-dir=dotbot-golang \
   --plugin-dir=dotbot-if \
-  --plugin-dir=dotbot-ifplatform \
+  --plugin-dir=dotbot-gh-extension \
   -c "${CONFIG}" \
   "${@}"

install.conf.yaml

@@ -7,7 +7,7 @@
     link:
       create: true
       relink: true
-      exclude: ["*.md"]
+      exclude: ["*.md", "*renovate*"]
 - clean:
     ~/:
     ~/.config:
@@ -25,33 +25,23 @@
 - link:
     ~/.config/:
       glob: true
-      path: config/*
+      path: config/**
     ~/.local/bin/:
       glob: true
-      path: local/bin/*
+      path: local/bin/**
     ~/.ssh/:
       force: true
       glob: true
       mode: 0600
-      path: ssh/*
+      path: ssh/**
     ~/:
       force: true
       glob: true
-      path: base/*
+      path: base/**
       prefix: "."
 - shell:
     - [git submodule update --init --recursive --force]
-    - [chsh -s $(which zsh), Making zsh the default shell]
+    - bash scripts/install-go-packages.sh
-- ifmacos:
-    - shell:
-        - [bash scripts/set-macos-defaults.sh]
-    - brewfile:
-        - Brewfile
-# Go packages what should be included in every system
-- go:
-    - github.com/skx/sysbox@latest
-    - github.com/dotzero/git-profile
-    - github.com/google/yamlfmt/cmd/yamlfmt@latest
 # hosts!
 ## hosts: air
 - if:

scripts/install-composer.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+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');")"
+
+if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ]
+then
+    >&2 echo 'ERROR: Invalid installer checksum'
+    rm composer-setup.php
+    exit 1
+fi
+
+php composer-setup.php --quiet
+RESULT=$?
+rm composer-setup.php
+mv composer.phar ~/.local/bin/composer
+exit $RESULT
+

scripts/install-go-packages.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# Install Go packages
+#
+# shellcheck source=shared.sh
+source "$HOME/.dotfiles/scripts/shared.sh"
+
+if ! command -v go &> /dev/null; then
+  msg "go hasn't been installed yet."
+else
+  packages=(
+    # sysadmin/scripting utilities, distributed as a single binary
+    github.com/skx/sysbox@latest
+    github.com/dotzero/git-profile@latest
+    github.com/google/yamlfmt/cmd/yamlfmt@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"
+
+fi

scripts/install-nfty.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+NFTY_VERSION=2.2.0
+
+curl -L "https://github.com/binwiederhier/ntfy/releases/download/v${NFTY_VERSION}/ntfy_${NFTY_VERSION}_macOS_all.tar.gz" > "ntfy_${NFTY_VERSION}_macOS_all.tar.gz"
+tar zxvf "ntfy_${NFTY_VERSION}_macOS_all.tar.gz"
+cp -a "ntfy_${NFTY_VERSION}_macOS_all/ntfy" ~/.local/bin/ntfy
+mkdir -p ~/.config/ntfy 
+cp "ntfy_${NFTY_VERSION}_macOS_all/client/client.yml" ~/.config/ntfy/client.yml
+ntfy --help
+rm -rf "ntfy_${NFTY_VERSION}_macOS_all" "ntfy_${NFTY_VERSION}_macOS_all.tar.gz"