From 503b6534ae6ace0a2e6878007d9f532479483fd8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 16 Feb 2026 00:04:18 +0000
Subject: [PATCH 01/20] Initial plan


From 0e20fe6229ca19b56f7faadd03cc4c1ad1b760e7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 16 Feb 2026 00:06:34 +0000
Subject: [PATCH 02/20] Add comprehensive test workflow for ED template

Co-authored-by: dwinkler1 <22460147+dwinkler1@users.noreply.github.com>
---
 .github/workflows/check_ed.yml    | 278 ++++++++++++++++++++++++++++++
 .github/workflows/check_macos.yml |  22 ++-
 2 files changed, 298 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/check_ed.yml

diff --git a/.github/workflows/check_ed.yml b/.github/workflows/check_ed.yml
new file mode 100644
index 0000000..09100e8
--- /dev/null
+++ b/.github/workflows/check_ed.yml
@@ -0,0 +1,278 @@
+name: "Test ED template"
+on:
+  workflow_dispatch: # allows manual triggering
+  push:
+    paths:
+      - 'templates/ed/flake.lock'
+      - 'templates/ed/**/*.nix'
+      - '.github/workflows/check_ed.yml'
+  pull_request:
+    paths:
+      - 'templates/ed/flake.lock'
+      - 'templates/ed/**/*.nix'
+      - '.github/workflows/check_ed.yml'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    steps:
+    - uses: actions/checkout@v6
+    - uses: wimpysworld/nothing-but-nix@main
+      with:
+        hatchet-protocol: 'carve'
+    - uses: cachix/install-nix-action@v31
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: cachix/cachix-action@v16
+      with:
+        name: rde
+        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+        extraPullNames: rstats-on-nix, nix-community
+    
+    # Build and basic checks
+    - name: Build template
+      run: nix build ./templates/ed
+    - name: Run flake check
+      run: nix flake check ./templates/ed
+    
+    # Test development shell functionality
+    - name: Test dev shell enters successfully
+      run: |
+        cd templates/ed
+        nix develop --command bash -c "echo 'Dev shell works'"
+    
+    # Test Neovim functionality (custom binary name: vv)
+    - name: Test vv command is available
+      run: |
+        cd templates/ed
+        nix develop --command bash -c "which vv"
+    
+    - name: Test vv launches in headless mode
+      run: |
+        cd templates/ed
+        nix develop --command bash -c "vv --headless --version"
+    
+    # Test utility commands
+    - name: Test updateR command is available
+      run: |
+        cd templates/ed
+        nix develop --command bash -c "which updateR"
+    
+    # Test extra packages
+    - name: Test cowsay is available
+      run: |
+        cd templates/ed
+        nix develop --command bash -c "which cowsay"
+    
+    - name: Test cowsay works
+      run: |
+        cd templates/ed
+        nix develop --command bash -c "cowsay 'ED template test'"
+    
+    # Test that package is built correctly
+    - name: Test default package can be run
+      run: |
+        cd templates/ed
+        nix run . -- --headless --version
+    
+    # Test Neovim configuration
+    - name: Test mini-notify plugin loads
+      run: |
+        cd templates/ed
+        # Check that the welcome notification config is present
+        nix develop --command bash -c "vv --headless -c 'lua print(vim.inspect(require(\"mini.notify\")))' -c 'quit' 2>&1 | grep -q 'table'"
+  
+  test-with-python:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: wimpysworld/nothing-but-nix@main
+      with:
+        hatchet-protocol: 'carve'
+    - uses: cachix/install-nix-action@v31
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: cachix/cachix-action@v16
+      with:
+        name: rde
+        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+        extraPullNames: rstats-on-nix, nix-community
+    
+    # Create a temporary directory with Python enabled
+    - name: Setup test directory with Python enabled
+      run: |
+        TEST_DIR=$(mktemp -d)
+        cp -r templates/ed/. "$TEST_DIR/"
+        cd "$TEST_DIR"
+        # Enable Python in the config
+        sed -i 's/python[[:space:]]*=[[:space:]]*false;/python = true;/' flake.nix
+        # Verify the change was successful
+        grep -q "python[[:space:]]*=[[:space:]]*true;" flake.nix || {
+          echo "Error: Failed to enable Python in flake.nix"
+          exit 1
+        }
+        echo "TEST_PYTHON_DIR=$TEST_DIR" >> $GITHUB_ENV
+    
+    - name: Build with Python enabled
+      run: |
+        cd "$TEST_PYTHON_DIR"
+        nix build
+    
+    - name: Test Python packages are available
+      run: |
+        cd "$TEST_PYTHON_DIR"
+        nix develop --command bash -c "python3 -c 'import duckdb; import polars; print(\"Python packages loaded\")'"
+    
+    - name: Test Python can execute code
+      run: |
+        cd "$TEST_PYTHON_DIR"
+        nix develop --command bash -c "python3 -c 'print(1+1)'"
+  
+  test-with-r:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: wimpysworld/nothing-but-nix@main
+      with:
+        hatchet-protocol: 'carve'
+    - uses: cachix/install-nix-action@v31
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: cachix/cachix-action@v16
+      with:
+        name: rde
+        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+        extraPullNames: rstats-on-nix, nix-community
+    
+    # Create a temporary directory with R enabled
+    - name: Setup test directory with R enabled
+      run: |
+        TEST_DIR=$(mktemp -d)
+        cp -r templates/ed/. "$TEST_DIR/"
+        cd "$TEST_DIR"
+        # Enable R in the config
+        sed -i 's/r[[:space:]]*=[[:space:]]*false;/r = true;/' flake.nix
+        # Verify the change was successful
+        grep -q "r[[:space:]]*=[[:space:]]*true;" flake.nix || {
+          echo "Error: Failed to enable R in flake.nix"
+          exit 1
+        }
+        echo "TEST_R_DIR=$TEST_DIR" >> $GITHUB_ENV
+    
+    - name: Build with R enabled
+      run: |
+        cd "$TEST_R_DIR"
+        nix build
+    
+    - name: Test R launches
+      run: |
+        cd "$TEST_R_DIR"
+        nix develop --command bash -c "R --version"
+    
+    - name: Test R packages are available
+      run: |
+        cd "$TEST_R_DIR"
+        nix develop --command bash -c "R -e 'library(fixest); print(\"R package fixest loaded\")'"
+    
+    - name: Test R can execute code
+      run: |
+        cd "$TEST_R_DIR"
+        nix develop --command bash -c "R -e 'print(1+1)'"
+  
+  test-with-julia:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: wimpysworld/nothing-but-nix@main
+      with:
+        hatchet-protocol: 'carve'
+    - uses: cachix/install-nix-action@v31
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: cachix/cachix-action@v16
+      with:
+        name: rde
+        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+        extraPullNames: rstats-on-nix, nix-community
+    
+    # Create a temporary directory with Julia enabled
+    - name: Setup test directory with Julia enabled
+      run: |
+        TEST_DIR=$(mktemp -d)
+        cp -r templates/ed/. "$TEST_DIR/"
+        cd "$TEST_DIR"
+        # Enable Julia in the config
+        sed -i 's/julia[[:space:]]*=[[:space:]]*false;/julia = true;/' flake.nix
+        # Verify the change was successful
+        grep -q "julia[[:space:]]*=[[:space:]]*true;" flake.nix || {
+          echo "Error: Failed to enable Julia in flake.nix"
+          exit 1
+        }
+        echo "TEST_JULIA_DIR=$TEST_DIR" >> $GITHUB_ENV
+    
+    - name: Build with Julia enabled
+      run: |
+        cd "$TEST_JULIA_DIR"
+        nix build
+    
+    - name: Test Julia launches
+      run: |
+        cd "$TEST_JULIA_DIR"
+        nix develop --command bash -c "julia --version"
+    
+    - name: Test Julia can execute code
+      run: |
+        cd "$TEST_JULIA_DIR"
+        nix develop --command bash -c "julia -e 'println(1+1)'"
+  
+  test-with-multiple-languages:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v6
+    - uses: wimpysworld/nothing-but-nix@main
+      with:
+        hatchet-protocol: 'carve'
+    - uses: cachix/install-nix-action@v31
+      with:
+        github_access_token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: cachix/cachix-action@v16
+      with:
+        name: rde
+        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+        extraPullNames: rstats-on-nix, nix-community
+    
+    # Create a temporary directory with multiple languages enabled
+    - name: Setup test directory with all languages enabled
+      run: |
+        TEST_DIR=$(mktemp -d)
+        cp -r templates/ed/. "$TEST_DIR/"
+        cd "$TEST_DIR"
+        # Enable all languages in the config
+        sed -i 's/python[[:space:]]*=[[:space:]]*false;/python = true;/' flake.nix
+        sed -i 's/r[[:space:]]*=[[:space:]]*false;/r = true;/' flake.nix
+        sed -i 's/julia[[:space:]]*=[[:space:]]*false;/julia = true;/' flake.nix
+        # Verify the changes were successful
+        grep -q "python[[:space:]]*=[[:space:]]*true;" flake.nix || exit 1
+        grep -q "r[[:space:]]*=[[:space:]]*true;" flake.nix || exit 1
+        grep -q "julia[[:space:]]*=[[:space:]]*true;" flake.nix || exit 1
+        echo "TEST_MULTI_DIR=$TEST_DIR" >> $GITHUB_ENV
+    
+    - name: Build with all languages enabled
+      run: |
+        cd "$TEST_MULTI_DIR"
+        nix build
+    
+    - name: Test all languages work together
+      run: |
+        cd "$TEST_MULTI_DIR"
+        nix develop --command bash -c "python3 --version && R --version && julia --version"
+    
+    - name: Test all language packages are available
+      run: |
+        cd "$TEST_MULTI_DIR"
+        nix develop --command bash -c "python3 -c 'import duckdb' && R -e 'library(fixest)' && julia -e 'using StatsBase'"
diff --git a/.github/workflows/check_macos.yml b/.github/workflows/check_macos.yml
index 06578c7..4e49161 100644
--- a/.github/workflows/check_macos.yml
+++ b/.github/workflows/check_macos.yml
@@ -23,5 +23,23 @@ jobs:
         name: rde
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
         extraPullNames: rstats-on-nix, nix-community
