From 61afd18f36fe758d962189d7a810f1def2b8a43e Mon Sep 17 00:00:00 2001
From: mattr <matt.roland1029@gmail.com>
Date: Wed, 23 Oct 2024 17:42:21 -0500
Subject: [PATCH] some changes idk

---
 BOOTSTRAP.sh        | 39 ++++++++++++++++++++++++++++++++++-----
 kitty/kitty.conf    |  2 +-
 nvim/lazy-lock.json |  2 +-
 zsh/.zshrc          | 15 +++++++++------
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/BOOTSTRAP.sh b/BOOTSTRAP.sh
index bdfc44a..431b165 100755
--- a/BOOTSTRAP.sh
+++ b/BOOTSTRAP.sh
@@ -1,5 +1,26 @@
 #!/bin/bash
 
+clicmd="zsh"
+if command -v "$clicmd"&> /dev/null; then
+    echo "$clicmd already installed"
+else
+    sudo dnf install "$clicmd" -y
+fi
+
+clicmd="tmux"
+if command -v "$clicmd" &> /dev/null; then
+    echo "$clicmd already installed"
+else
+    sudo dnf install "$clicmd" -y
+fi
+
+clicmd="nvim"
+if command -v "$clicmd" &> /dev/null; then
+    echo "$clicmd already installed"
+else
+    sudo dnf install "neovim" -y
+fi
+
 CONFIGDIR=$HOME/.config
 
 #############################
@@ -11,15 +32,23 @@ if [ -f "$ZSHFILE" ] || [ -d "$ZSHFILE" ]; then
     mv "$ZSHFILE" "$ZSHFILE.old"
 fi
 
-ln -s "$PWD/zsh/.zshrc" "$ZSHFILE" 
+ln -s "$PWD/zsh/.zshrc" "$ZSHFILE"
 
 POSHDIR="$HOME/.config/ohmyposh"
-if [ -f "$POSHDIR" ] || [ -d "$POSHDIR"]; then
+if [ -f "$POSHDIR" ] || [ -d "$POSHDIR" ]; then
     mv "$POSHDIR" "$POSHDIR.old"
 fi
 
 ln -s "$PWD/zsh/ohmyposh/" "$POSHDIR"
 
+OMZDIR="$HOME/.oh-my-zsh"
+
+if [ -e "$OMZDIR" ]; then
+    git clone --depth 1 https://github.com/ohmyzsh/ohmyzsh
+    git clone --depth 1 https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
+    git clone --depth 1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
+fi
+
 #############################
 # kitty
 #############################
@@ -29,7 +58,7 @@ if [ -f "$KITTYDIR" ] || [ -d "$KITTYDIR" ]; then
     mv "$KITTYDIR" "$KITTYDIR.old"
 fi
 
-ln -s "$PWD/kitty/" "$KITTYDIR" 
+ln -s "$PWD/kitty/" "$KITTYDIR"
 
 #############################
 # neovim
@@ -40,7 +69,7 @@ if [ -f "$NEOVIMFILE" ] || [ -d "$NEOVIMFILE" ]; then
     mv "$NEOVIMFILE" "$NEOVIMFILE.old"
 fi
 
-ln -s "$PWD/nvim/" "$NEOVIMFILE" 
+ln -s "$PWD/nvim/" "$NEOVIMFILE"
 
 #############################
 # tmux
@@ -53,4 +82,4 @@ fi
 
 git clone https://github.com/tmux-plugins/tpm ./tmux/plugins/tpm
 
-ln -s "$PWD/tmux/" "$TMUXFILE" 
+ln -s "$PWD/tmux/" "$TMUXFILE"
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index fb6d262..1512110 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -14,7 +14,7 @@ active_border_color #000000
 
 
 # BEGIN_KITTY_FONTS
-font_family      family="JetBrains Mono NL"
+font_family      family="Cascadia Code NF"
 bold_font        auto
 italic_font      auto
 bold_italic_font auto
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 4d7f52d..4bd005c 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -5,7 +5,7 @@
   "fine-cmdline.nvim": { "branch": "main", "commit": "aec9efebf6f4606a5204d49ffa3ce2eeb7e08a3e" },
   "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
   "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
-  "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" },
+  "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
   "lspsaga.nvim": { "branch": "main", "commit": "d027f8b9c7c55e26cf4030c8657a2fc8222ed762" },
   "markview.nvim": { "branch": "main", "commit": "67b69cdaf9055bebac3682a070d7e5c8eecba29c" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 61dc1d5..ce8455f 100755
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -3,13 +3,15 @@
 # Matthew's zshrc
 #
 #############################
-
+if [ -e "$HOME/.profile" ]; then
+    source "$HOME/.profile"
+fi
 
 
 #############################
 # Global Variables
 source "$HOME/.cargo/env"
-export PATH="$PATH:/home/mattr/.local/bin"
+export PATH="$PATH:$HOME/.local/bin"
 export projects="/media/shared/Projects/"
 export classes=$(eza --absolute -1 $HOME/Documents/Classes | sort -t_ -k 1,1 -k 2,2r | tail -n 1)
 export steam_loc="$HOME/.var/app/com.valvesoftware.Steam/.local/share/Steam/steamapps/compatdata"
@@ -102,14 +104,15 @@ eval "$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/ohmyposh.toml)"
 alias update-grub=' grub2-mkconfig -o /boot/grub2/grub.cfg'
 
 alias cat="bat"
-alias grep="rg"
+alias grep="rg --color=always"
+alias rg="rg --color=always"
 
 alias sudo='sudo '
 
 alias ls='eza --color=always'
-alias l='eza -1'
-alias la='eza -alh'
-alias ll='eza -lh'
+alias l='eza --color=always -1'
+alias la='eza --color=always -alh'
+alias ll='eza --color=always -lh'
 
 alias py='python3'