1.0: Rewrite in Python

.devcontainer.json

@@ -2,7 +2,7 @@
   "customizations": {
     "vscode": {
       "extensions": [
-        "bbenoist.Nix"
+        "jnoortheen.nix-ide"
       ]
     }
   },

.envrc

@@ -10,4 +10,4 @@ PATH_add "$devenv_bin/bin"
 # External users should use `source_url` to load this file
 source_env ./direnvrc
 
-use devenv
+use devenv

.github/workflows/buildtest.yml

@@ -18,21 +18,16 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - uses: cachix/install-nix-action@v25
-      with:
-        extra_nix_config: |
-          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
     - uses: cachix/cachix-action@v14
       with:
         name: devenv
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: |
-        nix profile remove '.*'
-        nix profile install --accept-flake-config .
+    - run: nix build
     - name: Run tests
       run: |
-        devenv ci
-        devenv shell devenv-run-tests
-        devenv search ncdu | grep "pkgs\.ncdu"
+        ./result/bin/devenv ci
+        ./result/bin/devenv shell devenv-run-tests
+        ./result/bin/devenv search ncdu | grep "pkgs\.ncdu"
   pin:
     needs: build
     if: startsWith(github.ref, 'refs/tags/v')
@@ -51,7 +46,7 @@ jobs:
         echo "examples=$json" >> $GITHUB_OUTPUT
   examples:
     name: ${{ matrix.example }} (${{ join(matrix.os) }})
-    needs: [generate-examples]
+    needs: [generate-examples, build]
     strategy:
       fail-fast: false
       matrix:
@@ -69,16 +64,16 @@ jobs:
       with:
         name: devenv
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: |
-        nix profile remove '.*'
-        nix profile install --accept-flake-config . "nixpkgs#gawk"
     - name: Disable package aliases 
       run: |
         mkdir -p ~/.config/nixpkgs
         echo '{ allowAliases = false; }' > ~/.config/nixpkgs/config.nix
-    - run: devenv shell devenv-test-example ${{ matrix.example }}
+    - run: |
+        nix build
+        ./result/bin/devenv test ${{ matrix.example }}
   direnv:
     name: direnv (${{ join(matrix.os) }})
+    needs: build
     strategy:
       fail-fast: false
       matrix:
@@ -95,15 +90,15 @@ jobs:
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
     - run: |
         mv ./examples/simple/devenv.yaml ./examples/simple/devenv.yaml.orig
-        awk '
+        nix run nixpkgs#gawk -- '
           { print }
           /^inputs:$/ {
             print "  devenv:";
-            print "    url: path:../../src/modules";
+            print "    url: path:../../?dir=src/modules";
           }
         ' ./examples/simple/devenv.yaml.orig > ./examples/simple/devenv.yaml
         nix profile remove '.*'
-        nix profile install . 'nixpkgs#direnv'
+        nix profile install . 'nixpkgs#direnv' 
         mkdir -p ~/.config/direnv/
         cat > ~/.config/direnv/direnv.toml << 'EOF'
         [global]
@@ -113,6 +108,7 @@ jobs:
         direnv exec ./examples/simple true
   fish-zsh:
     name: zsh/fish (${{ join(matrix.os) }})
+    needs: build
     strategy:
       fail-fast: false
       matrix:
@@ -127,9 +123,7 @@ jobs:
       with:
         name: devenv
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+    - run: nix build
     - run: |
-        nix profile remove '.*'
-        nix profile install --accept-flake-config . 
-    - run: |
-        nix shell nixpkgs#zsh -c zsh -c "$(which devenv) version"
-        nix shell nixpkgs#fish -c fish -c "$(which devenv) version"
+        nix shell nixpkgs#zsh -c zsh -c "./result/bin/devenv version"
+        nix shell nixpkgs#fish -c fish -c "./result/bin/devenv version"

.gitignore

