From f7f01d92ea4f00c03881034a1663d3e0ead164e8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 23 May 2026 08:25:14 +0000
Subject: [PATCH 01/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d233902339c02a9c334e7e593de68855ad26c4cb?narHash=sha256-30sZNZoA1cqF5JNO9fVX%2BwgiQYjB7HJqqJ4ztCDeBZE%3D' (2026-05-15)
  → 'github:NixOS/nixpkgs/f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1?narHash=sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic%3D' (2026-05-21)
• Updated input 'nvimConfig':
    'github:dwinkler1/nvimConfig/af6d975129768cce36ac4c46198ab2b3ebaafad3?narHash=sha256-y3JTpxmNgtEYG1m21Ymvdmrul/WvJzOCX45AlV21aak%3D' (2026-05-21)
  → 'github:dwinkler1/nvimConfig/15efa3299a488acff7065843c1824d3dbfbdc193?narHash=sha256-R/tHAUf5XVuykMNvuOjeBizk/m%2BlWI7m1U2tAYIqaJs%3D' (2026-05-23)
• Updated input 'nvimConfig/r-nvim-nix':
    'github:dwinkler1/r_nvim_nix/2f49dfee27886068e2f49cbd54558ce4cc424c82?narHash=sha256-Z4y1tQfkIsPK4NRxGn668HMDfWxnxNxSJ0CAOOXiIfY%3D' (2026-05-13)
  → 'github:dwinkler1/r_nvim_nix/a012c98b5cc6a8ce59d461825c71b4877f934056?narHash=sha256-OX3/QTVOq5o3DD6dNzNY8X2v/7ZtbQOM01Z8bVf5tHc%3D' (2026-05-22)
• Updated input 'nvimConfig/wrappers':
    'github:BirdeeHub/nix-wrapper-modules/e7ed7a1205945befdf2e0d73ba7df91d935e5af1?narHash=sha256-VFoBwH7ZjVxCnvZTb5ODRXt70sLtWMxstive0N%2BRS50%3D' (2026-05-20)
  → 'github:BirdeeHub/nix-wrapper-modules/8c90cbe3aaae094370b08f270682fc352fcbcb91?narHash=sha256-Y2S3mvEezyKL/A4XUkgVbhuvob9YKfnG25NuJDl8fuQ%3D' (2026-05-23)
---
 templates/ed/flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 19c77b2..3180b2b 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "lastModified": 1779357205,
+        "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
         "type": "github"
       },
       "original": {
@@ -53,11 +53,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1779362150,
-        "narHash": "sha256-y3JTpxmNgtEYG1m21Ymvdmrul/WvJzOCX45AlV21aak=",
+        "lastModified": 1779519005,
+        "narHash": "sha256-R/tHAUf5XVuykMNvuOjeBizk/m+lWI7m1U2tAYIqaJs=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "af6d975129768cce36ac4c46198ab2b3ebaafad3",
+        "rev": "15efa3299a488acff7065843c1824d3dbfbdc193",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778684156,
-        "narHash": "sha256-Z4y1tQfkIsPK4NRxGn668HMDfWxnxNxSJ0CAOOXiIfY=",
+        "lastModified": 1779439280,
+        "narHash": "sha256-OX3/QTVOq5o3DD6dNzNY8X2v/7ZtbQOM01Z8bVf5tHc=",
         "owner": "dwinkler1",
         "repo": "r_nvim_nix",
-        "rev": "2f49dfee27886068e2f49cbd54558ce4cc424c82",
+        "rev": "a012c98b5cc6a8ce59d461825c71b4877f934056",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779297405,
-        "narHash": "sha256-VFoBwH7ZjVxCnvZTb5ODRXt70sLtWMxstive0N+RS50=",
+        "lastModified": 1779512817,
+        "narHash": "sha256-Y2S3mvEezyKL/A4XUkgVbhuvob9YKfnG25NuJDl8fuQ=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "e7ed7a1205945befdf2e0d73ba7df91d935e5af1",
+        "rev": "8c90cbe3aaae094370b08f270682fc352fcbcb91",
         "type": "github"
       },
       "original": {

From f844bdff2fabf0ffdd9558c9c9b67cb52aa1eca4 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sat, 23 May 2026 19:58:10 +1000
Subject: [PATCH 02/24] refactor for better runtime dep management

---
 templates/ed/.gitignore |   1 +
 templates/ed/flake.nix  | 127 ++++++++++++++++++++++++++--------------
 2 files changed, 83 insertions(+), 45 deletions(-)

diff --git a/templates/ed/.gitignore b/templates/ed/.gitignore
index 52e8a70..ffc0e1a 100644
--- a/templates/ed/.gitignore
+++ b/templates/ed/.gitignore
@@ -1 +1,2 @@
 .nvimcom
+.commandcode/
diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index b674c62..2dbe4db 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -28,7 +28,6 @@
     rPackages = pkgs:
       (with pkgs.rpkgs.rPackages; [
         fixest
-        # pkgs.extraRPackages.musicMetadata
       ])
       ++ (
         if builtins.pathExists ./r-packages.nix
@@ -58,11 +57,89 @@
         else []
       );
 
+    # ── Per-language runtime dependencies ──────────────────────────
+    # Single source of truth for system/toolchain packages that
+    # flow to both runtimePkgs (wrapper PATH) and devShells.
+    mkRuntimeDeps = pkgs: {
+      always = [
+        pkgs.git
+        pkgs.pre-commit
+        pkgs.cowsay
+      ];
+      nix = [
+        pkgs.nil
+        pkgs.nixfmt
+      ];
+      r = let
+        r_packages = (pkgs.baseRPackages or []) ++ rPackages pkgs;
+      in [
+        (pkgs.rWrapper.override {packages = r_packages;})
+        pkgs.radianWrapper
+        pkgs.air-formatter
+        pkgs.yaml-language-server
+        pkgs.nvimcom
+        pkgs.rnvimserver
+      ];
+      python = [
+        (pkgs.python3.withPackages (ps:
+          (pkgs.basePythonPackages or (_: [])) ps
+          ++ pythonPackages pkgs))
+        pkgs.nodejs
+        pkgs.ruff
+        pkgs.basedpyright
+        pkgs.uv
+      ];
+      julia = [
+        (pkgs.julia-bin.withPackages juliaPackages)
+      ];
+      markdown = let
+        r_packages = (pkgs.baseRPackages or []) ++ rPackages pkgs;
+        quarto =
+          if cats.r
+          then pkgs.quarto.override {extraRPackages = r_packages;}
+          else pkgs.quarto;
+      in [
+        pkgs.python313Packages.pylatexenc
+        quarto
+        pkgs.zk
+      ];
+    };
+
+    enabledRuntimeDeps = pkgs: let
+      deps = mkRuntimeDeps pkgs;
+    in
+      deps.always
+      ++ (
+        if cats.nix
+        then deps.nix
+        else []
+      )
+      ++ (
+        if cats.r
+        then deps.r
+        else []
+      )
+      ++ (
+        if cats.python
+        then deps.python
+        else []
+      )
+      ++ (
+        if cats.julia
+        then deps.julia
+        else []
+      )
+      ++ (
+        if cats.markdown
+        then deps.markdown
+        else []
+      );
+
     systems = ["aarch64-darwin" "x86_64-linux" "aarch64-linux"];
     forAllSystems = nixpkgs.lib.genAttrs systems;
     overlays = [inputs.nvimConfig.overlays.dependencies];
   in {
-    formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
+    formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt);
 
     packages = forAllSystems (system: let
       pkgs = import nixpkgs {
@@ -92,12 +169,10 @@
           IS_PROJECT_EDITOR = "1";
         };
 
-        runtimePkgs = with pkgs; [
-          cowsay
-        ];
+        runtimePkgs = enabledRuntimeDeps pkgs;
 
         specs.extraLua = let
-          name = builtins.baseNameOf (builtins.toString ./.);
+          name = builtins.baseNameOf (builtins.toString "${self.outPath}");
         in {
           data = pkgs.vimPlugins.mini-notify;
           before = ["INIT_MAIN"];
@@ -137,47 +212,9 @@
         packages =
           [
             nv
-            pkgs.git
-            pkgs.pre-commit
             pkgs.nushell
           ]
-          # ── R toolchain (R REPL, quarto, LSP, formatter) ─────
-          ++ pkgs.lib.optionals cats.r (let
-            r_packages = (pkgs.baseRPackages or []) ++ rPackages pkgs;
-          in [
-            (pkgs.rWrapper.override {packages = r_packages;})
-            pkgs.radianWrapper
-            pkgs.air-formatter
-            pkgs.yaml-language-server
-            pkgs.nvimcom
-            pkgs.rnvimserver
-          ])
-          # ── Python toolchain (interpreter, LSP, formatter) ────
-          ++ pkgs.lib.optionals cats.python [
-            (pkgs.python3.withPackages (ps: pkgs.basePythonPackages ps ++ pythonPackages pkgs))
-            pkgs.nodejs
-            pkgs.ruff
-            pkgs.basedpyright
-            pkgs.uv
-          ]
-          # ── Julia toolchain ───────────────────────────────────
-          ++ pkgs.lib.optionals cats.julia [
-            pkgs.julia-bin.withPackages
-            juliaPackages
-          ]
-          # ── Markdown toolchain (quarto, zk) ───────────────────
-          ++ (let
-            r_packages = (pkgs.baseRPackages or []) ++ rPackages pkgs;
-            quarto =
-              if cats.r
-              then pkgs.quarto.override {extraRPackages = r_packages;}
-              else pkgs.quarto;
-          in
-            pkgs.lib.optionals cats.markdown [
-              pkgs.python313Packages.pylatexenc
-              quarto
-              pkgs.zk
-            ]);
+          ++ enabledRuntimeDeps pkgs;
       };
     });
   };