-    - run: nix build ./templates/rde
-    - run: nix build ./templates/ed
+    
+    # Test RDE template
+    - name: Build RDE template
+      run: nix build ./templates/rde
+    - name: Check RDE flake
+      run: nix flake check ./templates/rde
+    - name: Test RDE dev shell
+      run: |
+        cd templates/rde
+        nix develop --command bash -c "p --headless --version"
+    
+    # Test ED template
+    - name: Build ED template
+      run: nix build ./templates/ed
+    - name: Check ED flake
+      run: nix flake check ./templates/ed
+    - name: Test ED dev shell
+      run: |
+        cd templates/ed
+        nix develop --command bash -c "vv --headless --version"

From 5ac0c775ef4804e876d65cd3985a9261b668c51c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 16 Feb 2026 00:07:47 +0000
Subject: [PATCH 03/20] Update README with ED template documentation

Co-authored-by: dwinkler1 <22460147+dwinkler1@users.noreply.github.com>
---
 README.md              |  80 +++++++++++-
 templates/ed/README.md | 284 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 361 insertions(+), 3 deletions(-)
 create mode 100644 templates/ed/README.md

diff --git a/README.md b/README.md
index bfa3c32..daf004d 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,32 @@ A collection of Nix flake templates for reproducible development environments.
 
 ## Templates
 
+### ED (Editor)
+
+A simple Neovim-based development environment with optional language support.
+
+**Quick start:**
+```bash
+nix flake init -t github:dwinkler1/np#ed
+nix develop
+vv  # Launch Neovim (custom binary name)
+```
+
+**Features:**
+- ✨ Lightweight Neovim configuration
+- 🔧 Configurable language support (Python, R, Julia, Nix)
+- 📦 Reproducible with Nix
+- 🎨 Custom theming (Kanagawa by default)
+- 🔔 Mini-notify plugin for notifications
+
+**Default configuration:**
+- Nix support enabled
+- Custom binary: `vv`
+- Includes: cowsay, updateR utility
+
 ### RDE (Research Development Environment)
 
-The default template for data science and research projects with support for R, Python, and Julia.
+A comprehensive template for data science and research projects with support for R, Python, and Julia.
 
 **Quick start:**
 ```bash
@@ -34,12 +57,63 @@ All templates are automatically tested to ensure functionality:
 
 ### CI Workflows
 
-- `.github/workflows/check.yml` - Comprehensive functionality tests (Ubuntu)
-- `.github/workflows/check_macos.yml` - macOS compatibility tests
+**RDE Template:**
+- `.github/workflows/check.yml` - Comprehensive functionality tests for RDE (Ubuntu)
+  - Basic build and flake checks
+  - Dev shell functionality
+  - R command availability and functionality
+  - Neovim integration
+  - Utility commands (p-initProject, p-updateDeps)
+  - Separate jobs for Python and Julia configurations
+
+**ED Template:**
+- `.github/workflows/check_ed.yml` - Comprehensive functionality tests for ED (Ubuntu)
+  - Basic build and flake checks
+  - Dev shell functionality
+  - Neovim (vv) command tests
+  - updateR utility tests
+  - Extra packages (cowsay) verification
+  - Separate jobs for Python, R, Julia, and multi-language configurations
+
+**Cross-platform:**
+- `.github/workflows/check_macos.yml` - macOS compatibility tests for both templates
 - `.github/workflows/update.yml` - Automated dependency updates
 
 ## Usage
 
+### ED Template
+
+1. **Initialize a new project:**
+   ```bash
+   nix flake init -t github:dwinkler1/np#ed
+   ```
+
+2. **Enter development environment:**
+   ```bash
+   nix develop
+   # or with direnv
+   echo "use flake" > .envrc && direnv allow
+   ```
+
+3. **Start editing:**
+   ```bash
+   vv              # Launch Neovim
+   updateR         # Update R packages (when R is enabled)
+   cowsay "Hello!" # Fun utility included
+   ```
+
+4. **Enable languages:**
+   Edit `flake.nix` and change `false` to `true` in the `cats` section:
+   ```nix
+   cats = {
+     python = true;  # Enable Python support
+     r = true;       # Enable R support
+     julia = true;   # Enable Julia support
+   };
+   ```
+
+### RDE Template
+
 1. **Initialize a new project:**
    ```bash
    nix flake init -t github:dwinkler1/np#rde