@@ -1,13 +1,14 @@
+# Nix & devenv
 result
 .env
 .env.*
 .devenv*
 /.cache
 /.pre-commit-config.yaml
-/bin
-/include
-/lib
-pyvenv.cfg
-/.direnv
-/.venv
+
+# examples
 examples/rust/app/target
+
+# Python
+/.venv
+*.pyc

build_cloudflare.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 set -xe
-poetry install
+poetry install --with docs
 poetry run -- mkdocs build

devcontainer/nix-entrypoint.sh

@@ -4,6 +4,7 @@ set +e
 if ! pidof nix-daemon > /dev/null 2>&1; then
     start_ok=false
     if [ "$(id -u)" = "0" ]; then
+        # shellcheck disable=SC1091
         # shellcheck source=/dev/null
         ( . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh; /nix/var/nix/profiles/default/bin/nix-daemon > /tmp/nix-daemon.log 2>&1 ) &
         # shellcheck disable=SC2181

devenv.lock

@@ -14,11 +14,27 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "treeHash": "2addb7b71a20a25ea74feeaf5c2f6a6b30898ecb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "treeHash": "2addb7b71a20a25ea74feeaf5c2f6a6b30898ecb",
         "type": "github"
       },
       "original": {
@@ -32,11 +48,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1705309234,
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "treeHash": "80a852cb0f5bf29497a20ca4f37ba97b0e85c721",
         "type": "github"
       },
       "original": {
@@ -53,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1660459072,
-        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "lastModified": 1703887061,
         "owner": "hercules-ci",
         "repo": "gitignore.nix",
-        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
+        "treeHash": "2dd7f68f94467b298f778300ce0248117d6c500e",
         "type": "github"
       },
       "original": {
@@ -66,52 +82,36 @@
         "type": "github"
       }
     },
-    "lowdown-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1633514407,
-        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "type": "github"
-      }
-    },
     "nix": {
       "inputs": {
-        "lowdown-src": "lowdown-src",
+        "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
         ],
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1676545802,
-        "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=",
+        "lastModified": 1708370782,
         "owner": "domenkozar",
         "repo": "nix",
-        "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f",
+        "rev": "3b944df09a1d3606f094bd4b32c56846efc99ddf",
+        "treeHash": "401993a9735c08297eff0a593f6ac5adac68c8b9",
         "type": "github"
       },
       "original": {
         "owner": "domenkozar",
-        "ref": "relaxed-flakes",
+        "ref": "devenv-2.21",
         "repo": "nix",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701693815,
-        "narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=",
+        "lastModified": 1708373374,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "09ec6a0881e1a36c29d67497693a67a16f4da573",
+        "rev": "93e1c2d08467d1117ebac45689469613a9fe8453",
+        "treeHash": "a71be29ec9a1d906373bc8e8feac400a1bc378bf",
         "type": "github"
       },
       "original": {
@@ -124,10 +124,10 @@
     "nixpkgs-regression": {
       "locked": {
         "lastModified": 1643052045,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "treeHash": "749c7b11668286627143f45b3f9078561a91980a",
         "type": "github"
       },
       "original": {
@@ -139,23 +139,23 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1685801374,
-        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+        "lastModified": 1708294118,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+        "rev": "e0da498ad77ac8909a980f07eff060862417ccf7",
+        "treeHash": "6080d79e20d8f9fce719e518f10143595514df54",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils",
         "gitignore": "gitignore",
         "nixpkgs": [
@@ -164,11 +164,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1700922917,
-        "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=",
+        "lastModified": 1708018599,
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78",
+        "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
+        "treeHash": "6b6519c2b58ad1e106d9633f0d1b490a70fc6980",
         "type": "github"
       },
       "original": {
@@ -188,10 +188,10 @@
     "systems": {
       "locked": {
         "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
         "repo": "default",
         "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "treeHash": "cce81f2a0f0743b2eb61bc2eb6c7adbe2f2c6beb",
         "type": "github"
       },
       "original": {