chore(config): update terraform config

.nvmrc

@@ -0,0 +1 @@
+lts/*

base/bashrc

@@ -3,9 +3,6 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
-export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
-# shellcheck source=scripts/shared.sh
-# source "$DOTFILES/scripts/shared.sh"
 
 # Explicitly set XDG folders
 # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
@@ -18,7 +15,14 @@ export XDG_BIN_HOME="$HOME/.local/bin"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_RUNTIME_DIR="$HOME/.local/run"
 
+# Paths
+export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/cargo/bin:$PATH"
+
+# shellcheck source=scripts/shared.sh
+# source "$DOTFILES/scripts/shared.sh"
+
 source "$DOTFILES/config/exports"
+source "$DOTFILES/config/alias"
 
 # shellcheck source=../config/fzf/fzf.bash
 [ -f "${DOTFILES}/config/fzf/fzf.bash" ] &&

base/zshrc

@@ -1,7 +1,20 @@
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
+export DOTFILES="$HOME/.dotfiles"
+
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
+
+export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/cargo/bin:$PATH"
 
 source "$DOTFILES/config/exports"
 source "$DOTFILES/config/alias"

config/alias

@@ -144,7 +144,7 @@ if [[ -f "$HOME/.aliases.local" ]]; then
   source "$HOME/.aliases.local"
 fi
 
-alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
+alias wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts"
 alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
 
 # Alacritty preexec hook to update dynamic title

config/exports

@@ -2,6 +2,11 @@
 # shellcheck shell=bash
 # vim: filetype=zsh
 
+# if cargo directory exists, add it to path
+if [[ -d "$HOME/.local/share/cargo/bin" ]]; then
+  export PATH="$HOME/.local/share/cargo/bin:$PATH"
+fi
+
 # Cache commands using bkt if installed
 if command -v bkt >&/dev/null; then
   bkt()
@@ -55,4 +60,3 @@ function have_brew
 source "$DOTFILES/config/exports-shell"
 source "$DOTFILES/config/exports-apps"
 
-x-have nvim && export EDITOR="nvim"

config/exports-apps

@@ -104,6 +104,13 @@ export SCREENRC="$XDG_CONFIG_HOME/misc/screenrc"
 # sonarlint
 export SONARLINT_USER_HOME="$XDG_DATA_HOME/sonarlint"
 
+# terraform
+# https://www.terraform.io/docs/cli/config/config-file.html
+# https://www.terraform.io/docs/cli/config/environment-variables.html
+export TF_DATA_DIR="$XDG_STATE_HOME/terraform"
+export TF_CLI_CONFIG_FILE="$XDG_CONFIG_HOME/terraform/terraformrc"
+export TF_PLUGIN_CACHE_DIR="$XDG_CACHE_HOME/terraform/plugin-cache"
+
 # tldr / tealdeer
 export TEALDEER_CONFIG_DIR="$XDG_CONFIG_HOME/tealdeer/"
 
@@ -118,3 +125,4 @@ x-dc "$WAKATIME_HOME"
 export BAT_THEME="ansi"
 export CHEAT_USE_FZF=true
 export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history
+

config/homebrew/Brewfile

@@ -22,8 +22,6 @@ brew "ca-certificates"
 brew "libyaml"
 # Cryptography and SSL/TLS Toolkit
 brew "openssl@3"
-# Interpreted, interactive, object-oriented programming language
-brew "python@3.11"
 # Automate deployment, configuration, and upgrading
 brew "ansible"
 # Checks ansible playbooks for practices and behaviour
@@ -62,6 +60,8 @@ brew "coreutils"
 brew "asdf"
 # Spell checker with better logic than ispell
 brew "aspell"
+# Interpreted, interactive, object-oriented programming language
+brew "python@3.11"
 # Official Amazon AWS command-line interface
 brew "awscli"
 # Bourne-Again SHell, a UNIX command interpreter
@@ -270,6 +270,8 @@ brew "terragrunt"
 brew "testssl"
 # Terraform version manager inspired by rbenv
 brew "tfenv"
+# Linter for Terraform files
+brew "tflint"
 # Static analysis security scanner for your terraform code
 brew "tfsec"
 # Programmatically correct mistyped console commands

config/terraform/terraformrc

@@ -0,0 +1,2 @@
+plugin_cache_dir   = "$HOME/.cache/terraform/plugin-cache"
+

config/tmux/tmux.conf

@@ -103,6 +103,9 @@ set -g @suspend_key 'F12'
 set -g @tmux_window_name_max_name_len "30"
 ### Replace $HOME with ~ in window names
 set -g @tmux_window_name_use_tilde "True"
+set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']"
+set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
+set -g @tmux_window_name_ignored_programs "['sqlite3']" # Default is []
 
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'

local/bin/dfm

@@ -42,6 +42,7 @@ function section_install
     "macos:Setup nice macOS defaults"
     "neofetch:Install neofetch"
     "nvm:Install Node Version Manager (nvm)"
+    "nvm-latest:Install latest lts node using nvm"
     "npm:Install NPM Packages"
     "ntfy:Install ntfy"
     "ohmybash:Install oh-my-bash"
@@ -150,11 +151,19 @@ function section_install
       ;;
     nvm)
       msg "Installing nvm..."
-      curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash \
+      curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash
-        && nvm install --lts --latest-npm --default
+      $0 install nvm-latest
-      git checkout "$DOTFILES/base/zshrc"
       msg_yay "nvm installed!"
       ;;
+    nvm-latest)
+      msg "Installing latest lts node..."
+      if [ -n "$NVM_DIR" ]; then
+        [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+      fi
+      nvm install --lts --latest-npm --default
+      git checkout "$DOTFILES/base/*"
+      msg_yay "latest lts node installed!"
+      ;;
     npm)
       msg "NPM Packages install started..."
       bash "$DOTFILES/scripts/install-npm-packages.sh" \

scripts/install-pip-packages.sh

@@ -10,10 +10,12 @@ msg "Starting to install pip packages"
   msg_err "Could not find python3, something really weird is going on." && exit 1
 }
 
+msg_nested "Upgrading pip"
+python3 -m pip install --user --upgrade pip
+
 packages=(
   "pipx"
   "libtmux"
-  "ensurepath"
 )
 
 for pkg in "${packages[@]}"; do
@@ -23,7 +25,7 @@ for pkg in "${packages[@]}"; do
   if [[ ${pkg:0:1} == "#" ]]; then continue; fi
 
   msg_nested "Installing pip package: $pkg"
-  python3 -m pip install --user "$pkg"
+  python3 -m pip install --user --upgrade "$pkg"
 
   echo ""
 done