diff --git a/templates/ed/README.md b/templates/ed/README.md
new file mode 100644
index 0000000..b78c32d
--- /dev/null
+++ b/templates/ed/README.md
@@ -0,0 +1,284 @@
+# ED Template - Simple Editor Environment
+
+A lightweight, customizable Neovim-based development environment with optional language support for Python, R, Julia, and Nix.
+
+## Features
+
+- ✨ **Lightweight**: Minimal configuration, fast startup
+- 🔧 **Configurable**: Enable only the languages you need
+- 📦 **Reproducible**: Nix-based environment management
+- 🎨 **Themed**: Beautiful Kanagawa colorscheme (customizable)
+- 🔔 **Notifications**: Mini-notify plugin for user feedback
+
+## Quick Start
+
+```bash
+# Initialize a new project with the ED template
+nix flake init -t github:dwinkler1/np#ed
+
+# Enter the development environment
+nix develop
+
+# Launch Neovim
+vv
+```
+
+## Configuration
+
+The ED template uses a centralized configuration structure at the top of `flake.nix`:
+
+```nix
+cats = {
+  clickhouse = false;
+  gitPlugins = false;
+  julia = false;
+  lua = false;
+  markdown = false;
+  nix = true;        # Enabled by default
+  optional = false;
+  python = false;
+  r = false;
+};
+```
+
+### Enabling Languages
+
+To enable support for a specific language, edit `flake.nix` and set the corresponding cat to `true`:
+
+#### Python
+```nix
+cats = {
+  python = true;
+  # ... other settings
+};
+```
+
+Includes: Python 3, duckdb, polars packages by default
+
+#### R
+```nix
+cats = {
+  r = true;
+  # ... other settings
+};
+```
+
+Includes: fixest package by default
+
+#### Julia
+```nix
+cats = {
+  julia = true;
+  # ... other settings
+};
+```
+
+Includes: StatsBase package by default
+
+### Custom Package Files
+
+You can specify additional packages by creating these files in your project:
+
+- `python-packages.nix` - Additional Python packages
+  ```nix
+  p: with p; [
+    numpy
+    pandas
+    # ... more packages
+  ]
+  ```
+
+- `r-packages.nix` - Additional R packages
+  ```nix
+  p: with p.rPackages; [
+    ggplot2
+    dplyr
+    # ... more packages
+  ]
+  ```
+
+- `julia-packages.nix` - Additional Julia packages
+  ```nix
+  [
+    "DataFrames"
+    "Plots"
+    # ... more packages
+  ]
+  ```
+
+## Available Commands
+
+### Neovim
+- `vv` - Launch Neovim (custom binary name)
+- `vv --headless` - Run Neovim in headless mode for scripting
+
+### Utilities
+- `updateR` - Update R package snapshots from rstats-on-nix
+- `cowsay` - Fun ASCII art text formatter (included as example)
+
+## Customization
+
+### Binary Name
+
+The default binary name is `vv`. To change it, edit the `binName` in `flake.nix`:
+
+```nix
+binName = "myeditor";  # Changes command from 'vv' to 'myeditor'
+```
+
+### Colorscheme
+
+Change the colorscheme in the settings section:
+
+```nix
+settings = {
+  colorscheme = "kanagawa";  # or "gruvbox", "tokyonight", etc.
+  background = "dark";        # or "light"
+  # ...
+};
+```
+
+### Extra Packages
+
+Add more system packages in the `extraPackages` section:
+
+```nix
+extraPackages = with pkgs; [
+  cowsay
+  ripgrep
+  fd
+  # ... more packages
+];
+```
+
+### Welcome Message
+
+The template includes a welcome notification. Customize it in the `specs.extraLua` section:
+
+```nix
+config = ''
+  require("mini.notify").setup()
+  vim.notify = MiniNotify.make_notify()
+  vim.notify("Welcome to ${name}!")
+'';
+```
+
+## Environment Variables
+
+The template sets the following environment variables:
+
+- `IS_PROJECT_EDITOR=1` - Indicates you're in the project editor environment
+- `R_LIBS_USER=./.nvimcom` - Project-local R package directory
+
+## Language Package Management
+
+### Replace vs Merge
+
+By default, language packages are **replaced** rather than merged with base packages. This is controlled by:
+
+```nix
+let
+  replace = pkgs.lib.mkForce;
+in {
+  lang_packages = {
+    python = replace ([...]);  # Replaces base packages
+    r = replace ([...]);       # Replaces base packages
+    julia = replace ([...]);   # Replaces base packages
+  };
+}
+```
+
+To **merge** with base packages instead, remove the `replace` wrapper:
+
+```nix
+lang_packages = {
+  python = (with pkgs.python3Packages; [...]);
+  # ...
+};
+```
+
+## Development Shell
+
+The development shell provides access to the Neovim package plus additional utilities:
+
+```bash
+nix develop  # Enter the dev shell
+```
+
+Available in dev shell:
+- `vv` - The configured Neovim
+- `updateR` - Update R packages (when R support is enabled)
+- All packages listed in `extraPackages`
+
+## Testing
+
+The ED template has comprehensive CI/CD tests:
+
+### Automated Tests (`.github/workflows/check_ed.yml`)
+
+1. **Basic Tests** (Ubuntu)
+   - Build verification
+   - Flake check
+   - Dev shell entry
+   - Neovim launch and version check
+   - Utility commands availability
+
+2. **Language-Specific Tests**
+   - Python configuration: Package imports, code execution
+   - R configuration: Package loading, code execution
+   - Julia configuration: Version check, code execution
+   - Multi-language: All languages enabled together
+
+3. **macOS Tests** (`.github/workflows/check_macos.yml`)
+   - Build verification on macOS
+   - Basic functionality tests
+
+## Tips
+
+1. **Use direnv for automatic environment loading:**
+   ```bash
+   echo "use flake" > .envrc
+   direnv allow
+   ```
+
+2. **Pin specific package versions** by editing `flake.lock`:
+   ```bash
+   nix flake update  # Update all inputs
+   nix flake lock --update-input nixpkgs  # Update specific input
+   ```
+
+3. **Check what's included in your build:**
+   ```bash
+   nix path-info -Sh ./result
+   ```
+
+4. **Build for different platforms:**
+   ```bash
+   nix build .#packages.x86_64-linux.default
+   nix build .#packages.aarch64-darwin.default
+   ```
+
+## Comparison with RDE Template
+
+| Feature | ED Template | RDE Template |
+|---------|-------------|--------------|
+| **Complexity** | Lightweight | Comprehensive |
+| **Binary Name** | `vv` | `p` |
+| **Project Structure** | Manual | `p-initProject` command |
+| **Language Support** | Optional (Python, R, Julia, Nix) | Built-in (R default, Python/Julia optional) |
+| **Research Tools** | None | Quarto, Marimo, Pluto.jl |
+| **Package Management** | updateR | p-updateDeps (comprehensive) |
+| **Use Case** | Simple editing, lightweight projects | Research, data science, complex projects |
+
+## Contributing
+
+When modifying the ED template, please ensure:
+
+1. All tests pass in `.github/workflows/check_ed.yml`
+2. The template builds on both Linux and macOS
+3. Documentation is updated to reflect changes
+4. Changes follow the existing code patterns
+
+## License
+
+See [LICENSE](../../LICENSE) file for details.

From 3c52f6b8202ea74c1162a4a649bc050849ba19a4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 16 Feb 2026 00:10:00 +0000
Subject: [PATCH 04/20] Add permissions block to ED workflow for security

Co-authored-by: dwinkler1 <22460147+dwinkler1@users.noreply.github.com>
---
 .github/workflows/check_ed.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/check_ed.yml b/.github/workflows/check_ed.yml
index 09100e8..7485b62 100644
--- a/.github/workflows/check_ed.yml
+++ b/.github/workflows/check_ed.yml
@@ -14,6 +14,8 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
+permissions:
+  contents: read
 jobs:
   tests:
     runs-on: ${{ matrix.os }}

From 64369482151d7214433e6dcf208d02b63822a928 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 06:35:59 +0000
Subject: [PATCH 05/20] Bump cachix/cachix-action from 16 to 17

Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 16 to 17.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/v16...v17)

---
updated-dependencies:
- dependency-name: cachix/cachix-action
  dependency-version: '17'
  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_macos.yml | 2 +-
 .github/workflows/update.yml      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index a231159..8182304 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -32,7 +32,7 @@ jobs:
     - uses: cachix/install-nix-action@v31
       with:
         github_access_token: ${{ secrets.GITHUB_TOKEN }}
-    - uses: cachix/cachix-action@v16
+    - uses: cachix/cachix-action@v17
       with:
         name: rde
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
@@ -125,7 +125,7 @@ jobs:
     - uses: cachix/install-nix-action@v31
       with:
         github_access_token: ${{ secrets.GITHUB_TOKEN }}
-    - uses: cachix/cachix-action@v16
+    - uses: cachix/cachix-action@v17
       with:
         name: rde
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
@@ -181,7 +181,7 @@ jobs:
     - uses: cachix/install-nix-action@v31
       with:
         github_access_token: ${{ secrets.GITHUB_TOKEN }}
-    - uses: cachix/cachix-action@v16
+    - uses: cachix/cachix-action@v17
       with:
         name: rde
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
diff --git a/.github/workflows/check_macos.yml b/.github/workflows/check_macos.yml
index 06578c7..3b8e6f2 100644
--- a/.github/workflows/check_macos.yml
+++ b/.github/workflows/check_macos.yml
@@ -18,7 +18,7 @@ jobs:
     - uses: cachix/install-nix-action@v31
       with:
         github_access_token: ${{ secrets.GITHUB_TOKEN }}
-    - uses: cachix/cachix-action@v16
+    - uses: cachix/cachix-action@v17
       with:
         name: rde
         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 891e992..c181f1f 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: cachix/install-nix-action@v31
         with:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: cachix/cachix-action@v16
+      - uses: cachix/cachix-action@v17
         with:
           name: rde
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'

From 25bac48f1970d653c60f7242f1ee6780fac5e487 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2026 07:25:55 +0000
Subject: [PATCH 06/20] 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/68b189ab981adae06590ee1929a70c8b86afd2b8?narHash=sha256-DvHfkW3DctWV%2BYnigY4%2B5Stn9NgI38JqR2IScXDX8z8%3D' (2026-02-15)
  → 'github:dwinkler1/fran/7b8fbbcd0c55df98795a9e34621e6224b6713b5b?narHash=sha256-N3mUOwFwGBaFomNdlWuCRftzqy%2Bh9Io8PJGcMVtJJsY%3D' (2026-02-19)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3aadb7ca9eac2891d52a9dec199d9580a6e2bf44?narHash=sha256-O1XDr7EWbRp%2BkHrNNgLWgIrB0/US5wvw9K6RERWAj6I%3D' (2026-02-14)
  → 'github:NixOS/nixpkgs/107cba9eb4a8d8c9f8e9e61266d78d340867913a?narHash=sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw%3D' (2026-03-29)
• Updated input 'nvimConfig':
    'github:dwinkler1/nvimConfig/8f5c05252e914cb3738039a7ec13eb7d5955227a?narHash=sha256-gem34C89cocBGuWLj7cdrAS5WkrOBp6V%2BycQM/RhcCw%3D' (2026-02-04)
  → 'github:dwinkler1/nvimConfig/e3d29331298bee03d2dd78d0bd3327a6a121f95f?narHash=sha256-k7WEQZtvDgOfAGyAFELfzJigwUYpzFlW7sRjZbxrBnc%3D' (2026-02-18)
