From be36e4acb3e6923f44ba931e663f75865f6eb13e Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 13 Jan 2023 09:56:36 +0000
Subject: [PATCH] Add zsh and Fira Code to install pacman files

Install oh-my-zsh as part of install script
---
 install.sh | 6 +++++-
 pacman.txt | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 78b3f18c..a5bbf627 100755
--- a/install.sh
+++ b/install.sh
@@ -56,7 +56,8 @@ PACKER_REPO="https://github.com/wbthomason/packer.nvim"
 PACKER_DIR="$HOME/.local/share/nvim/site/pack/packer/start/packer.nvim"
 git_clone_if_missing $PACKER_REPO $PACKER_DIR
 
-# oh-my-zsh links (if available)
+# oh-my-zsh
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 OHMYZSH_DIR="${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}"
 if [ -d $OHMYZSH_DIR ]
 then
@@ -67,3 +68,6 @@ then
     # aliases
     create_symlink $OHMYZSH_DIR "./aliases.zsh"
 fi
+
+# Set up git editor if missing
+grep "editor" "$HOME/.gitconfig" > /dev/null || git config --global core.editor "nvim"
diff --git a/pacman.txt b/pacman.txt
index dd6b5e5e..d152ea97 100644
--- a/pacman.txt
+++ b/pacman.txt
@@ -18,3 +18,5 @@ wget
 python-black
 python-isort
 pyright
+ttf-fira-code
+zsh