From 94019c6d51f0ebd18044a778bb6f7ff13a90872a Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sun, 25 Oct 2020 12:27:35 +0200
Subject: [PATCH] Add root config for gondor

---
 config-root.yaml | 23 +++++++----------------
 home/.ssh/config | 16 +++-------------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/config-root.yaml b/config-root.yaml
index 8b1eb85..7a40d82 100644
--- a/config-root.yaml
+++ b/config-root.yaml
@@ -172,17 +172,6 @@ profiles:
     include:
       - Locale
       - Pacman
-  Rivendell:
-    include:
-      - Locale
-      - Pacman
-    dotfiles:
-      - f_getty.conf
-      - f_vconsole.conf
-      - f_mkinitcpio.conf
-      - f_bluetooth.conf
-      - f_60-uinput-permissions.rules
-      - f_sshd_config
   Moria:
     include:
       - Locale
@@ -190,11 +179,13 @@ profiles:
     dotfiles:
       - f_sshd_config
       - f_99-sysctl.conf
-      - f_ipmi-static.service
-      - f_ipmi-temp.service
-      - f_ipmi-temp.timer
-      - f_ipmi-fans.service
-      - f_ipmi-fans.timer
+  Gondor:
+    include:
+      - Locale
+      - Pacman
+    dotfiles:
+      - f_sshd_config
+      - f_99-sysctl.conf
   localhost:
     include:
       - Locale
diff --git a/home/.ssh/config b/home/.ssh/config
index fc93742..8248253 100644
--- a/home/.ssh/config
+++ b/home/.ssh/config
@@ -19,25 +19,15 @@ Host aur
   	User aur
 
 host moria
-{%@@ if profile == "Rivendell" @@%}
-	HostName moria.reekynet.lan
-	port 22
-{%@@ else @@%}
 	HostName reekynet.com
 	port 221
-{%@@ endif @@%}
 	User balrog
 	ForwardAgent yes
 
-host rivendell
-{%@@ if profile == "Moria" @@%}
-	HostName rivendell.reekynet.lan
+host gondor
+	hostname gondor.reekynet.com
 	port 22
-{%@@ else @@%}
-	HostName reekynet.com
-	port 222
-{%@@ endif @@%}
-	User gimli
+	User reekymarko
 	ForwardAgent yes
 
 host mirkwood