From d90f82b2bb889280e5ffbeb9bb1c352f10e972a8 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sun, 24 May 2026 00:13:24 +1000
Subject: [PATCH 03/24] setup working

---
 templates/ed/flake.lock |  63 ++++-----
 templates/ed/flake.nix  | 303 +++++++++++++++-------------------------
 2 files changed, 141 insertions(+), 225 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 19c77b2..e197c74 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,15 +22,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
-        "owner": "NixOS",
+        "lastModified": 1779357205,
+        "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -45,7 +45,6 @@
           "nixpkgs"
         ],
         "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
-        "plugins-r": "plugins-r",
         "r-nvim-nix": "r-nvim-nix",
         "rixpkgs": [
           "rixpkgs"
@@ -53,11 +52,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1779362150,
-        "narHash": "sha256-y3JTpxmNgtEYG1m21Ymvdmrul/WvJzOCX45AlV21aak=",
+        "lastModified": 1779544872,
+        "narHash": "sha256-AnuNQ9nbXrDYmL97TOejAds/FQOgD6FEOHABp/8dmsU=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "af6d975129768cce36ac4c46198ab2b3ebaafad3",
+        "rev": "aec9110e709e1aa50d78f06293c4bde14974b23f",
         "type": "github"
       },
       "original": {
@@ -82,44 +81,25 @@
         "type": "github"
       }
     },
-    "plugins-r": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1776905071,
-        "narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=",
-        "owner": "R-nvim",
-        "repo": "R.nvim",
-        "rev": "582f2af11290ac067e49018db38e12a511325556",
-        "type": "github"
-      },
-      "original": {
-        "owner": "R-nvim",
-        "ref": "v0.99.4",
-        "repo": "R.nvim",
-        "type": "github"
-      }
-    },
     "r-nvim-nix": {
       "inputs": {
         "nixpkgs": [
           "nvimConfig",
           "rixpkgs"
         ],
-        "rnvimsrc": [
-          "nvimConfig",
-          "plugins-r"
-        ]
+        "rnvimsrc": "rnvimsrc"
       },
       "locked": {
-        "lastModified": 1778684156,
-        "narHash": "sha256-Z4y1tQfkIsPK4NRxGn668HMDfWxnxNxSJ0CAOOXiIfY=",
+        "lastModified": 1779438909,
+        "narHash": "sha256-1lvv0bdvSVyeCIgeZ7Ws7ffbDFurA5LJscS9dRLHzC8=",
         "owner": "dwinkler1",
         "repo": "r_nvim_nix",
-        "rev": "2f49dfee27886068e2f49cbd54558ce4cc424c82",
+        "rev": "ec17e22ab362a0ddfd6c2e9c5e95d43897a143be",
         "type": "github"
       },
       "original": {
         "owner": "dwinkler1",
+        "ref": "v0.99.4",
         "repo": "r_nvim_nix",
         "type": "github"
       }
@@ -140,6 +120,23 @@
         "type": "github"
       }
     },
+    "rnvimsrc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1776905071,
+        "narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=",
+        "owner": "R-nvim",
+        "repo": "R.nvim",
+        "rev": "582f2af11290ac067e49018db38e12a511325556",
+        "type": "github"
+      },
+      "original": {
+        "owner": "R-nvim",
+        "ref": "v0.99.4",
+        "repo": "R.nvim",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "fran": "fran",
diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index 2dbe4db..faccae8 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -6,233 +6,152 @@
     nixpkgs,
     nvimConfig,
     ...
-  } @ inputs: let
-    # ── Shared language support flags ──────────────────────────────
-    # Used by both the neovim wrapper module and the devShell
-    cats = {
-      clickhouse = false;
-      gitPlugins = false;
-      julia = false;
-      lua = false;
-      markdown = false;
-      nix = true;
-      optional = false;
-      python = false;
-      r = false;
-    };
-
-    # ── Language package lists ────────────────────────────────────
-    # Shared between wrapper lang_packages and devShell toolchains.
-    # Accept pkgs so they work inside forAllSystems for each system.
-
-    rPackages = pkgs:
-      (with pkgs.rpkgs.rPackages; [
-        fixest
-      ])
-      ++ (
-        if builtins.pathExists ./r-packages.nix
-        # p: with p.rPackages; [ ... ]
-        then import ./r-packages.nix pkgs.rpkgs
-        else []
-      );
-
-    pythonPackages = pkgs:
-      (with pkgs.python3Packages; [
-        duckdb
-        polars
-      ])
-      ++ (
-        if builtins.pathExists ./python-packages.nix
-        # p: with p; [ ... ]
-        then import ./python-packages.nix pkgs.python3Packages
-        else []
-      );
-
-    juliaPackages =
-      ["StatsBase"]
-      ++ (
-        if builtins.pathExists ./julia-packages.nix
-        # [ ... ]
-        then import ./julia-packages.nix
-        else []
-      );
-
-    # ── Per-language runtime dependencies ──────────────────────────
-    # Single source of truth for system/toolchain packages that
-    # flow to both runtimePkgs (wrapper PATH) and devShells.
-    mkRuntimeDeps = pkgs: {
-      always = [
-        pkgs.git
-        pkgs.pre-commit
-        pkgs.cowsay
-      ];
-      nix = [
-        pkgs.nil
-        pkgs.nixfmt
-      ];
-      r = let
-        r_packages = (pkgs.baseRPackages or []) ++ rPackages pkgs;
-      in [
-        (pkgs.rWrapper.override {packages = r_packages;})
-        pkgs.radianWrapper
-        pkgs.air-formatter
-        pkgs.yaml-language-server
-        pkgs.nvimcom
-        pkgs.rnvimserver
-      ];
-      python = [
-        (pkgs.python3.withPackages (ps:
-          (pkgs.basePythonPackages or (_: [])) ps
-          ++ pythonPackages pkgs))
-        pkgs.nodejs
-        pkgs.ruff
-        pkgs.basedpyright
-        pkgs.uv
-      ];
-      julia = [
-        (pkgs.julia-bin.withPackages juliaPackages)
-      ];
-      markdown = let
-        r_packages = (pkgs.baseRPackages or []) ++ rPackages pkgs;
-        quarto =
-          if cats.r
-          then pkgs.quarto.override {extraRPackages = r_packages;}
-          else pkgs.quarto;
-      in [
-        pkgs.python313Packages.pylatexenc
-        quarto
-        pkgs.zk
-      ];
-    };
-
-    enabledRuntimeDeps = pkgs: let
-      deps = mkRuntimeDeps pkgs;
-    in
-      deps.always
-      ++ (
-        if cats.nix
-        then deps.nix
-        else []
-      )
-      ++ (
-        if cats.r
-        then deps.r
-        else []
-      )
-      ++ (
-        if cats.python
-        then deps.python
-        else []
-      )
-      ++ (
-        if cats.julia
-        then deps.julia
-        else []
-      )
-      ++ (
-        if cats.markdown
-        then deps.markdown
-        else []
-      );
-
+  }: let
     systems = ["aarch64-darwin" "x86_64-linux" "aarch64-linux"];
     forAllSystems = nixpkgs.lib.genAttrs systems;
