From 391318a839d8a0d4d5ff8368a639aadf07bc13cb Mon Sep 17 00:00:00 2001
From: Trevor Merritt <trevor.merritt@gmail.com>
Date: Fri, 26 Aug 2022 09:35:41 -0400
Subject: [PATCH] Adds SSH server and Axel Adding fix for Apple keyboard F keys
 on MBP and MBA

---
 configs/ssh/config                | 11 -----------
 configs/ssh/gitmessage            |  0
 install                           |  3 ++-
 install.conf.yaml                 | 33 +++++++++++++++++++++----------
 scripts/fixMacPortableKeyboard.sh | 16 +++++++++++++++
 5 files changed, 41 insertions(+), 22 deletions(-)
 create mode 100644 configs/ssh/gitmessage
 create mode 100755 scripts/fixMacPortableKeyboard.sh

diff --git a/configs/ssh/config b/configs/ssh/config
index 2407948..7244c9f 100644
--- a/configs/ssh/config
+++ b/configs/ssh/config
@@ -1,16 +1,5 @@
 Host 192.168.0.141
   KexAlgorithms diffie-hellman-group-exchange-sha1
-Host git.pyrocode.xyz
-  Port 2222
-  IdentitiesOnly yes
-  IdentityFile ~/.ssh/id_rsa
-# entry generated by okteto
-Host 172.24.4.115
-  HostName 172.24.4.115
-  User tmerritt
-Host 10.1.24.115
-  HostName 10.1.24.115
-  User tmerritt
 #Host 10.1.*.*
 #    PermitLocalCommand yes
 #    # Unfortunately ssh does not support line breaks in config files
diff --git a/configs/ssh/gitmessage b/configs/ssh/gitmessage
new file mode 100644
index 0000000..e69de29
diff --git a/install b/install
index 3ff5ca3..fee8761 100755
--- a/install
+++ b/install
@@ -13,4 +13,5 @@ git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive
 git submodule update --init --recursive "${DOTBOT_DIR}"
 
 "${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" \
-	--plugin-dir ${BASEDIR}/plugins/dotbot-git
\ No newline at end of file
+	--plugin-dir ${BASEDIR}/plugins/dotbot-git \
+	--plugin-dir ${BASEDIR}/plugins/dotbot-ifplatform
\ No newline at end of file
diff --git a/install.conf.yaml b/install.conf.yaml
index 6e7bec1..20e6fe6 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -17,7 +17,10 @@
     ~/.gitconfig: configs/git/gitconfig
     # SSH
     ~/.ssh/config:
-      path: configs/ssh/config
+      path: configs/ssh/config 
+      create: true
+    ~/.gitmessage:
+      path: configs/ssh/gitmessage
       create: true
     # ZSH
     ~/.zshrc: configs/zsh/zshrc
@@ -25,7 +28,7 @@
     ~/.aliases: configs/zsh/aliases
     # Postgres
     ~/.psqlrc: configs/postgres/psqlrc
-    # tmux
+    # tmux   
     ~/.tmux.conf: configs/tmux/tmux.conf
     # Remmina
     ~/.local/share/remmina:
@@ -40,10 +43,18 @@
     ~/.local/share/fonts/MesloLGS NF Bold .ttf: fonts/MesloLGS NF Bold.ttf
     ~/.local/share/fonts/MesloLGS NF Regular.ttf: fonts/MesloLGS NF Regular.ttf
 - shell:
+    - [ ~/.dotfiles/scripts/fixMacPortableKeyboard.sh, Fixing MacBook Air and MacBook Pro Keyboards]
     - [
-
-        sudo /home/tmerritt/.dotfiles/scripts/installPackages.sh,
-        Install Remmina, apps Trevor uses, Installing ZSH and its plugins,
+        sudo apt install remmina remmina-plugin-vnc remmina-plugin-rdp -y,
+        Install Remmina,
+      ]
+    - [
+        sudo apt install nmap tmux nmon htop axel ssh -y,
+        Installing apps Trevor uses...
+      ]
+    - [
+        sudo apt install zsh zsh-syntax-highlighting -y,
+        Installing ZSH and its plugins,
       ]
     - [git submodule update --init --recursive, Installing submodules]
     - [fc-cache -fv, Updating Font Cache]
@@ -53,8 +64,10 @@
       ]
     - [~/.dotfiles/scripts/setupKubectl.sh, Setting up Kubectl]
     - [~/.dotfiles/scripts/setupHelm.sh, Setting up Helm]
-- git:
-    "/home/tmerritt/Projects/lilly":
-      url: "https://git.geekback.dev/tmerritt/lilly"
-    "/home/tmerritt/Projects/gblib":
-      url: "https://git.geekback.dev/tmerritt/gblib"
+#- 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"
diff --git a/scripts/fixMacPortableKeyboard.sh b/scripts/fixMacPortableKeyboard.sh
new file mode 100755
index 0000000..c6b9556
--- /dev/null
+++ b/scripts/fixMacPortableKeyboard.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [ -f "/sys/module/hid_apple/parameters/fn_mode" ]; then
+    echo "Found a Mac!  Lets see about the keyboard..."
+    if [ ! -f "/etc/modprobe.d/hid_apple.conf"]; then
+        echo "Applying runtime fix"
+        sudo su -c "echo -n 0x02 > /sys/module/hid_apple/parameters/fnmode"
+        echo "Applying Boot fix..."
+        echo options hid_apple fnmode=2 | sudo tee -a /etc/modprobe.d/hid_apple.conf
+        update-initramfs -u -k all
+    else
+        echo "Keyboard already fixed."
+    fi
+else
+    echo "Not a mac."
+fi