PS1 changed

3 files changed, 67 insertions, 14 deletions

diff --git a/.bashrc b/.bashrc
index 948f40f..b69b0a9 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,5 +1,7 @@
 source /etc/profile
-source ~/.cursed_bash.sh
+source "$HOME/.cursed_bash.sh"
+source /usr/share/git/git-prompt.sh
+source /usr/share/doc/pkgfile/command-not-found.bash
 
 # application shortcuts
 alias ls="ls --color"
@@ -10,8 +12,35 @@ alias cppreference="microsoft-edge-dev /usr/share/doc/cppreference/en/cpp.html"
 alias lan="/home/main/zerotierconnect.sh"
 alias python=/home/main/coding/py/venv/bin/python3
 
-export JAVA_HOME="/usr/lib/jvm/default/"
+# shell options
+shopt -s autocd
+# # 256 colors
+# C_VIOLETISH="\[\e[38;5;183m\]"
+# C_="\[\e[38;5;183m\]"
+# # ANSII colors
+# C_RED="\[\e[31m\]"
+# C_GREEN="\[\e[32m\]"
+# C_YELLOW="\[\e[33m\]"
+# C_BLUE="\[\e[34m\]"
+# C_MAGENTA="\[\e[35m\]"
+# C_CYAN="\[\e[36m\]"
+# C_WHITE="\[\e[37m\]"
+# # bright colors
+# C_BRED="\[\e[91m\]"
+# C_BGREEN="\[\e[92m\]"
+# C_BYELLOW="\[\e[93m\]"
+# C_BBLUE="\[\e[94m\]"
+# C_BMAGENTA="\[\e[95m\]"
+# C_BCYAN="\[\e[96m\]"
+# C_BWHITE="\[\e[97m\]"
+# # font modifiers
+# C_BOLD="\[\e[1m\]"
+# C_BLINK="\[\e[5m\]"
+# # reset
+# C_RESET="\[\e[0m\]"
 
+export JAVA_HOME="/usr/lib/jvm/default/"
+export PS1='[\[\e[1;32m\]\u@\h\[\e[0m\]:\[\e[36m\]\W\[\e[93m\]$(__git_ps1 "(%s" | cut_dots 15 ")")\[\e[37m]\[\e[38;5;183m\]\$\[\e[0m\] '
 # dotfiles
 
 GHC_PACKAGE_PATH="/usr/lib/ghc-9.0.2/package.conf.d"
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
index 9cd87fe..b8d275b 100644
--- a/.config/picom/picom.conf
+++ b/.config/picom/picom.conf
@@ -1,16 +1,35 @@
-inactive-opacity = 0.90;
-fade-in-step = 0.01;
-fade-out-step = 0.01;
-fade-delta = 16;
+inactive-opacity = 0.85;
+fade-in-step = 0.075;
+fade-out-step = 0.075;
+fade-delta = 10;
 fading = true;
-no-fading-openclose = true;
-corner-radius = 10;
-shadow = true;
+no-fading-openclose = false;
+no-fading-destroyed-args = true;
+shadow = false; // high CPU load and degraded performance in terminal
+corner-radius = 13;
+rounded-corners-exclude = [
+	"window_type = 'dock'",
+	"class_g = 'i3bar'",
+];
+opacity-rule = [
+	"100:name *= 'YouTube'",
+	"100:name *= 'ヰカちゃん♡♡'",  
+	"90:class_g = 'telegram-desktop'",
+];
 blur = {
 	method = "gaussian";
-	size = 5;
-	deviation = 5;
-}
+	size = 7;
+	deviation = 7;
+};
+blur-background-exclude = [
+    "class_g = 'slop'",
+];
 wintypes = {
-
-}
+	toolbar = { fade = false };
+	menu = { fade = false };
+	dropdiwn_menu = { fade = false };
+	popup_menu = { fade = false };
+	utility = { fade = false };
+	dock = { fade = false };
+	dnd = { fade = false };
+};
diff --git a/.cursed_bash.sh b/.cursed_bash.sh
index f304e14..9ceaee6 100644
--- a/.cursed_bash.sh
+++ b/.cursed_bash.sh
@@ -1,4 +1,9 @@
 
+function cut_dots {
+	read arg
+	echo $arg | awk "{ if (length > $1) print substr(\$0,1,$(($1 - 2)))\"..$2\"; else if (length > 1) print \$0\"$2\"; else print; }"
+}
+
 function count_git_files_length {
 	echo $( for i in `git ls-tree --full-tree -r --name-only HEAD`; do wc -l "$i"; done | sed -r 's/[^0-9]+/\+/g' | cat - <(echo 0) | tr -d '\n'; echo )  | bc
 }