From 6b758580d3a9a47784f3fad694dcd2086bb6e10e Mon Sep 17 00:00:00 2001
From: Segcolt <9hmbzr275@mozmail.com>
Date: Wed, 18 Sep 2024 21:45:15 -0300
Subject: [PATCH] Update the initializer script to add more stuff

---
 fish_shell_install.sh | 25 +++++++++++++++++++++++++
 initialize.sh         | 20 +++++++++++++++-----
 2 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100755 fish_shell_install.sh

diff --git a/fish_shell_install.sh b/fish_shell_install.sh
new file mode 100755
index 0000000..46468a2
--- /dev/null
+++ b/fish_shell_install.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+ 
+# Script for installing Fish Shell on systems without root access.
+# Fish Shell will be installed in $HOME/local/bin.
+# It's assumed that wget and a C/C++ compiler are installed.
+ 
+# exit on error
+set -e
+ 
+FISH_SHELL_VERSION=3.7.1
+ 
+# create our directories
+mkdir -p $HOME/local $HOME/fish_shell_tmp
+cd $HOME/fish_shell_tmp
+ 
+# download source files for Fish Shell
+wget http://fishshell.com/files/${FISH_SHELL_VERSION}/fish-${FISH_SHELL_VERSION}.tar.gz
+ 
+# extract files, configure, and compile
+
+tar xvzf fish-${FISH_SHELL_VERSION}.tar.gz
+cd fish-${FISH_SHELL_VERSION}
+./configure --prefix=$HOME/local --disable-shared
+make
+make install
diff --git a/initialize.sh b/initialize.sh
index 43843e2..712604f 100644
--- a/initialize.sh
+++ b/initialize.sh
@@ -5,22 +5,20 @@ GIT_DOMAIN=https://git.puffypony.party:4433
 git config --global user.email "9hmbzr275@mozmail.com"
 git config --global user.name "Segcolt"
 
-git clone $GIT_DOMAIN/Segcolt/kitty-conf kitty
-git clone $GIT_DOMAIN/Segcolt/astronvim-config nvim
+git clone $GIT_DOMAIN/Segcolt/kitty-conf $HOME/.config/kitty
+git clone $GIT_DOMAIN/Segcolt/astronvim-config $HOME/.config/nvim
 
 curl -L https://sw.kovidgoyal.net/kitty/installer.sh | sh /dev/stdin \
     launch=n
 ln -s $HOME/.local/kitty.app/bin/kitty $HOME/.local/bin/kitty
 ln -s $HOME/.local/kitty.app/bin/kitten $HOME/.local/bin/kitten
 ln -s $HOME/.local/kitty.app/share/applications/kitty.desktop $HOME/.local/share/applications/kitty.desktop
-mv kitty $HOME/.config
-sed -i -e 's/fish/bash/' -e 's/JetBrains Mono/Monocraft Nerd Font/' $HOME/.config/kitty/kitty.conf
+sed -i -e 's/JetBrains Mono/Monocraft Nerd Font/' $HOME/.config/kitty/kitty.conf
     
 flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 
 chmod +x nvim.appimage
 mv nvim.appimage $HOME/.local/bin/nvim
-mv nvim $HOME/.config
 # mv nvim.share $HOME/.local/share/nvim
 mv clangd/bin/clangd $HOME/.local/bin
 mv clangd/lib/* $HOME/.local/lib
@@ -49,5 +47,17 @@ make install PREFIX=$HOME/.local
 cd $HOME/.local/share/nvim/lazy/neoclip/src
 CMAKE_PREFIX_PATH=$HOME/.local cmake -B build && make -C build && make -C build install
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/.local/lib
+
 echo "export LD_LIBRARY_PATH='$HOME/.local/lib'" >> $HOME/.bashrc
 echo "alias compile='g++ -O0 -g -fsanitize=address -o fds -std=c++17'" >> $HOME/.bashrc
+
+git clone -b alternative https://$GIT_DOMAIN/Segcolt/fish-config $HOME/.config/fish
+fish_shell_install.sh
+
+readonly FZF_VER
+curl -sSL https://github.com/junegunn/fzf/releases/download/v0.55.0/fzf-${FZF_VER}-linux_amd64.tar.gz > fzf.tar.gz
+tar xvzf fzf.tar.gz -C $HOME/.local/bin
+
+curl -sS https://starship.rs/install.sh | sh
+curl -sSL https://raw.githubusercontent.com/catppuccin/starship/refs/heads/main/starship.toml > $HOME/.conifg/starship.toml
+sed -i '0,/catppuccin_macchiato/s//catppuccin_mocha/' $HOME/.config/starship.toml