• Updated input 'nvimConfig/plugins-r':
    'github:R-nvim/R.nvim/2701ec64f5485e17c0e057081a9ae2058d776464?narHash=sha256-T4QgcBL%2BLCXvrEiRE2JW4jtUKl8DKzFHk8czGUO1jgY%3D' (2026-01-30)
  → 'github:R-nvim/R.nvim/659dc18aba2d2b799c04efbce66a15ea87bd6ec6?narHash=sha256-vI5XW33cNJdHdVAtLSSbKb5ROdSbeOMb23lXTUbgva8%3D' (2026-02-09)
• Updated input 'nvimConfig/wrappers':
    'github:BirdeeHub/nix-wrapper-modules/cc5e052dd1e93ae75dc06e3fabf46f0820c272f2?narHash=sha256-Fq6THKEiAKx%2BwWQ4wTg9HvOAyD6i8JkWfHVQDZH7Byo%3D' (2026-01-30)
  → 'github:BirdeeHub/nix-wrapper-modules/8ba8703b62c2cc7e642f58ff03bd14a2f836e07a?narHash=sha256-Ibv5WEXiwr6gIEOajD4QE93TYpXUhEYv1VZV8sdU3IQ%3D' (2026-02-15)
---
 templates/ed/flake.lock | 46 ++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 5839626..5e08dbb 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771133455,
-        "narHash": "sha256-DvHfkW3DctWV+YnigY4+5Stn9NgI38JqR2IScXDX8z8=",
+        "lastModified": 1771462351,
+        "narHash": "sha256-N3mUOwFwGBaFomNdlWuCRftzqy+h9Io8PJGcMVtJJsY=",
         "owner": "dwinkler1",
         "repo": "fran",
-        "rev": "68b189ab981adae06590ee1929a70c8b86afd2b8",
+        "rev": "7b8fbbcd0c55df98795a9e34621e6224b6713b5b",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771043024,
-        "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
+        "lastModified": 1774799055,
+        "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
+        "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1770172480,
-        "narHash": "sha256-gem34C89cocBGuWLj7cdrAS5WkrOBp6V+ycQM/RhcCw=",
+        "lastModified": 1771400409,
+        "narHash": "sha256-k7WEQZtvDgOfAGyAFELfzJigwUYpzFlW7sRjZbxrBnc=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "8f5c05252e914cb3738039a7ec13eb7d5955227a",
+        "rev": "e3d29331298bee03d2dd78d0bd3327a6a121f95f",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
     "plugins-r": {
       "flake": false,
       "locked": {
-        "lastModified": 1769736135,
-        "narHash": "sha256-T4QgcBL+LCXvrEiRE2JW4jtUKl8DKzFHk8czGUO1jgY=",
+        "lastModified": 1770663552,
+        "narHash": "sha256-vI5XW33cNJdHdVAtLSSbKb5ROdSbeOMb23lXTUbgva8=",
         "owner": "R-nvim",
         "repo": "R.nvim",
-        "rev": "2701ec64f5485e17c0e057081a9ae2058d776464",
+        "rev": "659dc18aba2d2b799c04efbce66a15ea87bd6ec6",
         "type": "github"
       },
       "original": {
@@ -99,17 +99,17 @@
     },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1770035835,
-        "narHash": "sha256-Pi8f3LPTFmG7SZeAJEAamOWly1SZhEofT92uBqS4atY=",
-        "owner": "rstats-on-nix",
-        "repo": "nixpkgs",
-        "rev": "0d3fe7afce51d2126fdccf0b717d8048b90e4781",
+        "lastModified": 1771303851,
+        "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=",
+        "owner": "dwinkler1",
+        "repo": "rixpkgs",
+        "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
         "type": "github"
       },
       "original": {
-        "owner": "rstats-on-nix",
-        "ref": "2026-02-02",
-        "repo": "nixpkgs",
+        "owner": "dwinkler1",
+        "ref": "nixpkgs",
+        "repo": "rixpkgs",
         "type": "github"
       }
     },
@@ -129,11 +129,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769745458,
-        "narHash": "sha256-Fq6THKEiAKx+wWQ4wTg9HvOAyD6i8JkWfHVQDZH7Byo=",
+        "lastModified": 1771192657,
+        "narHash": "sha256-Ibv5WEXiwr6gIEOajD4QE93TYpXUhEYv1VZV8sdU3IQ=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "cc5e052dd1e93ae75dc06e3fabf46f0820c272f2",
+        "rev": "8ba8703b62c2cc7e642f58ff03bd14a2f836e07a",
         "type": "github"
       },
       "original": {

From 39aa4b2aefe49e33497e4d86e5e7ee69d951b8cd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2026 07:25:56 +0000
Subject: [PATCH 07/20] [create-pull-request] automated change

---
 templates/rde/flake.lock | 20 ++++++++++----------
 templates/rde/flake.nix  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock
index 7617db3..eaf008a 100644
--- a/templates/rde/flake.lock
+++ b/templates/rde/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771133455,
-        "narHash": "sha256-DvHfkW3DctWV+YnigY4+5Stn9NgI38JqR2IScXDX8z8=",
+        "lastModified": 1771462351,
+        "narHash": "sha256-N3mUOwFwGBaFomNdlWuCRftzqy+h9Io8PJGcMVtJJsY=",
         "owner": "dwinkler1",
         "repo": "fran",
-        "rev": "68b189ab981adae06590ee1929a70c8b86afd2b8",
+        "rev": "7b8fbbcd0c55df98795a9e34621e6224b6713b5b",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771043024,
-        "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
+        "lastModified": 1774799055,
+        "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
+        "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a",
         "type": "github"
       },
       "original": {
@@ -138,16 +138,16 @@
     },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1770035835,
-        "narHash": "sha256-Pi8f3LPTFmG7SZeAJEAamOWly1SZhEofT92uBqS4atY=",
+        "lastModified": 1774874350,
+        "narHash": "sha256-SmKr+soxLyDCEBf8yM7JjmM2y9xduU2vRHXiHLGIGhc=",
         "owner": "rstats-on-nix",
         "repo": "nixpkgs",
