Improve Darwin support

flake.lock

@@ -110,11 +110,11 @@
     },
     "nurpkgs": {
       "locked": {
-        "lastModified": 1662575201,
-        "narHash": "sha256-hLWrWQ7PRLiKYzYMgICzktqZSN+r7i7zol6UVebn7Rg=",
+        "lastModified": 1662716683,
+        "narHash": "sha256-NU+YC3jT99fp8CPhtm+mgM/c8PP6DwIRzIGkuCO3Vss=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "8bdab6eab89b870fc90fa0ec766b4e8c0d8c33ba",
+        "rev": "44284844e8329dfd07163965d0b9e2c3192911bc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -95,6 +95,11 @@
 		);
 
 		overlay = local_overlay;
-		modules = import ./modules;
+		modules = import [
+			./modules-all
+			./modules-linux
+			./modules-darwin
+		];
+		packages = import ./overlays/packages.nix { pkgs = nixpkgs; };
 	};
 }

home/xonsh.nix

@@ -44,7 +44,6 @@
 			tspub = "sudo tailscale up --exit-node=linode";
 			tshome = "sudo tailscale up --exit-node=2maccabees";
 			tsclear = "sudo tailscale up --exit-node=''";
-			rebuild = "sudo nixos-rebuild switch";
 		};
 
 		configHeader = ''
@@ -61,6 +60,14 @@ xontrib load direnv
 #$GOPATH = $HOME + '/.go'
 #$JAVA_HOME = '/etc/alternatives/java_sdk'
 		configFooter = ''
+def _rebuild(args):
+    import os
+    system = os.uname()
+    if system.sysname == 'Darwin':
+        darwin-rebuild --flake ~/.config/nix switch
+    else:
+        sudo nixos-rebuild switch
+
 def _yaml2json(args, stdin=None, stdout=None):
     import sys, yaml, json
     from yaml import CLoader
@@ -95,6 +102,7 @@ def _newdock(args):
 def _unknown_host(args):
     sed -i -e @(args[0])d ~/.ssh/known_hosts
 
+aliases['rebuild'] = _rebuild
 aliases['yaml2json'] = _yaml2json
 aliases['py2env'] = _py2env
 aliases['py3env'] = _py3env

modules

@@ -0,0 +1 @@
+modules-all

modules-all/modules

@@ -0,0 +1 @@
+modules

overlays/datadog-api-client.nix

@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi, pkgs}:
+
+buildPythonPackage rec {
+	pname = "datadog-api-client";
+	version = "2.3.0";
+
+	src = fetchPypi {
+		inherit pname version;
+		sha256 = "";
+	};
+
+	meta = with lib; {
+		description = "Datadog API client support";
+		homepage = "https://github.com/DataDog/datadog-api-client-python";
+		license = licenses.bsd;
+		maintainers = [];
+	};
+
+	doCheck = false;
+}

overlays/default.nix

@@ -1,15 +1,20 @@
 self: super:
 {
-	xonsh-direnv = super.callPackage ./xonsh-direnv.nix {
+	datadog-api-client = super.callPackage ./datadog-api-client.nix {
 		buildPythonPackage = self.python3.pkgs.buildPythonPackage;
 		fetchPypi = self.python.pkgs.fetchPypi;
 	};
 
+	hms = super.callPackage ./hms.nix {
+		pkgs = self.pkgs;
+	};
+
 	xonsh = super.xonsh.overridePythonAttrs (old: rec{
 		propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.xonsh-direnv ];
 	});
 
-	hms = super.callPackage ./hms.nix {
-		pkgs = self.pkgs;
+	xonsh-direnv = super.callPackage ./xonsh-direnv.nix {
+		buildPythonPackage = self.python3.pkgs.buildPythonPackage;
+		fetchPypi = self.python.pkgs.fetchPypi;
 	};
 }

overlays/packages.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+
+{
+	datadog-api-client = pkgs.callPackage ./datadog-api-client.nix {
+		buildPythonPackage = pkgs.python3.pkgs.buildPythonPackage;
+		fetchPypi = pkgs.python.pkgs.fetchPypi;
+	};
+
+	hms = pkgs.callPackage ./hms.nix {
+		inherit pkgs;
+	};
+
+	xonsh-direnv = pkgs.callPackage ./xonsh-direnv.nix {
+		buildPythonPackage = pkgs.python3.pkgs.buildPythonPackage;
+		fetchPypi = pkgs.python.pkgs.fetchPypi;
+	};
+
+}

result

@@ -1 +1 @@
-/nix/store/xz2mcip95r90gdahyff2vn87hilw7lhp-darwin-system-22.05.20220801.e43cf17+darwin4.bb3baef
+/nix/store/8n593dx13kiqwpkcjjwg98rvwjl14jhy-darwin-system-22.11.20220901.2da64a8+darwin4.3b69bf3