DRY, codestyle, z installation, misc

config/alias

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# macOS specific
 
 # Get installed php versions from brew and setup aliases
 function x-set-php-aliases
@@ -42,6 +41,7 @@ if [[ $(uname) == 'Darwin' ]]; then
 
   x-set-php-aliases
 
+  # Laravel Sail shortcut
   alias sail='[ -f sail ] && bash sail || bash vendor/bin/sail'
 
   # Flush Directory Service cache
@@ -60,15 +60,12 @@ 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 \
-  --volume /var/run/docker.sock:/var/run/docker.sock \
-  registry.gitlab.com/gitlab-org/ci-cd/codequality:${CODEQUALITY_VERSION:-latest} \
-  /code"
-
-alias composerUp='composer global update'
-alias npmUp='npm -g up'
+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'
 
 alias zedit='$EDITOR ~/.dotfiles'
 

config/exports

@@ -1,17 +1,22 @@
 # shellcheck shell=bash
 
-export HIST_STAMPS="yyyy-mm-dd"
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_STATE_HOME="$HOME/.local/state"
+export XDG_BIN_HOME="$HOME/.local/bin" # this one is custom
 
+# History env variables
+export HIST_STAMPS="yyyy-mm-dd"
 # Larger bash history (allow 32³ entries; default is 500)
 export HISTSIZE=32768
 export HISTFILESIZE=$HISTSIZE
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options
 export HISTCONTROL=ignoreboth
-
 # Make some commands not show up in history
 export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
-
 # And include the parameter for ZSH
 export HISTORY_IGNORE="(ls|cd|cd -|pwd|exit|date|* --help)"
 
@@ -28,12 +33,7 @@ export GREP_OPTIONS="--color=auto"
 # update the values of LINES and COLUMNS.
 hash shopt 2> /dev/null && shopt -s checkwinsize
 
-# Explicitly set XDG folders
-# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_STATE_HOME="$HOME/.local/state"
-export XDG_BIN_HOME="$HOME/.local/bin" # this one is custom
+export LC_ALL=fi_FI.utf8
 
 # Antigen configuration
 # https://github.com/zsh-users/antigen/wiki/Configuration
@@ -87,6 +87,7 @@ fi
 
 # z, https://github.com/rupa/z
 export _Z_DATA="$XDG_STATE_HOME/z"
+[[ -f "$XDG_BIN_HOME/z/z.sh" ]] && source "$XDG_BIN_HOME/z/z.sh"
 
 # composer, https://getcomposer.org/
 if command -v composer &> /dev/null; then
@@ -138,4 +139,5 @@ fi
 
 # Load iterm2 shell integration
 # https://iterm2.com/documentation-shell-integration.html
-[[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] && source "$XDG_BIN_HOME/iterm2_shell_integration.zsh"
+[[ -f "$XDG_BIN_HOME/iterm2_shell_integration.zsh" ]] \
+  && source "$XDG_BIN_HOME/iterm2_shell_integration.zsh"

config/functions

@@ -65,3 +65,29 @@ function silent
 {
   "$@" >&/dev/null
 }
+
+# Defines default antigen bundles
+function x-default-antigen-bundles
+{
+  # these should be always available
+  antigen bundle colored-man-pages
+  antigen bundle command-not-found
+  antigen bundle ssh-agent
+  antigen bundle MichaelAquilina/zsh-you-should-use
+  antigen bundle Sparragus/zsh-auto-nvm-use
+  antigen bundle jreese/zsh-titles
+  antigen bundle unixorn/autoupdate-antigen.zshplugin
+  antigen bundle zsh-users/zsh-completions
+  antigen bundle zsh-users/zsh-syntax-highlighting
+
+  # these should be available if there's need
+  hash git 2> /dev/null && antigen bundle git
+  hash brew 2> /dev/null && antigen bundle brew
+  hash docker 2> /dev/null && antigen bundle docker
+  hash docker-compose 2> /dev/null && antigen bundle sroze/docker-compose-zsh-plugin
+  hash jq 2> /dev/null && antigen bundle reegnz/jq-zsh-plugin
+  hash nvm 2> /dev/null && antigen bundle nvm
+  hash php 2> /dev/null && antigen bundle php
+  hash python 2> /dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
+  hash rvm 2> /dev/null && antigen bundle unixorn/rvm-plugin
+}