refactor: expose justix module system (#8)

Author: jtrrll

.envrc

@@ -1,6 +1,11 @@
-# .envrc is used by direnv (if installed) to automatically load the devshell
+# .envrc is used by direnv (if installed) to automatically load the development environment.
+
+# Reload environment when these directories/files change.
 watch_dir "dev_shells"
 watch_file "flake.nix"
 watch_file "flake.lock"
 
+# Load the Nix development shell.
+USER_SHELL="$SHELL"
 use flake . --impure
+export SHELL="$USER_SHELL"

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ on:
   push:
     branches: ["main"]
   schedule:
-    - cron: '0 06 * * MON'
+    - cron: "0 06 * * MON"
   workflow_dispatch:
 concurrency:
   cancel-in-progress: true
@@ -17,7 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - uses: DeterminateSystems/nix-installer-action@v21
-      - uses: DeterminateSystems/magic-nix-cache-action@v13
       - uses: DeterminateSystems/flake-checker-action@v12
       - name: Check flake
         run: nix flake check --impure

.github/workflows/update_automated_pull_requests.yaml

@@ -0,0 +1,53 @@
+name: Update Automated Pull Requests
+on:
+  push:
+    branches: ["main"]
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  update-pull-requests:
+    name: Update automated pull requests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PR_BOT_PERSONAL_ACCESS_TOKEN }}
+      - name: Configure Git user
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+      - name: Update pull requests with automated label
+        env:
+          GH_TOKEN: ${{ secrets.PR_BOT_PERSONAL_ACCESS_TOKEN }}
+        run: |
+          prs=$(gh pr list --label automated --json number,headRefName,baseRefName --jq '.[] | "\(.number)|\(.headRefName)|\(.baseRefName)"')
+
+          if [ -z "$prs" ]; then
+            echo "No automated pull requests to update"
+            exit 0
+          fi
+
+          echo "$prs" | while IFS='|' read -r pr_number branch base_branch; do
+            echo "Updating PR #$pr_number (merging $base_branch into $branch)"
+
+            git fetch origin "$branch" "$base_branch" || {
+              echo "Failed to fetch branches for PR #$pr_number. Skipping."
+              continue
+            }
+
+            git checkout -B "$branch" "origin/$branch" || {
+              echo "Failed to checkout $branch for PR #$pr_number. Skipping."
+              continue
+            }
+
+            if git merge "origin/$base_branch" --no-edit; then
+              echo "Successfully merged $base_branch into $branch"
+              git push origin "$branch"
+            else
+              echo "Merge conflict detected for PR #$pr_number. Skipping."
+              git merge --abort
+            fi
+          done

.github/workflows/update_dependencies.yaml

@@ -7,19 +7,47 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  nix-flake:
-    name: Update Nix flake dependencies
+  development:
+    name: Update development dependencies
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
       - uses: DeterminateSystems/nix-installer-action@v21
-      - uses: DeterminateSystems/magic-nix-cache-action@v13
       - name: Update flake.lock
+        id: update
         uses: DeterminateSystems/update-flake-lock@v28
         with:
-          pr-title: "deps: update Nix flake dependencies"
+          branch: "update_flake_lock_development"
+          inputs: devenv flake-parts import-tree nixpkgs snekcheck treefmt-nix
+          pr-title: "deps: update development dependencies"
           pr-labels: |
             automated
             dependencies
-            nix
           token: ${{ secrets.PR_BOT_PERSONAL_ACCESS_TOKEN }}
+      - name: Enable auto-merge
+        if: steps.update.outputs.pull-request-number != ''
+        env:
+          GH_TOKEN: ${{ secrets.PR_BOT_PERSONAL_ACCESS_TOKEN }}
+        run: gh pr merge ${{ steps.update.outputs.pull-request-number }} --auto --squash
+  build:
+    name: Update build dependencies
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: DeterminateSystems/nix-installer-action@v21
+      - name: Update flake.lock
+        id: update
+        uses: DeterminateSystems/update-flake-lock@v28
+        with:
+          branch: "update_flake_lock_build"
+          inputs: nixpkgs-just
+          pr-title: "deps: update build dependencies"
+          pr-labels: |
+            automated
+            dependencies
+          token: ${{ secrets.PR_BOT_PERSONAL_ACCESS_TOKEN }}
+      - name: Enable auto-merge
+        if: steps.update.outputs.pull-request-number != ''
+        env:
+          GH_TOKEN: ${{ secrets.PR_BOT_PERSONAL_ACCESS_TOKEN }}
+        run: gh pr merge ${{ steps.update.outputs.pull-request-number }} --auto --squash

README.md

@@ -6,4 +6,4 @@
 ![License](https://img.shields.io/github/license/jtrrll/justix?label=license&logo=googledocs&logoColor=white)
 <!-- markdownlint-enable MD013 -->
 
-Build Justfiles with Nix!
+Build justfiles with Nix!

dev_shells/default.nix

@@ -1,6 +1,7 @@
 { inputs, self, ... }:
 {
   imports = [ inputs.devenv.flakeModule ];
+
   perSystem =
     {
       inputs',
@@ -9,11 +10,10 @@
     }:
     {
       devenv = {
-        modules = [
+        modules = (lib.attrValues self.modules.devenv) ++ [
           {
             containers = lib.mkForce { }; # Workaround to remove containers from flake checks.
           }
-          self.devenvModules.default
         ];
         shells.default =
           { lib, pkgs, ... }:
@@ -42,7 +42,7 @@
 
             justix = {
               enable = true;
-              justfile.config = {
+              config = {
                 recipes = {
                   default = {
                     attributes = {
@@ -62,7 +62,7 @@
                         elif [ -d "$path" ]; then \
                           while IFS= read -r -d "" file; do \
                             files+=("$file"); \
-                          done < <(find "$path" ! -path '*/.*' ! -path '*/node_modules/*' -type f -print0); \
+                          done < <(find "$path" ! -path '*/.*' -type f -print0); \
                         fi; \
                       done; \
                       [ ''${#files[@]} -gt 0 ] && ${lib.getExe inputs'.snekcheck.packages.default} --fix "''${files[@]}"
@@ -74,23 +74,11 @@
               };
             };
 
-            languages = {
-              javascript = {
-                bun.enable = true;
-                enable = true;
-              };
-              nix = {
-                enable = true;
-                lsp.package = pkgs.nixd;
-              };
-              typescript.enable = true;
+            languages.nix = {
+              enable = true;
+              lsp.package = pkgs.nixd;
             };
 
-            packages = [
-              inputs'.bun2nix.packages.bun2nix
-              pkgs.vtsls
-            ];
-
             git-hooks = {
               default_stages = [ "pre-push" ];
               hooks = {