From d3a7f20f84d4439f9ad53dd4b9881530c4c89937 Mon Sep 17 00:00:00 2001
From: dimti <demidov@dimti.ru>
Date: Wed, 2 Oct 2024 16:55:34 +0300
Subject: [PATCH] * correct shell aliases appropriate by latest legacy forked
 repo version on fe8fc34e7a8e277b08cd2f3f0bcf2b6f918e9551

---
 .bash_aliases  |  7 -------
 .shell-aliases | 51 +++++++++++++++------------------------------------
 2 files changed, 15 insertions(+), 43 deletions(-)
 delete mode 100644 .bash_aliases

diff --git a/.bash_aliases b/.bash_aliases
deleted file mode 100644
index dc8936e..0000000
--- a/.bash_aliases
+++ /dev/null
@@ -1,7 +0,0 @@
-alias gst='git status'
-alias ga='git add'
-alias gc='git commit -m'
-alias gush='git push'
-alias gull='git pull'
-alias gb='git branch'
-alias dc='docker-compose'
diff --git a/.shell-aliases b/.shell-aliases
index 9994b2d..5adfdb1 100644
--- a/.shell-aliases
+++ b/.shell-aliases
@@ -1,36 +1,15 @@
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-# Source global definitions
-test -r /etc/bashrc && . /etc/bashrc
-
-test -r ~/.bash_aliases && . ~/.bash_aliases
-
-# don't put duplicate lines in the history. See bash(1) for more options
-# ... or force ignoredups and ignorespace
-HISTCONTROL=ignoreboth
-export HISTIGNORE="&:ls:[bf]g:pwd:exit:cd .."
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-PROMPT_COMMAND="history -a;$PROMPT_COMMAND"
-
-# Store multiline commands as one line.
-shopt -s cmdhist
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=10000
-HISTFILESIZE=20000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# Spellcheck directories
-shopt -s dirspell
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-test -f /usr/share/bash-completion/bash_completion && . /usr/share/bash-completion/bash_completion
-test -f /etc/bash_completion && . /etc/bash_completion
+alias tmux='tmux -2'
+
+if command -v eza >/dev/null 2>&1; then
+  alias ls='eza'
+else
+  alias ls='ls --color=auto'
+fi
+
+alias gst='git status'
+alias ga='git add'
+alias gc='git commit -m'
+alias gush='git push'
+alias gull='git pull'
+alias gb='git branch'
+alias dc='docker-compose'