From 9876c30d6defed5576df940d1aee024c3e9f8148 Mon Sep 17 00:00:00 2001
From: Dmitry Chumak <mega.venik@gmail.com>
Date: Sun, 28 Jul 2024 16:18:45 +0300
Subject: [PATCH 1/2] [shell] moved to a single directory + alias.sh

---
 install.conf.yaml           | 4 ++--
 shell/alias.sh              | 2 ++
 {bash => shell/bash}/bashrc | 1 +
 {zsh => shell/zsh}/zshrc    | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 shell/alias.sh
 rename {bash => shell/bash}/bashrc (96%)
 rename {zsh => shell/zsh}/zshrc (93%)

diff --git a/install.conf.yaml b/install.conf.yaml
index 838daaf..fdfc1fa 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -7,8 +7,8 @@
 - link:
     ~/.tmux.conf: tmux.conf
     ~/.vim: vim
-    ~/.zshrc: zsh/zshrc
-    ~/.bashrc: bash/bashrc
+    ~/.zshrc: shell/zsh/zshrc
+    ~/.bashrc: shell/bash/bashrc
 
 - asdf:
   - plugin: vim
diff --git a/shell/alias.sh b/shell/alias.sh
new file mode 100644
index 0000000..82ceb9e
--- /dev/null
+++ b/shell/alias.sh
@@ -0,0 +1,2 @@
+alias l="ls -lah"
+alias lg="lazygit"
diff --git a/bash/bashrc b/shell/bash/bashrc
similarity index 96%
rename from bash/bashrc
rename to shell/bash/bashrc
index f630a13..7a57814 100644
--- a/bash/bashrc
+++ b/shell/bash/bashrc
@@ -1,4 +1,5 @@
 source ~/.dotfiles/git/git-prompt.sh
+source ~/.dotfiles/shell/alias.sh
 PROMPT_COMMAND='PS1_CMD1=$(__git_ps1 " [%s]")'; PS1='\[\e[38;5;117m\]\u\[\e[0m\] \w${PS1_CMD1}\$ '
 
 #
diff --git a/zsh/zshrc b/shell/zsh/zshrc
similarity index 93%
rename from zsh/zshrc
rename to shell/zsh/zshrc
index 83649bc..db2d811 100644
--- a/zsh/zshrc
+++ b/shell/zsh/zshrc
@@ -1,3 +1,4 @@
+source ~/.dotfiles/shell/alias.sh
 eval "$(/opt/homebrew/bin/brew shellenv)"
 if type brew &>/dev/null
 then

From 274c9f2babef9d1117a63787808101b41f34ee97 Mon Sep 17 00:00:00 2001
From: Dmitry Chumak <mega.venik@gmail.com>
Date: Sun, 28 Jul 2024 16:29:33 +0300
Subject: [PATCH 2/2] [shell] eng locale for lazygit alias

---
 shell/alias.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/alias.sh b/shell/alias.sh
index 82ceb9e..1a115a8 100644
--- a/shell/alias.sh
+++ b/shell/alias.sh
@@ -1,2 +1,2 @@
 alias l="ls -lah"
-alias lg="lazygit"
+alias lg="LANG=en_US-UTF-8 lazygit"