almost fix zsh

Signed-off-by: Balazs Horvath <[email protected]>

.zshrc

@@ -1,9 +1,89 @@
+export ZSH="$HOME/.oh-my-zsh"
+
+plugins=(git autojump conda-env)
+
+ZSH_THEME="kade"
+# CASE_SENSITIVE="true"
+# HYPHEN_INSENSITIVE="true"
+# DISABLE_MAGIC_FUNCTIONS="true"
+# DISABLE_LS_COLORS="true"
+# DISABLE_AUTO_TITLE="true"
+# ENABLE_CORRECTION="true"
+# COMPLETION_WAITING_DOTS="true"
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+export LANG=ja_JP.UTF-8
+export LC_ALL=ja_JP.UTF-8
+
+export COMFYUI_PATH="$HOME/ComfyUI"
+export BNB_CUDA_VERSION=126
+
+export RUST_BACKTRACE=1
+
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export CLICOLOR=126
+
 # ⚠️ TODO: This needs to be benched but I'm too bad at this!
 export NUMEXPR_MAX_THREADS=24 
 export VECLIB_MAXIMUM_THREADS=24
 export MKL_NUM_THREADS=24
 export OMP_NUM_THREADS=24
 
+export TOKENIZERS_PARALLELISM=false
+
+source $ZSH/oh-my-zsh.sh
+
+export PATH=$PATH:$HOME/source/repos/dataset-tools/target/x86_64-unknown-linux-gnu/release:$HOME/.cargo/bin:$HOME/miniconda3/bin:$HOME/toolkit:$HOME/db/redis-stable/src:$HOME/db/postgresql/bin:$HOME/.local/bin:/opt/cuda/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CONDA_PREFIX/lib:/opt/cuda/targets/x86_64-linux/lib
+export COMFYUI_MODEL_PATH=/home/kade/ComfyUI/models
+
+alias ls='ls --color=always'
+alias ll="ls -lah --color=always"
+alias cp='cp --reflink=auto'
+alias t="tensorboard --logdir=$HOME/output_dir/logs"
+alias rt="vim ~/.tmux.conf && echo \"Reloading tmux config\" && tmux source ~/.tmux.conf"
+alias zr="vim ~/.zshrc && echo \"Reloading zsh config\" && source ~/.zshrc"
+alias ta="tmux att"
+alias ga="git add . && git commit -avs && git push"
+alias gs="git status"
+alias wd="git diff --word-diff-regex='[^,]+' --patience"
+alias vim="nvim"
+alias vi="nvim"
+alias v="nvim"
+alias grh='git reset --hard'
+alias gcs='git clone --recurse-submodules'
+alias grabber="Grabber-cli"
+
+# 'pie' is a shortcut for installing a Python package in editable mode
+# using the pip command with the --use-pep517 option.
+alias pie='pip install -e . --use-pep517'
+alias gc="git commit -avs --verbose"
+alias dir="dir --color=always"
+
+alias ezc="nvim ~/.zshrc && source ~/.zshrc"
+
+source /home/kade/.config/broot/launcher/bash/br
+
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/home/kade/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/home/kade/miniconda3/etc/profile.d/conda.sh" ]; then
+        . "/home/kade/miniconda3/etc/profile.d/conda.sh"
+    else
+        export PATH="/home/kade/miniconda3/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+
+unset CONDA_CHANGEPS1
+
+
 display_git_help() {
   echo "Git"
   echo "---"
@@ -17,13 +97,6 @@ display_git_help() {
 }
 display_git_help
 
-export CLICOLOR=126
-
-alias gc="git commit -avs --verbose"
-alias dir="dir --color=always"
-alias ll="ls -lah --color=always"
-alias ezc="nvim ~/.zshrc && source ~/.zshrc"
-
 # This function, rejiggle_captions, takes two arguments: a tag and a directory.
 # It searches for all .txt files in the specified directory and its subdirectories.
 # If a file contains the specified tag, the function removes the tag from its original position
@@ -46,7 +119,6 @@ rejiggle_captions() {
   done
 }
 
-
 # This function, `update_conda`, automates the process of upgrading all packages in every conda environment.
 # It performs the following steps:
 # 1. Retrieves the list of all conda environments using `conda env list` and extracts their names.
@@ -77,9 +149,6 @@ update_conda() {
     echo "All environments have been upgraded."
 }
 
-export LANG=ja_JP.UTF-8
-export LC_ALL=ja_JP.UTF-8
-
 list_word_freqs() {
     local target_dir=$1
     if [[ -z "$target_dir" ]]; then
@@ -248,8 +317,6 @@ display_custom_help() {
     echo "----------------------------------------------------------------------------------------------------------------------"
 }
 
-export RUST_BACKTRACE=1
-
 # This function `nv` retrieves the version of the NVIDIA CUDA Compiler (nvcc) installed on the system.
 # It extracts the version number from the `nvcc --version` command output.
 # The version number is then formatted by removing the dot (e.g., 12.6 becomes 126).
@@ -268,15 +335,13 @@ nv() {
     echo $result
 }
 
-export BNB_CUDA_VERSION=126
-
 # Function to remove consecutive repeated words in text files within a directory
 remove_repetition() {
   local dir=$1  # The directory to search for text files
   # Find all .txt files in the specified directory and process each file
   find "$dir" -type f -name "*.txt" | while read -r file; do
     # Use awk to process each line of the file
-    awk
+    awk '
     {
       n = split($0, words, " ")  # Split the line into words
       for (i = n; i > 1; i--) {  # Iterate from the last word to the second word
@@ -286,18 +351,10 @@ remove_repetition() {
         printf "%s%s", words[j], (j == i ? ORS : OFS)  # Print the word followed by a space or newline
       }
     }
-
-    # Save the processed content to a temporary file and replace the original file
-    "$file" > "${file}.tmp" && mv "${file}.tmp" "$file"
+    ' "$file" > "${file}.tmp" && mv "${file}.tmp" "$file"
   done
 }
 
-# This alias 'pie' is a shortcut for installing a Python package in editable mode
-# using the pip command with the --use-pep517 option.
-alias pie='pip install -e . --use-pep517'
-
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-
 # Organizes a sample prompt file from the current directory to datasets/furry.
 # It moves the file named sample-prompts.txt to either
 # ~/datasets/furry/sample_prompts/pony or ~/datasets/furry/sample_prompts/compass based on the content.
@@ -382,7 +439,6 @@ copy_matching_caption_files() {
   done
 }
 
-
 # This script performs a text replacement operation in all .txt files within a specified directory.
 # It takes three arguments:
 # 1. target_dir: The directory containing the .txt files where the text replacement will occur.
@@ -464,12 +520,6 @@ update_dir() {
     fi
 }
 
-export TOKENIZERS_PARALLELISM=false
-
-alias grabber="Grabber-cli"
-
-#export force_color_prompt=yes
-
 chop_lora() {
     local input_file="$1"
     local base_name="${input_file:r}"  # Remove extension
@@ -505,21 +555,6 @@ swch() {
     git clean -fxd && git pull && git checkout $branchname
 }
 
-export COMFYUI_PATH="$HOME/ComfyUI"
-export ZSH="$HOME/.oh-my-zsh"
-
-ZSH_THEME="kade"
-# CASE_SENSITIVE="true"
-# HYPHEN_INSENSITIVE="true"
-# DISABLE_MAGIC_FUNCTIONS="true"
-# DISABLE_LS_COLORS="true"
-# DISABLE_AUTO_TITLE="true"
-# ENABLE_CORRECTION="true"
-# COMPLETION_WAITING_DOTS="true"
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-plugins=(git autojump conda-env)
-
 extract_iframes() {
     # Assign input arguments
     input_file="$1"
@@ -557,7 +592,6 @@ convert_to_jxl() {
     echo "Conversion complete."
 }
 
-
 convert_pxl_to_png() {
     local target_directory="$1"
 
@@ -583,7 +617,6 @@ convert_pxl_to_png() {
     echo "Conversion complete."
 }
 
-
 seed() {
     local filePath="$1"
     python3 -c "
@@ -597,13 +630,6 @@ png2mp4() {
   -c:v libx264 -pix_fmt yuv420p out.mp4
 }
 
-
-source $ZSH/oh-my-zsh.sh
-
-export PATH=$PATH:$HOME/source/repos/dataset-tools/target/x86_64-unknown-linux-gnu/release:$HOME/.cargo/bin:$HOME/miniconda3/bin:$HOME/toolkit:$HOME/db/redis-stable/src:$HOME/db/postgresql/bin:$HOME/.local/bin:/opt/cuda/bin
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CONDA_PREFIX/lib:/opt/cuda/targets/x86_64-linux/lib
-export COMFYUI_MODEL_PATH=/home/kade/ComfyUI/models
-
 c_old() {
     cd ~/ComfyUI &&
     python3.12 main.py --listen 0.0.0.0 --preview-method taesd --use-pytorch-cross-attention --disable-xformers --fast
@@ -615,43 +641,6 @@ c() {
     python main.py --listen 0.0.0.0 --preview-method taesd --use-pytorch-cross-attention --disable-xformers --front-end-version Comfy-Org/ComfyUI_frontend@latest --fast
 }
 
-alias cp='cp --reflink=auto'
-alias t="tensorboard --logdir=$HOME/output_dir/logs"
-alias rt="vim ~/.tmux.conf && echo \"Reloading tmux config\" && tmux source ~/.tmux.conf"
-alias zr="vim ~/.zshrc && echo \"Reloading zsh config\" && source ~/.zshrc"
-alias ta="tmux att"
-alias ga="git add . && git commit -avs && git push"
-alias gs="git status"
-alias wd="git diff --word-diff-regex='[^,]+' --patience"
-alias vim="nvim"
-alias vi="nvim"
-alias v="nvim"
-alias grh='git reset --hard'
-alias gcs='git clone --recurse-submodules'
-
-source /home/kade/.config/broot/launcher/bash/br
-
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-
-alias ls='ls --color=always'
-
-# >>> conda initialize >>>
-# !! Contents within this block are managed by 'conda init' !!
-__conda_setup="$('/home/kade/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
-if [ $? -eq 0 ]; then
-    eval "$__conda_setup"
-else
-    if [ -f "/home/kade/miniconda3/etc/profile.d/conda.sh" ]; then
-        . "/home/kade/miniconda3/etc/profile.d/conda.sh"
-    else
-        export PATH="/home/kade/miniconda3/bin:$PATH"
-    fi
-fi
-unset __conda_setup
-# <<< conda initialize <<<
-
-unset CONDA_CHANGEPS1
-
 conda_prompt_info() {
   if [[ -n "$CONDA_DEFAULT_ENV" ]]; then
     echo "(${CONDA_DEFAULT_ENV})"