diff --git a/home/.config/shell/aliases.sh b/home/.config/shell/aliases.sh
index 2fc4f5f..904e1aa 100644
--- a/home/.config/shell/aliases.sh
+++ b/home/.config/shell/aliases.sh
@@ -3,8 +3,11 @@ alias lsc='/usr/bin/ls --color=auto' # Default ls with colors
 alias jls='jls -lh'
 alias ls='eza --icons'
 alias l='ls -lh'
+alias la='l -a'
 
 # navigation
+alias cd='z'
+alias cdi='zi'
 alias ~='cd ~'
 alias .-='cd -'
 alias cd..='cd ..'
@@ -48,6 +51,7 @@ alias pusht='push --tags'
 alias pushf='push --force'
 alias commit='git commit -S'
 alias clone='git clone'
+alias sclone='git clone --depth=1'
 alias add='git add'
 alias addp='git addp'
 alias status='git status'
diff --git a/home/.config/shell/setup.sh b/home/.config/shell/setup.sh
index ecc920a..909d2d6 100644
--- a/home/.config/shell/setup.sh
+++ b/home/.config/shell/setup.sh
@@ -4,26 +4,27 @@ AURHELPER=paru
 LC_MESSAGES=en_US.UTF-8
 LANGUAGE=en_US
 LANG=en_US.UTF-8
+SHELL_NAME=$(basename $SHELL)
 
-# Enable the autojump
-[[ -s /etc/profile.d/autojump.sh ]] && source /etc/profile.d/autojump.sh
-# Setup the github-copilot-cli alias `??`
-if command -v github-copilot-cli >/dev/null 2>&1; then
-  eval "$(github-copilot-cli alias -- "$0")"
+[[ -e "$HOME/.private-env.sh" ]] && source "$HOME/.private-env.sh"
+
+if command -v gh >/dev/null 2>&1; then
+  eval "$(gh copilot alias -- $SHELL_NAME)"
 fi
 
 # The prompt
 if command -v oh-my-posh >/dev/null 2>&1 && [[ $PROMPT == "ohmyposh" ]]; then
-  eval "$(oh-my-posh init $(basename $SHELL) --config ~/.config/ohmyposh/1_shell.omp.json)"
+  eval "$(oh-my-posh init $SHELL_NAME --config ~/.config/ohmyposh/1_shell.omp.json)"
 fi
 if command -v starship >/dev/null 2>&1 && [[ $PROMPT == "starship" ]]; then
-  eval "$(starship init $(basename $SHELL))"
+  eval "$(starship init $SHELL_NAME)"
 fi
 
-if command -v opam >/dev/null 2>&1; then
-  eval "$(opam env)"
-fi
+# if command -v opam >/dev/null 2>&1; then
+#   eval "$(opam env)"
+# fi
 
+eval "$(zoxide init $SHELL_NAME)"
 
 
 # Auto run
diff --git a/home/.config/sxhkd/sxhkdrc b/home/.config/sxhkd/sxhkdrc
index 6562f27..bbcf38a 100644
--- a/home/.config/sxhkd/sxhkdrc
+++ b/home/.config/sxhkd/sxhkdrc
@@ -15,7 +15,7 @@ super + Return
 
 # Lockscreen
 super + shift + x
-    betterlockscreen -l
+    slock
 
 ##---------- Applications ----------##
 
diff --git a/home/.config/tmux/tmux.conf b/home/.config/tmux/tmux.conf
index 3b1048f..b0a07ff 100644
--- a/home/.config/tmux/tmux.conf
+++ b/home/.config/tmux/tmux.conf
@@ -33,7 +33,7 @@ set -g display-time 4000
 # Focus events enabled for terminals that support them
 set -g focus-events on
 
-# Move between panes with vi keys
+# Move between panes
 bind t select-pane -L
 bind e select-pane -D
 bind s select-pane -U
@@ -59,6 +59,8 @@ unbind %
 bind -n M-tab last-window
 bind tab last-pane
 
+bind -n M-b choose-buffer
+
 # Plugins
 # I don't see the point of having a plugin manager for tmux
 # Just clone the repo and source it
@@ -67,4 +69,5 @@ bind tab last-pane
 run ~/.config/tmux/plugins/tmux-prefix-highlight/prefix_highlight.tmux
 
 # Status bar
-set -g status-right "#{prefix_highlight} | %a %Y-%m-%d %H:%M"
+set -g status-right '#(gitmux "#{pane_current_path}")'
+# set -g status-right "#{prefix_highlight} | %a %Y-%m-%d %H:%M"
diff --git a/home/.xprofile b/home/.xprofile
index d9fcd7a..4552ad8 100644
--- a/home/.xprofile
+++ b/home/.xprofile
@@ -16,6 +16,9 @@ export "SSH_AUTH_SOCK=/run/user/$(id -u)/gnupg/S.gpg-agent.ssh"
 
 # Keyboard layouts switch (requires setxkbmap)
 setxkbmap -model pc104 -layout us,ara -variant dvorak-l, -option grp:win_space_toggle caps:swapescape keypad:pointerkeys
+export TOUCHPAD_ACCEL_SPEED=0.6
+touchpad-accel-toggle -e
+
 # Start the key deamon
 sxhkd -m 1 &
 #  Restores the wallpaper
@@ -23,7 +26,7 @@ nitrogen --restore &
 #  Start the network manger
 nm-applet &
 # Start the  clipboard manger
-copyq &
+# copyq &
 # sticky keys script
 stickykeys &
 # Start a new terminal with tmux
diff --git a/home/.zshenv b/home/.zshenv
index 17fdcde..614317a 100644
--- a/home/.zshenv
+++ b/home/.zshenv
@@ -19,12 +19,12 @@ fi
 export PATH="$PATH:$HOME/.local/share/bin"
 export PATH="$PATH:$JAVA_HOME/bin:$HOME/.local/share/gem/ruby/3.0.0/bin:$HOME/Android/Sdk/platform-tools"
 export PATH="$PATH:$HOME/.scripts"
-export PATH="$PATH:$HOME/.config/emacs/bin:$HOME/.emacs.d/bin"
+# export PATH="$PATH:$HOME/.config/emacs/bin:$HOME/.emacs.d/bin"
 export PATH="$PATH:/snap/bin"
 export PATH="$PATH:$HOME/.local/share/JetBrains/Toolbox/scripts"
 export PATH="$PATH:$HOME/.nimbel/bin"
 
 ### cargo ###
 export CARGO_TARGET_DIR=$HOME/.cargo-target
-export PATH="$PATH:$CARGO_TARGET_DIR/release"
+# export PATH="$PATH:$CARGO_TARGET_DIR/release"
 . "$HOME/.cargo/env"
diff --git a/home/.zshrc b/home/.zshrc
index 92b79ae..2122979 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -9,6 +9,10 @@ setopt aliases    # Expand aliases
 setopt autocd
 setopt cdablevars
 setopt multios
+setopt extended_history
+setopt inc_append_history_time
+setopt autopushd
+setopt pushdignoredups
 
 # Enable colors and change prompt:
 autoload -U colors && colors
@@ -16,6 +20,7 @@ PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magent
 
 # PROMPT="%B%{$fg[cyan]%}%(4~|%-1~/.../%2~|%~)%u%b >%{$fg[cyan]%}>%B%(?.% "
 
+DIRSTACKSIZE=25
 # History in cache directory:
 HISTSIZE=1000000000
 SAVEHIST=1000000000