From 6edcfc4decb62da0c15a1ab03dcc6fe0b1b1cb75 Mon Sep 17 00:00:00 2001
From: Lucas Barbieri <lucasbarbieri.c@gmail.com>
Date: Mon, 17 Jun 2024 10:47:39 -0300
Subject: [PATCH] tidy up shell files

---
 .../shell-files/{Xresources => .Xresources}   |  0
 .../configs/shell-files/{bashrc => .bashrc}   |  0
 desktop/configs/shell-files/{urxvt => .urxvt} |  0
 .../configs/shell-files/{xinitrc => .xinitrc} |  2 +-
 desktop/configs/shell-files/{zshrc => .zshrc} | 30 +++++++++++++++----
 5 files changed, 25 insertions(+), 7 deletions(-)
 rename desktop/configs/shell-files/{Xresources => .Xresources} (100%)
 rename desktop/configs/shell-files/{bashrc => .bashrc} (100%)
 rename desktop/configs/shell-files/{urxvt => .urxvt} (100%)
 rename desktop/configs/shell-files/{xinitrc => .xinitrc} (92%)
 rename desktop/configs/shell-files/{zshrc => .zshrc} (56%)

diff --git a/desktop/configs/shell-files/Xresources b/desktop/configs/shell-files/.Xresources
similarity index 100%
rename from desktop/configs/shell-files/Xresources
rename to desktop/configs/shell-files/.Xresources
diff --git a/desktop/configs/shell-files/bashrc b/desktop/configs/shell-files/.bashrc
similarity index 100%
rename from desktop/configs/shell-files/bashrc
rename to desktop/configs/shell-files/.bashrc
diff --git a/desktop/configs/shell-files/urxvt b/desktop/configs/shell-files/.urxvt
similarity index 100%
rename from desktop/configs/shell-files/urxvt
rename to desktop/configs/shell-files/.urxvt
diff --git a/desktop/configs/shell-files/xinitrc b/desktop/configs/shell-files/.xinitrc
similarity index 92%
rename from desktop/configs/shell-files/xinitrc
rename to desktop/configs/shell-files/.xinitrc
index 735250f..68e898c 100644
--- a/desktop/configs/shell-files/xinitrc
+++ b/desktop/configs/shell-files/.xinitrc
@@ -44,7 +44,7 @@ fi
 
 if [ -n "$failsafe" ]; then
     export XDG_SESSION_TYPE="x11"
-    exec dbus-launch --exit-with-session leftwm | tee ~/leftwm.log
+    exec dbus-launch --exit-with-session leftwm > ~/leftwm.log
 else
     exec $command
 fi
diff --git a/desktop/configs/shell-files/zshrc b/desktop/configs/shell-files/.zshrc
similarity index 56%
rename from desktop/configs/shell-files/zshrc
rename to desktop/configs/shell-files/.zshrc
index 86ffb6e..864486d 100644
--- a/desktop/configs/shell-files/zshrc
+++ b/desktop/configs/shell-files/.zshrc
@@ -1,13 +1,22 @@
 export PATH=$HOME/.local/bin:$PATH
 export PATH=$HOME/.ghcup/bin:$PATH
+export PATH=$HOME/.cargo/bin:$PATH
 export PATH=$HOME/.config/emacs/bin:$PATH
+export PATH=/sbin:$PATH
+export PATH=$HOME/.local/share/nvim/mason/bin:$PATH
+export PATH=$HOME/go/bin:$PATH
+export PATH=$HOME/.yarn/bin:$PATH
 export ZSH="$HOME/.oh-my-zsh"
 export R2MOD_INSTALL_DIR="/games/SteamLibrary/steamapps/common/Risk of Rain 2"
 export R2MOD_COMPAT_DIR="/games/SteamLibrary/steamapps/compatdata/632360"
+export GTK_THEME=Everforest-Dark-BL
 
-ZSH_THEME="daivasmara"
+# ZSH_THEME="daivasmara"
+ZSH_THEME="common"
 zstyle ':omz:update' mode auto      # update automatically without asking
 
+umask 002
+
 # Uncomment the following line if pasting URLs and other text is messed up.
 # DISABLE_MAGIC_FUNCTIONS="true"
 plugins=(git fast-syntax-highlighting zsh-autosuggestions autojump)
@@ -16,21 +25,30 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#344146"
 
 source $ZSH/oh-my-zsh.sh
 unsetopt beep
-alias ls="bash ~/elash.sh"
+alias ls="bash ~/scripts/elash.sh"
 alias cat="bat"
 alias v="nvim"
 alias c="clear"
-alias hi="loginctl hibernate"
+alias hi="pkill linux-wallpaperengine; loginctl hibernate"
 alias sx="startx"
 alias reboot="loginctl reboot"
 alias poweroff="loginctl poweroff"
-alias wget="aria2c"
-alias kitsune="cd ~/repos/kitsune && source ~/repos/venv/bin/activate"
+alias kitsune="cd ~/repos/kitsune && . ~/repos/venv/bin/activate"
 alias sus="loginctl suspend-then-hibernate"
 alias xsc="xclip -sel clip"
 alias sw="swapon --show"
+alias icat="kitty +kitten icat"
 [ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+alias hr="date +'%Hh:%M, %d-%m-%Y'"
+alias neofetch="fastfetch"
 
-export BAT_THEME="Solarized (dark)"
+export BAT_THEME="Solarized (light)"
 export FPATH="/hdd/docs/eza/completions/zsh:$FPATH"
 export EDITOR=nvim
+export PATH=$PATH:/yang/.spicetify
+
+[ -f "/yang/.ghcup/env" ] && source "/yang/.ghcup/env" # ghcup-env
+
+# if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
+#     dbus-run-session Hyprland
+# fi