diff --git a/devenv.lock b/devenv.lock index e10d706..dfb89de 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,10 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1770744655, + "lastModified": 1793025392, + "narHash": "sha256-gq7TcA/Enyxw50ucuLZG8ocUWQro6sryMlAejEex0DY=", "owner": "cachix", "repo": "devenv", - "rev": "d8bd7b74d0604227220074ac0bc934c4efb2b8fb", + "rev": "6af962f65a11a6a0a785e3ec957cb4b75245e086", "type": "github" }, "original": { @@ -31,21 +32,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "owner": "edolstra", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -105,26 +91,6 @@ "type": "github" } }, - "nixpkgs-python": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770193939, - "owner": "cachix", - "repo": "nixpkgs-python", - "rev": "0630618bfe33895453257fb606af75aa71247393", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "nixpkgs-python", - "type": "github" - } - }, "nixpkgs-src": { "flake": false, "locked": { @@ -146,14 +112,10 @@ "inputs": { "devenv": "devenv", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs", - "nixpkgs-python": "nixpkgs-python", - "pre-commit-hooks": [ - "git-hooks" - ] + "nixpkgs": "nixpkgs" } } }, "root": "root", "version": 7 -} +} \ No newline at end of file diff --git a/devenv.nix b/devenv.nix index 56564c5..6225152 100644 --- a/devenv.nix +++ b/devenv.nix @@ -10,7 +10,8 @@ # Python configuration languages.python = { enable = true; - version = "3.12"; + package = pkgs.python312; + venv.enable = true; uv = { enable = true; sync.enable = true; @@ -39,23 +40,25 @@ # Shell initialization enterShell = '' - echo "" - echo "Python Development Environment" - echo "==============================" - echo "Python: $(python --version)" - echo "uv: $(uv --version)" - echo "" - echo "Tools:" - echo " ruff: $(ruff --version)" - echo " basedpyright: $(basedpyright --version)" - echo "" - echo "Commands:" - echo " uv sync - Install dependencies" - echo " uv add - Add dependency" - echo " ruff check . - Run linter" - echo " ruff format . - Format code" - echo " basedpyright - Type check" - echo " treefmt - Format all files" - echo "" + if [[ -z "''${DIRENV_IN_ENVRC:-}" ]]; then + echo "" + echo "Python Development Environment" + echo "==============================" + echo "Python: $(python --version)" + echo "uv: $(uv --version)" + echo "" + echo "Tools:" + echo " ruff: $(ruff --version)" + echo " basedpyright: $(basedpyright --version)" + echo "" + echo "Commands:" + echo " uv sync - Install dependencies" + echo " uv add - Add dependency" + echo " ruff check . - Run linter" + echo " ruff format . - Format code" + echo " basedpyright - Type check" + echo " treefmt - Format all files" + echo "" + fi ''; } diff --git a/devenv.yaml b/devenv.yaml index 951439f..e91c1f5 100644 --- a/devenv.yaml +++ b/devenv.yaml @@ -1,8 +1,8 @@ inputs: nixpkgs: url: github:cachix/devenv-nixpkgs/rolling - nixpkgs-python: - url: github:cachix/nixpkgs-python + git-hooks: + url: github:cachix/git-hooks.nix inputs: nixpkgs: follows: nixpkgs @@ -11,6 +11,5 @@ cachix: enable: true caches: - shiftone-ai-simple-a2a-agent - - nixpkgs-python - devenv - nix-community