From f1c9fe9c161d876498658d273b9a94385a6c48eb Mon Sep 17 00:00:00 2001
From: gibbyb <gib@gibbyb.com>
Date: Tue, 11 Jun 2024 09:35:10 -0500
Subject: [PATCH] Clean up bashrc

---
 defaults/bash/aliases  |  1 -
 defaults/bash/inputrc  | 31 -------------------------------
 defaults/bash/shell    | 13 +++++++++++--
 install/app_bottles.sh |  1 +
 sources/dotfiles.sh    |  6 +-----
 5 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 defaults/bash/inputrc
 create mode 100644 install/app_bottles.sh

diff --git a/defaults/bash/aliases b/defaults/bash/aliases
index 74bd045..598dd0f 100644
--- a/defaults/bash/aliases
+++ b/defaults/bash/aliases
@@ -8,7 +8,6 @@ alias :wq="exit"
 alias cdcode="cd ~/Documents/Code"
 alias rnr="ranger"
 alias startsunshine="systemctl --user restart sunshine.service"
-alias jump="wine /home/gib/.wine/drive_c/Program\ Files/Phase\ Five\ Systems/Jump\ Desktop/JumpClient.exe & disown"
 alias n.="nvim ."
 
 # File system
diff --git a/defaults/bash/inputrc b/defaults/bash/inputrc
deleted file mode 100644
index a0ef754..0000000
--- a/defaults/bash/inputrc
+++ /dev/null
@@ -1,31 +0,0 @@
-set completion-ignore-case on
-set completion-prefix-display-length 2
-set show-all-if-ambiguous on
-set show-all-if-unmodified on
-
-# Immediately add a trailing slash when autocompleting symlinks to directories
-set mark-symlinked-directories on
-
-# Do not autocomplete hidden files unless the pattern explicitly begins with a dot
-set match-hidden-files off
-
-# Show all autocomplete results at once
-set page-completions off
-
-# If there are more than 200 possible completions for a word, ask to show them all
-set completion-query-items 200
-
-# Show extra file information when completing, like `ls -F` does
-set visible-stats on
-
-$if Bash
-  # Be more intelligent when autocompleting by also looking at the text after
-  # the cursor. For example, when the current line is "cd ~/src/mozil", and
-  # the cursor is on the "z", pressing Tab will not autocomplete it to "cd
-  # ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
-  # Readline used by Bash 4.)
-  set skip-completed-text on
-
-  # Coloring for Bash 4 tab completions.
-  set colored-stats on
-$endif
diff --git a/defaults/bash/shell b/defaults/bash/shell
index 3ee6522..1760ff6 100644
--- a/defaults/bash/shell
+++ b/defaults/bash/shell
@@ -1,3 +1,8 @@
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
 # History control
 shopt -s histappend
 HISTCONTROL=ignoreboth
@@ -8,10 +13,14 @@ HISTFILESIZE="${HISTSIZE}"
 export EDITOR="nvim"
 export SUDO_EDITOR="nvim"
 
-export SUNHAT_PATH="/home/$USER/.local/share/sunhat"
+# Define Paths
+export SUNHAT_PATH="$HOME/.local/share/sunhat"
+export CARGO_PATH="$HOME/.cargo"
 export BUN_INSTALL="$HOME/.bun"
+export PYENV_ROOT="$HOME/.pyenv"
+export PNPM_HOME="$HOME/.local/share/pnpm"
 
 # Set complete path
-export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/sunhat/bin:$HOME/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$BUN_INSTALL/bin:$HOME/.cargo/bin"
+export PATH="$HOME/bin:$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SUNHAT_PATH/bin:$BUN_INSTALL/bin:$CARGO_PATH/bin:$PNPM_HOME:$PYENV_ROOT/bin:$HOME/.rbenv/bin"
 set +h
 
diff --git a/install/app_bottles.sh b/install/app_bottles.sh
new file mode 100644
index 0000000..e99cbd9
--- /dev/null
+++ b/install/app_bottles.sh
@@ -0,0 +1 @@
+sudo dnf install -y bottles
diff --git a/sources/dotfiles.sh b/sources/dotfiles.sh
index be223d5..d730092 100644
--- a/sources/dotfiles.sh
+++ b/sources/dotfiles.sh
@@ -2,15 +2,11 @@
 mkdir ~/Documents/Configs
 
 # Set up Bash Config and Source it ASAP.
-[ -f "~/.bashrc" ] && rm ~/.bashrc
+[ -f "$HOME/.bashrc" ] && rm ~/.bashrc
 cp ~/.local/share/sunhat/configs/rc/bashrc ~/Documents/Configs/bashrc
 ln -s ~/Documents/Configs/bashrc ~/.bashrc
 source ~/.bashrc
 
-[ -f "~/.inputrc" ] && rm ~/.inputrc
-cp ~/.local/share/sunhat/configs/rc/inputrc ~/Documents/Configs/inputrc
-ln -s ~/Documents/Configs/inputrc ~/.inputrc
-
 # Copy all Dotfiles to the Configs Directory.
 cp -r ~/.local/share/sunhat/configs/dotfiles/. ~/Documents/Configs/