-        "rev": "0d3fe7afce51d2126fdccf0b717d8048b90e4781",
+        "rev": "d65bf3d951d474c2759ac31a1c0796e5af565f7c",
         "type": "github"
       },
       "original": {
         "owner": "rstats-on-nix",
-        "ref": "2026-02-02",
+        "ref": "2026-03-30",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix
index a6aa9a3..d43464c 100644
--- a/templates/rde/flake.nix
+++ b/templates/rde/flake.nix
@@ -219,7 +219,7 @@
     });
   };
   inputs = {
-    rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-02-02";
+    rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-03-30";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
     nixCats = {
       url = "github:dwinkler1/nixCatsConfig";

From a5a36052e1353065d81007f2c7f4ce53d9a35348 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 11 Apr 2026 07:09:21 +0000
Subject: [PATCH 08/20] 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/107cba9eb4a8d8c9f8e9e61266d78d340867913a?narHash=sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw%3D' (2026-03-29)
  → 'github:NixOS/nixpkgs/54170c54449ea4d6725efd30d719c5e505f1c10e?narHash=sha256-t%2BHZK42pB6N%2Bi5RGbuy7Xluez/VvWbembBdvzsc23Ss%3D' (2026-04-10)
• Updated input 'nvimConfig':
    'github:dwinkler1/nvimConfig/e3d29331298bee03d2dd78d0bd3327a6a121f95f?narHash=sha256-k7WEQZtvDgOfAGyAFELfzJigwUYpzFlW7sRjZbxrBnc%3D' (2026-02-18)
  → 'github:dwinkler1/nvimConfig/38d3d49665bc65bc2b0ab82270e9296a94a19c8f?narHash=sha256-6hRdCsXZhWi0ZzkGdMmCjuOagOkTBowT4/nR7H/CsSI%3D' (2026-04-01)
• Updated input 'nvimConfig/plugins-r':
    'github:R-nvim/R.nvim/659dc18aba2d2b799c04efbce66a15ea87bd6ec6?narHash=sha256-vI5XW33cNJdHdVAtLSSbKb5ROdSbeOMb23lXTUbgva8%3D' (2026-02-09)
  → 'github:R-nvim/R.nvim/5b9c870fbb5c61126d30e6b277695d6f3c54da5b?narHash=sha256-qfT4htOqZI%2BJEM2t3I/iuGu2XPu7vNmu4Fkj%2B2seKgE%3D' (2026-03-31)
• Updated input 'nvimConfig/wrappers':
    'github:BirdeeHub/nix-wrapper-modules/8ba8703b62c2cc7e642f58ff03bd14a2f836e07a?narHash=sha256-Ibv5WEXiwr6gIEOajD4QE93TYpXUhEYv1VZV8sdU3IQ%3D' (2026-02-15)
  → 'github:BirdeeHub/nix-wrapper-modules/bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737?narHash=sha256-a6JZDuBIwQmuEwYM4dziH%2BWyrpE8HCP8F7JFIn3CNvw%3D' (2026-03-30)
---
 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 5e08dbb..fede06e 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1774799055,
-        "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=",
+        "lastModified": 1775811116,
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1771400409,
-        "narHash": "sha256-k7WEQZtvDgOfAGyAFELfzJigwUYpzFlW7sRjZbxrBnc=",
+        "lastModified": 1775085146,
+        "narHash": "sha256-6hRdCsXZhWi0ZzkGdMmCjuOagOkTBowT4/nR7H/CsSI=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "e3d29331298bee03d2dd78d0bd3327a6a121f95f",
+        "rev": "38d3d49665bc65bc2b0ab82270e9296a94a19c8f",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
     "plugins-r": {
       "flake": false,
       "locked": {
-        "lastModified": 1770663552,
-        "narHash": "sha256-vI5XW33cNJdHdVAtLSSbKb5ROdSbeOMb23lXTUbgva8=",
+        "lastModified": 1774957049,
+        "narHash": "sha256-qfT4htOqZI+JEM2t3I/iuGu2XPu7vNmu4Fkj+2seKgE=",
         "owner": "R-nvim",
         "repo": "R.nvim",
-        "rev": "659dc18aba2d2b799c04efbce66a15ea87bd6ec6",
+        "rev": "5b9c870fbb5c61126d30e6b277695d6f3c54da5b",
         "type": "github"
       },
       "original": {
@@ -129,11 +129,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771192657,
-        "narHash": "sha256-Ibv5WEXiwr6gIEOajD4QE93TYpXUhEYv1VZV8sdU3IQ=",
+        "lastModified": 1774879171,
+        "narHash": "sha256-a6JZDuBIwQmuEwYM4dziH+WyrpE8HCP8F7JFIn3CNvw=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "8ba8703b62c2cc7e642f58ff03bd14a2f836e07a",
+        "rev": "bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737",
         "type": "github"
       },
       "original": {

From c7e81b4d51b5260742ad41e102ff5d722c5d59ec Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 11 Apr 2026 07:09:22 +0000
Subject: [PATCH 09/20] [create-pull-request] automated change

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

diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock
index eaf008a..a860080 100644
--- a/templates/rde/flake.lock
+++ b/templates/rde/flake.lock
@@ -73,11 +73,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1774799055,
-        "narHash": "sha256-Tsq9BCz0q47ej1uFF39m4tuhcwru/ls6vCCJzutEpaw=",
+        "lastModified": 1775811116,
+        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "107cba9eb4a8d8c9f8e9e61266d78d340867913a",
+        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
         "type": "github"
       },
       "original": {
@@ -138,16 +138,16 @@
     },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1774874350,
-        "narHash": "sha256-SmKr+soxLyDCEBf8yM7JjmM2y9xduU2vRHXiHLGIGhc=",
+        "lastModified": 1775479062,
+        "narHash": "sha256-hbH7uuftiG3KhWGigTEzu0ucIJOa+iDroSDgMN7fOJE=",
         "owner": "rstats-on-nix",
         "repo": "nixpkgs",
-        "rev": "d65bf3d951d474c2759ac31a1c0796e5af565f7c",
+        "rev": "577e9cf0442e030ac9f891cb3e56af9a208c8e20",
         "type": "github"
       },
       "original": {
         "owner": "rstats-on-nix",
-        "ref": "2026-03-30",
+        "ref": "2026-04-06",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix
index d43464c..60f9948 100644
--- a/templates/rde/flake.nix
+++ b/templates/rde/flake.nix
@@ -219,7 +219,7 @@
     });
   };
   inputs = {
-    rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-03-30";
+    rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-04-06";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
     nixCats = {
       url = "github:dwinkler1/nixCatsConfig";

From 893b92a863d115dcf4687491c405634333c89ef9 Mon Sep 17 00:00:00 2001
From: Daniel <dw@dwinkler.org>
Date: Thu, 23 Apr 2026 19:07:46 +1000
Subject: [PATCH 10/20] Update nixpkgs URL to point to unstable branch

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

diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index 46b9141..08a618d 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -114,7 +114,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs";
     fran = {
       url = "github:dwinkler1/fran";
@@ -128,7 +128,12 @@
         rixpkgs.follows = "rixpkgs";
         nixpkgs.follows = "nixpkgs";
         fran.follows = "fran";
+        "plugins-r".follows = "plugins-r";
       };
     };
+    "plugins-r" = {
+      url = "github:R-nvim/R.nvim/v0.99.3";
+      flake = false;
+    };
   };
 }

From a28cc5da2d141ca49bb21dbbba4159cf0d81f15e Mon Sep 17 00:00:00 2001
From: Daniel <dw@dwinkler.org>
Date: Tue, 28 Apr 2026 11:33:20 +1000
Subject: [PATCH 11/20] Rename update step for ed flake.lock

---
 .github/workflows/update.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index c181f1f..a42ac30 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -23,8 +23,7 @@ jobs:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
           extraPullNames: rstats-on-nix, nix-community
       - run: cd templates/rde/ && nix develop -c p-updateDeps
-      - run: cd templates/ed/ && nix develop -c updateR
-      - name: Update n flake.lock
+      - name: Update ed flake.lock
         uses: DeterminateSystems/update-flake-lock@v28
         with:
           token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}

From a2518902731532e5d39205bd50fee4a2cd725ea8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Apr 2026 01:44:15 +0000
Subject: [PATCH 12/20] 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/7b8fbbcd0c55df98795a9e34621e6224b6713b5b?narHash=sha256-N3mUOwFwGBaFomNdlWuCRftzqy%2Bh9Io8PJGcMVtJJsY%3D' (2026-02-19)
  → 'github:dwinkler1/fran/da09626e4dd8f0f57078b3a04e0443a8c20defa1?narHash=sha256-xqqv46MTveuT4yJH2YihmbHGy5mdLnnLFDebVmUws/E%3D' (2026-04-17)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/54170c54449ea4d6725efd30d719c5e505f1c10e?narHash=sha256-t%2BHZK42pB6N%2Bi5RGbuy7Xluez/VvWbembBdvzsc23Ss%3D' (2026-04-10)
  → 'github:NixOS/nixpkgs/0726a0ecb6d4e08f6adced58726b95db924cef57?narHash=sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI%3D' (2026-04-22)
• Updated input 'nvimConfig':
    'github:dwinkler1/nvimConfig/38d3d49665bc65bc2b0ab82270e9296a94a19c8f?narHash=sha256-6hRdCsXZhWi0ZzkGdMmCjuOagOkTBowT4/nR7H/CsSI%3D' (2026-04-01)
  → 'github:dwinkler1/nvimConfig/2617face3b1be40534d2cae7f0a374a062b3710d?narHash=sha256-pU3u7T4MqpjUWxflNvd4i47FURp756L7nMRL8MV%2BQEw%3D' (2026-04-17)
• Updated input 'nvimConfig/plugins-r':
    'github:R-nvim/R.nvim/5b9c870fbb5c61126d30e6b277695d6f3c54da5b?narHash=sha256-qfT4htOqZI%2BJEM2t3I/iuGu2XPu7vNmu4Fkj%2B2seKgE%3D' (2026-03-31)
  → follows 'plugins-r'
• Updated input 'nvimConfig/wrappers':
    'github:BirdeeHub/nix-wrapper-modules/bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737?narHash=sha256-a6JZDuBIwQmuEwYM4dziH%2BWyrpE8HCP8F7JFIn3CNvw%3D' (2026-03-30)
  → 'github:BirdeeHub/nix-wrapper-modules/f11469ca69068bac13d9e163b2bd268cc06dff57?narHash=sha256-/SSAR77Brr9fbapsh1cb2K47JXCbvwS1GjM4yyDxle8%3D' (2026-04-16)
• Added input 'plugins-r':
    'github:R-nvim/R.nvim/958b472d763cb258927c7ef69af4fd9945cc5469?narHash=sha256-oQSHHu6filJkAyH94yEvyTVuxA%2B5MU2dMOEAnsIjJKQ%3D' (2026-01-31)
---
 templates/ed/flake.lock | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index fede06e..8da8614 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771462351,
-        "narHash": "sha256-N3mUOwFwGBaFomNdlWuCRftzqy+h9Io8PJGcMVtJJsY=",
+        "lastModified": 1776413584,
+        "narHash": "sha256-xqqv46MTveuT4yJH2YihmbHGy5mdLnnLFDebVmUws/E=",
         "owner": "dwinkler1",
         "repo": "fran",
-        "rev": "7b8fbbcd0c55df98795a9e34621e6224b6713b5b",
+        "rev": "da09626e4dd8f0f57078b3a04e0443a8c20defa1",
         "type": "github"
       },
       "original": {
@@ -22,16 +22,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775811116,
-        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
+        "lastModified": 1776877367,
+        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
+        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -45,18 +45,20 @@
           "nixpkgs"
         ],
         "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