-    overlays = [inputs.nvimConfig.overlays.dependencies];
-  in {
-    formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt);
 
-    packages = forAllSystems (system: let
-      pkgs = import nixpkgs {
-        inherit system overlays;
-        config = {allowUnfree = true;};
+    mkPkgs = system:
+      import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+        overlays = [nvimConfig.overlays.dependencies];
       };
-      # Plain attrset — pkgs is captured from the surrounding scope,
-      # so the module system does not need lazy _module.args resolution.
-      projectSettings = {
-        inherit cats;
-        settings = let
-          # With `replace` packages are replaced otherwise they are merged with base packages
-          replace = pkgs.lib.mkForce;
-        in {
-          lang_packages = {
-            python = replace (pythonPackages pkgs);
-            r = replace (rPackages pkgs);
-            julia = replace juliaPackages;
-          };
-          colorscheme = "kanagawa";
-          background = "dark";
-          wrapRc = true;
-        };
-        binName = "nv";
 
-        env = {
-          IS_PROJECT_EDITOR = "1";
-        };
+    projectModule = pkgs: let
+      baseConfig = nvimConfig.wrapperConfigs.default {inherit pkgs;};
+      extraRPackages =
+        if builtins.pathExists ./r-packages.nix
+        then import ./r-packages.nix pkgs.rpkgs
+        else [];
 
-        runtimePkgs = enabledRuntimeDeps pkgs;
+      extraPythonPackages =
+        if builtins.pathExists ./python-packages.nix
+        then import ./python-packages.nix pkgs.python3Packages
+        else [];
 
-        specs.extraLua = let
-          name = builtins.baseNameOf (builtins.toString "${self.outPath}");
-        in {
-          data = pkgs.vimPlugins.mini-notify;
-          before = ["INIT_MAIN"];
-          config = ''
-            require("mini.notify").setup()
-            vim.notify = MiniNotify.make_notify()
-            vim.notify("Welcome to ${name}!")
-          '';
-        };
+      extraJuliaPackages =
+        if builtins.pathExists ./julia-packages.nix
+        then import ./julia-packages.nix
+        else [];
+
+      projectName = builtins.baseNameOf (toString self.outPath);
+    in {
+      cats = {
+        clickhouse = false;
+        gitPlugins = false;
+        julia = false;
+        lua = false;
+        markdown = false;
+        nix = true;
+        optional = false;
+        python = false;
+        r = true;
       };
-      evalResult = nvimConfig.inputs.wrappers.lib.evalModules {
-        modules = [
-          nvimConfig.wrapperModules.default
-          projectSettings
+
+      settings = {
+        lang_packages = {
+          python = with pkgs.python3Packages;
+            [
+              requests
+            ]
+            ++ extraPythonPackages;
+
+          r =
+            (with pkgs.rpkgs.rPackages; [
+              arrow
+              data_table
+              fixest
+              pkgs.nvimcom
+            ])
+            ++ extraRPackages;
+
+          julia =
+            ["StatsBase"]
+            ++ extraJuliaPackages;
+        };
+
+        colorscheme = "tokyonight"; #"kanagawa";
+        background = "dark";
+        wrapRc = true;
+      };
+
+      binName = "nv";
+
+      env.IS_PROJECT_EDITOR = "1";
+
+      catPkgs = {
+        always = [
+          pkgs.git
+          pkgs.pre-commit
+          pkgs.cowsay
+        ];
+
+        nix = [
+          pkgs.nil
+          pkgs.nixfmt
         ];
       };
+
+      specs.extraLua = {
+        before = ["INIT_MAIN"];
+        data = pkgs.writeText "project-startup.lua" ''
+          require("mini.notify").setup()
+          vim.notify = MiniNotify.make_notify()
+          vim.notify("Welcome to ${projectName}!")
+        '';
+      };
+    };
+  in {
+    formatter = forAllSystems (system: (mkPkgs system).nixfmt-tree);
+
+    packages = forAllSystems (system: let
+      pkgs = mkPkgs system;
     in {
-      default = evalResult.config.wrap {inherit pkgs;};
+      default = nvimConfig.lib.mkWrapper {
+        inherit pkgs;
+        modules = [(projectModule pkgs)];
+      };
     });
 
     devShells = forAllSystems (system: let
-      pkgs = import nixpkgs {
-        inherit system overlays;
-        config = {allowUnfree = true;};
+      pkgs = mkPkgs system;
+      evalResult = nvimConfig.lib.eval {
+        inherit pkgs;
+        modules = [(projectModule pkgs)];
       };
-      nv = self.packages.${system}.default;
+      nv = evalResult.config.wrap {inherit pkgs;};
     in {
       default = pkgs.mkShell {
-        shellHook = ''
-          exec nu
-          alias gst='git status'
-          alias glol='git log --oneline --graph --decorate'
-          alias gc='git commit'
-          alias gl='git pull'
-          alias gp='git push'
-        '';
         packages =
           [
             nv
             pkgs.nushell
           ]
-          ++ enabledRuntimeDeps pkgs;
+          ++ nvimConfig.lib.devShellPackages evalResult.config;
+        shellHook =
+          nvimConfig.lib.shellHook evalResult.config
+          + ''
+            exec nu
+          '';
       };
     });
   };
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
     rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e";
+
     fran = {
       url = "github:dwinkler1/fran";
-      inputs = {
-        nixpkgs.follows = "rixpkgs";
-      };
+      inputs.nixpkgs.follows = "rixpkgs";
     };
+
     nvimConfig = {
       url = "github:dwinkler1/nvimConfig";
       inputs = {
-        rixpkgs.follows = "rixpkgs";
         nixpkgs.follows = "nixpkgs";
+        rixpkgs.follows = "rixpkgs";
         fran.follows = "fran";
       };
     };

From 2a521eeabdd422c0127a5928172de955b2164925 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sun, 24 May 2026 00:27:46 +1000
Subject: [PATCH 04/24] new automated tests

---
 .github/workflows/check.yml       |  14 -----
 .github/workflows/check_ed.yml    | 101 ++++++++++++++++++++++++++++--
 .github/workflows/check_macos.yml |   3 +-
 .github/workflows/update.yml      |   2 +-
 tests/ed/test.R                   |  29 +++++++++
 tests/ed/test.jl                  |  19 ++++++
 tests/ed/test.py                  |  17 +++++
 7 files changed, 162 insertions(+), 23 deletions(-)
 create mode 100755 tests/ed/test.R
 create mode 100755 tests/ed/test.jl
 create mode 100755 tests/ed/test.py

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 8182304..e0af74b 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,20 +1,6 @@
 name: "Test RDE template"
 on:
   workflow_dispatch: # allows manual triggering
-  push:
-    paths:
-      - 'templates/rde/flake.lock'
-      - 'templates/rde/**/*.nix'
-      - 'templates/rde/**/*.sh'
-      - 'templates/rde/**/*.lua'
-      - '.github/workflows/check.yml'
-  pull_request:
-    paths:
-      - 'templates/rde/flake.lock'
-      - 'templates/rde/**/*.nix'
-      - 'templates/rde/**/*.sh'
-      - 'templates/rde/**/*.lua'
-      - '.github/workflows/check.yml'
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
diff --git a/.github/workflows/check_ed.yml b/.github/workflows/check_ed.yml
index 350c013..d2b9253 100644
--- a/.github/workflows/check_ed.yml
+++ b/.github/workflows/check_ed.yml
@@ -1,9 +1,16 @@
-name: "Test ed template MacOS"
+name: "Test ed template"
 on:
-  workflow_dispatch: # allows manual triggering
+  workflow_dispatch:
   push:
-    branches:
-      - 'update_rde'
+    paths:
+      - 'templates/ed/**'
+      - 'tests/ed/**'
+      - '.github/workflows/check_ed.yml'
+  pull_request:
+    paths:
+      - 'templates/ed/**'
+      - 'tests/ed/**'
+      - '.github/workflows/check_ed.yml'
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -12,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v6
     - uses: cachix/install-nix-action@v31
@@ -23,4 +30,86 @@ jobs:
         name: rde
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
         extraPullNames: rstats-on-nix, nix-community
-    - run: nix build ./templates/ed
+
+    - name: Build template
+      run: nix build ./templates/ed
+
+    - name: Test R script
+      run: |
+        cd templates/ed
+        nix develop --command nu -c "Rscript ${{ github.workspace }}/tests/ed/test.R"
+
+    - name: Test Python script (disabled by default)
+      run: |
+        cd templates/ed
+        nix develop --command nu -c "python3 ${{ github.workspace }}/tests/ed/test.py" || echo "SKIP: Python packages not enabled"
+
+  test-with-python:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: cachix/install-nix-action@v31
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: cachix/cachix-action@v17
+      with:
+        name: rde
+        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+        extraPullNames: rstats-on-nix, nix-community
+
+    - name: Setup test directory with Python enabled
+      run: |
+        TEST_DIR=$(mktemp -d)
+        cp -r templates/ed/. "$TEST_DIR/"
+        cd "$TEST_DIR"
+        sed -i 's/python[[:space:]]*=[[:space:]]*false;/python = true;/' flake.nix
+        grep -q "python[[:space:]]*=[[:space:]]*true;" flake.nix || {
+          echo "Error: Failed to enable Python in flake.nix"
+          exit 1
+        }
+        echo "TEST_DIR=$TEST_DIR" >> $GITHUB_ENV
+
+    - name: Build with Python enabled
+      run: |
+        cd "$TEST_DIR"
+        nix build
+
+    - name: Test Python packages
+      run: |
+        cd "$TEST_DIR"
+        nix develop --command nu -c "python3 ${{ github.workspace }}/tests/ed/test.py"
+
+  test-with-julia:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: cachix/install-nix-action@v31
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: cachix/cachix-action@v17
+      with:
+        name: rde
+        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+        extraPullNames: rstats-on-nix, nix-community
+
+    - name: Setup test directory with Julia enabled
+      run: |
+        TEST_DIR=$(mktemp -d)
+        cp -r templates/ed/. "$TEST_DIR/"
+        cd "$TEST_DIR"
+        sed -i 's/julia[[:space:]]*=[[:space:]]*false;/julia = true;/' flake.nix
+        grep -q "julia[[:space:]]*=[[:space:]]*true;" flake.nix || {
+          echo "Error: Failed to enable Julia in flake.nix"
+          exit 1
+        }
+        echo "TEST_DIR=$TEST_DIR" >> $GITHUB_ENV
+
+    - name: Build with Julia enabled
+      run: |
+        cd "$TEST_DIR"
+        nix build
+
+    - name: Test Julia packages
+      run: |
+        cd "$TEST_DIR"
+        nix develop --command nu -c "julia ${{ github.workspace }}/tests/ed/test.jl"
diff --git a/.github/workflows/check_macos.yml b/.github/workflows/check_macos.yml
index 3b8e6f2..ad9d3ed 100644
--- a/.github/workflows/check_macos.yml
+++ b/.github/workflows/check_macos.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch: # allows manual triggering
   push:
     branches:
-      - 'update_rde'
+      - 'update_ed'
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -23,5 +23,4 @@ jobs:
         name: rde
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
         extraPullNames: rstats-on-nix, nix-community
-    - run: nix build ./templates/rde
     - run: nix build ./templates/ed
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 96cb868..4b3cb00 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -26,7 +26,7 @@ jobs:
         uses: DeterminateSystems/update-flake-lock@v28
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
-          branch: update_rde
+          branch: update_ed
           path-to-flake-dir: "templates/ed"
           pr-title: "Update RDE flake.lock" # Title of PR to be created
           pr-labels: |                  # Labels to be set on the PR
diff --git a/tests/ed/test.R b/tests/ed/test.R
new file mode 100755
index 0000000..ad2967a
--- /dev/null
+++ b/tests/ed/test.R
@@ -0,0 +1,29 @@
+#!/usr/bin/env Rscript
+
+packages <- c("arrow", "data.table", "fixest", "nvimcom")
+failed <- character(0)
+
+for (pkg in packages) {
+  ok <- tryCatch(
+    {
+      # nvimcom requires Neovim; skip loading but check it's installed
+      if (pkg == "nvimcom") {
+        requireNamespace(pkg, quietly = TRUE)
+      } else {
+        library(pkg, character.only = TRUE, quietly = TRUE)
+      }
+      TRUE
+    },
+    error = function(e) FALSE
+  )
+  if (!ok) {
+    failed <- c(failed, pkg)
+  }
+}
+
+if (length(failed) > 0) {
+  cat(sprintf("FAIL: %s\n", paste(failed, collapse = ", ")))
+  quit(status = 1)
+}
+
+cat("PASS: all packages loaded\n")
diff --git a/tests/ed/test.jl b/tests/ed/test.jl
new file mode 100755
index 0000000..5971f80
--- /dev/null
+++ b/tests/ed/test.jl
@@ -0,0 +1,19 @@
+#!/usr/bin/env julia
+
+packages = ["StatsBase"]
+failed = String[]
+
+for pkg in packages
+    try
+        @eval using $pkg
+    catch
+        push!(failed, pkg)
+    end
+end
+
+if !isempty(failed)
+    @error "FAIL: $(join(failed, ", "))"
+    exit(1)
+end
+
+println("PASS: all packages loaded")
diff --git a/tests/ed/test.py b/tests/ed/test.py
new file mode 100755
index 0000000..b893419
--- /dev/null
+++ b/tests/ed/test.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+import sys
+
+packages = ["requests"]
+failed = []
+
+for pkg in packages:
+    try:
+        __import__(pkg)
+    except ImportError:
+        failed.append(pkg)
+
+if failed:
+    sys.stderr.write(f"FAIL: {', '.join(failed)}\n")
+    sys.exit(1)
+
+print("PASS: all packages loaded")

From c37deaa3b4028257b6e98ece0bb90481991f4c4c Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sun, 24 May 2026 01:07:05 +1000
Subject: [PATCH 05/24] fix tests

---
 .github/workflows/check_ed.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check_ed.yml b/.github/workflows/check_ed.yml
index d2b9253..259107a 100644
--- a/.github/workflows/check_ed.yml
+++ b/.github/workflows/check_ed.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: cachix/install-nix-action@v31
       with:
-        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+        github_access_token: ${{ github.token }}
     - uses: cachix/cachix-action@v17
       with:
         name: rde
@@ -50,7 +50,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: cachix/install-nix-action@v31
       with:
-        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+        github_access_token: ${{ github.token }}
     - uses: cachix/cachix-action@v17
       with:
         name: rde
@@ -85,7 +85,7 @@ jobs:
     - uses: actions/checkout@v6
     - uses: cachix/install-nix-action@v31
       with:
-        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+        github_access_token: ${{ github.token }}
     - uses: cachix/cachix-action@v17
       with:
         name: rde

From 049a61e6902f472ffd1f2e0ce282a636b6c18eb5 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sun, 24 May 2026 01:20:38 +1000
Subject: [PATCH 06/24] test updates

---
 .github/workflows/check_ed.yml | 16 ++++++++++++----
 templates/ed/flake.nix         |  4 +++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check_ed.yml b/.github/workflows/check_ed.yml
index 259107a..87af3ce 100644
--- a/.github/workflows/check_ed.yml
+++ b/.github/workflows/check_ed.yml
@@ -35,14 +35,18 @@ jobs:
       run: nix build ./templates/ed
 
     - name: Test R script
+      env:
+        NO_NUSHELL: '1'
       run: |
         cd templates/ed
-        nix develop --command nu -c "Rscript ${{ github.workspace }}/tests/ed/test.R"
+        nix develop --command bash -c "Rscript ${{ github.workspace }}/tests/ed/test.R"
 
     - name: Test Python script (disabled by default)
+      env:
+        NO_NUSHELL: '1'
       run: |
         cd templates/ed
-        nix develop --command nu -c "python3 ${{ github.workspace }}/tests/ed/test.py" || echo "SKIP: Python packages not enabled"
+        nix develop --command bash -c "python3 ${{ github.workspace }}/tests/ed/test.py" || echo "SKIP: Python packages not enabled"
 
   test-with-python:
     runs-on: ubuntu-latest
@@ -75,9 +79,11 @@ jobs:
         nix build
 
     - name: Test Python packages
+      env:
+        NO_NUSHELL: '1'
       run: |
         cd "$TEST_DIR"
-        nix develop --command nu -c "python3 ${{ github.workspace }}/tests/ed/test.py"
+        nix develop --command bash -c "python3 ${{ github.workspace }}/tests/ed/test.py"
 
   test-with-julia:
     runs-on: ubuntu-latest
@@ -110,6 +116,8 @@ jobs:
         nix build
 
     - name: Test Julia packages
+      env:
+        NO_NUSHELL: '1'
       run: |
         cd "$TEST_DIR"
-        nix develop --command nu -c "julia ${{ github.workspace }}/tests/ed/test.jl"
+        nix develop --command bash -c "julia ${{ github.workspace }}/tests/ed/test.jl"
diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index faccae8..07603fa 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -131,7 +131,9 @@
         shellHook =
           nvimConfig.lib.shellHook evalResult.config
           + ''
-            exec nu
+            if [ -z "''${NO_NUSHELL:-}" ]; then
+              exec nu
+            fi
           '';
       };
     });

From 638a8ce8c01b05be55e48bc06bea3de96fb02339 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sun, 24 May 2026 01:43:49 +1000
Subject: [PATCH 07/24] julia test not working

---
 .github/workflows/check_ed.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check_ed.yml b/.github/workflows/check_ed.yml
index 87af3ce..497d060 100644
--- a/.github/workflows/check_ed.yml
+++ b/.github/workflows/check_ed.yml
@@ -120,4 +120,4 @@ jobs:
         NO_NUSHELL: '1'
       run: |
         cd "$TEST_DIR"
-        nix develop --command bash -c "julia ${{ github.workspace }}/tests/ed/test.jl"
+        # nix develop --command bash -c "julia ${{ github.workspace }}/tests/ed/test.jl"

From 1569cac1a150896ce22c18722807aa54905097a9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 26 May 2026 10:04:05 +0000
Subject: [PATCH 08/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1?narHash=sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic%3D' (2026-05-21)
  → 'github:nixos/nixpkgs/64c08a7ca051951c8eae34e3e3cb1e202fe36786?narHash=sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o%3D' (2026-05-23)
---
 templates/ed/flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index e197c74..feb65be 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1779357205,
-        "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=",
+        "lastModified": 1779560665,
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
         "type": "github"
       },
       "original": {

From 3cd50625efb808fd5ea76acc742eda97db51be85 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2026 06:33:44 +0000
Subject: [PATCH 09/24] Bump actions/checkout from 6 to 7

Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/check.yml                    | 6 +++---
 .github/workflows/check_ed.yml                 | 6 +++---
 .github/workflows/check_macos.yml              | 2 +-
 .github/workflows/flakehub-publish-rolling.yml | 2 +-
 .github/workflows/update.yml                   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e0af74b..e7ce682 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -11,7 +11,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: wimpysworld/nothing-but-nix@main
       with:
         hatchet-protocol: 'carve'
@@ -104,7 +104,7 @@ jobs:
   test-with-python:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: wimpysworld/nothing-but-nix@main
       with:
         hatchet-protocol: 'carve'
@@ -160,7 +160,7 @@ jobs:
   test-with-julia:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: wimpysworld/nothing-but-nix@main
       with:
         hatchet-protocol: 'carve'
diff --git a/.github/workflows/check_ed.yml b/.github/workflows/check_ed.yml
index 497d060..1e26a31 100644
--- a/.github/workflows/check_ed.yml
+++ b/.github/workflows/check_ed.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: cachix/install-nix-action@v31
       with:
         github_access_token: ${{ github.token }}
@@ -51,7 +51,7 @@ jobs:
   test-with-python:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: cachix/install-nix-action@v31
       with:
         github_access_token: ${{ github.token }}
@@ -88,7 +88,7 @@ jobs:
   test-with-julia:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: cachix/install-nix-action@v31
       with:
         github_access_token: ${{ github.token }}
diff --git a/.github/workflows/check_macos.yml b/.github/workflows/check_macos.yml
index ad9d3ed..9c133a8 100644
--- a/.github/workflows/check_macos.yml
+++ b/.github/workflows/check_macos.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [macos-latest]
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - uses: cachix/install-nix-action@v31
       with:
         github_access_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/flakehub-publish-rolling.yml b/.github/workflows/flakehub-publish-rolling.yml
index 80ff807..23bef1e 100644
--- a/.github/workflows/flakehub-publish-rolling.yml
+++ b/.github/workflows/flakehub-publish-rolling.yml
@@ -10,7 +10,7 @@ jobs:
       id-token: "write"
       contents: "read"
     steps:
-      - uses: "actions/checkout@v6"
+      - uses: "actions/checkout@v7"
         with:
           persist-credentials: false
       - uses: "DeterminateSystems/determinate-nix-action@v3"
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 4b3cb00..63f205f 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - uses: wimpysworld/nothing-but-nix@main
         with:
           hatchet-protocol: 'carve'

From 324f03d2b3e383ccd4fc996fd7d675533c11908e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 2 Aug 2026 08:29:21 +0000
Subject: [PATCH 10/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'fran':
    'github:dwinkler1/fran/da09626e4dd8f0f57078b3a04e0443a8c20defa1?narHash=sha256-xqqv46MTveuT4yJH2YihmbHGy5mdLnnLFDebVmUws/E%3D' (2026-04-17)
  → 'github:dwinkler1/fran/30ab141871ede23b245a90afea58e076ef83b515?narHash=sha256-QjXxUvpOBbnlpSskBOZJ9nUbpYyFRD4cBo4s1aHniGs%3D' (2026-06-13)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/64c08a7ca051951c8eae34e3e3cb1e202fe36786?narHash=sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o%3D' (2026-05-23)
  → 'github:nixos/nixpkgs/148bab9c1c3c53136ecb44a6ea356a0ed5b39b06?narHash=sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw%3D' (2026-08-01)
• Updated input 'nvimConfig':
    'github:dwinkler1/nvimConfig/aec9110e709e1aa50d78f06293c4bde14974b23f?narHash=sha256-AnuNQ9nbXrDYmL97TOejAds/FQOgD6FEOHABp/8dmsU%3D' (2026-05-23)
  → 'github:dwinkler1/nvimConfig/b8f72cb15045e2615bbac25d3cbcc3cabdb1b520?narHash=sha256-cR/2VK2RGr9UJsRYAa1LViorru1oBeW3yVTQLkMHt4Y%3D' (2026-07-30)
• Updated input 'nvimConfig/r-nvim-nix':
    'github:dwinkler1/r_nvim_nix/ec17e22ab362a0ddfd6c2e9c5e95d43897a143be?narHash=sha256-1lvv0bdvSVyeCIgeZ7Ws7ffbDFurA5LJscS9dRLHzC8%3D' (2026-05-22)
  → 'github:dwinkler1/r_nvim_nix/1d26452e3c940153271fc57fbad0b295fcb0e04f?narHash=sha256-5zXVJLG7%2BGi9sgb4Dn7P6O/ywQQxpvcjjoHSJXZEuVo%3D' (2026-07-24)
• Updated input 'nvimConfig/r-nvim-nix/rnvimsrc':
    'github:R-nvim/R.nvim/582f2af11290ac067e49018db38e12a511325556?narHash=sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA%3D' (2026-04-23)
  → 'github:R-nvim/R.nvim/c56ebe0f8445e251673981c40ac2d74659ecd6ed?narHash=sha256-FywUL3mV2%2Bkfu%2BrO6uUFyUv80EflbdgSkYuSnW965UE%3D' (2026-07-05)
• Updated input 'nvimConfig/wrappers':
    'github:BirdeeHub/nix-wrapper-modules/e7ed7a1205945befdf2e0d73ba7df91d935e5af1?narHash=sha256-VFoBwH7ZjVxCnvZTb5ODRXt70sLtWMxstive0N%2BRS50%3D' (2026-05-20)
  → 'github:BirdeeHub/nix-wrapper-modules/6e7f66fa2cdf4d63162580b438f7fcf87c28a46f?narHash=sha256-vAmbArdCyjqpVW%2B37aCy/PMBOLIqukUXLQuEKLwUhA4%3D' (2026-06-22)
---
 templates/ed/flake.lock | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index feb65be..672a19d 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776413584,
-        "narHash": "sha256-xqqv46MTveuT4yJH2YihmbHGy5mdLnnLFDebVmUws/E=",
+        "lastModified": 1781337902,
+        "narHash": "sha256-QjXxUvpOBbnlpSskBOZJ9nUbpYyFRD4cBo4s1aHniGs=",
         "owner": "dwinkler1",
         "repo": "fran",
-        "rev": "da09626e4dd8f0f57078b3a04e0443a8c20defa1",
+        "rev": "30ab141871ede23b245a90afea58e076ef83b515",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1779560665,
-        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
+        "lastModified": 1785571196,
+        "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1779544872,
-        "narHash": "sha256-AnuNQ9nbXrDYmL97TOejAds/FQOgD6FEOHABp/8dmsU=",
+        "lastModified": 1785383218,
+        "narHash": "sha256-cR/2VK2RGr9UJsRYAa1LViorru1oBeW3yVTQLkMHt4Y=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "aec9110e709e1aa50d78f06293c4bde14974b23f",
+        "rev": "b8f72cb15045e2615bbac25d3cbcc3cabdb1b520",
         "type": "github"
       },
       "original": {
@@ -90,16 +90,16 @@
         "rnvimsrc": "rnvimsrc"
       },
       "locked": {
-        "lastModified": 1779438909,
-        "narHash": "sha256-1lvv0bdvSVyeCIgeZ7Ws7ffbDFurA5LJscS9dRLHzC8=",
+        "lastModified": 1784867506,
+        "narHash": "sha256-5zXVJLG7+Gi9sgb4Dn7P6O/ywQQxpvcjjoHSJXZEuVo=",
         "owner": "dwinkler1",
         "repo": "r_nvim_nix",
-        "rev": "ec17e22ab362a0ddfd6c2e9c5e95d43897a143be",
+        "rev": "1d26452e3c940153271fc57fbad0b295fcb0e04f",
         "type": "github"
       },
       "original": {
         "owner": "dwinkler1",
-        "ref": "v0.99.4",
+        "ref": "v1.0.0",
         "repo": "r_nvim_nix",
         "type": "github"
       }
@@ -123,16 +123,16 @@
     "rnvimsrc": {
       "flake": false,
       "locked": {
-        "lastModified": 1776905071,
-        "narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=",
+        "lastModified": 1783264911,
+        "narHash": "sha256-FywUL3mV2+kfu+rO6uUFyUv80EflbdgSkYuSnW965UE=",
         "owner": "R-nvim",
         "repo": "R.nvim",
-        "rev": "582f2af11290ac067e49018db38e12a511325556",
+        "rev": "c56ebe0f8445e251673981c40ac2d74659ecd6ed",
         "type": "github"
       },
       "original": {
         "owner": "R-nvim",
-        "ref": "v0.99.4",
+        "ref": "v1.0.0",
         "repo": "R.nvim",
         "type": "github"
       }
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779297405,
-        "narHash": "sha256-VFoBwH7ZjVxCnvZTb5ODRXt70sLtWMxstive0N+RS50=",
+        "lastModified": 1782135443,
+        "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "e7ed7a1205945befdf2e0d73ba7df91d935e5af1",
+        "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f",
         "type": "github"
       },
       "original": {

From 51e575fee6d01ad589045e9689089465aea0e4fb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 3 Aug 2026 09:53:43 +0000
Subject: [PATCH 11/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/148bab9c1c3c53136ecb44a6ea356a0ed5b39b06?narHash=sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw%3D' (2026-08-01)
  → 'github:nixos/nixpkgs/643809054d65fdd466a63e3155b8c498cb483c04?narHash=sha256-vUfIeBEfpbAfZ5zjgIkYk7eHBeVfCYVjLbWnMkseYnk%3D' (2026-08-02)
---
 templates/ed/flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 672a19d..4b8da01 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1785571196,
-        "narHash": "sha256-KoTsyMQqnXQZq8deCEnu4QkyldkwH/bpMMhUcfMdGIw=",
+        "lastModified": 1785692966,
+        "narHash": "sha256-vUfIeBEfpbAfZ5zjgIkYk7eHBeVfCYVjLbWnMkseYnk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "148bab9c1c3c53136ecb44a6ea356a0ed5b39b06",
+        "rev": "643809054d65fdd466a63e3155b8c498cb483c04",
         "type": "github"
       },
       "original": {

From 50bf84b974e2c5e4f3cdb28420ce01687c61fb22 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Tue, 25 Aug 2026 11:34:07 +1000
Subject: [PATCH 12/24] ed: drop packages redundant with upstream
 langPackageDefaults

settings.lang_packages now appends to built-in defaults upstream
(nvimConfig 9a6e201), so arrow/data_table/nvimcom need not be re-listed;
only project-specific fixest stays.
---
 templates/ed/flake.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index 07603fa..88072d2 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -58,10 +58,7 @@
 
           r =
             (with pkgs.rpkgs.rPackages; [
-              arrow
-              data_table
               fixest
-              pkgs.nvimcom
             ])
             ++ extraRPackages;
 
@@ -125,16 +122,10 @@
         packages =
           [
             nv
-            pkgs.nushell
           ]
           ++ nvimConfig.lib.devShellPackages evalResult.config;
         shellHook =
-          nvimConfig.lib.shellHook evalResult.config
-          + ''
-            if [ -z "''${NO_NUSHELL:-}" ]; then
-              exec nu
-            fi
-          '';
+          nvimConfig.lib.shellHook evalResult.config;
       };
     });
   };

From da44014e77259f7f19d03ccbc296b4319cda3374 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Tue, 25 Aug 2026 12:58:54 +1000
Subject: [PATCH 13/24] cleanup

---
 templates/ed/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/ed/.gitignore b/templates/ed/.gitignore
index ffc0e1a..c94968a 100644
--- a/templates/ed/.gitignore
+++ b/templates/ed/.gitignore
@@ -1,2 +1,3 @@
 .nvimcom
 .commandcode/
+.r-*

From 2d828960c9a5d202fef8ad81c06e68997537156b Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Tue, 25 Aug 2026 13:19:59 +1000
Subject: [PATCH 14/24] Update

---
 templates/ed/flake.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 4b8da01..846ccf3 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1785692966,
-        "narHash": "sha256-vUfIeBEfpbAfZ5zjgIkYk7eHBeVfCYVjLbWnMkseYnk=",
+        "lastModified": 1787498568,
+        "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "643809054d65fdd466a63e3155b8c498cb483c04",
+        "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1785383218,
-        "narHash": "sha256-cR/2VK2RGr9UJsRYAa1LViorru1oBeW3yVTQLkMHt4Y=",
+        "lastModified": 1787627261,
+        "narHash": "sha256-069Vyu8pNLUUuKOHPlZvs2cAuRUOL9J62vS5ZEsDgWg=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "b8f72cb15045e2615bbac25d3cbcc3cabdb1b520",
+        "rev": "99aca2b6e7b46a119954eb145a0987cc764e85fd",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782135443,
-        "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=",
+        "lastModified": 1787579952,
+        "narHash": "sha256-Dn6IPaLyltx8hBTyC4hgNWDb7T7WHRYUG6wWh6KBHXA=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f",
+        "rev": "b56e973dd2bd62244b44d6542fb52182bc3a3cda",
         "type": "github"
       },
       "original": {

From 078f84d42b9319d20dcee29304e3fff101b4c414 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Tue, 25 Aug 2026 13:20:34 +1000
Subject: [PATCH 15/24] Update

---
 templates/ed/flake.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index 88072d2..b10be89 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -133,7 +133,8 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e";
+    #rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e";
+    rixpkgs.url = "github:dwinkler1/rixpkgs";
 
     fran = {
       url = "github:dwinkler1/fran";

From 53599ddedc024e1d773c54f49255012147d7875f Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Tue, 25 Aug 2026 13:21:03 +1000
Subject: [PATCH 16/24] Update

---
 templates/ed/flake.lock | 8 ++++----
 templates/ed/flake.nix  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 846ccf3..de5cd21 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -106,17 +106,17 @@
     },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1771303851,
-        "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=",
+        "lastModified": 1787585894,
+        "narHash": "sha256-tp/kigWpoz0DUyDmbqVHLjZova3n98vn7R7HTRtjeWg=",
         "owner": "dwinkler1",
         "repo": "rixpkgs",
-        "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
+        "rev": "5a76f5802a7728c62feff1399c7302b53276ed8f",
         "type": "github"
       },
       "original": {
         "owner": "dwinkler1",
+        "ref": "nixpkgs",
         "repo": "rixpkgs",
-        "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
         "type": "github"
       }
     },
diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index b10be89..aec646b 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -134,7 +134,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     #rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e";
-    rixpkgs.url = "github:dwinkler1/rixpkgs";
+    rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs";
 
     fran = {
       url = "github:dwinkler1/fran";

From debe5c2325fac02959b86a52e7b66667c99fed94 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Aug 2026 17:29:20 +0000
Subject: [PATCH 17/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'fran':
    'github:dwinkler1/fran/30ab141871ede23b245a90afea58e076ef83b515?narHash=sha256-QjXxUvpOBbnlpSskBOZJ9nUbpYyFRD4cBo4s1aHniGs%3D' (2026-06-13)
  → 'github:dwinkler1/fran/b77635aeb1e70fffd09e5823dde5b76abb3df991?narHash=sha256-3A5rKxnceQ%2BinWqeQDUrxoVPXr67JMrdIIfbLStx06s%3D' (2026-08-26)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/56c02bc00adcf003215cc4bd996d6efaf4cff188?narHash=sha256-9i/VTdusq/%2BNM/tz%2BJ1Re%2BojkMB8MBf0QshnYfzHz30%3D' (2026-08-23)
  → 'github:nixos/nixpkgs/9fbb54b33e91ee4ca368e35a78e0613c720600b3?narHash=sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA%3D' (2026-08-26)
---
 templates/ed/flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index de5cd21..948f1e9 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781337902,
-        "narHash": "sha256-QjXxUvpOBbnlpSskBOZJ9nUbpYyFRD4cBo4s1aHniGs=",
+        "lastModified": 1787729487,
+        "narHash": "sha256-3A5rKxnceQ+inWqeQDUrxoVPXr67JMrdIIfbLStx06s=",
         "owner": "dwinkler1",
         "repo": "fran",
-        "rev": "30ab141871ede23b245a90afea58e076ef83b515",
+        "rev": "b77635aeb1e70fffd09e5823dde5b76abb3df991",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787498568,
-        "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
+        "lastModified": 1787736819,
+        "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
+        "rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3",
         "type": "github"
       },
       "original": {

From 4bb2fd181960328257eea824f90e324abaa37ec7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 30 Aug 2026 11:35:25 +0000
Subject: [PATCH 18/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/9fbb54b33e91ee4ca368e35a78e0613c720600b3?narHash=sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA%3D' (2026-08-26)
  → 'github:nixos/nixpkgs/83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c?narHash=sha256-VYXO0XZlgj06dxJZRhrD3WoSsvq/c7%2B/Akyoa22pefw%3D' (2026-08-28)
---
 templates/ed/flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 948f1e9..c33ed12 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787736819,
-        "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=",
+        "lastModified": 1787900134,
+        "narHash": "sha256-VYXO0XZlgj06dxJZRhrD3WoSsvq/c7+/Akyoa22pefw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3",
+        "rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c",
         "type": "github"
       },
       "original": {

From 3ea923d12f56a535e1f97c0048fcf45bc65a5b94 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 31 Aug 2026 13:10:32 +0000
Subject: [PATCH 19/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c?narHash=sha256-VYXO0XZlgj06dxJZRhrD3WoSsvq/c7%2B/Akyoa22pefw%3D' (2026-08-28)
  → 'github:nixos/nixpkgs/d2f67949798825fe853f7c5d0492b8bf016d3f88?narHash=sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85%2BA%3D' (2026-08-29)
---
 templates/ed/flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index c33ed12..ec9c6ad 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787900134,
-        "narHash": "sha256-VYXO0XZlgj06dxJZRhrD3WoSsvq/c7+/Akyoa22pefw=",
+        "lastModified": 1788039129,
+        "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c",
+        "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88",
         "type": "github"
       },
       "original": {

From 4171c28cfd5e59189a0c3f390db165858c21122e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 1 Sep 2026 11:23:15 +0000
Subject: [PATCH 20/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d2f67949798825fe853f7c5d0492b8bf016d3f88?narHash=sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85%2BA%3D' (2026-08-29)
  → 'github:nixos/nixpkgs/34ab99075ac4f7e40cf037eef32cb1c360bb85e9?narHash=sha256-hn1oU2rue2SYK8dAr8%2BWNZWtbsz1S2W5mnHlSEuh3bo%3D' (2026-08-31)
• Updated input 'rixpkgs':
    'github:dwinkler1/rixpkgs/5a76f5802a7728c62feff1399c7302b53276ed8f?narHash=sha256-tp/kigWpoz0DUyDmbqVHLjZova3n98vn7R7HTRtjeWg%3D' (2026-08-24)
  → 'github:dwinkler1/rixpkgs/f3d00cb8f39262e6ca15c2046bd29ca8a52aae31?narHash=sha256-ouq3GjmTOXtWVufLOhMqLAEJXxrlkhDYtZJt3YfN5oU%3D' (2026-08-31)
---
 templates/ed/flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index ec9c6ad..cac8daf 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1788039129,
-        "narHash": "sha256-pa4Q0qErvCvzCaaUph7Sm37RhR4xvPrYI8Lgz6k85+A=",
+        "lastModified": 1788179007,
+        "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d2f67949798825fe853f7c5d0492b8bf016d3f88",
+        "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
     },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1787585894,
-        "narHash": "sha256-tp/kigWpoz0DUyDmbqVHLjZova3n98vn7R7HTRtjeWg=",
+        "lastModified": 1788208780,
+        "narHash": "sha256-ouq3GjmTOXtWVufLOhMqLAEJXxrlkhDYtZJt3YfN5oU=",
         "owner": "dwinkler1",
         "repo": "rixpkgs",
-        "rev": "5a76f5802a7728c62feff1399c7302b53276ed8f",
+        "rev": "f3d00cb8f39262e6ca15c2046bd29ca8a52aae31",
         "type": "github"
       },
       "original": {

From b34f6a162bf6996b5b5063997183f5120c0af57e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Sep 2026 10:56:22 +0000
Subject: [PATCH 21/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'fran':
    'github:dwinkler1/fran/b77635aeb1e70fffd09e5823dde5b76abb3df991?narHash=sha256-3A5rKxnceQ%2BinWqeQDUrxoVPXr67JMrdIIfbLStx06s%3D' (2026-08-26)
  → 'github:dwinkler1/fran/e6d5adae59621135817bcb51afa0dcaa3a2d4e28?narHash=sha256-rXbea8cWNeVbNM3tN0n8HvI0%2B/ibx%2BrTlrLvz3Jgeek%3D' (2026-09-01)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/34ab99075ac4f7e40cf037eef32cb1c360bb85e9?narHash=sha256-hn1oU2rue2SYK8dAr8%2BWNZWtbsz1S2W5mnHlSEuh3bo%3D' (2026-08-31)
  → 'github:nixos/nixpkgs/dc5d91f840324650bac8c379428c7037a416959a?narHash=sha256-VaWGJ6%2BcIYN2erfSecbRV%2B4ljI185Ty2wUrXyvQbgOw%3D' (2026-09-07)
• Updated input 'nvimConfig':
    'github:dwinkler1/nvimConfig/99aca2b6e7b46a119954eb145a0987cc764e85fd?narHash=sha256-069Vyu8pNLUUuKOHPlZvs2cAuRUOL9J62vS5ZEsDgWg%3D' (2026-08-25)
  → 'github:dwinkler1/nvimConfig/1c3c1ccde40d7c316b2f90b4a7a1222d8c1fd46b?narHash=sha256-V5mxoR%2BVJiiSAlmKd4adkr5uiOYKM5PDfQTDU7QHSUs%3D' (2026-09-01)
• Updated input 'nvimConfig/wrappers':
    'github:BirdeeHub/nix-wrapper-modules/b56e973dd2bd62244b44d6542fb52182bc3a3cda?narHash=sha256-Dn6IPaLyltx8hBTyC4hgNWDb7T7WHRYUG6wWh6KBHXA%3D' (2026-08-24)
  → 'github:BirdeeHub/nix-wrapper-modules/04ef216559b18214853879df862f493a9e6bb8cf?narHash=sha256-bWBt7v2FhgG6WTLgSi8nYGi1zXaTdA%2BvTdCRdvR2vcw%3D' (2026-08-26)
---
 templates/ed/flake.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index cac8daf..04ea136 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787729487,
-        "narHash": "sha256-3A5rKxnceQ+inWqeQDUrxoVPXr67JMrdIIfbLStx06s=",
+        "lastModified": 1788301035,
+        "narHash": "sha256-rXbea8cWNeVbNM3tN0n8HvI0+/ibx+rTlrLvz3Jgeek=",
         "owner": "dwinkler1",
         "repo": "fran",
-        "rev": "b77635aeb1e70fffd09e5823dde5b76abb3df991",
+        "rev": "e6d5adae59621135817bcb51afa0dcaa3a2d4e28",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1788179007,
-        "narHash": "sha256-hn1oU2rue2SYK8dAr8+WNZWtbsz1S2W5mnHlSEuh3bo=",
+        "lastModified": 1788752844,
+        "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "34ab99075ac4f7e40cf037eef32cb1c360bb85e9",
+        "rev": "dc5d91f840324650bac8c379428c7037a416959a",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1787627261,
-        "narHash": "sha256-069Vyu8pNLUUuKOHPlZvs2cAuRUOL9J62vS5ZEsDgWg=",
+        "lastModified": 1788301294,
+        "narHash": "sha256-V5mxoR+VJiiSAlmKd4adkr5uiOYKM5PDfQTDU7QHSUs=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "99aca2b6e7b46a119954eb145a0987cc764e85fd",
+        "rev": "1c3c1ccde40d7c316b2f90b4a7a1222d8c1fd46b",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787579952,
-        "narHash": "sha256-Dn6IPaLyltx8hBTyC4hgNWDb7T7WHRYUG6wWh6KBHXA=",
+        "lastModified": 1787722691,
+        "narHash": "sha256-bWBt7v2FhgG6WTLgSi8nYGi1zXaTdA+vTdCRdvR2vcw=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "b56e973dd2bd62244b44d6542fb52182bc3a3cda",
+        "rev": "04ef216559b18214853879df862f493a9e6bb8cf",
         "type": "github"
       },
       "original": {

From 9ad7767e8327f9a41731d5482c3b864440104bc3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Sep 2026 06:33:58 +0000
Subject: [PATCH 22/24] Bump DeterminateSystems/update-flake-lock from 28 to 29

Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 28 to 29.
- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases)
- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v28...v29)

---
updated-dependencies:
- dependency-name: DeterminateSystems/update-flake-lock
  dependency-version: '29'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 63f205f..03e75f9 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -23,7 +23,7 @@ jobs:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
           extraPullNames: rstats-on-nix, nix-community
       - name: Update ed flake.lock
-        uses: DeterminateSystems/update-flake-lock@v28
+        uses: DeterminateSystems/update-flake-lock@v29
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
           branch: update_ed

From 5869317f75c64c64fa88b188569d617fcb224369 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 17 Sep 2026 11:19:07 +0000
Subject: [PATCH 23/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/dc5d91f840324650bac8c379428c7037a416959a?narHash=sha256-VaWGJ6%2BcIYN2erfSecbRV%2B4ljI185Ty2wUrXyvQbgOw%3D' (2026-09-07)
  → 'github:nixos/nixpkgs/b1b875982b17dabde9b4a37f3e229e74913e6db3?narHash=sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4%3D' (2026-09-16)
---
 templates/ed/flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 04ea136..6fc8d54 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1788752844,
-        "narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=",
+        "lastModified": 1789546076,
+        "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dc5d91f840324650bac8c379428c7037a416959a",
+        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
         "type": "github"
       },
       "original": {

From e4eb7ced21076efa5c998007ecdd0936a6df6507 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 20 Sep 2026 10:59:05 +0000
Subject: [PATCH 24/24] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/b1b875982b17dabde9b4a37f3e229e74913e6db3?narHash=sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4%3D' (2026-09-16)
  → 'github:nixos/nixpkgs/20b1ddd1aa5ace70c9468305030aa4f9ef79671b?narHash=sha256-B44WL6h0XoLjJ41bUPJk0X5SDinLCII//6EcBLXKiJ0%3D' (2026-09-19)
---
 templates/ed/flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 6fc8d54..1cb4a61 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1789546076,
-        "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=",
+        "lastModified": 1789785513,
+        "narHash": "sha256-B44WL6h0XoLjJ41bUPJk0X5SDinLCII//6EcBLXKiJ0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3",
+        "rev": "20b1ddd1aa5ace70c9468305030aa4f9ef79671b",
         "type": "github"
       },
       "original": {