feat(config): add tldr to cheat as a submodule

.gitmodules

@@ -55,3 +55,6 @@
 [submodule "tmux/tmux-current-pane-hostname"]
 	path = config/tmux/plugins/tmux-current-pane-hostname
 	url = https://github.com/soyuka/tmux-current-pane-hostname.git
+[submodule "cheat-tldr"]
+	path = config/cheat/cheatsheets/tldr
+	url = https://github.com/ivuorinen/cheatsheet-tldr.git

add-submodules.sh

@@ -13,6 +13,8 @@ git submodule add --name dotbot-pip \
 # other repos
 git submodule add --name cheat-community \
   -f https://github.com/cheat/cheatsheets.git config/cheat/cheatsheets/community
+git submodule add --name cheat-tldr \
+  -f https://github.com/ivuorinen/cheatsheet-tldr.git config/cheat/cheatsheets/tldr
 
 # tmux plugin manager and plugins
 git submodule add --name tmux/tmux-continuum \

base/bashrc

@@ -34,5 +34,8 @@ x-have rbenv && {
   eval "$(rbenv init - bash)"
 }
 
-eval "$(starship init bash)"
+# eval "$(starship init bash)"
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init bash --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+}
 source "$DOTFILES/config/alias"

base/zshrc

@@ -100,5 +100,7 @@ x-have rbenv && {
 }
 
 # eval "$(starship init zsh)"
-eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+x-have oh-my-posh && {
+  eval "$(oh-my-posh init zsh --config $XDG_CONFIG_HOME/oh-my-posh.omp.json)"
+}
 source "$DOTFILES/config/alias"

config/alias

@@ -75,6 +75,8 @@ alias code_scanner='docker run
   registry.gitlab.com/gitlab-org/ci-cd/codequality:"${CODEQUALITY_VERSION:-latest}"
   /code'
 
+alias trivy_scan='docker run -v /var/run/docker.sock:/var/run/docker.sock -v $HOME/Library/Caches:/root/.cache/ aquasec/trivy'
+
 alias zedit='$EDITOR ~/.dotfiles'
 
 alias irssi="irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_CONFIG_HOME/irssi"

config/cheat/conf.yml

@@ -72,7 +72,7 @@ cheatpaths:
     tags: [pure-bash-bible]
     readonly: true
   - name: tldr
-    path: ~/.dotfiles/config/cheat/cheatsheets/tldr
+    path: ~/.dotfiles/config/cheat/cheatsheets/tldr/tldr
     tags: [tldr]
     readonly: true
 # While it requires no configuration here, it's also worth noting that

config/tmux/tmux.conf

@@ -105,7 +105,7 @@ set-option -g window-status-format ' #I:#W '
 set-window-option -g window-status-current-style 'fg=#111111,bg=#7aa2f7'
 set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag,  , } '
 
-set-option -g status-left "#{?#{pane_ssh_connected},#{hostname_short}/,}#S"
+set-option -g status-left "#{hostname_short}/#S"
 set-option -g status-right "%H:%M #{tmux_mode_indicator}"
 
 #  ╭──────────────────────────────────────────────────────────╮
@@ -120,12 +120,12 @@ set -g @suspend_key 'F12'
 ##  A plugin to name your tmux windows smartly.
 ## https://github.com/ofirgall/tmux-window-name
 ### Maximum name length of a window
-set -g @tmux_window_name_max_name_len "30"
+set -g @tmux_window_name_max_name_len "20"
 ### 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 []
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases']" # Default is []
 
 ## https://github.com/tmux-plugins/tmux-continuum
 set -g @continuum-restore 'on'

scripts/install-cheat-tldr.sh

@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck disable=SC2231,SC2034,SC2181,SC2068
-# shellcheck source=shared.sh
-source "$HOME/.dotfiles/scripts/shared.sh"
-
-TLDR_REQUIRED_TOOLS=(git cheat)
-for t in ${TLDR_REQUIRED_TOOLS[@]}; do
-  ! x-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="$XDG_CACHE_HOME/cheat/tldr"
-
-# 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"
-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 --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}')"
-
-[ "$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"
-
-  [ "$DIRNAME" = "common" ] && SECTION_DIR="${TLDR_CHEAT_DEST}"
-
-  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/${BASENAME}"
-    # echo "-> dest: $TLDR_FILE"
-
-    # Update the original file for making the replacable value comparable
-    if [ -f "$FILE" ] && [ '---' != "$(head -1 < "$FILE")" ]; then
-      echo -e "---\n$TLDR_SYNTAX\n$TLDR_TAGS\n$TLDR_SOURCE\n---\n$(cat "$FILE")" > "$FILE"
-    fi
-
-    replacable "$FILE" "$TLDR_FILE"
-    override=$?
-    if [ "$override" -ne 0 ]; then
-      cp "$FILE" "$TLDR_FILE" && msg_run "Updated: $TLDR_FILE"
-    fi
-
-  done
-done