From c28df1df7d98b61dcb985250f7f0e2c4d803fd04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 06:38:37 +0000 Subject: [PATCH 01/26] Bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [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/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check.yml | 2 +- .github/workflows/check_macos.yml | 2 +- .github/workflows/flakehub-publish-rolling.yml | 2 +- .github/workflows/update.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index afd4c48..63738dd 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ubuntu-latest] steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: wimpysworld/nothing-but-nix@main with: hatchet-protocol: 'carve' diff --git a/.github/workflows/check_macos.yml b/.github/workflows/check_macos.yml index be76aa2..26998f0 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@v5 + - uses: actions/checkout@v6 - 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 8403bbe..80ff807 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@v5" + - uses: "actions/checkout@v6" with: persist-credentials: false - uses: "DeterminateSystems/determinate-nix-action@v3" diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 44f16ec..a27933b 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@v5 + uses: actions/checkout@v6 - uses: wimpysworld/nothing-but-nix@main with: hatchet-protocol: 'carve' From dc44024b1aec1baa56dfbd55347e17648a2c8c83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Dec 2025 07:01:30 +0000 Subject: [PATCH 02/26] Bump DeterminateSystems/update-flake-lock from 27 to 28 Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 27 to 28. - [Release notes](https://github.com/determinatesystems/update-flake-lock/releases) - [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v27...v28) --- updated-dependencies: - dependency-name: DeterminateSystems/update-flake-lock dependency-version: '28' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .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 44f16ec..ced2e5f 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -24,7 +24,7 @@ jobs: extraPullNames: rstats-on-nix, nix-community - run: cd templates/rde/ && nix develop -c p-updateDeps - name: Update n flake.lock - uses: DeterminateSystems/update-flake-lock@v27 + uses: DeterminateSystems/update-flake-lock@v28 with: token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} branch: update_rde From 703690472a4535bf25dc6ca0061801753e1f278c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 13 Jan 2026 06:43:33 +0000 Subject: [PATCH 03/26] [create-pull-request] automated change --- templates/rde/flake.lock | 26 +++++++++++++------------- templates/rde/flake.nix | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index d462a94..492ca59 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1765425579, - "narHash": "sha256-XQLrlG8Uf1GOBy5EQlPP19foLfF3CY/ruQc9xonyGCQ=", + "lastModified": 1768279254, + "narHash": "sha256-aklrm/m1p3W8c8cxtRfFPYw10s3Gf1SGK50V8/6mS6M=", "owner": "dwinkler1", "repo": "nixCatsConfig", - "rev": "7fc90930a9cb08aeccd575122f6fc1524ed2c71b", + "rev": "25f6e29bc808fda2b9856d9b0b6d87ab2f5f050f", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixCats_2": { "locked": { - "lastModified": 1763330129, - "narHash": "sha256-KbOeWIF52SV53BOeETGO2C5ewaV2Ex9iaXH7G72gOr8=", + "lastModified": 1767604651, + "narHash": "sha256-itAnxzTpWpY1s3LA/oNngOuZDXT5U5JUZP5fApwx9gs=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "c81551ed87db2aefab30a12cf7425ff94dc0ad64", + "rev": "3c9bc4d7123e1b48d92f25ba505b889af541e897", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765838191, - "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", + "lastModified": 1768028080, + "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", + "rev": "d03088749a110d52a4739348f39a63f84bb0be14", "type": "github" }, "original": { @@ -141,16 +141,16 @@ }, "rixpkgs": { "locked": { - "lastModified": 1765802109, - "narHash": "sha256-Aru0TG1mEhIJiaXElFopn5lrAE+pyxfF0JelHOIY4FQ=", + "lastModified": 1768221128, + "narHash": "sha256-fdbeVtk/MpCo+K3sxjb6O0IoIlD2Auq8pWsmvvL2Rqo=", "owner": "rstats-on-nix", "repo": "nixpkgs", - "rev": "bdfc55ed37f7d1228a856be0f57876596b04477a", + "rev": "1fc8f31c4620e8291dfd10fdb0ed89c207f87860", "type": "github" }, "original": { "owner": "rstats-on-nix", - "ref": "2025-12-15", + "ref": "2026-01-12", "repo": "nixpkgs", "type": "github" } diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix index 2fc5749..1cb2649 100644 --- a/templates/rde/flake.nix +++ b/templates/rde/flake.nix @@ -213,7 +213,7 @@ }); }; inputs = { - rixpkgs.url = "github:rstats-on-nix/nixpkgs/2025-12-15"; + rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-12"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixCats = { url = "github:dwinkler1/nixCatsConfig"; From 39311f182276c9fd394463d79cc7a76aada3e32c Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Fri, 16 Jan 2026 19:13:55 +1100 Subject: [PATCH 04/26] Update --- 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 492ca59..6521118 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1768279254, - "narHash": "sha256-aklrm/m1p3W8c8cxtRfFPYw10s3Gf1SGK50V8/6mS6M=", + "lastModified": 1768314902, + "narHash": "sha256-faz7r9QbUxVyBNuu1rEHTilNBJc/wrzKQ5tibg1cSBI=", "owner": "dwinkler1", "repo": "nixCatsConfig", - "rev": "25f6e29bc808fda2b9856d9b0b6d87ab2f5f050f", + "rev": "bad4147e0374280c447c24900f0f738c75f89c80", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768028080, - "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=", + "lastModified": 1768323494, + "narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d03088749a110d52a4739348f39a63f84bb0be14", + "rev": "2c3e5ec5df46d3aeee2a1da0bfedd74e21f4bf3a", "type": "github" }, "original": { @@ -141,16 +141,16 @@ }, "rixpkgs": { "locked": { - "lastModified": 1768221128, - "narHash": "sha256-fdbeVtk/MpCo+K3sxjb6O0IoIlD2Auq8pWsmvvL2Rqo=", + "lastModified": 1768393955, + "narHash": "sha256-Jma2rZFxF6kvj4qS5kfxjTDGTm+yk3veLc3Hp5kF5hI=", "owner": "rstats-on-nix", "repo": "nixpkgs", - "rev": "1fc8f31c4620e8291dfd10fdb0ed89c207f87860", + "rev": "858b128a3271165855d7211e878e6e48be886dfa", "type": "github" }, "original": { "owner": "rstats-on-nix", - "ref": "2026-01-12", + "ref": "2026-01-14", "repo": "nixpkgs", "type": "github" } diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix index 31c180f..8491e45 100644 --- a/templates/rde/flake.nix +++ b/templates/rde/flake.nix @@ -219,7 +219,7 @@ }); }; inputs = { - rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-12"; + rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-14"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixCats = { url = "github:dwinkler1/nixCatsConfig"; From c3bc8f74a681b5c62e3cb2c9ef6cf65bd178b370 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Fri, 16 Jan 2026 19:47:23 +1100 Subject: [PATCH 05/26] Cleanup --- templates/rde/README.md | 5 - templates/rde/REFACTORING.md | 150 ------------------------------ templates/rde/SUMMARY.md | 172 ----------------------------------- templates/rde/flake.lock | 6 +- 4 files changed, 3 insertions(+), 330 deletions(-) delete mode 100644 templates/rde/REFACTORING.md delete mode 100644 templates/rde/SUMMARY.md diff --git a/templates/rde/README.md b/templates/rde/README.md index c28ac3c..d3a4cbf 100644 --- a/templates/rde/README.md +++ b/templates/rde/README.md @@ -367,11 +367,6 @@ The CI runs on: This ensures that users can confidently use the template knowing that all advertised functionality has been verified. -## Related Documentation - -- [REFACTORING.md](REFACTORING.md) - Technical details about the modular structure -- [SUMMARY.md](SUMMARY.md) - Metrics and comparison with original template - ## Usage Use this template with: diff --git a/templates/rde/REFACTORING.md b/templates/rde/REFACTORING.md deleted file mode 100644 index 7098105..0000000 --- a/templates/rde/REFACTORING.md +++ /dev/null @@ -1,150 +0,0 @@ -# Template Refactoring Summary - -## Overview -This document summarizes the refactoring improvements made to the RDE (Research Development Environment) template flake. - -## Changes Made - -### 1. File Structure Reorganization -**Before**: Single 688-line `flake.nix` file -**After**: Modular structure with 17 files across 5 directories - -``` -templates/rde/ -├── flake.nix (261 lines) - Main configuration -├── README.md - User documentation -├── REFACTORING.md - This file -├── overlays/ (5 files) -│ ├── r.nix - R package configuration -│ ├── python.nix - Python package configuration -│ ├── rix.nix - rstats-on-nix integration -│ ├── theme.nix - Neovim theme setup -│ └── project-scripts.nix - Script wrapper definitions -├── hosts/ (5 files) -│ ├── default.nix - Merges all host configs -│ ├── python.nix - Python command definitions -│ ├── julia.nix - Julia command definitions -│ ├── r.nix - R command definitions -│ └── utils.nix - Utility command definitions -├── lib/ (2 files) -│ ├── shell-hook.nix - Dev shell welcome message -│ └── mini-notify-config.lua - Neovim notification config -└── scripts/ (4 files) - ├── initPython.sh - Python project initialization - ├── initProject.sh - Project structure setup - ├── updateDeps.sh - Dependency update script - └── activateDevenv.sh - Devenv activation -``` - -### 2. Key Improvements - -#### Separation of Concerns -- **Config**: Main configuration stays in flake.nix -- **Overlays**: Package modifications isolated in overlays/ -- **Hosts**: Command definitions organized by language in hosts/ -- **Scripts**: Shell scripts extracted to scripts/ directory -- **Helpers**: Utility functions in lib/ - -#### Readability -- Reduced main file from 688 to 261 lines (62% reduction) -- Added strategic comments explaining key sections -- Extracted long inline strings to separate files -- Grouped related functionality together - -#### Maintainability -- Language-specific changes isolated to dedicated files -- Easy to add new languages (create new host/overlay files) -- Easy to modify scripts without touching Nix code -- Clear separation between different concerns - -#### Reusability -- Individual overlays can be reused in other projects -- Host definitions can be copied/modified independently -- Scripts can be tested/modified separately -- Modular design allows selective adoption - -### 3. Specific Extractions - -#### Shell Scripts (200+ lines → 4 files) -- `initPython.sh`: Python project initialization logic -- `initProject.sh`: Directory structure and git setup -- `updateDeps.sh`: Dependency update automation -- `activateDevenv.sh`: Devenv shell activation - -#### Overlays (100+ lines → 5 files) -- `r.nix`: R package management with rix integration -- `python.nix`: Python package configuration -- `rix.nix`: rstats-on-nix package source -- `theme.nix`: Neovim colorscheme handling -- `project-scripts.nix`: Script wrapper generation - -#### Host Definitions (200+ lines → 5 files) -- `python.nix`: marimo, ipy, py, initPython commands -- `julia.nix`: jl, pluto, initJl commands -- `r.nix`: R console command -- `utils.nix`: initProject, updateDeps, devenv commands -- `default.nix`: Merges all host configurations - -#### Helper Functions (40+ lines → 2 files) -- `shell-hook.nix`: Dev shell welcome message generation -- `mini-notify-config.lua`: Neovim notification filtering - -### 4. Added Documentation - -#### README.md -- Overview of template purpose -- Directory structure explanation -- Benefits of modular design -- Configuration instructions -- Extension guidelines -- Usage examples - -#### Inline Comments -- Section headers in flake.nix -- Explanation of key configuration blocks -- Purpose of each import -- Documentation of categories and settings - -### 5. Benefits Achieved - -1. **Maintainability**: - - Changes to one language don't affect others - - Easy to locate and modify specific functionality - - Clear ownership of different components - -2. **Readability**: - - Main file is now scannable and understandable - - Related code grouped together - - Inline documentation guides users - -3. **Testability**: - - Scripts can be tested independently - - Overlays can be verified in isolation - - Smaller files are easier to debug - -4. **Extensibility**: - - Clear patterns for adding new languages - - Easy to add new commands - - Simple to customize per language - -5. **Learning**: - - New users can understand the template structure - - Examples in each file guide modifications - - Documentation explains purpose and usage - -## Migration Guide - -For users of the old template: -1. The functionality remains identical -2. Configuration in the main config section is the same -3. All commands work exactly as before -4. To customize, now edit the specific file in the appropriate directory - -## Future Improvements - -Possible future enhancements: -- Add validation scripts for configuration -- Create unit tests for individual modules -- Add more language examples (Go, Rust, etc.) -- Create a configuration wizard script -- Add CI/CD integration examples diff --git a/templates/rde/SUMMARY.md b/templates/rde/SUMMARY.md deleted file mode 100644 index 9b9947d..0000000 --- a/templates/rde/SUMMARY.md +++ /dev/null @@ -1,172 +0,0 @@ -# Template Refactoring - Complete Summary - -## 🎯 Objective Achieved -Successfully refactored the RDE template from a single 688-line file into a modular, maintainable structure. - -## 📊 Key Metrics - -| Aspect | Before | After | Improvement | -|--------|--------|-------|-------------| -| **Main file (flake.nix)** | 688 lines | 261 lines | **62% reduction** | -| **File structure** | 1 monolithic file | 17 modular files | **Better organized** | -| **Documentation** | 0 lines | 218 lines | **Fully documented** | -| **Directories** | 0 | 5 organized dirs | **Clear structure** | - -## 📁 New Structure - -``` -templates/rde/ -├── 📄 flake.nix (261 lines) # Main config - clean & commented -├── 📖 README.md # User guide -├── 📖 REFACTORING.md # Technical details -│ -├── 📂 overlays/ # Package configurations -│ ├── r.nix # R packages -│ ├── python.nix # Python packages -│ ├── rix.nix # R nixpkgs source -│ ├── theme.nix # Neovim themes -│ └── project-scripts.nix # Script wrappers -│ -├── 📂 hosts/ # Command definitions -│ ├── default.nix # Merger -│ ├── python.nix # Python commands -│ ├── julia.nix # Julia commands -│ ├── r.nix # R commands -│ └── utils.nix # Utility commands -│ -├── 📂 lib/ # Helper functions -│ ├── shell-hook.nix # Welcome message -│ └── mini-notify-config.lua # Neovim config -│ -└── 📂 scripts/ # Shell scripts - ├── initPython.sh # Python init - ├── initProject.sh # Project setup - ├── updateDeps.sh # Update deps - └── activateDevenv.sh # Devenv activation -``` - -## ✨ Key Improvements - -### 1. **Separation of Concerns** -- Configuration stays in main flake.nix -- Language-specific code in dedicated files -- Scripts separated from Nix code -- Helpers isolated in lib/ - -### 2. **Enhanced Readability** -- Main file reduced from 688 → 261 lines -- Strategic comments explain sections -- Clear naming conventions -- Logical grouping of related code - -### 3. **Better Maintainability** -- Modify one language without affecting others -- Easy to locate specific functionality -- Clear patterns for adding features -- Reduced risk of breaking changes - -### 4. **Improved Extensibility** -- Add new languages: create host + overlay files -- Add new commands: edit relevant host file -- Modify scripts: edit .sh files directly -- Customize behavior: clear config section - -### 5. **Comprehensive Documentation** -- README.md: User-facing guide -- REFACTORING.md: Technical details -- Inline comments: Explain key sections -- Examples: Show how to extend - -## 🔄 Backwards Compatibility - -✅ **Zero Breaking Changes** -- All existing functionality preserved -- Same configuration interface -- All commands work identically -- Migration is seamless - -## 🎓 Learning Benefits - -### For Users -- Easier to understand template structure -- Clear examples for customization -- Self-documenting code organization -- Guided by inline comments - -### For Developers -- Easy to modify individual components -- Clear separation aids debugging -- Modular structure enables testing -- Well-documented refactoring process - -## 📈 Before & After Comparison - -### Before Refactoring -```nix -{ - description = "New Project"; - outputs = { ... }: let - config = { ... }; - # 200+ lines of inline bash scripts - initPython = '' - #!/usr/bin/env bash - # ... lots of bash code ... - ''; - # 100+ lines of overlay definitions - rOverlay = final: prev: let - # ... complex overlay code ... - # 300+ lines of host definitions - hosts = { - marimo = let marimoInit = '' - # ... more inline bash ... - # ... continues for 688 lines total -``` - -### After Refactoring -```nix -{ - description = "New Project"; - outputs = { ... }: let - # Clear config section - config = { ... }; - - # Import from organized modules - rOverlay = import ./overlays/r.nix; - pythonOverlay = import ./overlays/python.nix; - # ... clean imports ... - - # Main configuration - projectConfig = forSystems (system: - # ... focused on structure, not details -``` - -## 🚀 Next Steps - -The template is now: -1. ✅ Well-organized and modular -2. ✅ Fully documented -3. ✅ Easy to maintain -4. ✅ Simple to extend -5. ✅ Ready for production use - -## 💡 Usage - -No changes required for existing users! The template works exactly as before, but now with: -- Better code organization -- Comprehensive documentation -- Easier customization options -- Clearer structure for learning - -## 📝 Files Modified - -- `flake.nix` - Simplified and reorganized -- Created `overlays/` - Package configurations -- Created `hosts/` - Command definitions -- Created `lib/` - Helper functions -- Created `scripts/` - Shell scripts -- Added `README.md` - User documentation -- Added `REFACTORING.md` - Technical guide - -## 🎉 Success! - -The refactoring is complete. The template is now significantly more maintainable, readable, and extensible while preserving all original functionality. diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index 6521118..5ab196a 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1768314902, - "narHash": "sha256-faz7r9QbUxVyBNuu1rEHTilNBJc/wrzKQ5tibg1cSBI=", + "lastModified": 1768552827, + "narHash": "sha256-hOcpR1vSawDkIVgAJY96Y7jBy+mXdWCqQ5Ig0fDSUEQ=", "owner": "dwinkler1", "repo": "nixCatsConfig", - "rev": "bad4147e0374280c447c24900f0f738c75f89c80", + "rev": "53dfaba70d16a179f8a6dbd40d7b06cd495bbc15", "type": "github" }, "original": { From c703bf420afb091d545c860a0f33687276d7e7cc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 18 Jan 2026 06:39:48 +0000 Subject: [PATCH 06/26] [create-pull-request] automated change --- templates/rde/flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index 5ab196a..4cf8555 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -76,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768323494, - "narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=", + "lastModified": 1768621446, + "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c3e5ec5df46d3aeee2a1da0bfedd74e21f4bf3a", + "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", "type": "github" }, "original": { From bb7dfcbb56f7346e626d95c1eeb54cb4fdd6d87e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jan 2026 07:17:03 +0000 Subject: [PATCH 07/26] Bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [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/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index fdcc5e8..a231159 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -118,7 +118,7 @@ jobs: test-with-python: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: wimpysworld/nothing-but-nix@main with: hatchet-protocol: 'carve' @@ -174,7 +174,7 @@ jobs: test-with-julia: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: wimpysworld/nothing-but-nix@main with: hatchet-protocol: 'carve' From 0f7687bc394ab3feae54274cd1ad5beaebef4c7f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 24 Jan 2026 06:40:55 +0000 Subject: [PATCH 08/26] [create-pull-request] automated change --- templates/rde/flake.lock | 35 ++++++++++++++++------------------- templates/rde/flake.nix | 2 +- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index 4cf8555..29cbef8 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -4,17 +4,14 @@ "inputs": { "nixpkgs": [ "rixpkgs" - ], - "nvimcom": [ - "plugins-r" ] }, "locked": { - "lastModified": 1761271358, - "narHash": "sha256-Yf1u/FvSKCD0sr0xmTE/Cwgy7H/YW2L/1R7tbxtLfDw=", + "lastModified": 1768802006, + "narHash": "sha256-czGb4RwTBahNNK9S7ySXeTWIrn/jKH+74hN/uIS2XrM=", "owner": "dwinkler1", "repo": "fran", - "rev": "3bcaf6aa8b74bb1f754e14d975d64bd970fdbe56", + "rev": "a3879317519fd3685f3b7679a1de4c5ae65a7cb9", "type": "github" }, "original": { @@ -46,11 +43,11 @@ ] }, "locked": { - "lastModified": 1768552827, - "narHash": "sha256-hOcpR1vSawDkIVgAJY96Y7jBy+mXdWCqQ5Ig0fDSUEQ=", + "lastModified": 1769144694, + "narHash": "sha256-E0MBuganiHqgWueIqoAcpYiTgcRD2OVtOZz490y89Hs=", "owner": "dwinkler1", "repo": "nixCatsConfig", - "rev": "53dfaba70d16a179f8a6dbd40d7b06cd495bbc15", + "rev": "c1d094fba43aaac897746705a92574b40a0686b2", "type": "github" }, "original": { @@ -61,11 +58,11 @@ }, "nixCats_2": { "locked": { - "lastModified": 1767604651, - "narHash": "sha256-itAnxzTpWpY1s3LA/oNngOuZDXT5U5JUZP5fApwx9gs=", + "lastModified": 1768932549, + "narHash": "sha256-ElZV6Tm35NmRLqWaQDNgsJlkxeHPmSEko5WXXBeMA2E=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "3c9bc4d7123e1b48d92f25ba505b889af541e897", + "rev": "22cd80f04d07e8388f3d52dcf37479bfd718961b", "type": "github" }, "original": { @@ -76,11 +73,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768621446, - "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=", + "lastModified": 1769089682, + "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72ac591e737060deab2b86d6952babd1f896d7c5", + "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", "type": "github" }, "original": { @@ -141,16 +138,16 @@ }, "rixpkgs": { "locked": { - "lastModified": 1768393955, - "narHash": "sha256-Jma2rZFxF6kvj4qS5kfxjTDGTm+yk3veLc3Hp5kF5hI=", + "lastModified": 1768825970, + "narHash": "sha256-m/BI9IO7tMuOSdVNSqr0knQ4V9R6rgSXyGQOp3FovSA=", "owner": "rstats-on-nix", "repo": "nixpkgs", - "rev": "858b128a3271165855d7211e878e6e48be886dfa", + "rev": "927be4d4e6f643164305d6d30cf09d2f1e7d16ac", "type": "github" }, "original": { "owner": "rstats-on-nix", - "ref": "2026-01-14", + "ref": "2026-01-19", "repo": "nixpkgs", "type": "github" } diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix index 8491e45..261f64c 100644 --- a/templates/rde/flake.nix +++ b/templates/rde/flake.nix @@ -219,7 +219,7 @@ }); }; inputs = { - rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-14"; + rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-19"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixCats = { url = "github:dwinkler1/nixCatsConfig"; From d22cc8f3313a9d8df98202c2cc4b73a1519c4dd7 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 27 Jan 2026 11:25:26 +1100 Subject: [PATCH 09/26] Remove nvimcom input from fran in flake.nix Removed nvimcom input from fran configuration. --- templates/rde/flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix index 261f64c..7250abf 100644 --- a/templates/rde/flake.nix +++ b/templates/rde/flake.nix @@ -237,7 +237,6 @@ url = "github:dwinkler1/fran"; inputs = { nixpkgs.follows = "rixpkgs"; - nvimcom.follows = "plugins-r"; }; }; ## Git Plugins From 8d6ea0b0d55c9d4193b054d5673f64d1db03f34f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 27 Jan 2026 00:26:17 +0000 Subject: [PATCH 10/26] [create-pull-request] automated change --- templates/rde/flake.lock | 26 +++++++++++++------------- templates/rde/flake.nix | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index 29cbef8..22627f4 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1769144694, - "narHash": "sha256-E0MBuganiHqgWueIqoAcpYiTgcRD2OVtOZz490y89Hs=", + "lastModified": 1769470689, + "narHash": "sha256-hh4E/kPxbkfqyUfKTM1NWd2Eb95DbhEY0eEBr+MOoso=", "owner": "dwinkler1", "repo": "nixCatsConfig", - "rev": "c1d094fba43aaac897746705a92574b40a0686b2", + "rev": "dbc277d7696062cb731da2faad7095607e2f97ce", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixCats_2": { "locked": { - "lastModified": 1768932549, - "narHash": "sha256-ElZV6Tm35NmRLqWaQDNgsJlkxeHPmSEko5WXXBeMA2E=", + "lastModified": 1769085828, + "narHash": "sha256-TjhFIAtS628+/r3IuYWPcNa++mUMMDDG8PbSfFHXBiA=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "22cd80f04d07e8388f3d52dcf37479bfd718961b", + "rev": "43fbf4d12b0a613f1a792503da4bb2bf270173c7", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769089682, - "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", + "lastModified": 1769318308, + "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", + "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c", "type": "github" }, "original": { @@ -138,16 +138,16 @@ }, "rixpkgs": { "locked": { - "lastModified": 1768825970, - "narHash": "sha256-m/BI9IO7tMuOSdVNSqr0knQ4V9R6rgSXyGQOp3FovSA=", + "lastModified": 1769430759, + "narHash": "sha256-Z63gLlvj2WnJoi/3/3oOLBipuYII+sfTT1C+8BTt+5c=", "owner": "rstats-on-nix", "repo": "nixpkgs", - "rev": "927be4d4e6f643164305d6d30cf09d2f1e7d16ac", + "rev": "4cf98f12168c1974a040ea34756f8dec5cfc793e", "type": "github" }, "original": { "owner": "rstats-on-nix", - "ref": "2026-01-19", + "ref": "2026-01-26", "repo": "nixpkgs", "type": "github" } diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix index 261f64c..f06420f 100644 --- a/templates/rde/flake.nix +++ b/templates/rde/flake.nix @@ -219,7 +219,7 @@ }); }; inputs = { - rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-19"; + rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixCats = { url = "github:dwinkler1/nixCatsConfig"; From 94b25e5b5c0700b6467d2b2a62b1373bcf9fc121 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Sat, 31 Jan 2026 00:46:27 +1100 Subject: [PATCH 11/26] corrected override inputs --- templates/ed/.envrc | 1 + templates/ed/flake.lock | 146 ++++++++++++++++++++++++++++++++++++++++ templates/ed/flake.nix | 118 ++++++++++++++++++++++++++++++++ 3 files changed, 265 insertions(+) create mode 100644 templates/ed/.envrc create mode 100644 templates/ed/flake.lock create mode 100644 templates/ed/flake.nix diff --git a/templates/ed/.envrc b/templates/ed/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/templates/ed/.envrc @@ -0,0 +1 @@ +use flake diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock new file mode 100644 index 0000000..e203677 --- /dev/null +++ b/templates/ed/flake.lock @@ -0,0 +1,146 @@ +{ + "nodes": { + "fran": { + "inputs": { + "nixpkgs": [ + "nvimConfig", + "rixpkgs" + ] + }, + "locked": { + "lastModified": 1768802006, + "narHash": "sha256-czGb4RwTBahNNK9S7ySXeTWIrn/jKH+74hN/uIS2XrM=", + "owner": "dwinkler1", + "repo": "fran", + "rev": "a3879317519fd3685f3b7679a1de4c5ae65a7cb9", + "type": "github" + }, + "original": { + "owner": "dwinkler1", + "repo": "fran", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1769598131, + "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nvimConfig": { + "inputs": { + "fran": "fran", + "nixpkgs": [ + "nixpkgs" + ], + "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references", + "plugins-r": "plugins-r", + "rixpkgs": [ + "rixpkgs" + ], + "wrappers": "wrappers" + }, + "locked": { + "lastModified": 1769773342, + "narHash": "sha256-eHU4lhLWfCTTG3Wyn1M35PHxUcY+pILoTPwvyJ3X1jI=", + "owner": "dwinkler1", + "repo": "nvimConfig", + "rev": "8d183d78effd3d33398819f8eb2f6d673d46d4c1", + "type": "github" + }, + "original": { + "owner": "dwinkler1", + "repo": "nvimConfig", + "type": "github" + } + }, + "plugins-cmp-pandoc-references": { + "flake": false, + "locked": { + "lastModified": 1743491695, + "narHash": "sha256-XsdneGNJzmRBggk8lz9JNDQYk7wbYfUAF2oZLXzFb9c=", + "owner": "jmbuhr", + "repo": "cmp-pandoc-references", + "rev": "130eae4f75029d6495808e0ea4b769fa1ce4c9ac", + "type": "github" + }, + "original": { + "owner": "jmbuhr", + "repo": "cmp-pandoc-references", + "type": "github" + } + }, + "plugins-r": { + "flake": false, + "locked": { + "lastModified": 1769736135, + "narHash": "sha256-T4QgcBL+LCXvrEiRE2JW4jtUKl8DKzFHk8czGUO1jgY=", + "owner": "R-nvim", + "repo": "R.nvim", + "rev": "2701ec64f5485e17c0e057081a9ae2058d776464", + "type": "github" + }, + "original": { + "owner": "R-nvim", + "repo": "R.nvim", + "type": "github" + } + }, + "rixpkgs": { + "locked": { + "lastModified": 1769430759, + "narHash": "sha256-Z63gLlvj2WnJoi/3/3oOLBipuYII+sfTT1C+8BTt+5c=", + "owner": "rstats-on-nix", + "repo": "nixpkgs", + "rev": "4cf98f12168c1974a040ea34756f8dec5cfc793e", + "type": "github" + }, + "original": { + "owner": "rstats-on-nix", + "ref": "2026-01-26", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "nvimConfig": "nvimConfig", + "rixpkgs": "rixpkgs" + } + }, + "wrappers": { + "inputs": { + "nixpkgs": [ + "nvimConfig", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769745458, + "narHash": "sha256-Fq6THKEiAKx+wWQ4wTg9HvOAyD6i8JkWfHVQDZH7Byo=", + "owner": "BirdeeHub", + "repo": "nix-wrapper-modules", + "rev": "cc5e052dd1e93ae75dc06e3fabf46f0820c272f2", + "type": "github" + }, + "original": { + "owner": "BirdeeHub", + "repo": "nix-wrapper-modules", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix new file mode 100644 index 0000000..cf4768f --- /dev/null +++ b/templates/ed/flake.nix @@ -0,0 +1,118 @@ +{ + description = "Project Editor"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26"; + nvimConfig = { + url = "github:dwinkler1/nvimConfig"; + inputs = { + rixpkgs.follows = "rixpkgs"; + nixpkgs.follows = "nixpkgs"; + }; + }; + }; + + outputs = { + self, + nixpkgs, + nvimConfig, + ... + } @ inputs: let + systems = nixpkgs.lib.systems.flakeExposed; + forAllSystems = nixpkgs.lib.genAttrs systems; + projectSettings = {pkgs}: { + cats = { + clickhouse = false; + gitPlugins = false; + julia = false; + lua = false; + markdown = false; + nix = true; + optional = false; + python = false; + r = false; + }; + + 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"; + + 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}!") + ''; + }; + }; + + overlays = [inputs.nvimConfig.overlays.dependencies]; + in { + 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; + in { + default = nvim; + }); + + devShells = forAllSystems (system: let + pkgs = import nixpkgs {inherit system overlays;}; + nv = self.packages.${system}.default; + in { + default = pkgs.mkShell { + packages = [nv pkgs.updateR]; + }; + }); + }; +} From 338a5a38dc7dc11638f23ffda70190b77acf200f Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Sat, 31 Jan 2026 00:46:49 +1100 Subject: [PATCH 12/26] moved to new default template --- flake.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e2cb7cc..7b723a7 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,11 @@ path = ./templates/rde; description = "Research Development Environment"; }; + ed = { + path = ./templates/ed; + description = "Simple nvim Environment"; + }; }; - defaultTemplate = self.templates.rde; + defaultTemplate = self.templates.ed; }; } From 47260db047523c1fc8f68266fe7b68f2bd4be74d Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 31 Jan 2026 00:51:51 +1100 Subject: [PATCH 13/26] Change flake directory path from 'rde' to 'ed' --- .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 f6a015e..45eba2d 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -28,7 +28,7 @@ jobs: with: token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} branch: update_rde - path-to-flake-dir: "templates/rde" + 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 dependencies From 5acc6c196e3cdbe5c56d8ee2b4f8cc03f969e51f Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 31 Jan 2026 00:57:46 +1100 Subject: [PATCH 14/26] Add step to update dependencies in ed template --- .github/workflows/update.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 45eba2d..891e992 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -23,6 +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 uses: DeterminateSystems/update-flake-lock@v28 with: From 785cdaaa91ea7e58e6d4d974898916223b0ace63 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Sat, 31 Jan 2026 02:38:45 +1100 Subject: [PATCH 15/26] added env vars --- templates/ed/.gitignore | 2 ++ templates/ed/flake.lock | 6 +++--- templates/ed/flake.nix | 7 ++++++- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 templates/ed/.gitignore diff --git a/templates/ed/.gitignore b/templates/ed/.gitignore new file mode 100644 index 0000000..3e71520 --- /dev/null +++ b/templates/ed/.gitignore @@ -0,0 +1,2 @@ +.nvimcom +*.R diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock index e203677..1b39ed0 100644 --- a/templates/ed/flake.lock +++ b/templates/ed/flake.lock @@ -51,11 +51,11 @@ "wrappers": "wrappers" }, "locked": { - "lastModified": 1769773342, - "narHash": "sha256-eHU4lhLWfCTTG3Wyn1M35PHxUcY+pILoTPwvyJ3X1jI=", + "lastModified": 1769787248, + "narHash": "sha256-skscpI6AkHV93iecNah21HSVr59AEGimA51kmQ7UOtg=", "owner": "dwinkler1", "repo": "nvimConfig", - "rev": "8d183d78effd3d33398819f8eb2f6d673d46d4c1", + "rev": "f0d0d3c4ec0c0345508ac3217ec9bf999335fef4", "type": "github" }, "original": { diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index cf4768f..a4c2a0f 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -31,7 +31,7 @@ nix = true; optional = false; python = false; - r = false; + r = true; }; settings = let @@ -81,6 +81,11 @@ }; binName = "vv"; + env = { + IS_PROJECT_EDITOR = "1"; + R_LIBS_USER = "./.nvimcom"; + }; + specs.extraLua = let name = builtins.baseNameOf (builtins.toString ./.); in { From a337a9cf1e294ba3497f3ca8b8cc11e6c9356897 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Sat, 31 Jan 2026 02:39:43 +1100 Subject: [PATCH 16/26] do track R files --- templates/ed/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/ed/.gitignore b/templates/ed/.gitignore index 3e71520..52e8a70 100644 --- a/templates/ed/.gitignore +++ b/templates/ed/.gitignore @@ -1,2 +1 @@ .nvimcom -*.R From 0d7caccf065c9b4fc7fd202fbbb24659334dce90 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Sat, 31 Jan 2026 02:56:31 +1100 Subject: [PATCH 17/26] allow extra runtime deps --- templates/ed/flake.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index a4c2a0f..aa6af64 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -31,7 +31,7 @@ nix = true; optional = false; python = false; - r = true; + r = false; }; settings = let @@ -86,6 +86,10 @@ R_LIBS_USER = "./.nvimcom"; }; + extraPackages = with pkgs; [ + cowsay + ]; + specs.extraLua = let name = builtins.baseNameOf (builtins.toString ./.); in { From 5646308c2194597c33d044427095438452906d93 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Sat, 31 Jan 2026 03:09:40 +1100 Subject: [PATCH 18/26] reorganization --- templates/ed/flake.lock | 6 ++++-- templates/ed/flake.nix | 35 +++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock index 1b39ed0..f3664ab 100644 --- a/templates/ed/flake.lock +++ b/templates/ed/flake.lock @@ -3,7 +3,6 @@ "fran": { "inputs": { "nixpkgs": [ - "nvimConfig", "rixpkgs" ] }, @@ -39,7 +38,9 @@ }, "nvimConfig": { "inputs": { - "fran": "fran", + "fran": [ + "fran" + ], "nixpkgs": [ "nixpkgs" ], @@ -114,6 +115,7 @@ }, "root": { "inputs": { + "fran": "fran", "nixpkgs": "nixpkgs", "nvimConfig": "nvimConfig", "rixpkgs": "rixpkgs" diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index aa6af64..a35780a 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -1,26 +1,12 @@ { description = "Project Editor"; - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; - rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26"; - nvimConfig = { - url = "github:dwinkler1/nvimConfig"; - inputs = { - rixpkgs.follows = "rixpkgs"; - nixpkgs.follows = "nixpkgs"; - }; - }; - }; - outputs = { self, nixpkgs, nvimConfig, ... } @ inputs: let - systems = nixpkgs.lib.systems.flakeExposed; - forAllSystems = nixpkgs.lib.genAttrs systems; projectSettings = {pkgs}: { cats = { clickhouse = false; @@ -103,6 +89,8 @@ }; }; + systems = nixpkgs.lib.systems.flakeExposed; + forAllSystems = nixpkgs.lib.genAttrs systems; overlays = [inputs.nvimConfig.overlays.dependencies]; in { packages = forAllSystems (system: let @@ -124,4 +112,23 @@ }; }); }; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26"; + fran = { + url = "github:dwinkler1/fran"; + inputs = { + nixpkgs.follows = "rixpkgs"; + }; + }; + nvimConfig = { + url = "github:dwinkler1/nvimConfig"; + inputs = { + rixpkgs.follows = "rixpkgs"; + nixpkgs.follows = "nixpkgs"; + fran.follows = "fran"; + }; + }; + }; } From 286373374293b9e91379e0aa2f3667b11e5d57a8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 11 Feb 2026 07:11:49 +0000 Subject: [PATCH 19/26] 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/a3879317519fd3685f3b7679a1de4c5ae65a7cb9?narHash=sha256-czGb4RwTBahNNK9S7ySXeTWIrn/jKH%2B74hN/uIS2XrM%3D' (2026-01-19) → 'github:dwinkler1/fran/c5c7f360c7954b422918b2136087f5d3a8f4937f?narHash=sha256-3LWIQnTBSV3eMliFhk1K5cEAJokJVnnoChY0lcDzqNM%3D' (2026-02-10) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/fa83fd837f3098e3e678e6cf017b2b36102c7211?narHash=sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o%3D' (2026-01-28) → 'github:NixOS/nixpkgs/2db38e08fdadcc0ce3232f7279bab59a15b94482?narHash=sha256-1jZvgZoAagZZB6NwGRv2T2ezPy%2BX6EFDsJm%2BYSlsvEs%3D' (2026-02-09) • Updated input 'nvimConfig': 'github:dwinkler1/nvimConfig/f0d0d3c4ec0c0345508ac3217ec9bf999335fef4?narHash=sha256-skscpI6AkHV93iecNah21HSVr59AEGimA51kmQ7UOtg%3D' (2026-01-30) → 'github:dwinkler1/nvimConfig/8f5c05252e914cb3738039a7ec13eb7d5955227a?narHash=sha256-gem34C89cocBGuWLj7cdrAS5WkrOBp6V%2BycQM/RhcCw%3D' (2026-02-04) • Updated input 'rixpkgs': 'github:rstats-on-nix/nixpkgs/4cf98f12168c1974a040ea34756f8dec5cfc793e?narHash=sha256-Z63gLlvj2WnJoi/3/3oOLBipuYII%2BsfTT1C%2B8BTt%2B5c%3D' (2026-01-26) → 'github:rstats-on-nix/nixpkgs/0d3fe7afce51d2126fdccf0b717d8048b90e4781?narHash=sha256-Pi8f3LPTFmG7SZeAJEAamOWly1SZhEofT92uBqS4atY%3D' (2026-02-02) --- templates/ed/flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock index f3664ab..5d5b0f0 100644 --- a/templates/ed/flake.lock +++ b/templates/ed/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1768802006, - "narHash": "sha256-czGb4RwTBahNNK9S7ySXeTWIrn/jKH+74hN/uIS2XrM=", + "lastModified": 1770753736, + "narHash": "sha256-3LWIQnTBSV3eMliFhk1K5cEAJokJVnnoChY0lcDzqNM=", "owner": "dwinkler1", "repo": "fran", - "rev": "a3879317519fd3685f3b7679a1de4c5ae65a7cb9", + "rev": "c5c7f360c7954b422918b2136087f5d3a8f4937f", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1770617025, + "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "wrappers": "wrappers" }, "locked": { - "lastModified": 1769787248, - "narHash": "sha256-skscpI6AkHV93iecNah21HSVr59AEGimA51kmQ7UOtg=", + "lastModified": 1770172480, + "narHash": "sha256-gem34C89cocBGuWLj7cdrAS5WkrOBp6V+ycQM/RhcCw=", "owner": "dwinkler1", "repo": "nvimConfig", - "rev": "f0d0d3c4ec0c0345508ac3217ec9bf999335fef4", + "rev": "8f5c05252e914cb3738039a7ec13eb7d5955227a", "type": "github" }, "original": { @@ -99,16 +99,16 @@ }, "rixpkgs": { "locked": { - "lastModified": 1769430759, - "narHash": "sha256-Z63gLlvj2WnJoi/3/3oOLBipuYII+sfTT1C+8BTt+5c=", + "lastModified": 1770035835, + "narHash": "sha256-Pi8f3LPTFmG7SZeAJEAamOWly1SZhEofT92uBqS4atY=", "owner": "rstats-on-nix", "repo": "nixpkgs", - "rev": "4cf98f12168c1974a040ea34756f8dec5cfc793e", + "rev": "0d3fe7afce51d2126fdccf0b717d8048b90e4781", "type": "github" }, "original": { "owner": "rstats-on-nix", - "ref": "2026-01-26", + "ref": "2026-02-02", "repo": "nixpkgs", "type": "github" } From 1376f8ddc58739d396c5dc2ac25534dde464ff72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 11 Feb 2026 07:11:50 +0000 Subject: [PATCH 20/26] [create-pull-request] automated change --- templates/ed/flake.nix | 2 +- templates/rde/flake.lock | 26 +++++++++++++------------- templates/rde/flake.nix | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index a35780a..b2921b0 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -115,7 +115,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; - rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26"; + rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-02-02"; fran = { url = "github:dwinkler1/fran"; inputs = { diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index 22627f4..447c576 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1768802006, - "narHash": "sha256-czGb4RwTBahNNK9S7ySXeTWIrn/jKH+74hN/uIS2XrM=", + "lastModified": 1770753736, + "narHash": "sha256-3LWIQnTBSV3eMliFhk1K5cEAJokJVnnoChY0lcDzqNM=", "owner": "dwinkler1", "repo": "fran", - "rev": "a3879317519fd3685f3b7679a1de4c5ae65a7cb9", + "rev": "c5c7f360c7954b422918b2136087f5d3a8f4937f", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1769470689, - "narHash": "sha256-hh4E/kPxbkfqyUfKTM1NWd2Eb95DbhEY0eEBr+MOoso=", + "lastModified": 1770172580, + "narHash": "sha256-l/fKPLdKxq7PLRbExDxsS4Esel4yos/NFJOFcDpsm2E=", "owner": "dwinkler1", "repo": "nixCatsConfig", - "rev": "dbc277d7696062cb731da2faad7095607e2f97ce", + "rev": "98079a0844e53afd0c593c8f4d1ee5381baf36f0", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769318308, - "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=", + "lastModified": 1770617025, + "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c", + "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", "type": "github" }, "original": { @@ -138,16 +138,16 @@ }, "rixpkgs": { "locked": { - "lastModified": 1769430759, - "narHash": "sha256-Z63gLlvj2WnJoi/3/3oOLBipuYII+sfTT1C+8BTt+5c=", + "lastModified": 1770035835, + "narHash": "sha256-Pi8f3LPTFmG7SZeAJEAamOWly1SZhEofT92uBqS4atY=", "owner": "rstats-on-nix", "repo": "nixpkgs", - "rev": "4cf98f12168c1974a040ea34756f8dec5cfc793e", + "rev": "0d3fe7afce51d2126fdccf0b717d8048b90e4781", "type": "github" }, "original": { "owner": "rstats-on-nix", - "ref": "2026-01-26", + "ref": "2026-02-02", "repo": "nixpkgs", "type": "github" } diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix index 2e2dfde..a6aa9a3 100644 --- a/templates/rde/flake.nix +++ b/templates/rde/flake.nix @@ -219,7 +219,7 @@ }); }; inputs = { - rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-01-26"; + rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-02-02"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixCats = { url = "github:dwinkler1/nixCatsConfig"; From b36261407661076bd75e024b50963ae3486c2e45 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 12 Feb 2026 07:10:12 +0000 Subject: [PATCH 21/26] 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/2db38e08fdadcc0ce3232f7279bab59a15b94482?narHash=sha256-1jZvgZoAagZZB6NwGRv2T2ezPy%2BX6EFDsJm%2BYSlsvEs%3D' (2026-02-09) → 'github:NixOS/nixpkgs/6c5e707c6b5339359a9a9e215c5e66d6d802fd7a?narHash=sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs%3D' (2026-02-11) --- 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 5d5b0f0..950e57c 100644 --- a/templates/ed/flake.lock +++ b/templates/ed/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770617025, - "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { From a1e803a0239e3b2ce4e6d4458d71ef1500ba4b30 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 12 Feb 2026 07:10:13 +0000 Subject: [PATCH 22/26] [create-pull-request] automated change --- templates/rde/flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index 447c576..0c23e2e 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -73,11 +73,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770617025, - "narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { From 4662b867bd137acbea964cc81c7ab8fd82e916ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Feb 2026 06:59:44 +0000 Subject: [PATCH 23/26] 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/c5c7f360c7954b422918b2136087f5d3a8f4937f?narHash=sha256-3LWIQnTBSV3eMliFhk1K5cEAJokJVnnoChY0lcDzqNM%3D' (2026-02-10) → 'github:dwinkler1/fran/68b189ab981adae06590ee1929a70c8b86afd2b8?narHash=sha256-DvHfkW3DctWV%2BYnigY4%2B5Stn9NgI38JqR2IScXDX8z8%3D' (2026-02-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6c5e707c6b5339359a9a9e215c5e66d6d802fd7a?narHash=sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs%3D' (2026-02-11) → 'github:NixOS/nixpkgs/3aadb7ca9eac2891d52a9dec199d9580a6e2bf44?narHash=sha256-O1XDr7EWbRp%2BkHrNNgLWgIrB0/US5wvw9K6RERWAj6I%3D' (2026-02-14) --- 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 950e57c..5839626 100644 --- a/templates/ed/flake.lock +++ b/templates/ed/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1770753736, - "narHash": "sha256-3LWIQnTBSV3eMliFhk1K5cEAJokJVnnoChY0lcDzqNM=", + "lastModified": 1771133455, + "narHash": "sha256-DvHfkW3DctWV+YnigY4+5Stn9NgI38JqR2IScXDX8z8=", "owner": "dwinkler1", "repo": "fran", - "rev": "c5c7f360c7954b422918b2136087f5d3a8f4937f", + "rev": "68b189ab981adae06590ee1929a70c8b86afd2b8", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770770419, - "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", + "lastModified": 1771043024, + "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", + "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44", "type": "github" }, "original": { From 1fca4c0330eb986962b820db8c7324beb9f1ec85 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 15 Feb 2026 06:59:45 +0000 Subject: [PATCH 24/26] [create-pull-request] automated change --- templates/rde/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index 0c23e2e..7617db3 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1770753736, - "narHash": "sha256-3LWIQnTBSV3eMliFhk1K5cEAJokJVnnoChY0lcDzqNM=", + "lastModified": 1771133455, + "narHash": "sha256-DvHfkW3DctWV+YnigY4+5Stn9NgI38JqR2IScXDX8z8=", "owner": "dwinkler1", "repo": "fran", - "rev": "c5c7f360c7954b422918b2136087f5d3a8f4937f", + "rev": "68b189ab981adae06590ee1929a70c8b86afd2b8", "type": "github" }, "original": { @@ -73,11 +73,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770770419, - "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", + "lastModified": 1771043024, + "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", + "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44", "type": "github" }, "original": { From 274972e8a42b27101530133d263e42c4fbcb675d Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 16 Feb 2026 10:59:10 +1100 Subject: [PATCH 25/26] Update flake.nix --- templates/ed/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index b2921b0..46b9141 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -115,7 +115,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; - rixpkgs.url = "github:rstats-on-nix/nixpkgs/2026-02-02"; + rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs"; fran = { url = "github:dwinkler1/fran"; inputs = { From be5572e84d0905e92d67631821bffec1abc36507 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 16 Feb 2026 11:01:54 +1100 Subject: [PATCH 26/26] Add build step for ed template in CI workflow --- .github/workflows/check_macos.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check_macos.yml b/.github/workflows/check_macos.yml index 26998f0..06578c7 100644 --- a/.github/workflows/check_macos.yml +++ b/.github/workflows/check_macos.yml @@ -24,3 +24,4 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: rstats-on-nix, nix-community - run: nix build ./templates/rde + - run: nix build ./templates/ed