From d3d484e9bcfa22d4202f15c41d18eca7c58f0405 Mon Sep 17 00:00:00 2001
From: StealthCT <dpreid@gmail.com>
Date: Fri, 12 Apr 2024 12:53:45 +0100
Subject: [PATCH] feat: pre-commit and Actions workflow (#62)

---
 .github/pull_request_template.md |  2 +-
 .github/workflows/pre-commit.yml | 16 ++++++++
 .pre-commit-config.yaml          | 15 ++++++++
 README.md                        | 11 +++++-
 src/cmus-tmux-statusbar.sh       | 34 ++++++++---------
 src/custom-number.sh             |  4 +-
 src/datetime-widget.sh           | 18 ++++-----
 src/git-status.sh                | 63 +++++++++++++++++---------------
 src/music-tmux-statusbar.sh      | 39 ++++++++++----------
 src/netspeed.sh                  | 30 +++++++--------
 src/path-widget.sh               |  8 ++--
 src/wb-git-status.sh             |  4 +-
 tokyo-night.tmux                 |  5 +--
 13 files changed, 142 insertions(+), 107 deletions(-)
 create mode 100644 .github/workflows/pre-commit.yml
 create mode 100644 .pre-commit-config.yaml

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 56decf4e..0353f9c0 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -16,6 +16,6 @@
 - [ ] Fixes #...
 - [ ] Fixes #...
 
-## Additional informations
+## Additional information
 
 None.
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
new file mode 100644
index 00000000..3475e6ce
--- /dev/null
+++ b/.github/workflows/pre-commit.yml
@@ -0,0 +1,16 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: [master]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - uses: pre-commit/action@v3.0.1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..64d4e710
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,15 @@
+repos:
+  - repo: https://github.com/pecigonzalo/pre-commit-shfmt
+    rev: v2.1.0
+    hooks:
+      - id: shell-fmt-go
+        args:
+          - -w
+          - -s
+          - -l
+          - -i
+          - "2"
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.6
+    hooks:
+      - id: codespell
diff --git a/README.md b/README.md
index 8e7d53df..67cd3ad8 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ This is a very opinionated project, as I am a Tech Lead, this theme is very deve
 ### Nerd Fonts
 
 This theme requires the use of a patched font with Nerd Font. Ensure your terminal is set to use one before installing this theme. Any patched font will do. See
-[`nerdfonts.com`](https://www.nerdfonts.com/) for more informations.
+[`nerdfonts.com`](https://www.nerdfonts.com/) for more information.
 
 ### Noto Fonts
 
@@ -166,5 +166,14 @@ Legacy tokyo-night
 
 ![Snap 4](snaps/l01.png)
 
+## Contributing
+
+This project is open to contributions. Please feel free to open an issue or a pull request.
+
+Ensure your editor is configured appropriately to consider the provided `.editorconfig` file.
+[pre-commit] hooks are also provided to ensure code consistency, and will be run against any raised PRs.
+
+
 [cmus]: https://cmus.github.io/
 [nowplaying-cli]: https://github.com/kirtan-shah/nowplaying-cli
+[pre-commit]: https://pre-commit.com/
diff --git a/src/cmus-tmux-statusbar.sh b/src/cmus-tmux-statusbar.sh
index 17aad51e..8cfe8cba 100755
--- a/src/cmus-tmux-statusbar.sh
+++ b/src/cmus-tmux-statusbar.sh
@@ -6,15 +6,15 @@ BG_COLOR="#1F2335"
 BG_BAR="#15161e"
 TIME_COLOR="#414868"
 
-if [[ $1 =~ ^[[:digit:]]+$  ]]; then
-    MAX_TITLE_WIDTH=20
-  else
-    MAX_TITLE_WIDTH=$(($(tmux display -p '#{window_width}' 2> /dev/null || echo 120) - 130))
+if [[ $1 =~ ^[[:digit:]]+$ ]]; then
+  MAX_TITLE_WIDTH=20
+else
+  MAX_TITLE_WIDTH=$(($(tmux display -p '#{window_width}' 2>/dev/null || echo 120) - 130))
 fi
 
 MAX_TITLE_WIDTH=25
 
-if cmus-remote -Q > /dev/null 2> /dev/null; then
+if cmus-remote -Q >/dev/null 2>/dev/null; then
   CMUS_STATUS=$(cmus-remote -Q)
   STATUS=$(echo "$CMUS_STATUS" | grep status | head -n 1 | cut -d' ' -f2-)
   ARTIST=$(echo "$CMUS_STATUS" | grep 'tag artist' | head -n 1 | cut -d' ' -f3-)
@@ -22,22 +22,19 @@ if cmus-remote -Q > /dev/null 2> /dev/null; then
   DURATION=$(echo "$CMUS_STATUS" | grep 'duration' | cut -d' ' -f2-)
   POSITION=$(echo "$CMUS_STATUS" | grep 'position' | cut -d' ' -f2-)
 
+  P_MIN=$(printf '%02d' $((POSITION / 60)))
+  P_SEC=$(printf '%02d' $((POSITION % 60)))
 
-  P_MIN=`printf '%02d' $(($POSITION / 60))`
-  P_SEC=`printf '%02d' $(($POSITION % 60))`
-
-  D_MIN=`printf '%02d' $(($DURATION / 60))`
-  D_SEC=`printf '%02d' $(($DURATION % 60))`
+  D_MIN=$(printf '%02d' $((DURATION / 60)))
+  D_SEC=$(printf '%02d' $((DURATION % 60)))
   TIME="[$P_MIN:$P_SEC / $D_MIN:$D_SEC]"
 
-
-
   if [ "$D_SEC" = "-1" ]; then
     TIME="[ $P_MIN:$P_SEC]"
   fi
 
-  if [ -n "$TITLE"  ]; then
-    if [ "$STATUS" = "playing"  ]; then
+  if [ -n "$TITLE" ]; then
+    if [ "$STATUS" = "playing" ]; then
       PLAY_STATE="$OUTPUT"
     else
       PLAY_STATE="$OUTPUT"
@@ -50,14 +47,13 @@ if cmus-remote -Q > /dev/null 2> /dev/null; then
   fi
 fi
 
-if [ "${#OUTPUT}" -ge $MAX_TITLE_WIDTH  ]; then
+if [ "${#OUTPUT}" -ge $MAX_TITLE_WIDTH ]; then
   OUTPUT="$PLAY_STATE ${TITLE:0:$MAX_TITLE_WIDTH-1}"
   # Remove trailing spaces
   OUTPUT="${OUTPUT%"${OUTPUT##*[![:space:]]}"}…"
 fi
 
-if [ -z "$OUTPUT" ]
-then
+if [ -z "$OUTPUT" ]; then
   echo "$OUTPUT #[fg=green,bg=default]"
 else
   OUT=" $OUTPUT $TIME "
@@ -69,9 +65,9 @@ else
   O=" $OUTPUT"
 
   if [ $PROGRESS -le $TIME_INDEX ]; then
-    echo "#[nobold,fg=$BG_COLOR,bg=$ACCENT_COLOR]${O:0:$PROGRESS}#[fg=$ACCENT_COLOR,bg=$BG_BAR]${O:$PROGRESS:$TIME_INDEX} #[fg=$TIME_COLOR,bg=$BG_BAR]$TIME "
+    echo "#[nobold,fg=$BG_COLOR,bg=$ACCENT_COLOR]${O:0:PROGRESS}#[fg=$ACCENT_COLOR,bg=$BG_BAR]${O:PROGRESS:TIME_INDEX} #[fg=$TIME_COLOR,bg=$BG_BAR]$TIME "
   else
     DIFF=$((PROGRESS - TIME_INDEX))
-    echo "#[nobold,fg=$BG_COLOR,bg=$ACCENT_COLOR]${O:0:$TIME_INDEX} #[fg=$BG_BAR,bg=$ACCENT_COLOR]${OUT:$TIME_INDEX:$DIFF}#[fg=$TIME_COLOR,bg=$BG_BAR]${OUT:$PROGRESS}"
+    echo "#[nobold,fg=$BG_COLOR,bg=$ACCENT_COLOR]${O:0:TIME_INDEX} #[fg=$BG_BAR,bg=$ACCENT_COLOR]${OUT:TIME_INDEX:DIFF}#[fg=$TIME_COLOR,bg=$BG_BAR]${OUT:PROGRESS}"
   fi
 fi
diff --git a/src/custom-number.sh b/src/custom-number.sh
index dc73aeab..5239e68e 100755
--- a/src/custom-number.sh
+++ b/src/custom-number.sh
@@ -26,7 +26,7 @@ if [ "$FORMAT" = "roman" ] && [ ${#ID} -gt 1 ]; then
   continue
 else
   for ((i = 0; i < ${#ID}; i++)); do
-    DIGIT=${ID:$i:1}
-    echo -n "${format:$DIGIT:1}"
+    DIGIT=${ID:i:1}
+    echo -n "${format:DIGIT:1}"
   done
 fi
diff --git a/src/datetime-widget.sh b/src/datetime-widget.sh
index 5ca9a9b8..c35d1fcc 100755
--- a/src/datetime-widget.sh
+++ b/src/datetime-widget.sh
@@ -2,7 +2,7 @@
 
 # Grab global variable for showing datetime widget, only hide if explicitly disabled
 SHOW_DATETIME=$(tmux show-option -gv @tokyo-night-tmux_show_datetime 2>/dev/null)
-if [[ "$SHOW_DATETIME" == "0" ]]; then
+if [[ $SHOW_DATETIME == "0" ]]; then
   exit 0
 fi
 
@@ -13,13 +13,13 @@ time_format=$(tmux show-option -gv @tokyo-night-tmux_time_format 2>/dev/null)
 date_string=""
 time_string=""
 
-if [[ "$date_format" == "YMD" ]]; then
+if [[ $date_format == "YMD" ]]; then
   # Year Month Day date format
   date_string="%Y-%m-%d"
-elif [[ "$date_format" == "MDY" ]]; then
+elif [[ $date_format == "MDY" ]]; then
   # Month Day Year date format
   date_string="%m-%d-%Y"
-elif [[ "$date_format" == "DMY" ]]; then
+elif [[ $date_format == "DMY" ]]; then
   # Day Month Year date format
   date_string="%d-%m-%Y"
 else
@@ -27,12 +27,12 @@ else
   date_string="%Y-%m-%d"
 fi
 
-if [[ "$time_format" == "12H" ]]; then
-    # 12-hour format with AM/PM
-    time_string="%I:%M %p"
+if [[ $time_format == "12H" ]]; then
+  # 12-hour format with AM/PM
+  time_string="%I:%M %p"
 else
-    # Default to 24-hour format if not specified
-    time_string="%H:%M"
+  # Default to 24-hour format if not specified
+  time_string="%H:%M"
 fi
 
 echo "#[fg=#a9b1d6,bg=#24283B] $date_string #[]❬ $time_string "
diff --git a/src/git-status.sh b/src/git-status.sh
index c04de960..eb350e14 100755
--- a/src/git-status.sh
+++ b/src/git-status.sh
@@ -3,7 +3,7 @@
 cd $1
 RESET="#[fg=brightwhite,bg=#15161e,nobold,noitalics,nounderscore,nodim]"
 BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
-STATUS=$(git status --porcelain 2>/dev/null| egrep "^(M| M)" | wc -l)
+STATUS=$(git status --porcelain 2>/dev/null | egrep "^(M| M)" | wc -l)
 BRANCH_SIZE=${#BRANCH}
 
 SYNC_MODE=0
@@ -47,41 +47,44 @@ else
   STATUS_UNTRACKED=""
 fi
 
-
 # Determine repository sync status
 if [[ $SYNC_MODE == 0 ]]; then
-    NEED_PUSH=$(git log @{push}.. | wc -l | bc)
-    if [[ $NEED_PUSH > 0 ]]; then
-      SYNC_MODE=2
-    else
-      LAST_FETCH=$(stat -c %Y .git/FETCH_HEAD | bc)
-      NOW=$(date +%s | bc)
-
-      # if 5 minutes have passed since the last fetch
-      if [[ $((NOW-LAST_FETCH)) -gt 300 ]]; then
-        git fetch --atomic origin --negotiation-tip=HEAD
-      fi
-
-      REMOTE_DIFF="$(git diff --shortstat $(git rev-parse --abbrev-ref HEAD) origin/$(git rev-parse --abbrev-ref HEAD) 2>/dev/null | wc -l | bc)"
-      if [[ $REMOTE_DIFF > 0 ]]; then
-        SYNC_MODE=3
-      fi
+  NEED_PUSH=$(git log @{push}.. | wc -l | bc)
+  if [[ $NEED_PUSH > 0 ]]; then
+    SYNC_MODE=2
+  else
+    LAST_FETCH=$(stat -c %Y .git/FETCH_HEAD | bc)
+    NOW=$(date +%s | bc)
+
+    # if 5 minutes have passed since the last fetch
+    if [[ $((NOW - LAST_FETCH)) -gt 300 ]]; then
+      git fetch --atomic origin --negotiation-tip=HEAD
+    fi
+
+    REMOTE_DIFF="$(git diff --shortstat $(git rev-parse --abbrev-ref HEAD) origin/$(git rev-parse --abbrev-ref HEAD) 2>/dev/null | wc -l | bc)"
+    if [[ $REMOTE_DIFF > 0 ]]; then
+      SYNC_MODE=3
     fi
+  fi
 fi
 
 if [[ $SYNC_MODE > 0 ]]; then
-    case "$SYNC_MODE" in
-      1) REMOTE_STATUS="$RESET#[bg=#15161e,fg=#ff9e64,bold]▒ 󱓎"
-      ;;
-      2) REMOTE_STATUS="$RESET#[bg=#15161e,fg=#f7768e,bold]▒ 󰛃"
-      ;;
-      3) REMOTE_STATUS="$RESET#[bg=#15161e,fg=#bb9af7,bold]▒ 󰛀"
-      ;;
-      *) echo default
-      ;;
-    esac
-  else
-    REMOTE_STATUS="$RESET#[fg=#73daca,bg=#15161e,bold]▒ "
+  case "$SYNC_MODE" in
+  1)
+    REMOTE_STATUS="$RESET#[bg=#15161e,fg=#ff9e64,bold]▒ 󱓎"
+    ;;
+  2)
+    REMOTE_STATUS="$RESET#[bg=#15161e,fg=#f7768e,bold]▒ 󰛃"
+    ;;
+  3)
+    REMOTE_STATUS="$RESET#[bg=#15161e,fg=#bb9af7,bold]▒ 󰛀"
+    ;;
+  *)
+    echo default
+    ;;
+  esac
+else
+  REMOTE_STATUS="$RESET#[fg=#73daca,bg=#15161e,bold]▒ "
 fi
 
 if test "$BRANCH" != ""; then
diff --git a/src/music-tmux-statusbar.sh b/src/music-tmux-statusbar.sh
index a46423d9..1848f5c8 100755
--- a/src/music-tmux-statusbar.sh
+++ b/src/music-tmux-statusbar.sh
@@ -3,12 +3,12 @@
 # Check the global value
 SHOW_MUSIC=$(tmux show-option -gv @tokyo-night-tmux_show_music)
 if [ "$SHOW_MUSIC" != "1" ]; then
-    exit 0
+  exit 0
 fi
 
 # Value parser for nowplaying-cli
 parse_npcli_value() {
-    echo "$NPCLI_STATUS" | grep "$1" | awk -F '= ' '{print $2}' | tr -d '";'
+  echo "$NPCLI_STATUS" | grep "$1" | awk -F '= ' '{print $2}' | tr -d '";'
 }
 
 ACCENT_COLOR="#7aa2f7"
@@ -17,14 +17,14 @@ BG_COLOR="#1F2335"
 BG_BAR="#15161e"
 TIME_COLOR="#414868"
 
-if [[ $1 =~ ^[[:digit:]]+$  ]]; then
-    MAX_TITLE_WIDTH=$1
-  else
-    MAX_TITLE_WIDTH=$(($(tmux display -p '#{window_width}' 2> /dev/null || echo 120) - 90))
+if [[ $1 =~ ^[[:digit:]]+$ ]]; then
+  MAX_TITLE_WIDTH=$1
+else
+  MAX_TITLE_WIDTH=$(($(tmux display -p '#{window_width}' 2>/dev/null || echo 120) - 90))
 fi
 
 # playerctl
-if command -v playerctl > /dev/null; then
+if command -v playerctl >/dev/null; then
   PLAYER_STATUS=$(playerctl -a metadata --format "{{status}};{{mpris:length}};{{position}};{{title}}" | grep -m1 "Playing")
   STATUS="playing"
 
@@ -48,7 +48,7 @@ if command -v playerctl > /dev/null; then
   fi
 
 # nowplaying-cli
-elif command -v nowplaying-cli > /dev/null; then
+elif command -v nowplaying-cli >/dev/null; then
   NPCLI_STATUS=$(nowplaying-cli get-raw)
   if [ "$(parse_npcli_value PlaybackRate)" = "1" ]; then
     STATUS="playing"
@@ -79,12 +79,12 @@ elif command -v nowplaying-cli > /dev/null; then
 fi
 # If POSITION, calculate the progress bar
 if [ -n "$POSITION" ]; then
-  P_MIN=`printf '%02d' $(($POSITION / 60))`
-  P_SEC=`printf '%02d' $(($POSITION % 60))`
+  P_MIN=$(printf '%02d' $((POSITION / 60)))
+  P_SEC=$(printf '%02d' $((POSITION % 60)))
 fi
 if [ -n "$DURATION" ]; then
-  D_MIN=`printf '%02d' $(($DURATION / 60))`
-  D_SEC=`printf '%02d' $(($DURATION % 60))`
+  D_MIN=$(printf '%02d' $((DURATION / 60)))
+  D_SEC=$(printf '%02d' $((DURATION % 60)))
 fi
 if [ -n "$DURATION" ] && [ -n "$POSITION" ]; then
   TIME="[$P_MIN:$P_SEC / $D_MIN:$D_SEC]"
@@ -94,8 +94,8 @@ if [ -n "$DURATION" ] && [ -n "$POSITION" ]; then
 else
   TIME="[--:--]"
 fi
-if [ -n "$TITLE"  ]; then
-  if [ "$STATUS" = "playing"  ]; then
+if [ -n "$TITLE" ]; then
+  if [ "$STATUS" = "playing" ]; then
     PLAY_STATE="$OUTPUT"
   else
     PLAY_STATE="󰏤$OUTPUT"
@@ -103,7 +103,7 @@ if [ -n "$TITLE"  ]; then
   OUTPUT="$PLAY_STATE $TITLE"
 
   # Only show the song title if we are over $MAX_TITLE_WIDTH characters
-  if [ "${#OUTPUT}" -ge $MAX_TITLE_WIDTH  ]; then
+  if [ "${#OUTPUT}" -ge $MAX_TITLE_WIDTH ]; then
     OUTPUT="$PLAY_STATE ${TITLE:0:$MAX_TITLE_WIDTH-1}…"
   fi
 else
@@ -111,14 +111,13 @@ else
 fi
 
 MAX_TITLE_WIDTH=25
-if [ "${#OUTPUT}" -ge $MAX_TITLE_WIDTH  ]; then
+if [ "${#OUTPUT}" -ge $MAX_TITLE_WIDTH ]; then
   OUTPUT="$PLAY_STATE ${TITLE:0:$MAX_TITLE_WIDTH-1}"
   # Remove trailing spaces
   OUTPUT="${OUTPUT%"${OUTPUT##*[![:space:]]}"}…"
 fi
 
-if [ -z "$OUTPUT" ]
-then
+if [ -z "$OUTPUT" ]; then
   echo "$OUTPUT #[fg=green,bg=default]"
 else
   OUT=" $OUTPUT $TIME "
@@ -130,9 +129,9 @@ else
   O=" $OUTPUT"
 
   if [ $PROGRESS -le $TIME_INDEX ]; then
-    echo "#[nobold,fg=$BG_COLOR,bg=$ACCENT_COLOR]${O:0:$PROGRESS}#[fg=$ACCENT_COLOR,bg=$BG_BAR]${O:$PROGRESS:$TIME_INDEX} #[fg=$TIME_COLOR,bg=$BG_BAR]$TIME "
+    echo "#[nobold,fg=$BG_COLOR,bg=$ACCENT_COLOR]${O:0:PROGRESS}#[fg=$ACCENT_COLOR,bg=$BG_BAR]${O:PROGRESS:TIME_INDEX} #[fg=$TIME_COLOR,bg=$BG_BAR]$TIME "
   else
     DIFF=$((PROGRESS - TIME_INDEX))
-    echo "#[nobold,fg=$BG_COLOR,bg=$ACCENT_COLOR]${O:0:$TIME_INDEX} #[fg=$BG_BAR,bg=$ACCENT_COLOR]${OUT:$TIME_INDEX:$DIFF}#[fg=$TIME_COLOR,bg=$BG_BAR]${OUT:$PROGRESS}"
+    echo "#[nobold,fg=$BG_COLOR,bg=$ACCENT_COLOR]${O:0:TIME_INDEX} #[fg=$BG_BAR,bg=$ACCENT_COLOR]${OUT:TIME_INDEX:DIFF}#[fg=$TIME_COLOR,bg=$BG_BAR]${OUT:PROGRESS}"
   fi
 fi
diff --git a/src/netspeed.sh b/src/netspeed.sh
index f3d905ed..b2060988 100755
--- a/src/netspeed.sh
+++ b/src/netspeed.sh
@@ -7,7 +7,7 @@
 # Check the global value
 SHOW_NETSPEED=$(tmux show-option -gv @tokyo-night-tmux_show_netspeed)
 if [ "$SHOW_NETSPEED" != "1" ]; then
-    exit 0
+  exit 0
 fi
 
 # Get network interface
@@ -15,24 +15,24 @@ INTERFACE=$(tmux show-option -gv @tokyo-night-tmux_netspeed_iface 2>/dev/null)
 
 # Get network transmit data from /proc/net/dev
 get_bytes() {
-    awk -v interface="$1" '$1 == interface ":" {print $2, $10}' /proc/net/dev
+  awk -v interface="$1" '$1 == interface ":" {print $2, $10}' /proc/net/dev
 }
 
 # Convert into readable format
 readable_format() {
-    local bytes=$1
-
-    # Convert bytes to KBps, 'bc' is dependency, 'pacman -S bc'
-    local kbps=$(echo "scale=1; $bytes / 1024" | bc)
-    if (( $(echo "$kbps < 1" | bc -l) )); then
-        echo "0.0B"
-    elif (( $(echo "$kbps >= 1024" | bc -l) )); then
-        # Convert KBps to MBps
-        local mbps=$(echo "scale=1; $kbps / 1024" | bc)
-        echo "${mbps}MB/s"
-    else
-        echo "${kbps}KB/s"
-    fi
+  local bytes=$1
+
+  # Convert bytes to KBps, 'bc' is dependency, 'pacman -S bc'
+  local kbps=$(echo "scale=1; $bytes / 1024" | bc)
+  if (($(echo "$kbps < 1" | bc -l))); then
+    echo "0.0B"
+  elif (($(echo "$kbps >= 1024" | bc -l))); then
+    # Convert KBps to MBps
+    local mbps=$(echo "scale=1; $kbps / 1024" | bc)
+    echo "${mbps}MB/s"
+  else
+    echo "${kbps}KB/s"
+  fi
 }
 
 # Echo network speed
diff --git a/src/path-widget.sh b/src/path-widget.sh
index 827b8f4d..35551973 100755
--- a/src/path-widget.sh
+++ b/src/path-widget.sh
@@ -7,16 +7,16 @@ RESET="#[fg=brightwhite,bg=#15161e,nobold,noitalics,nounderscore,nodim]"
 
 # check if not enabled
 if [ "${SHOW_PATH}" != "1" ]; then
-    exit 0
+  exit 0
 fi
 
 current_path="${1}"
 default_path_format="relative"
 PATH_FORMAT="${PATH_FORMAT:-$default_path_format}"
 
-# check user rquested format
-if [[ "${PATH_FORMAT}" == "relative" ]]; then
-  current_path="$(echo ${current_path} |  sed 's#'"$HOME"'#~#g')"
+# check user requested format
+if [[ ${PATH_FORMAT} == "relative" ]]; then
+  current_path="$(echo ${current_path} | sed 's#'"$HOME"'#~#g')"
 fi
 
 echo "#[fg=blue,bg=default]░  ${RESET}#[bg=default]${current_path} "
diff --git a/src/wb-git-status.sh b/src/wb-git-status.sh
index 92f38e88..c7ee36de 100755
--- a/src/wb-git-status.sh
+++ b/src/wb-git-status.sh
@@ -4,7 +4,7 @@ cd $1
 RESET="#[fg=brightwhite,bg=#15161e,nobold,noitalics,nounderscore,nodim,nostrikethrough]"
 BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
 PROVIDER=$(git config remote.origin.url | awk -F '@|:' '{print $2}')
-STATUS=$(git status --porcelain 2>/dev/null| egrep "^(M| M)" | wc -l)
+STATUS=$(git status --porcelain 2>/dev/null | egrep "^(M| M)" | wc -l)
 
 PROVIDER_ICON=""
 
@@ -20,7 +20,7 @@ REMOTE_STATUS=""
 
 if [[ $PROVIDER == "github.com" ]]; then
 
-  if ! command -v gh &> /dev/null; then
+  if ! command -v gh &>/dev/null; then
     exit 1
   fi
 
diff --git a/tokyo-night.tmux b/tokyo-night.tmux
index 5c99b150..f7e433de 100755
--- a/tokyo-night.tmux
+++ b/tokyo-night.tmux
@@ -8,7 +8,7 @@
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 RESET="#[fg=brightwhite,bg=#15161e,nobold,noitalics,nounderscore,nodim]"
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 tmux set -g status-left-length 80
 tmux set -g status-right-length 150
@@ -54,9 +54,6 @@ battery_status="#($SCRIPTS_PATH/battery-widget.sh)"
 # Session name
 tmux set -g status-left "#[fg=#1F2335,bg=#2D96FA,bold] #{?client_prefix,󰠠 ,#[dim]󰤂 }#[bold,nodim]#S "
 
-
-
-
 #+--- Windows ---+
 # Focus
 tmux set -g window-status-current-format "$RESET#[fg=#44dfaf,bg=#1F2335]  $window_number #[fg=#a9b1d6,bold,nodim]#W#[nobold,dim]#{?window_zoomed_flag, $zoom_number, $custom_pane} #{?window_last_flag,,} "