diff --git a/Scripts/r.sh b/Scripts/r.sh
index 4ef06a5..ec69982 100644
--- a/Scripts/r.sh
+++ b/Scripts/r.sh
@@ -107,7 +107,7 @@ elif is_fedora_family; then
 
     echo -e "${BLUE}    LOG:${YELLOW} Fedora detected. Using system R...${NC}"
     install_status=0
-    install_packages R-core gcc-gfortran curl tar || install_status=$?
+    install_packages R-core R-core-devel gcc-gfortran curl tar || install_status=$?
     if [ "$install_status" -eq 42 ]; then
         exit 0
     elif [ "$install_status" -ne 0 ]; then
diff --git a/Zsh/.zshrc b/Zsh/.zshrc
index c206d3d..04fc215 100644
--- a/Zsh/.zshrc
+++ b/Zsh/.zshrc
@@ -12,10 +12,26 @@ export DOTZSH_SUDO_PLUGIN="$ZSH/plugins/sudo/sudo.plugin.zsh"
 export DOTZSH_RCLONE_PLUGIN="$ZSH/plugins/rclone/rclone.plugin.zsh"
 export DOTZSH_AUTOSUGGESTIONS_PLUGIN="$ZSH/custom/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh"
 export DOTZSH_SYNTAX_HIGHLIGHTING_PLUGIN="$ZSH/custom/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh"
+export DOTZSH_HISTORY_SUBSTRING_SEARCH_PLUGIN="$ZSH/plugins/history-substring-search/history-substring-search.plugin.zsh"
 
 # Programming Languages Root
 export PROG_DIR="$HOME/.programming"
 
+# History
+export HISTFILE="$HOME/.zsh_history"
+export HISTSIZE=10000
+export SAVEHIST=10000
+
+setopt APPEND_HISTORY
+setopt SHARE_HISTORY
+setopt EXTENDED_HISTORY
+setopt HIST_EXPIRE_DUPS_FIRST
+setopt HIST_IGNORE_ALL_DUPS
+setopt HIST_IGNORE_SPACE
+setopt HIST_FIND_NO_DUPS
+setopt HIST_REDUCE_BLANKS
+setopt HIST_SAVE_NO_DUPS
+
 typeset -gA DOTZSH_MISSING_TOOL_WARNED
 
 dotzsh_warn_missing_tool_once() {
@@ -190,5 +206,22 @@ fi
 [ -f ~/.zsh_prompt ] && source ~/.zsh_prompt
 
 # Interactive Enhancements
+[ -f "$DOTZSH_HISTORY_SUBSTRING_SEARCH_PLUGIN" ] && source "$DOTZSH_HISTORY_SUBSTRING_SEARCH_PLUGIN"
 [ -f "$DOTZSH_AUTOSUGGESTIONS_PLUGIN" ] && source "$DOTZSH_AUTOSUGGESTIONS_PLUGIN"
 [ -f "$DOTZSH_SYNTAX_HIGHLIGHTING_PLUGIN" ] && source "$DOTZSH_SYNTAX_HIGHLIGHTING_PLUGIN"
+
+export HISTORY_SUBSTRING_SEARCH_PREFIXED=1
+
+# History keybindings
+bindkey '^[[A' history-substring-search-up
+bindkey '^[OA' history-substring-search-up
+bindkey '^[[B' history-substring-search-down
+bindkey '^[OB' history-substring-search-down
+
+# pnpm
+export PNPM_HOME="$PROG_DIR/node/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+# pnpm end