feat(config): xdg user dirs

base/bashrc

@@ -18,6 +18,9 @@ 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"
 
+source "$DOTFILES/config/exports"
+source "$DOTFILES/config/functions"
+source "$DOTFILES/config/alias"
 x-load-configs
 
 # shellcheck source=../config/fzf/fzf.bash
@@ -31,78 +34,5 @@ x-have rbenv && {
   eval "$(rbenv init - bash)"
 }
 
-# Enable the subsequent settings only in interactive sessions
-case $- in
-*i*) ;;
-*) return ;;
-esac
-
-# Path to your oh-my-bash installation.
-export OSH="$HOME/.local/share/oh-my-bash"
-
-[ -d "$OSH" ] && {
-  export OSH_THEME="powerline-multiline"
-
-  # PowerLine theme config
-  export POWERLINE_LEFT_PROMPT="cwd scm"
-  export POWERLINE_RIGHT_PROMPT="python_venv ruby in_vim battery user_info"
-
-  # Display red dots whilst waiting for completion.
-  export COMPLETION_WAITING_DOTS="true"
-
-  # Uncomment the following line if you want to disable marking untracked files
-  # under VCS as dirty. This makes repository status check for large repositories
-  # much, much faster.
-  export DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-  # To disable the uses of "sudo" by oh-my-bash, please set "false" to
-  # this variable.  The default behavior for the empty value is "true".
-  export OMB_USE_SUDO=true
-
-  # To enable/disable display of Python virtualenv and condaenv
-  export OMB_PROMPT_SHOW_PYTHON_VENV=true # enable
-  # OMB_PROMPT_SHOW_PYTHON_VENV=false # disable
-
-  # Which completions would you like to load? (completions can be found in ~/.oh-my-bash/completions/*)
-  # Custom completions may be added to ~/.oh-my-bash/custom/completions/
-  # Example format: completions=(ssh git bundler gem pip pip3)
-  # Add wisely, as too many completions slow down shell startup.
-  export completions=(
-    git
-    composer
-    ssh
-  )
-
-  # Which aliases would you like to load? (aliases can be found in ~/.oh-my-bash/aliases/*)
-  # Custom aliases may be added to ~/.oh-my-bash/custom/aliases/
-  # Example format: aliases=(vagrant composer git-avh)
-  # Add wisely, as too many aliases slow down shell startup.
-  export aliases=(
-    general
-  )
-
-  # Which plugins would you like to load? (plugins can be found in ~/.oh-my-bash/plugins/*)
-  # Custom plugins may be added to ~/.oh-my-bash/custom/plugins/
-  # Example format: plugins=(rails git textmate ruby lighthouse)
-  # Add wisely, as too many plugins slow down shell startup.
-  export plugins=(
-    git
-    bashmarks
-  )
-
-  # Which plugins would you like to conditionally load? (plugins can be found in ~/.oh-my-bash/plugins/*)
-  # Custom plugins may be added to ~/.oh-my-bash/custom/plugins/
-  # Example format:
-  #  if [ "$DISPLAY" ] || [ "$SSH" ]; then
-  #      plugins+=(tmux-autoattach)
-  #  fi
-
-  source "$OSH/oh-my-bash.sh"
-
-  # Preferred editor for local and remote sessions
-  # if [[ -n $SSH_CONNECTION ]]; then
-  #   export EDITOR='vim'
-  # else
-  #   export EDITOR='mvim'
-  # fi
-}
+eval "$(starship init bash)"
+source "$DOTFILES/config/alias"

base/zshrc

@@ -100,7 +100,5 @@ TMUX_WINDOW_NAME_PLUGIN="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/
   add-zsh-hook chpwd tmux-window-name
 }
 
-# Start starship
 eval "$(starship init zsh)"
-
-source $DOTFILES/config/alias
+source "$DOTFILES/config/alias"

config/alias

@@ -2,9 +2,6 @@
 # shellcheck source="../scripts/shared.sh"
 # shellcheck disable=1091,2139
 
-# Be nice
-alias please="sudo "
-
 # Color the grep output
 alias grep="grep --color"
 
@@ -32,7 +29,7 @@ alias sl="ls"
 alias lsd="ls -lF | grep '^d'"
 
 # IP addresses
-alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
+alias x-ip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias localip="ipconfig getifaddr en1"
 alias ips="ifconfig -a | grep -o 'inet6\? \(\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)\|[a-fA-F0-9:]\+\)' | sed -e 's/inet6* //'"
 
@@ -49,9 +46,6 @@ alias flush="dscacheutil -flushcache"
 # Update locatedb
 alias updatedb="sudo /usr/libexec/locate.updatedb"
 
-# Always return full history
-alias history="history 1"
-
 # tmux: automatically attach or create session with name 'main'
 alias tmux='tmux new-session -A -s main'
 # tmux: attach or create new session