-        "plugins-r": "plugins-r",
+        "plugins-r": [
+          "plugins-r"
+        ],
         "rixpkgs": [
           "rixpkgs"
         ],
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1775085146,
-        "narHash": "sha256-6hRdCsXZhWi0ZzkGdMmCjuOagOkTBowT4/nR7H/CsSI=",
+        "lastModified": 1776413627,
+        "narHash": "sha256-pU3u7T4MqpjUWxflNvd4i47FURp756L7nMRL8MV+QEw=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "38d3d49665bc65bc2b0ab82270e9296a94a19c8f",
+        "rev": "2617face3b1be40534d2cae7f0a374a062b3710d",
         "type": "github"
       },
       "original": {
@@ -84,15 +86,16 @@
     "plugins-r": {
       "flake": false,
       "locked": {
-        "lastModified": 1774957049,
-        "narHash": "sha256-qfT4htOqZI+JEM2t3I/iuGu2XPu7vNmu4Fkj+2seKgE=",
+        "lastModified": 1769881528,
+        "narHash": "sha256-oQSHHu6filJkAyH94yEvyTVuxA+5MU2dMOEAnsIjJKQ=",
         "owner": "R-nvim",
         "repo": "R.nvim",
-        "rev": "5b9c870fbb5c61126d30e6b277695d6f3c54da5b",
+        "rev": "958b472d763cb258927c7ef69af4fd9945cc5469",
         "type": "github"
       },
       "original": {
         "owner": "R-nvim",
+        "ref": "v0.99.3",
         "repo": "R.nvim",
         "type": "github"
       }
@@ -118,6 +121,7 @@
         "fran": "fran",
         "nixpkgs": "nixpkgs",
         "nvimConfig": "nvimConfig",
+        "plugins-r": "plugins-r",
         "rixpkgs": "rixpkgs"
       }
     },
@@ -129,11 +133,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774879171,
-        "narHash": "sha256-a6JZDuBIwQmuEwYM4dziH+WyrpE8HCP8F7JFIn3CNvw=",
+        "lastModified": 1776375800,
+        "narHash": "sha256-/SSAR77Brr9fbapsh1cb2K47JXCbvwS1GjM4yyDxle8=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "bab35ffae25cf6f4e4fdb3c2f7f0ac80966ce737",
+        "rev": "f11469ca69068bac13d9e163b2bd268cc06dff57",
         "type": "github"
       },
       "original": {

From 1f974e4167877c6d1f16f4f84e558f7866b42e8b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Apr 2026 01:44:17 +0000
Subject: [PATCH 13/20] [create-pull-request] automated change

---
 templates/rde/flake.lock | 20 ++++++++++----------
 templates/rde/flake.nix  |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock
index a860080..6e88194 100644
--- a/templates/rde/flake.lock
+++ b/templates/rde/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771462351,
-        "narHash": "sha256-N3mUOwFwGBaFomNdlWuCRftzqy+h9Io8PJGcMVtJJsY=",
+        "lastModified": 1776413584,
+        "narHash": "sha256-xqqv46MTveuT4yJH2YihmbHGy5mdLnnLFDebVmUws/E=",
         "owner": "dwinkler1",
         "repo": "fran",
-        "rev": "7b8fbbcd0c55df98795a9e34621e6224b6713b5b",
+        "rev": "da09626e4dd8f0f57078b3a04e0443a8c20defa1",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775811116,
-        "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
+        "lastModified": 1777077449,
+        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
+        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
         "type": "github"
       },
       "original": {
@@ -138,16 +138,16 @@
     },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1775479062,
-        "narHash": "sha256-hbH7uuftiG3KhWGigTEzu0ucIJOa+iDroSDgMN7fOJE=",
+        "lastModified": 1776958221,
+        "narHash": "sha256-cOHLrMWifj8HQMIG6gMhGowwPAkyX/kijDx38wK8kUM=",
         "owner": "rstats-on-nix",
         "repo": "nixpkgs",
-        "rev": "577e9cf0442e030ac9f891cb3e56af9a208c8e20",
+        "rev": "db90c554b7172188324b84deea35ed5975e20e44",
         "type": "github"
       },
       "original": {
         "owner": "rstats-on-nix",
-        "ref": "2026-04-06",
+        "ref": "2026-04-22",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix
index 60f9948..12ae4f0 100644
--- a/templates/rde/flake.nix
+++ b/templates/rde/flake.nix
@@ -219,7 +219,7 @@
     });
   };
   inputs = {
-    rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-04-06";
+    rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-04-22";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
     nixCats = {
       url = "github:dwinkler1/nixCatsConfig";

From 4b7c5bc13fea02d539e7a5b7df8eafb9feecb0e2 Mon Sep 17 00:00:00 2001
From: Daniel <dw@dwinkler.org>
Date: Tue, 28 Apr 2026 15:29:43 +1000
Subject: [PATCH 14/20] Rename workflow and add Ubuntu support

---
 .github/workflows/check_ed.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/workflows/check_ed.yml

diff --git a/.github/workflows/check_ed.yml b/.github/workflows/check_ed.yml
new file mode 100644
index 0000000..350c013
--- /dev/null
+++ b/.github/workflows/check_ed.yml
@@ -0,0 +1,26 @@
+name: "Test ed template MacOS"
+on:
+  workflow_dispatch: # allows manual triggering
+  push:
+    branches:
+      - 'update_rde'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, 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
+    - run: nix build ./templates/ed

From dad9e7d14e5afe57ec820c528aedf16a106339d7 Mon Sep 17 00:00:00 2001
From: Daniel <dw@dwinkler.org>
Date: Sun, 3 May 2026 16:39:21 +1000
Subject: [PATCH 15/20] Remove dependency update command from workflow

Removed the command to update dependencies in the RDE template.
---
 .github/workflows/update.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index a42ac30..96cb868 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -22,7 +22,6 @@ jobs:
           name: rde
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
           extraPullNames: rstats-on-nix, nix-community
-      - run: cd templates/rde/ && nix develop -c p-updateDeps
       - name: Update ed flake.lock
         uses: DeterminateSystems/update-flake-lock@v28
         with:

From c1c92ec37c2d7183be4a0ba575e3d26d74400273 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 3 May 2026 06:40:30 +0000
Subject: [PATCH 16/20] 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/0726a0ecb6d4e08f6adced58726b95db924cef57?narHash=sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI%3D' (2026-04-22)
  → 'github:NixOS/nixpkgs/15f4ee454b1dce334612fa6843b3e05cf546efab?narHash=sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM%2BZ4%3D' (2026-04-30)
• Updated input 'nvimConfig':
    'github:dwinkler1/nvimConfig/2617face3b1be40534d2cae7f0a374a062b3710d?narHash=sha256-pU3u7T4MqpjUWxflNvd4i47FURp756L7nMRL8MV%2BQEw%3D' (2026-04-17)
  → 'github:dwinkler1/nvimConfig/e9c99811d4b8684814608c7bff89dd5bb4d20cda?narHash=sha256-PY%2BhOXV5%2BW0rpWtnUI9QO3tFyyzlpDG8rVjPbaBoHxo%3D' (2026-05-03)
---
 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 8da8614..3457e77 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776877367,
-        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
+        "lastModified": 1777578337,
+        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
+        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1776413627,
-        "narHash": "sha256-pU3u7T4MqpjUWxflNvd4i47FURp756L7nMRL8MV+QEw=",
+        "lastModified": 1777790156,
+        "narHash": "sha256-PY+hOXV5+W0rpWtnUI9QO3tFyyzlpDG8rVjPbaBoHxo=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "2617face3b1be40534d2cae7f0a374a062b3710d",
+        "rev": "e9c99811d4b8684814608c7bff89dd5bb4d20cda",
         "type": "github"
       },
       "original": {

From 24175e36c3540693f918ee629ac79fbb609342cc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 7 May 2026 08:40:44 +0000
Subject: [PATCH 17/20] 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/15f4ee454b1dce334612fa6843b3e05cf546efab?narHash=sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM%2BZ4%3D' (2026-04-30)
  → 'github:NixOS/nixpkgs/549bd84d6279f9852cae6225e372cc67fb91a4c1?narHash=sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9%2BhrDTkDU%3D' (2026-05-05)
• Updated input 'nvimConfig':
    'github:dwinkler1/nvimConfig/e9c99811d4b8684814608c7bff89dd5bb4d20cda?narHash=sha256-PY%2BhOXV5%2BW0rpWtnUI9QO3tFyyzlpDG8rVjPbaBoHxo%3D' (2026-05-03)
  → 'github:dwinkler1/nvimConfig/4884bf685f157da4f4d60f8e40febeac0b9bf0e9?narHash=sha256-FB8M8D8YzfSe/oL4l6XGJxErq6nRjWSAeJzNXpk2g0E%3D' (2026-05-07)
• Updated input 'nvimConfig/wrappers':
    'github:BirdeeHub/nix-wrapper-modules/f11469ca69068bac13d9e163b2bd268cc06dff57?narHash=sha256-/SSAR77Brr9fbapsh1cb2K47JXCbvwS1GjM4yyDxle8%3D' (2026-04-16)
  → 'github:BirdeeHub/nix-wrapper-modules/dc5184095ad488e937ec308b52c9c0b218959d8b?narHash=sha256-0DS24OW9d9iz%2Bw0LCz6KpS2IpE2z2gHxeBdMZg9xpDY%3D' (2026-05-05)
• Updated input 'rixpkgs':
    'github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e?narHash=sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM%3D' (2026-02-17)
  → 'github:dwinkler1/rixpkgs/028af91e9161008fce750f3e249afe471a302037?narHash=sha256-K%2BRz%2BpghAmynE83%2Be9svnNYsDgPnbEohrcPb6duG5wM%3D' (2026-05-07)
---
 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 3457e77..572e58d 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777578337,
-        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1777790156,
-        "narHash": "sha256-PY+hOXV5+W0rpWtnUI9QO3tFyyzlpDG8rVjPbaBoHxo=",
+        "lastModified": 1778114917,
+        "narHash": "sha256-FB8M8D8YzfSe/oL4l6XGJxErq6nRjWSAeJzNXpk2g0E=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "e9c99811d4b8684814608c7bff89dd5bb4d20cda",
+        "rev": "4884bf685f157da4f4d60f8e40febeac0b9bf0e9",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
     },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1771303851,
-        "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=",
+        "lastModified": 1778115084,
+        "narHash": "sha256-K+Rz+pghAmynE83+e9svnNYsDgPnbEohrcPb6duG5wM=",
         "owner": "dwinkler1",
         "repo": "rixpkgs",
-        "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
+        "rev": "028af91e9161008fce750f3e249afe471a302037",
         "type": "github"
       },
       "original": {
@@ -133,11 +133,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776375800,
-        "narHash": "sha256-/SSAR77Brr9fbapsh1cb2K47JXCbvwS1GjM4yyDxle8=",
+        "lastModified": 1777991014,
+        "narHash": "sha256-0DS24OW9d9iz+w0LCz6KpS2IpE2z2gHxeBdMZg9xpDY=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "f11469ca69068bac13d9e163b2bd268cc06dff57",
+        "rev": "dc5184095ad488e937ec308b52c9c0b218959d8b",
         "type": "github"
       },
       "original": {

From 5c851aecbaf44287d7d9f7de9510d85be439920b Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Thu, 21 May 2026 20:38:02 +1000
Subject: [PATCH 18/20] temp

---
 templates/ed/flake.nix | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index 08a618d..7ac16f6 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -17,7 +17,7 @@
         nix = true;
         optional = false;
         python = false;
-        r = false;
+        r = true;
       };
 
       settings = let
