From 2ad80f6eca706b8a49f885bdf10ce4dd5021a24d Mon Sep 17 00:00:00 2001
From: matt <matt@recchia.dev>
Date: Sat, 24 Aug 2024 19:45:25 +0200
Subject: [PATCH] Updating install script and utilizing local mirros when
 possible

---
 install-fonts.sh | 14 ++++++++++++++
 install.sh       | 16 +++++++++++++---
 installFonts.sh  |  6 ------
 vim-setup.sh     | 10 ++++++++--
 4 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 install-fonts.sh
 delete mode 100644 installFonts.sh

diff --git a/install-fonts.sh b/install-fonts.sh
new file mode 100644
index 0000000..733e9fb
--- /dev/null
+++ b/install-fonts.sh
@@ -0,0 +1,14 @@
+# Install the GlassTTY: TrueType VT220 font from github
+
+mkdir -p ~/.local/share/fonts/truetype/
+cd ~/.local/share/fonts/truetype/
+
+curl -O http://192.168.0.44:3000/matt/glasstty/src/branch/master/Glass_TTY_VT220.ttf
+if [ $? -eq 0 ]; then
+    echo "Cloned Glass TTY font from local mirror"
+else
+    curl -O https://github.com/svofski/glasstty/blob/master/Glass_TTY_VT220.ttf
+    echo "Cloned Glass TTY font from github"
+fi
+
+fc-cache -f -v ~/.local/share/fonts/truetype/
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 878f7fa..ae4e7a9 100644
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,16 @@
 #!/usr/bin/env bash
 # Originally setup based on the post https://medium.com/@webprolific/getting-started-with-dotfiles-43c3602fd789
 
-ln -sv “~/.dotfiles/runcom/.bash_profile” ~
-ln -sv “~/.dotfiles/runcom/.inputrc” ~
-ln -sv “~/.dotfiles/git/.gitconfig” ~
\ No newline at end of file
+# ln -sv “~/.dotfiles/runcom/.bash_profile” ~
+# ln -sv “~/.dotfiles/runcom/.inputrc” ~
+# ln -sv “~/.dotfiles/git/.gitconfig” ~
+
+# Install a retro looking font that I like to use in my terminal
+./install-fonts.sh
+
+# Setup Vimrc using paste to merge our saved vimrc with
+# system default
+paste ~/.vimrc ./vimrc > ~/vimrc.new
+mv ~/.vimrc ~/.vimrc.bak
+mv ~/vimrc.new ~/.vimrc
+./vim-setup.sh
\ No newline at end of file
diff --git a/installFonts.sh b/installFonts.sh
deleted file mode 100644
index bee895e..0000000
--- a/installFonts.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Install the GlassTTY: TrueType VT220 font from github
-
-mkdir -p ~/.local/share/fonts/truetype/
-cd ~/.local/share/fonts/truetype/
-curl -O https://github.com/svofski/glasstty/blob/master/Glass_TTY_VT220.ttf
-fc-cache -f -v ~/.local/share/fonts/truetype/
\ No newline at end of file
diff --git a/vim-setup.sh b/vim-setup.sh
index 9da3f56..1715b1d 100755
--- a/vim-setup.sh
+++ b/vim-setup.sh
@@ -1,7 +1,13 @@
-git clone https://github.com/lifepillar/vim-solarized8.git ~/.vim/pack/themes/opt/solarized8
+git clone ssh://git@192.168.0.44:2222/matt/vim-solarized8.git
+if [ $? -eq 0 ]; then
+    echo "Cloned vim solarized theme from local mirror"
+else
+    git clone https://github.com/lifepillar/vim-solarized8.git ~/.vim/pack/themes/opt/solarized8
+    echo "Cloned vim solarized theme from github"
+fi
 
 cat >> ~/.bashrc<< EOF
-sh ~/vim-solarized8/scripts/solarized8.sh
+sh ~/.vim/pack/themes/opt/solarized8/scripts/solarized8.sh
 EOF
 
 cat > ~/.vimrc<< EOF