@@ -134,12 +128,6 @@ ssh-docker()
   docker exec -it "$@" bash
 }
 
-# All the dig info
-digga()
-{
-  dig +nocmd "$1" any +multiline +noall +answer
-}
-
 # Rector project to php version 8.2 by default.
 rector()
 {

config/exports-apps

@@ -7,6 +7,7 @@
 # Antigen configuration
 # https://github.com/zsh-users/antigen/wiki/Configuration
 export ADOTDIR="$XDG_DATA_HOME/antigen"
+export ANTIGEN_CACHE="$XDG_CACHE_HOME/antigen"
 export ANTIGEN_SYSTEM_RECEIPT_F=".local/share/antigen/antigen_system_lastupdate"
 export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
 

config/functions

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 #
 # shell functions
-
-set -euo pipefail

config/user-dirs.dirs

@@ -0,0 +1,15 @@
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run.
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+# 
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+XDG_TEMPLATES_DIR="$HOME/"
+XDG_PUBLICSHARE_DIR="$HOME/"
+XDG_DOCUMENTS_DIR="$HOME/"
+XDG_MUSIC_DIR="$HOME/"
+XDG_PICTURES_DIR="$HOME/"
+XDG_VIDEOS_DIR="$HOME/"

config/user-dirs.locale

@@ -0,0 +1 @@
+en_US

local/bin/dfm

@@ -19,6 +19,9 @@ VERSION_NVM="v0.39.5"
 export DOTFILES="$HOME/.dotfiles"
 # shellcheck source=./../../scripts/shared.sh
 source "$HOME/.dotfiles/scripts/shared.sh"
+source "$DOTFILES/config/exports"
+source "$DOTFILES/config/alias"
+source "$DOTFILES/config/functions"
 
 # Loads configs for better installation experience
 x-load-configs
@@ -152,6 +155,8 @@ function section_install
     nvm)
       msg "Installing nvm..."
       curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION_NVM/install.sh" | bash
+      git checkout "$DOTFILES/base/zshrc"
+      git checkout "$DOTFILES/base/bashrc"
       $0 install nvm-latest
       msg_yay "nvm installed!"
       ;;
@@ -161,7 +166,8 @@ function section_install
         [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
       fi
       nvm install --lts --latest-npm --default
-      git checkout "$DOTFILES/base/*"
+      git checkout "$DOTFILES/base/zshrc"
+      git checkout "$DOTFILES/base/bashrc"
       msg_yay "latest lts node installed!"
       ;;
     npm)

scripts/install-cargo-packages.sh

@@ -2,18 +2,29 @@
 # Install cargo/rust packages.
 #
 # shellcheck source=shared.sh
+source "$HOME/.dotfiles/config/exports"
+source "$HOME/.dotfiles/config/alias"
+source "$HOME/.dotfiles/config/functions"
 source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg "Starting to install rust/cargo packages"
 
 ! x-have cargo && {
   msg "cargo could not be found. installing cargo with rustup.rs"
-  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path -y
 }
 
 source "$CARGO_HOME/env"
 
+! x-have rustup && {
+  msg_err "rustup could not be found. Aborting..."
+  exit 1
+}
+
+rustup default system
+
 packages=(
+  "cargo-cache"
   # starship.rs
   "starship"
   # An incremental parsing system for programming tools
@@ -58,4 +69,5 @@ x-have bob && {
   bob use stable && x-path-append "$XDG_DATA_HOME/bob/nvim-bin"
 }
 
-msg_done "All next steps done!"
+msg_run "Removing cargo cache"
+cargo cache --autoclean

scripts/install-cheat-tldr.sh

@@ -24,10 +24,13 @@ else
   # Update the repo
   msg_run "Starting to update $TLDR_GIT"
   git -C "$TLDR_TEMP_DIR" reset --hard origin/main
-  git -C "$TLDR_TEMP_DIR" pull -q \
+  git -C "$TLDR_TEMP_DIR" pull -q --depth 2 \
     && msg_done "Updated $TLDR_GIT"
 fi
 
+msg_run "Removing non-english translation files"
+rm -rf "$TLDR_TEMP_DIR/pages.*"
+
 # Fetch the destination directory from cheat defined directories.
 TLDR_CHEAT_DEST="$(cheat -d | grep tldr | head -1 | awk '{print $2}')"
 

scripts/install-go-packages.sh

@@ -50,4 +50,8 @@ x-have git-profile && {
 }
 
 echo ""
+
+msg_run "Clearing go cache"
+go clean -cache -modcache
+
 msg_ok "Done"

scripts/install-npm-packages.sh

@@ -37,3 +37,8 @@ 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 "Cleaning up npm cache"
+npm cache verify
+npm cache clean --force
+npm cache verify