@@ -69,7 +69,6 @@
 
       env = {
         IS_PROJECT_EDITOR = "1";
-        R_LIBS_USER = "./.nvimcom";
       };
 
       extraPackages = with pkgs; [
@@ -93,14 +92,18 @@
     forAllSystems = nixpkgs.lib.genAttrs systems;
     overlays = [inputs.nvimConfig.overlays.dependencies];
   in {
+    formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
+
     packages = forAllSystems (system: let
       pkgs = import nixpkgs {inherit system overlays;};
-      baseNvim = nvimConfig.packages.${system}.default;
-
-      nvim = (baseNvim.eval (projectSettings {inherit pkgs;})).config.wrapper;
-      default = nvim;
+      evalResult = nvimConfig.inputs.wrappers.lib.evalModules {
+        modules = [
+          nvimConfig.wrapperModules.default
+          projectSettings
+        ];
+      };
     in {
-      default = nvim;
+      default = evalResult.config.wrap { inherit pkgs; };
     });
 
     devShells = forAllSystems (system: let
@@ -108,14 +111,14 @@
       nv = self.packages.${system}.default;
     in {
       default = pkgs.mkShell {
-        packages = [nv pkgs.updateR];
+        packages = [nv];
       };
     });
   };
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs";
+    rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e";
     fran = {
       url = "github:dwinkler1/fran";
       inputs = {
@@ -128,12 +131,7 @@
         rixpkgs.follows = "rixpkgs";
         nixpkgs.follows = "nixpkgs";
         fran.follows = "fran";
-        "plugins-r".follows = "plugins-r";
       };
     };
-    "plugins-r" = {
-      url = "github:R-nvim/R.nvim/v0.99.3";
-      flake = false;
-    };
   };
 }

From e814d2c04c36a5542c11caadbcae5148aaf05594 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Thu, 21 May 2026 21:43:04 +1000
Subject: [PATCH 19/20] simplified

---
 templates/ed/README.md  |  73 +++++++++++++
 templates/ed/flake.lock |  65 ++++++++----
 templates/ed/flake.nix  | 223 +++++++++++++++++++++++++---------------
 3 files changed, 256 insertions(+), 105 deletions(-)
 create mode 100644 templates/ed/README.md

diff --git a/templates/ed/README.md b/templates/ed/README.md
new file mode 100644
index 0000000..272d827
--- /dev/null
+++ b/templates/ed/README.md
@@ -0,0 +1,73 @@
+# Project Editor
+
+A per-project Neovim wrapper built with [nix-wrapper-modules](https://birdeehub.github.io/nix-wrapper-modules/) and [nvimConfig](https://github.com/dwinkler1/nvimConfig).
+
+## Setup
+
+The flake provides two entry points:
+
+| Command | What you get |
+|---|---|
+| `direnv allow` / `nix develop` | **(Recommended)** A shell with `nv` and all enabled language toolchains (R, Python, Julia, Quarto) on `PATH`. |
+| `nix run` | Launches only the `nv` editor. Language toolchains (R, Python, etc.) are **not** on `PATH`. |
+
+### With direnv (recommended)
+
+```bash
+direnv allow   # enter the devShell automatically
+nv             # launch the pre-configured Neovim
+R              # R REPL is available (if enabled in flake.nix)
+```
+
+### Without direnv
+
+```bash
+nix develop    # enter the devShell manually
+nv             # launch Neovim
+R              # R REPL is available (if enabled in flake.nix)
+```
+
+> **Why `nix run` only gives the editor:** The flake's `packages.default` is the wrapped Neovim binary. Language toolchains (R, radian, quarto, etc.) live in `devShells.default`. Use `nix develop` (or `direnv allow`) to get the full environment.
+
+## Configuration
+
+The `flake.nix` is the single source of truth. Key knobs:
+
+| Option | What it controls |
+|---|---|
+| `cats` | Toggle language support (nix, r, python, julia, etc.) |
+| `settings.lang_packages.<lang>` | Language-specific packages installed in the wrapper |
+| `settings.colorscheme` | Neovim colorscheme |
+| `settings.background` | `"dark"` or `"light"` |
+| `settings.wrapRc` | When `true`, init.lua is embedded (rebuild to change); when `false`, init.lua is external (reload without rebuild) |
+| `binName` | The wrapper binary name (`nv` by default) |
+| `env` | Environment variables set in the wrapper |
+| `extraPackages` | Extra system packages available in the wrapper's PATH |
+| `specs.extraLua` | Inject lazy.nvim plugin specs |
+
+### Adding packages without editing flake.nix
+
+Create any of these optional files in the project root to add dependencies without modifying `flake.nix`:
+
+- **`python-packages.nix`** — receives `python3Packages`, return a list of packages:
+  ```nix
+  p: with p; [ numpy scipy ]
+  ```
+
+- **`r-packages.nix`** — receives `rpkgs` (includes `rPackages`), return a list:
+  ```nix
+  p: with p.rPackages; [ ggplot2 data.table ]
+  ```
+
+- **`julia-packages.nix`** — no arguments, return a list of package name strings:
+  ```nix
+  [ "DataFrames" "Plots" ]
+  ```
+
+## Formatting
+
+```bash
+nix fmt
+```
+
+Uses `nixfmt-rfc-style` pinned via the flake's `formatter` output.
diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock
index 572e58d..19c77b2 100644
--- a/templates/ed/flake.lock
+++ b/templates/ed/flake.lock
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "lastModified": 1778869304,
+        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
         "type": "github"
       },
       "original": {
@@ -45,20 +45,19 @@
           "nixpkgs"
         ],
         "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
