From d84d4e06aecee49d15490a1ce8f7a5d9f5b406d5 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Mon, 18 Apr 2022 14:01:00 -0500
Subject: [PATCH] Move SSH config to Nix

---
 home/home.nix     |  1 +
 home/ssh.nix      | 40 ++++++++++++++++++++++++++++++++++++++++
 profiles/base.nix |  7 ++-----
 3 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 home/ssh.nix

diff --git a/home/home.nix b/home/home.nix
index 8395b83..81efcc4 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -5,6 +5,7 @@ name: pkgs:
 		./bash.nix
 		./git.nix
 		./vim.nix
+		./ssh.nix
 	];
 
 	home.username = name;
diff --git a/home/ssh.nix b/home/ssh.nix
new file mode 100644
index 0000000..609c923
--- /dev/null
+++ b/home/ssh.nix
@@ -0,0 +1,40 @@
+{ lib, ... }:
+
+{
+	programs.ssh = {
+		enable = true;
+		serverAliveInterval = 60;
+
+		matchBlocks =
+		let
+			nas = { user = "admin"; };
+			owned = { user = "greg"; };
+		in {
+			"10.42.1.4" = lib.hm.dag.entryBefore ["10.42.*"] nas;
+			nas = nas;
+			"nas.thehellings.lan" = nas;
+			"nas.greg-hellings.gmail.com.beta.tailscale.net" = nas;
+			chronicles = nas;
+			"chronicles.thehellings.lan" = lib.hm.dag.entryBefore [ "*.thehellings.lan"] nas;
+
+			gh = { user = "git"; hostname = "github.com"; };
+
+			"*.thehellings.lan" = owned;
+			"10.42.*" = owned;
+
+			"host.crosswire.org crosswire" = {
+				hostname = "host.crosswire.org";
+				user = "ghellings";
+			};
+
+			fedpeople = {
+				hostname = "fedorapeople.org";
+				user = "greghellings";
+			};
+
+			"src.fedoraproject.org pkgs.fedoraproject.org" = {
+				user = "greghellings";
+			};
+		};
+	};
+}
diff --git a/profiles/base.nix b/profiles/base.nix
index 3168521..1607262 100755
--- a/profiles/base.nix
+++ b/profiles/base.nix
@@ -30,7 +30,9 @@ in
 	# Define a user account. Don't forget to set a password with ‘passwd’.
 	users.users.greg = {
 		isNormalUser = true;
+		createHome = true;
 		extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
+		shell = pkgs.xonsh;
 		openssh.authorizedKeys.keys = [
 			"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDLQRq55JKqLifX+31kEXyuoB8gfM+5thAlgR7XLPvvdu6g2a5cCWyozQ1I2oGbPRfJtzcJ5ifM7Ii2PuqAj3MdYFLHBEDOhIpBBWme9Ts2YB9HJ4NorBvB4zEfJd0Q7k2MmylyeBOwdwGz3bVqPRDcJbxWFMDHqr33FEs6SXdfyAQ5SvhWGARI84qz8zUUdOp6M4e3aIGO3cx1gA+YzYQ4FbUtL8+m1NFO8VoNFMZBMf5q0iF/SgEu5bmGWUCePia6DvfeBFQ2/y4Y7WmOj980WE+JmFTkIvmGruMYeGI8FuDQ2JIIIcehddy9bQbPF4VlGnTFsHqJYVRUUWc+vH1cPNMn01oB8s27ogf9e1lyhIN+cZOgp/jDt4eXcO4Wr04uwj7CI6m+d8iMQOa5Jv0hmNgqqiwOMVBlKeo0FCxlovzwvn/Lia9WZ74JqM6JwLCD8SZ0oFgiSIHOTHrQhr7iaCmj7X/0ey7VR8FnCrpeAJpG+ELTfWGshF1d9QR2zW7u4EsXTDLiuOmdJ+/KxwMvjMcWdlg2+Qch6SwulTQRxWaED2IWJo+YiAql8eaiVXu/eZJGLoiskGFZnONoLrzIT4pSjakPlrSpn/M/GkP1pDpaMkr24OhJsGpJNEU3F1ZcOMqy2iJzIxlPmU8Xg0I/OrnbJplpaXeRCqnmouJUJhWkaPzawaVyW7dtvprLWcpQtUgTRet18WLyOrLKlq1jwvNRMTPKUJ2IFJMpk2pNEP6bdiUxyMa4vrRIEU2p1zsYSUJpCRLtccZ/i/+yAqwnTA2L5TdAORi9nD2uCdM/Ljz52V3A14QapS6oqcoWx2soWKgnsbVXoG8DxmUTpll77Ze9t7Y5216SMInWuOu0vstP8ZcgFmWsiBgIYIuLA58abWHMxgD251phYidua6R3Gtkf8J/kYqTR1P6eJF1bt5efEg7FD2aL1QQZsYJo3CRNz7yVe1XqMdPbfe2mFXQVF9TDX5x6r9Ir3d0KiEmTlBdByz8nSyPJ8IQxC58NT4LNVQs3p2XH2Zcf6B4JOBSmV4NNBnLseFobsxniWjkWwZigED/D2iu3OXuuhmskCbw0hKy2rBcKffaSNMioVqYIiYNfKlMlSvAacQKqc/1HCpqgX8PwAcSgNSLy4K7/gIrTHmjY+g+CH7onzatWzkLo+0vsZRa/D/qwhhK2CU2FeU07mhnWxWuzqpJuqVaAwDTaEforK7nQUtAOFAZZP6qGhIoqsynYt4THb+QORb3QYfaP0PVgQwXfVU5Q8eUQFZ8A+siPtOASFjDumsIbseB5VzkF+UhvdseJwkX2+4pVFu8eHFDyvArYsHeGK6fBcQGJFQc2jSs6doIP9HD9IO2R ghelling@unknown38BAF87CD102"
 			"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDv26EhyBZS9E5bcuZDHHkh/oeyINHXlsD3OEL1UjZekIsiHoMv2QHYq99cYO/CsTVGcZj4ZTOKxrQQ069Cm1II76nXJP9mb3+jip5QAE/zYSWfxi3SgQum95qmkQsx9mxeKFi4NfUU9qN9vpmJkn0hrvYWg8vU98bcYmkx4RtGW6EgZJed3347EtHshTqq3UfAbj3ErSQdCbEqgNOjokzGWmcx16HyyO5HoQj2FP7PGQmArzMz0V76BRsnpg97CoPKkoWoGk+P13BCWWXR9GCa2PbJ9uprzPa6Ib4+i9RJPdeSkUiLlFi6rBTHaZUT9WUIEaqNSq3bbu1bIqMXkifPeDw7m+TMfOBT8MUBciJaPlPTgXuz3T4kCHBI041hIt+/VqryGtxnT45IavyUaN3JWYntDbpG3eEW4N9IB2oGWuC/XuTJrsUaNpLPpApUKuozxhsFELBRepU+j+Wn4kgJJl8hy0n+WL63ZUee+/F23C7UNXoOc/wU3KbpxO6ipsTSkTzhZpQF2LOuA3JUs5t9ZaiCJ2P9r8axHiphCRcIYSbcCo3pZupf1eTDSXm+x9/UB2sfzErNEH4SdakoSdAi8jG8WhPVOs3BrIXjVBjvyBLeOH86EzBGR/Ba8X6MWoEW9Oau1C3P/z65VH8RHpvPvp6axlMynyVI1ygt5uheuQ== gregory.hellings@C02G48H8MD6R"
@@ -74,11 +76,6 @@ in
 				path = "/home/greg/drive";
 				devices = syncs;
 			};
-			"xnjk7-vexga" = {
-				enable = true;
-				path = "/home/greg/.config/nixpkgs";
-				devices = syncs;
-			};
 			"pifvm-wdsh9" = {
 				enable = true;
 				path = "/home/greg/.ssh";