From 1627351c1f07657acb9c422cb1bf2f763e179cad Mon Sep 17 00:00:00 2001
From: 71Zombie <76274154+71Zombie@users.noreply.github.com>
Date: Mon, 25 Oct 2021 09:40:34 -0400
Subject: [PATCH] Fish configuration

---
 0-preinstall.sh                  | 19 ++++++++++--------
 1-setup.sh                       |  2 ++
 2-user.sh                        | 10 +++++++++-
 archtitus.sh => betterarch.sh    |  0
 configs/.config/fish/config.fish | 33 ++++++++++++++++++++++++++++++++
 5 files changed, 55 insertions(+), 9 deletions(-)
 rename archtitus.sh => betterarch.sh (100%)
 mode change 100755 => 100644
 create mode 100644 configs/.config/fish/config.fish

diff --git a/0-preinstall.sh b/0-preinstall.sh
index 577276d..ed34820 100644
--- a/0-preinstall.sh
+++ b/0-preinstall.sh
@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
-#-------------------------------------------------------------------------
-#   █████╗ ██████╗  ██████╗██╗  ██╗████████╗██╗████████╗██╗   ██╗███████╗
-#  ██╔══██╗██╔══██╗██╔════╝██║  ██║╚══██╔══╝██║╚══██╔══╝██║   ██║██╔════╝
-#  ███████║██████╔╝██║     ███████║   ██║   ██║   ██║   ██║   ██║███████╗
-#  ██╔══██║██╔══██╗██║     ██╔══██║   ██║   ██║   ██║   ██║   ██║╚════██║
-#  ██║  ██║██║  ██║╚██████╗██║  ██║   ██║   ██║   ██║   ╚██████╔╝███████║
-#  ╚═╝  ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝   ╚═╝   ╚═╝   ╚═╝    ╚═════╝ ╚══════╝
-#-------------------------------------------------------------------------
+#------------------------------------------------------------------------------------
+#                                                                          ▄▄
+#▀███▀▀▀██▄         ██    ██                        ██                    ███
+#  ██    ██         ██    ██                       ▄██▄                    ██
+#  ██    ██ ▄▄█▀██████████████  ▄▄█▀██▀███▄███    ▄█▀██▄   ▀███▄███ ▄██▀██ ███████▄
+#  ██▀▀▀█▄▄▄█▀   ██ ██    ██   ▄█▀   ██ ██▀ ▀▀   ▄█  ▀██     ██▀ ▀▀██▀  ██ ██    ██
+#  ██    ▀███▀▀▀▀▀▀ ██    ██   ██▀▀▀▀▀▀ ██       ████████    ██    ██      ██    ██
+#  ██    ▄███▄    ▄ ██    ██   ██▄    ▄ ██      █▀      ██   ██    ██▄    ▄██    ██
+#▄████████  ▀█████▀ ▀████ ▀████ ▀█████▀████▄  ▄███▄   ▄████▄████▄   █████▀████  ████▄
+#
+#------------------------------------------------------------------------------------
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 echo "-------------------------------------------------"
 echo "Setting up mirrors for optimal download          "
diff --git a/1-setup.sh b/1-setup.sh
index 9e1a1e1..fd2689a 100644
--- a/1-setup.sh
+++ b/1-setup.sh
@@ -135,6 +135,7 @@ PKGS=(
 'lzop'
 'm4'
 'make'
+'metasploit' #Exploit
 'milou'
 'nano'
 'neofetch'
@@ -177,6 +178,7 @@ PKGS=(
 'vim'
 'virt-manager'
 'virt-viewer'
+'vlc'
 'wget'
 'which'
 'wine-gecko'
diff --git a/2-user.sh b/2-user.sh
index 6afa471..c70ce2f 100755
--- a/2-user.sh
+++ b/2-user.sh
@@ -57,6 +57,14 @@ for PKG in "${PKGS[@]}"; do
     yay -S --noconfirm $PKG
 done
 
+
+#echo eval "$(starship init bash)" >> ~/.bashrc
+
+  # Fish
+  mkdir $HOME/.config/fish
+  mv /root/BetterArch/configs/.config/fish/config.fish $HOME/.config/fish/
+
+
 export PATH=$PATH:~/.local/bin
 cp -r $HOME/BetterArch/dotfiles/* $HOME/.config/
 pip install konsave
@@ -66,7 +74,7 @@ konsave -a kde
 
 echo -e "\nInstalling Portsmaster\n"
 sudo pacman -S libnetfilter_queue libappindicator-gtk3
-
+cd ~
 git clone https://github.com/safing/portmaster-packaging
 cd portmaster-packaging/linux
 makepkg -is
diff --git a/archtitus.sh b/betterarch.sh
old mode 100755
new mode 100644
similarity index 100%
rename from archtitus.sh
rename to betterarch.sh
diff --git a/configs/.config/fish/config.fish b/configs/.config/fish/config.fish
new file mode 100644
index 0000000..9f5fff5
--- /dev/null
+++ b/configs/.config/fish/config.fish
@@ -0,0 +1,33 @@
+source ~/.config/fish/alias.fish
+
+# Configure Jump
+status --is-interactive; and source (jump shell fish | psub)
+
+# Load all saved ssh keys
+/usr/bin/ssh-add -A ^/dev/null
+
+# Fish syntax highlighting
+set -g fish_color_autosuggestion '555'  'brblack'
+set -g fish_color_cancel -r
+set -g fish_color_command --bold
+set -g fish_color_comment red
+set -g fish_color_cwd green
+set -g fish_color_cwd_root red
+set -g fish_color_end brmagenta
+set -g fish_color_error brred
+set -g fish_color_escape 'bryellow'  '--bold'
+set -g fish_color_history_current --bold
+set -g fish_color_host normal
+set -g fish_color_match --background=brblue
+set -g fish_color_normal normal
+set -g fish_color_operator bryellow
+set -g fish_color_param cyan
+set -g fish_color_quote yellow
+set -g fish_color_redirection brblue
+set -g fish_color_search_match 'bryellow'  '--background=brblack'
+set -g fish_color_selection 'white'  '--bold'  '--background=brblack'
+set -g fish_color_user brgreen
+set -g fish_color_valid_path --underline
+
+# Install Starship
+starship init fish | source
\ No newline at end of file