From a3e615a76f99c8afc8c70e75101c6ec4382247ba Mon Sep 17 00:00:00 2001
From: Trevor Merritt <trevor.merritt@gmail.com>
Date: Sat, 17 Sep 2022 22:55:58 -0400
Subject: [PATCH] updates move in process

---
 configs/git/gitconfig      |  3 +--
 install.conf.yaml          | 22 ++++++----------------
 scripts/installPackages.sh |  7 +++++++
 3 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100755 scripts/installPackages.sh

diff --git a/configs/git/gitconfig b/configs/git/gitconfig
index fef7760..00ef110 100644
--- a/configs/git/gitconfig
+++ b/configs/git/gitconfig
@@ -3,7 +3,6 @@
 	name = Trevor Merritt
 [init]
   defaultBranch = master
-  templatedir = ~/.git_template
 [push]
   default = current
 [color]
@@ -22,7 +21,7 @@
 [merge]
   ff = only
 [commit]
-  template = ~/.gitmessage
+#   template = ~/.gitmessage
 [fetch]
   prune = true
 [rebase]
diff --git a/install.conf.yaml b/install.conf.yaml
index 42c25e4..b39c896 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -41,16 +41,8 @@
     ~/.local/share/fonts/MesloLGS NF Regular.ttf: fonts/MesloLGS NF Regular.ttf
 - shell:
     - [
-        sudo apt install remmina remmina-plugin-vnc remmina-plugin-rdp -y,
-        Install Remmina,
-      ]
-    - [
-        sudo apt install nmap tmux nmon htop -y,
-        Installing apps Trevor uses...
-      ]
-    - [
-        sudo apt install zsh zsh-syntax-highlighting -y,
-        Installing ZSH and its plugins,
+        sudo /home/tmerritt/.dotfiles/scripts/installPackages.sh,`
+        Install Remmina, apps Trevor uses, Installing ZSH and its plugins,
       ]
     - [git submodule update --init --recursive, Installing submodules]
     - [fc-cache -fv, Updating Font Cache]
@@ -61,9 +53,7 @@
     - [~/.dotfiles/scripts/setupKubectl.sh, Setting up Kubectl]
     - [~/.dotfiles/scripts/setupHelm.sh, Setting up Helm]
 - git:
-    "/home/tmerritt/Projects/dfr":
-      url: "https://git.pyrocode.xyz/tmerritt/dfr.git"
-    "/home/tmerritt/Projects/lilith":
-      url: "https://git.pyrocode.xyz/tmerritt/lilith.git"
-    "/home/tmerritt/Projects/GBLib":
-      url: "http://git.pyrocode.xyz/tmerritt/GBLib.git"
+    "/home/tmerritt/Projects/lilly":
+      url: "https://git.geekback.dev/tmerritt/lilly"
+    "/home/tmerritt/Projects/gblib":
+      url: "https://git.geekback.dev/tmerritt/gblib"
diff --git a/scripts/installPackages.sh b/scripts/installPackages.sh
new file mode 100755
index 0000000..5e770fa
--- /dev/null
+++ b/scripts/installPackages.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+
+ sudo apt install \
+    remmina remmina-plugin-vnc remmina-plugin-rdp \
+    zsh zsh-syntax-highlighting \
+    nmap tmux nmon htop -y