From 17aa8a658534ba32243706afca492e497a09b8f7 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 16 Aug 2024 15:49:29 -0500
Subject: [PATCH] Got it working, at last

---
 flake.lock                | 28 +++++++++++++++++++++++-----
 flake.nix                 |  3 ++-
 modules/nixos/default.nix | 21 +++++++++++++--------
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index 26bb76a..3732900 100644
--- a/flake.lock
+++ b/flake.lock
@@ -28,16 +28,17 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "dirtyRev": "4ff5384b96c24919c2b4ac3d7c588db2f22a528a-dirty",
-        "dirtyShortRev": "4ff5384-dirty",
         "lastModified": 1723461092,
-        "narHash": "sha256-Z/o1ebB2U+5cAjC44yryxSCfzR6BkBcZ2UAMDE3Zgg8=",
+        "narHash": "sha256-4Ouw2IqRut2uZUU7UPjtmx4FcpMUFXd7XcJxFtKErOI=",
+        "ref": "refs/heads/master",
+        "rev": "4ff5384b96c24919c2b4ac3d7c588db2f22a528a",
+        "revCount": 56,
         "type": "git",
-        "url": "file:///home/greg/nur-packages"
+        "url": "file:///home/greg/src/nur-packages"
       },
       "original": {
         "type": "git",
-        "url": "file:///home/greg/nur-packages"
+        "url": "file:///home/greg/src/nur-packages"
       }
     },
     "darwin": {
@@ -513,6 +514,7 @@
         "nixunstable": "nixunstable",
         "nixvim": "nixvim",
         "nurpkgs": "nurpkgs",
+        "test": "test",
         "wsl": "wsl"
       }
     },
@@ -576,6 +578,22 @@
         "type": "github"
       }
     },
+    "test": {
+      "locked": {
+        "lastModified": 1723214923,
+        "narHash": "sha256-6RSkrFPjOzqhT6y3xxDtNkbDyunzqXVSygB9UDrG/P4=",
+        "owner": "SamLukeYes",
+        "repo": "nixpkgs",
+        "rev": "633da8f7a0a05aca42f6cc23e53523e18ce10a4f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SamLukeYes",
+        "ref": "xonsh",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index be0babb..e90d8d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,8 @@
 			inputs.nixpkgs.follows = "nixunstable";
 		};
 
-		crowe.url = "/home/greg/nur-packages";
+		crowe.url = "/home/greg/src/nur-packages";
+		test.url = "github:SamLukeYes/nixpkgs/xonsh";
 	};
 
 	outputs = {
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 65499bb..05f1485 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -48,15 +48,20 @@ in {
 		networkmanager.enable = true;
 	};
 
-	programs.xonsh = with crowe; {
+	programs.xonsh = let
+		test = import inputs.test {
+			inherit (pkgs.stdenv) system;
+			overlays = [ inputs.self.overlays.default ];
+		};
+	in {
 		enable = true;
-		package = (xonsh.overridePythonAttrs (old: {
-			propagatedBuildInputs = old.propagatedBuildInputs ++ ([
-				#pkgs.python3.pkgs.xonsh-apipenv
-				xontrib-direnv
-				xontrib-vox
+		package = (test.xonsh.override {
+			extraPackages = (ps: [
+				ps.xonsh-apipenv
+				ps.xonsh-direnv
+				ps.xontrib-vox
 			]);
-		}));
+		});
 	};
 
 	# Enable the OpenSSH daemon for remote control
@@ -72,7 +77,7 @@ in {
 		isNormalUser = true;
 		createHome = true;
 		extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
-		#shell = config.programs.xonsh.package;
+		shell = config.programs.xonsh.package;
 		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"