Merge branch 'neovim-lua-config'

overlays/default.nix

@@ -10,6 +10,7 @@ let
 		flake8
 		ipython
 		jedi
+		jedi-language-server
 		mypy
 		pylint
 		pyyaml
@@ -48,14 +49,21 @@ let
 	});
 
 in rec {
-	#python3 = final.unstable.python3;
 	gregpy = myPython;
 
+	## Testing adding python packages in the correct manner
+	pythonPackagesExtensions = (prev.pythonPackagesExtensions or []) ++ [
+		(python-final: python-prev: {
+			django-rapyd-modernauth = python-final.callPackage ./django-rapyd-modernauth.nix {};
+			xonsh-apipenv = cp ./xonsh-apipenv.nix {};
+			xonsh-direnv = cp ./xonsh-direnv.nix {};
+		})
+	];
+
 	my-py-addons = rec {
 		copier =  cp ./copier.nix {
 			inherit iteration-utilities
 			        jinja2-ansible-filters
-			        pydantic
 			        pyyaml-include
 			;
 		};
@@ -63,7 +71,6 @@ in rec {
 		jinja2-ansible-filters = cp ./jinja2-ansible-filters.nix {};
 		pydantic = cp ./pydantic.nix {};
 		pyyaml-include = cp ./pyyaml-include.nix {};
-		xonsh-direnv = cp ./xonsh-direnv.nix {};
 	};
 
 	#fcitx-engines = if ! prev.stdenv.isDarwin then prev.fcitx5 else prev.fcitx-engines;
@@ -79,7 +86,10 @@ in rec {
 
 	xonsh = prev.xonsh.overridePythonAttrs (old: rec{
 		python3 = final.gregpy;
-		propagatedBuildInputs = old.propagatedBuildInputs ++ [ my-py-addons.xonsh-direnv ];
+		propagatedBuildInputs = with final.gregpy.pkgs; old.propagatedBuildInputs ++ [
+			xonsh-apipenv
+			xonsh-direnv
+		];
 	});
 
 	bitwarden = macOver ./mac/bitwarden.nix "bitwarden";

overlays/django-rapyd-modernauth.nix

@@ -0,0 +1,45 @@
+{ lib, buildPythonPackage, fetchPypi, pkgs}:
+
+let
+    pydeps = pypkgs: with pypkgs; [
+        click
+        django
+        python-dotenv
+        pytz
+        setuptools
+        sqlparse
+        zipp
+    ];
+in buildPythonPackage rec {
+    pname = "django-rapyd-modernauth";
+    version = "0.0.4";
+
+    src = fetchPypi {
+        inherit pname version;
+        sha256 = "sha256-kDZjI32LcKsmLI38ruINKOUfi6lWTIqXF5qIQHi0LeQ=";
+    };
+
+    meta = with lib; {
+        description = "A Django application that provides a custom User model where the username is the email address.";
+        homepage = "https://github.com/karthicraghupathi/django_rapyd_modernauth";
+        license = licenses.afl20;
+        maintainers = [];
+    };
+
+    doCheck = false;
+
+    buildInputs = with pkgs; [
+        #(python3.withPackages pydeps)
+        click
+        django
+        python-dotenv
+        pytz
+        setuptools
+        sqlparse
+        zipp
+    ];
+
+    nativeBuildInputs = with pkgs; [
+        #(python3.withPackages pydeps)
+    ];
+}

overlays/packages.nix

@@ -14,6 +14,10 @@ flake-utils.lib.eachDefaultSystemMap (system:
 
 		brew = pkgs.callPackage ./homebrew.nix {};
 
+		django-rapyd-modernauth = pkgs.callPackage ./django-rapyd-modernauth.nix {
+			buildPythonPackage = pkgs.python3.pkgs.buildPythonPackage;
+		};
+
 		xonsh-direnv = pkgs.callPackage ./xonsh-direnv.nix {
 			buildPythonPackage = pkgs.python3.pkgs.buildPythonPackage;
 			fetchPypi = pkgs.python.pkgs.fetchPypi;

overlays/pydantic.nix

@@ -1,33 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, pkgs,
-typing-extensions
-}:
-
-let
-	pydeps = [
-		typing-extensions
-	];
-in buildPythonPackage rec {
-	pname = "pydantic";
-	version = "1.10.2";
-
-	src = fetchPypi {
-		inherit pname version;
-		sha256 = "sha256-kbjiGIUu9gB8K5jNhhYBxqCfGqMru7dPq1scM9Sh5BA=";
-	};
-
-	meta = with lib; {
-		description = "Data validation and settings management using Python type hints.";
-		homepage = "https://github.com/pydantic/pydantic";
-		license = licenses.mit;
-		maintainers = [];
-	};
-
-	doCheck = false;
-
-	propagatedBuildInputs = pydeps;
-
-	buildInputs = [];
-
-	nativeBuildInputs = with pkgs; [
-	];
-}

overlays/xonsh-apipenv.nix

@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pkgs}:
+
+buildPythonPackage rec {
+	pname = "xonsh-apipenv";
+	version = "0.4.0";
+
+	src = fetchFromGitHub {
+		owner = "deeuu";
+		repo = "xontrib-apipenv";
+		rev = "0.4.0";
+		sha256 = "sha256-uFn3kF7P4wykd72XkQx6cPWLhBOh2SDQBcI3Idc2rFM=";
+	};
+
+	meta = with lib; {
+		description = "Auto pipenv support for Xonsh";
+		homepage = "https://github.com/deeuu/xontrib-apipenv";
+		license = licenses.mit;
+		maintainers = [];
+	};
+
+	doCheck = false;
+
+	buildInputs = with pkgs; [
+		pipenv
+	];
+
+	nativeBuildInputs = [
+	];
+}