-        "plugins-r": [
-          "plugins-r"
-        ],
+        "plugins-r": "plugins-r",
+        "r-nvim-nix": "r-nvim-nix",
         "rixpkgs": [
           "rixpkgs"
         ],
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1778114917,
-        "narHash": "sha256-FB8M8D8YzfSe/oL4l6XGJxErq6nRjWSAeJzNXpk2g0E=",
+        "lastModified": 1779362150,
+        "narHash": "sha256-y3JTpxmNgtEYG1m21Ymvdmrul/WvJzOCX45AlV21aak=",
         "owner": "dwinkler1",
         "repo": "nvimConfig",
-        "rev": "4884bf685f157da4f4d60f8e40febeac0b9bf0e9",
+        "rev": "af6d975129768cce36ac4c46198ab2b3ebaafad3",
         "type": "github"
       },
       "original": {
@@ -86,33 +85,58 @@
     "plugins-r": {
       "flake": false,
       "locked": {
-        "lastModified": 1769881528,
-        "narHash": "sha256-oQSHHu6filJkAyH94yEvyTVuxA+5MU2dMOEAnsIjJKQ=",
+        "lastModified": 1776905071,
+        "narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=",
         "owner": "R-nvim",
         "repo": "R.nvim",
-        "rev": "958b472d763cb258927c7ef69af4fd9945cc5469",
+        "rev": "582f2af11290ac067e49018db38e12a511325556",
         "type": "github"
       },
       "original": {
         "owner": "R-nvim",
-        "ref": "v0.99.3",
+        "ref": "v0.99.4",
         "repo": "R.nvim",
         "type": "github"
       }
     },
+    "r-nvim-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nvimConfig",
+          "rixpkgs"
+        ],
+        "rnvimsrc": [
+          "nvimConfig",
+          "plugins-r"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778684156,
+        "narHash": "sha256-Z4y1tQfkIsPK4NRxGn668HMDfWxnxNxSJ0CAOOXiIfY=",
+        "owner": "dwinkler1",
+        "repo": "r_nvim_nix",
+        "rev": "2f49dfee27886068e2f49cbd54558ce4cc424c82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "dwinkler1",
+        "repo": "r_nvim_nix",
+        "type": "github"
+      }
+    },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1778115084,
-        "narHash": "sha256-K+Rz+pghAmynE83+e9svnNYsDgPnbEohrcPb6duG5wM=",
+        "lastModified": 1771303851,
+        "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=",
         "owner": "dwinkler1",
         "repo": "rixpkgs",
-        "rev": "028af91e9161008fce750f3e249afe471a302037",
+        "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
         "type": "github"
       },
       "original": {
         "owner": "dwinkler1",
-        "ref": "nixpkgs",
         "repo": "rixpkgs",
+        "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e",
         "type": "github"
       }
     },
@@ -121,7 +145,6 @@
         "fran": "fran",
         "nixpkgs": "nixpkgs",
         "nvimConfig": "nvimConfig",
-        "plugins-r": "plugins-r",
         "rixpkgs": "rixpkgs"
       }
     },
@@ -133,11 +156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777991014,
-        "narHash": "sha256-0DS24OW9d9iz+w0LCz6KpS2IpE2z2gHxeBdMZg9xpDY=",
+        "lastModified": 1779297405,
+        "narHash": "sha256-VFoBwH7ZjVxCnvZTb5ODRXt70sLtWMxstive0N+RS50=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "dc5184095ad488e937ec308b52c9c0b218959d8b",
+        "rev": "e7ed7a1205945befdf2e0d73ba7df91d935e5af1",
         "type": "github"
       },
       "original": {
diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index 7ac16f6..bc5f7d3 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -7,95 +7,107 @@
     nvimConfig,
     ...
   } @ inputs: let
-    projectSettings = {pkgs}: {
-      cats = {
-        clickhouse = false;
-        gitPlugins = false;
-        julia = false;
-        lua = false;
-        markdown = false;
-        nix = true;
-        optional = false;
-        python = false;
-        r = true;
-      };
-
-      settings = let
-        # With `replace` packages are replaced otherwise they are merged with base packages
-        replace = pkgs.lib.mkForce;
-      in {
-        lang_packages = {
-          python = replace (
-            (with pkgs.python3Packages; [
-              duckdb
-              polars
-            ])
-            ++ (
-              if builtins.pathExists ./python-packages.nix
-              # p: with p; [ ... ]
-              then import ./python-packages.nix pkgs.python3Packages
-              else []
-            )
-          );
-
-          r = replace (
-            (with pkgs.rpkgs.rPackages; [
-              fixest
-              # pkgs.extraRPackages.musicMetadata
-            ])
-            ++ (
-              if builtins.pathExists ./r-packages.nix
-              # p: with p.rPackages; [ ... ]
-              then import ./r-packages.nix pkgs.rpkgs
-              else []
-            )
-          );
-
-          julia = replace ([
-              "StatsBase"
-            ]
-            ++ (
-              if builtins.pathExists ./julia-packages.nix
-              # [ ... ]
-              then import ./julia-packages.nix
-              else []
-            ));
-        };
-        colorscheme = "kanagawa";
-        background = "dark";
-        wrapRc = true;
-      };
-      binName = "vv";
-
-      env = {
-        IS_PROJECT_EDITOR = "1";
-      };
-
-      extraPackages = with pkgs; [
-        cowsay
-      ];
-
-      specs.extraLua = let
-        name = builtins.baseNameOf (builtins.toString ./.);
-      in {
-        data = pkgs.vimPlugins.mini-notify;
-        before = ["INIT_MAIN"];
-        config = ''
-          require("mini.notify").setup()
-          vim.notify = MiniNotify.make_notify()
-          vim.notify("Welcome to ${name}!")
-        '';
-      };
+    # ── 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;
     };
 
-    systems = nixpkgs.lib.systems.flakeExposed;
+    # ── 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
+        # pkgs.extraRPackages.musicMetadata
+      ])
+      ++ (
+        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 []
+      );
+
+    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);
 
     packages = forAllSystems (system: let
-      pkgs = import nixpkgs {inherit system overlays;};
+      pkgs = import nixpkgs {
+        inherit system overlays;
+        config = {allowUnfree = true;};
+      };
+      # 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";
+        };
+
+        runtimePkgs = with pkgs; [
+          cowsay
+        ];
+
+        specs.extraLua = let
+          name = builtins.baseNameOf (builtins.toString ./.);
+        in {
+          data = pkgs.vimPlugins.mini-notify;
+          before = ["INIT_MAIN"];
+          config = ''
+            require("mini.notify").setup()
+            vim.notify = MiniNotify.make_notify()
+            vim.notify("Welcome to ${name}!")
+          '';
+        };
+      };
       evalResult = nvimConfig.inputs.wrappers.lib.evalModules {
         modules = [
           nvimConfig.wrapperModules.default
@@ -103,15 +115,58 @@
         ];
       };
     in {
-      default = evalResult.config.wrap { inherit pkgs; };
+      default = evalResult.config.wrap {inherit pkgs;};
     });
 
     devShells = forAllSystems (system: let
-      pkgs = import nixpkgs {inherit system overlays;};
+      pkgs = import nixpkgs {
+        inherit system overlays;
+        config = {allowUnfree = true;};
+      };
       nv = self.packages.${system}.default;
     in {
       default = pkgs.mkShell {
-        packages = [nv];
+        packages =
+          [nv]
+
+          # ── 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
+          ]);
       };
     });
   };

From 5d8c198afaffc99a119cfc69256f6bdb99632959 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <dw@dwinkler.org>
Date: Sat, 23 May 2026 02:27:20 +1000
Subject: [PATCH 20/20] More robust shell setup with nu

---
 templates/ed/flake.nix | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix
index bc5f7d3..b674c62 100644
--- a/templates/ed/flake.nix
+++ b/templates/ed/flake.nix
@@ -126,9 +126,21 @@
       nv = self.packages.${system}.default;
     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]
-
+          [
+            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;
@@ -140,7 +152,6 @@
             pkgs.nvimcom
             pkgs.rnvimserver
           ])
-
           # ── Python toolchain (interpreter, LSP, formatter) ────
           ++ pkgs.lib.optionals cats.python [
             (pkgs.python3.withPackages (ps: pkgs.basePythonPackages ps ++ pythonPackages pkgs))
@@ -149,12 +160,11 @@
             pkgs.basedpyright
             pkgs.uv
           ]
-
           # ── Julia toolchain ───────────────────────────────────
           ++ pkgs.lib.optionals cats.julia [
-            pkgs.julia-bin.withPackages juliaPackages
+            pkgs.julia-bin.withPackages
+            juliaPackages
           ]
-
           # ── Markdown toolchain (quarto, zk) ───────────────────
           ++ (let
             r_packages = (pkgs.baseRPackages or []) ++ rPackages pkgs;
@@ -162,11 +172,12 @@
               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
-          ]);
+          in
+            pkgs.lib.optionals cats.markdown [
+              pkgs.python313Packages.pylatexenc
+              quarto
+              pkgs.zk
+            ]);
       };
     });
   };