Testing xonsh

flake.lock

@@ -23,6 +23,23 @@
         "type": "github"
       }
     },
+    "crowe": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "dirtyRev": "4ff5384b96c24919c2b4ac3d7c588db2f22a528a-dirty",
+        "dirtyShortRev": "4ff5384-dirty",
+        "lastModified": 1723461092,
+        "narHash": "sha256-Z/o1ebB2U+5cAjC44yryxSCfzR6BkBcZ2UAMDE3Zgg8=",
+        "type": "git",
+        "url": "file:///home/greg/nur-packages"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/greg/nur-packages"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -380,6 +397,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1712449641,
+        "narHash": "sha256-U9DDWMexN6o5Td2DznEgguh8TRIUnIl9levmit43GcI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "600b15aea1b36eeb43833a50b0e96579147099ff",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1717786204,
         "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
@@ -435,7 +468,7 @@
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -454,11 +487,11 @@
     },
     "nurpkgs": {
       "locked": {
-        "lastModified": 1722483963,
+        "lastModified": 1723825553,
-        "narHash": "sha256-YHzqiXEptvpB6npuEyg+C8NkIpiHqbrbhuBaq66DxwU=",
+        "narHash": "sha256-M7w/KcMfA4iQE9dJrCRk/vbBBH2fbuJEeiu1pod7HwI=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c7c930c6dff8e35e6a232b8e9bd19b091ad15f10",
+        "rev": "27fff3e7e6d489968a48a2348b712ffaaf04b50b",
         "type": "github"
       },
       "original": {
@@ -470,6 +503,7 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "crowe": "crowe",
         "darwin": "darwin_2",
         "flake-utils": "flake-utils",
         "hm": "hm",

flake.nix

@@ -31,6 +31,8 @@
 			url = "github:nix-community/NixOS-WSL";
 			inputs.nixpkgs.follows = "nixunstable";
 		};
+
+		crowe.url = "/home/greg/nur-packages";
 	};
 
 	outputs = {

home/modules/gnome.nix

@@ -14,7 +14,7 @@ in {
 			themeVariant = "dark";
 			profile."95f3c68e-82f3-4f44-ac85-6e075fed80b0" = {
 				default = true;
-				customCommand = "${pkgs.myxonsh}/bin/xonsh -st best";
+				customCommand = "xonsh -st best";
 				loginShell = true;
 				scrollbackLines = 65535;
 				transparencyPercent = 50;

home/modules/xonsh.nix

@@ -81,8 +81,6 @@ in with lib; {
 
 	in mkIf cfg.enable {
 
-		home.packages = [ pkgs.myxonsh ];
-
 		home.file.".xonshrc".text = ''
 ${cfg.configHeader}
 

hosts/default.nix

@@ -16,6 +16,10 @@ let
 		nixpkgs = import channel {
 			inherit system;
 		};
+		# Use this to include modules directly from a repo
+		nurNoPkg = import inputs.nurpkgs {
+			nurpkgs = nixpkgs;
+		};
 	in channel.lib.nixosSystem {
 		inherit system;
 		specialArgs = { inherit nixpkgs inputs overlays; };
@@ -37,6 +41,7 @@ let
 			inputs.agenix.nixosModules.default
 			hm.nixosModules.home-manager
 			inputs.self.modules.nixosModule
+			inputs.nurpkgs.nixosModules.nur
 			./${name}
 		] ++ extraMods;
 	};

modules/baseline.nix

@@ -33,7 +33,6 @@ in
         allowUnfree = true;
     };
 
-
     # Base packages that need to be in all my hosts
     environment.systemPackages = with pkgs; [
 		agenix

modules/nixos/default.nix

@@ -1,6 +1,8 @@
-{ pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
-{
+let
+	crowe = inputs.crowe.legacyPackages."${pkgs.stdenv.system}";
+in {
 	imports = [
 		../baseline.nix
 		./backup.nix
@@ -46,11 +48,15 @@
 		networkmanager.enable = true;
 	};
 
-	programs = {
+	programs.xonsh = with crowe; {
-		xonsh = {
 		enable = true;
-			package = pkgs.myxonsh;
+		package = (xonsh.overridePythonAttrs (old: {
-		};
+			propagatedBuildInputs = old.propagatedBuildInputs ++ ([
+				#pkgs.python3.pkgs.xonsh-apipenv
+				xontrib-direnv
+				xontrib-vox
+			]);
+		}));
 	};
 
 	# Enable the OpenSSH daemon for remote control
@@ -66,7 +72,7 @@
 		isNormalUser = true;
 		createHome = true;
 		extraGroups = [ "wheel" "networkmanager" ]; # Enable ‘sudo’ for the user.
-		shell = pkgs.xonsh;
+		#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"

overlays/default.nix

@@ -81,12 +81,4 @@ in rec {
 		postInstall = prev.libvirt.postInstall + "rm -r $out/lib/systemd/system/libvirtd.service";
 	};
 	pipenv-ivr = prev.callPackage ./pipenv.nix { };
-
-	myxonsh = (prev.xonsh-unwrapped.passthru.wrapper.override {
-		extraPackages = (ps: with ps; [
-			xonsh-apipenv
-			xonsh-direnv
-			xontrib-vox
-		]);
-	});
 }