diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
new file mode 100644
index 0000000..d470cda
--- /dev/null
+++ b/.forgejo/workflows/build.yaml
@@ -0,0 +1,6 @@
+on: [push]
+jobs:
+  test:
+    runs-on: docker
+    steps:
+      - run: echo All Good
diff --git a/flake.lock b/flake.lock
index 0bf62e8..c94d79c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1706777546,
-        "narHash": "sha256-ZOsu6wxxNXm5o6RfXTcsDHiTtXf6fxCeEEpu73RJVh0=",
+        "lastModified": 1707469552,
+        "narHash": "sha256-CPHB05n2FKAcPtjLows1+cEOA3ivDeFHs5bkvTGSgR4=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "42f2c32d615b145ab47faeca4d9cfb48f7909052",
+        "rev": "eda89e24ee4ceb6e4bfcd00dabb894d6301c36db",
         "type": "github"
       },
       "original": {
@@ -71,17 +71,16 @@
     "extra-package-copilot": {
       "flake": false,
       "locked": {
-        "lastModified": 1704184504,
-        "narHash": "sha256-Vt+3OZM89dyLKjFnODWNHLDwrURXAtY5MFugyfEMbho=",
+        "lastModified": 1707055282,
+        "narHash": "sha256-Drx2bB/Uiq0Alm8d575eucQrK6erFy4Z0KXsL5RsFaY=",
         "owner": "zerolfx",
         "repo": "copilot.el",
-        "rev": "1542d76909636bf8804dd9c770f28818a897cfdc",
+        "rev": "22f0446a17753716456e0cb8ee33f47731fc4ec3",
         "type": "github"
       },
       "original": {
         "owner": "zerolfx",
         "repo": "copilot.el",
-        "rev": "1542d76909636bf8804dd9c770f28818a897cfdc",
         "type": "github"
       }
     },
@@ -139,11 +138,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1706569497,
-        "narHash": "sha256-oixb0IDb5eZYw6BaVr/R/1pSoMh4rfJHkVnlgeRIeZs=",
+        "lastModified": 1706830856,
+        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "60c614008eed1d0383d21daac177a3e036192ed8",
+        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
         "type": "github"
       },
       "original": {
@@ -211,11 +210,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706550542,
-        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+        "lastModified": 1707268954,
+        "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+        "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
         "type": "github"
       },
       "original": {
@@ -228,11 +227,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1703961334,
-        "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
+        "lastModified": 1706550542,
+        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
+        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
         "type": "github"
       },
       "original": {
@@ -245,11 +244,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1706515015,
-        "narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=",
+        "lastModified": 1707347730,
+        "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4",
+        "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6",
         "type": "github"
       },
       "original": {
@@ -277,11 +276,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1706550542,
-        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+        "lastModified": 1707268954,
+        "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+        "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ae3db9c..3e63ada 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,9 +27,7 @@
       flake = false;
     };
     extra-package-copilot = {
-      # TODO remove rev when jsonrpc 1.0.23 hits emacs 29
-      # https://github.com/copilot-emacs/copilot.el/issues/232
-      url = "github:zerolfx/copilot.el/1542d76909636bf8804dd9c770f28818a897cfdc";
+      url = "github:zerolfx/copilot.el";
       flake = false;
     };
     extra-package-notmuch-notify = {
@@ -50,10 +48,4 @@
 	./ci
       ];
     };
-
-  # Not hitting it
-  # nixConfig = {
-  #   extra-substituters = ["https://nix-community.cachix.org"];
-  #   extra-trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
-  # };
 }
diff --git a/init.el b/init.el
index 94eeaf7..307efde 100644
--- a/init.el
+++ b/init.el
@@ -453,7 +453,9 @@
 ;;   :config
 ;;   (global-nix-prettify-mode))
 
-(use-package agenix)
+(use-package agenix
+  :after envrc
+  :hook (agenix-pre-mode . envrc-mode))
 
 (use-package nix-ts-mode
   :custom ((nix-ts-mode--embed-bash nil))
@@ -491,9 +493,7 @@
   :mode "\\.ts\\'")
 
 (use-package haskell-mode
-  :hook ((haskell-mode . eglot-ensure)
-	 ;; (haskell-mode . tree-sitter-hl-mode) # doesn't exist yet?
-	 )
+  :hook ((haskell-mode . eglot-ensure))
   :mode "\\.hs\\'")
 
 (use-package purescript-mode
@@ -553,7 +553,6 @@
     (diff-hl-margin-mode 1))
 
 (use-package envrc
-  :hook (agenix-pre-mode . envrc-mode)
   :config
   (envrc-global-mode +1))
 
diff --git a/packages/default.nix b/packages/default.nix
index 2485a8a..a4d9425 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -20,6 +20,7 @@
         }) (lib.filterAttrs (inputName: _: ! builtins.isNull (builtins.match "extra-package-.*" inputName)) inputs);
       })
       inputs.emacs-overlay.overlays.package
+      inputs.emacs-overlay.overlays.emacs
       # Some tree-sitter grammars in nixpksg are built with a too new ABI
       # https://github.com/NixOS/nixpkgs/issues/209114
       # (_: _: {
@@ -48,7 +49,7 @@
             cp $f $out/"libtree-sitter-$(basename $f)"
           done
         '';
-      ccrEmacsWithoutPackages = pkgs.emacs29.override {
+      ccrEmacsWithoutPackages = pkgs.emacs-git.override {
         withSQLite3 = true;
         withWebP = true;
         withPgtk = true;