From 76cd51a2b3c554e04a428669953ec2c82fd3651e Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Sat, 16 Mar 2024 10:00:19 +0330
Subject: [PATCH] fix: dbus launch

---
 configs/hyprland/hypr/conf/autostart.conf    |  1 -
 configs/sh/.bashrc                           | 12 ++++++++++++
 configs/{zsh => sh}/.shell/dns-changer.sh    |  0
 configs/{zsh => sh}/.zsh/aliases/dir.zsh     |  0
 configs/{zsh => sh}/.zsh/aliases/git.zsh     |  0
 configs/{zsh => sh}/.zsh/aliases/index.zsh   |  0
 configs/{zsh => sh}/.zsh/functions/index.zsh |  0
 configs/{zsh => sh}/.zsh/os/debian.zsh       |  0
 configs/{zsh => sh}/.zsh/os/void.zsh         |  0
 configs/{zsh => sh}/.zshenv                  |  1 +
 configs/{zsh => sh}/.zshlogin                |  0
 configs/{zsh => sh}/.zshrc                   |  0
 stow.sh                                      |  4 ++--
 13 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 configs/sh/.bashrc
 rename configs/{zsh => sh}/.shell/dns-changer.sh (100%)
 rename configs/{zsh => sh}/.zsh/aliases/dir.zsh (100%)
 rename configs/{zsh => sh}/.zsh/aliases/git.zsh (100%)
 rename configs/{zsh => sh}/.zsh/aliases/index.zsh (100%)
 rename configs/{zsh => sh}/.zsh/functions/index.zsh (100%)
 rename configs/{zsh => sh}/.zsh/os/debian.zsh (100%)
 rename configs/{zsh => sh}/.zsh/os/void.zsh (100%)
 rename configs/{zsh => sh}/.zshenv (97%)
 rename configs/{zsh => sh}/.zshlogin (100%)
 rename configs/{zsh => sh}/.zshrc (100%)

diff --git a/configs/hyprland/hypr/conf/autostart.conf b/configs/hyprland/hypr/conf/autostart.conf
index 2c7c221..63412a2 100644
--- a/configs/hyprland/hypr/conf/autostart.conf
+++ b/configs/hyprland/hypr/conf/autostart.conf
@@ -3,7 +3,6 @@
 # -----------------------------------------------------
 
 # background services :
-exec-once = export $(dbus-launch) &
 exec-once = dbus-update-activation-environment --all &
 exec-once = ~/.config/hypr/scripts/keyring-launch.sh &
 exec-once = sleep 1 && pipewire &
diff --git a/configs/sh/.bashrc b/configs/sh/.bashrc
new file mode 100644
index 0000000..ed33d5f
--- /dev/null
+++ b/configs/sh/.bashrc
@@ -0,0 +1,12 @@
+# .bashrc
+export $(dbus-launch)
+
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
+alias ls='ls --color=auto'
+PS1='[\u@\h \W]\$ '
+. "$HOME/.cargo/env"
+
+[[ -f ~/.bash-preexec.sh ]] && source ~/.bash-preexec.sh
+eval "$(atuin init bash)"
diff --git a/configs/zsh/.shell/dns-changer.sh b/configs/sh/.shell/dns-changer.sh
similarity index 100%
rename from configs/zsh/.shell/dns-changer.sh
rename to configs/sh/.shell/dns-changer.sh
diff --git a/configs/zsh/.zsh/aliases/dir.zsh b/configs/sh/.zsh/aliases/dir.zsh
similarity index 100%
rename from configs/zsh/.zsh/aliases/dir.zsh
rename to configs/sh/.zsh/aliases/dir.zsh
diff --git a/configs/zsh/.zsh/aliases/git.zsh b/configs/sh/.zsh/aliases/git.zsh
similarity index 100%
rename from configs/zsh/.zsh/aliases/git.zsh
rename to configs/sh/.zsh/aliases/git.zsh
diff --git a/configs/zsh/.zsh/aliases/index.zsh b/configs/sh/.zsh/aliases/index.zsh
similarity index 100%
rename from configs/zsh/.zsh/aliases/index.zsh
rename to configs/sh/.zsh/aliases/index.zsh
diff --git a/configs/zsh/.zsh/functions/index.zsh b/configs/sh/.zsh/functions/index.zsh
similarity index 100%
rename from configs/zsh/.zsh/functions/index.zsh
rename to configs/sh/.zsh/functions/index.zsh
diff --git a/configs/zsh/.zsh/os/debian.zsh b/configs/sh/.zsh/os/debian.zsh
similarity index 100%
rename from configs/zsh/.zsh/os/debian.zsh
rename to configs/sh/.zsh/os/debian.zsh
diff --git a/configs/zsh/.zsh/os/void.zsh b/configs/sh/.zsh/os/void.zsh
similarity index 100%
rename from configs/zsh/.zsh/os/void.zsh
rename to configs/sh/.zsh/os/void.zsh
diff --git a/configs/zsh/.zshenv b/configs/sh/.zshenv
similarity index 97%
rename from configs/zsh/.zshenv
rename to configs/sh/.zshenv
index 9a9743b..9537ed8 100644
--- a/configs/zsh/.zshenv
+++ b/configs/sh/.zshenv
@@ -1,3 +1,4 @@
+export $(dbus-launch)
 export ZELLIJ_START=false
 export ZSH="$HOME/.oh-my-zsh"
 export OS_ID="$(grep -i -w 'ID=' /etc/os-release | awk -F= '{print $2}')"
diff --git a/configs/zsh/.zshlogin b/configs/sh/.zshlogin
similarity index 100%
rename from configs/zsh/.zshlogin
rename to configs/sh/.zshlogin
diff --git a/configs/zsh/.zshrc b/configs/sh/.zshrc
similarity index 100%
rename from configs/zsh/.zshrc
rename to configs/sh/.zshrc
diff --git a/stow.sh b/stow.sh
index aa58e06..d55e378 100755
--- a/stow.sh
+++ b/stow.sh
@@ -51,7 +51,7 @@ unstow_shortcuts() {
 
 stow_dotfiles() {
     create_symlinks $configs_dir/dotfiles ~/.config
-    create_symlinks $configs_dir/zsh ~/
+    create_symlinks $configs_dir/sh ~/
 
     echo "Dotfiles stowed successfully!"
 }
@@ -69,7 +69,7 @@ unstow_dotfiles() {
         fi
     done
 
-    for config in $configs_dir/zsh/.*; do
+    for config in $configs_dir/sh/.*; do
         if [ -f $config ]; then
             local file_name=$(basename $config)
             local target_file=~/$file_name