From 18f882a4d94c401fe4315613078b7931dc282da2 Mon Sep 17 00:00:00 2001
From: Roman <sher-rom2013@yandex.ru>
Date: Wed, 21 Feb 2024 20:18:25 +0700
Subject: [PATCH] Changed zsh prompt colors; Changed mistakes in gitconfig file

---
 git/.gitconfig | 22 +++++++++++-----------
 zsh/.zshrc     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 968e949..d86e331 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,22 +1,22 @@
 [user]
-	name = NordeN
-	email = sher-rom2013@yandex.ru
+    name = NordeN
+    email = sher-rom2013@yandex.ru
 [core]
-	longpaths = true
-	quotepath = off
-	safecrlf = warn
-	editor = vim
+    longpaths = true
+    quotepath = off
+    safecrlf = warn
+    editor = vim
 [diff]
-	tool = meld
+    tool = meld
 [difftool "meld"]
     cmd = meld $LOCAL $REMOTE
 [merge]
-	tool = meld
+    tool = meld
 [mergetool "meld"]
     prompt = false
-    keepBackup = true
+    keepBackup = false
     cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output="$MERGED"
 [alias]
-	lore = log --all --pretty=format:'%C(174)%h%C(auto)%d %C(114)[%s]'
-	df = difftool --dir-diff
+    lore = log --all --pretty=format:'%C(174)%h%C(auto)%d %C(114)[%s]'
+    df = difftool -t meld
     mt = mergetool -t meld
\ No newline at end of file
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 57aab36..364ac3a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -120,7 +120,7 @@ bindkey '^[[B' down-line-or-search
 bindkey '^ ' autosuggest-accept
 
 # Настройки Shell Prompt
-export PROMPT='$FG[224]┌──[%F{8}%*%f$FG[224]]-[$FG[167]%n$FG[217]@$FG[215]%M$FG[224]]-[$FG[109]%~$FG[224]] $(git_prompt_info)%{$reset_color%}
+export PROMPT='$FG[224]┌──[%F{29}%*%f$FG[224]]-[$FG[167]%n$FG[217]@$FG[215]%M$FG[224]]-[$FG[109]%~$FG[224]] $(git_prompt_info)%{$reset_color%}
 └─$FG[224]# '
 export ZSH_THEME_GIT_PROMPT_PREFIX="$FG[145]git:[$FG[228]"
 export ZSH_THEME_GIT_PROMPT_DIRTY="$FG[145]]:[$FG[228]✗$FG[145]] "