From f99b4de09c34f9d54efa779e371b7c1020430cb0 Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Tue, 22 Oct 2024 10:18:33 -0500
Subject: [PATCH] Fix bundle update

---
 .bundle/config                        | 5 ++++-
 .github/workflows/bundler-update.yaml | 4 +++-
 .justfile                             | 5 +++--
 .ruby-version                         | 1 -
 flake.nix                             | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 .ruby-version

diff --git a/.bundle/config b/.bundle/config
index f154eb2..477216d 100644
--- a/.bundle/config
+++ b/.bundle/config
@@ -1,2 +1,5 @@
 ---
-BUNDLE_FORCE_RUBY_PLATFORM: "true"
+deployment: "false"
+force_ruby_platform: "true"
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_CACHE_ALL: "true"
diff --git a/.github/workflows/bundler-update.yaml b/.github/workflows/bundler-update.yaml
index 24c5bc1..900ee10 100644
--- a/.github/workflows/bundler-update.yaml
+++ b/.github/workflows/bundler-update.yaml
@@ -20,7 +20,9 @@ jobs:
       - name: Update Gem lock file
         run: nix develop --command bundle update
       - name: Update the hashes in the gemset.nix file
-        run: nix develop --command bundix --lock
+        run: nix develop --command bundix
+      - name: Format the gemset.nix file
+        run: nix fmt
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
         with:
diff --git a/.justfile b/.justfile
index 2e7d1a5..57266f5 100644
--- a/.justfile
+++ b/.justfile
@@ -26,7 +26,8 @@ serve:
 alias u := update
 alias up := update
 
-update: && build test
+update:
     nix flake update
     bundle update
-    bundix --lock
+    bundix
+    nix fmt
diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index a3ec5a4..0000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-3.2
diff --git a/flake.nix b/flake.nix
index 6208b28..dc88d58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,6 @@
         gems = pkgs.bundlerEnv {
           name = "jwillikers-blog";
           gemdir = ./.;
-          extraConfigPaths = [ "${./.}/.ruby-version" ];
         };
         treefmt.config = {
           programs = {
@@ -137,6 +136,7 @@
             [
               asciidoctor
               bundix
+              bundler
               fish
               gems
               gems.wrappedRuby
@@ -149,7 +149,7 @@
               (lib.attrValues treefmtEval.config.build.programs)
             ]
             ++ pre-commit.enabledPackages;
-          postShellHook = pre-commit.shellHook;
+          inherit (pre-commit) shellHook;
         };
         packages.default = callPackage ./default.nix { inherit gems; };
         formatter = treefmtEval.config.build.wrapper;