From 50bf84b974e2c5e4f3cdb28420ce01687c61fb22 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Tue, 25 Aug 2026 11:34:07 +1000 Subject: [PATCH 1/5] ed: drop packages redundant with upstream langPackageDefaults settings.lang_packages now appends to built-in defaults upstream (nvimConfig 9a6e201), so arrow/data_table/nvimcom need not be re-listed; only project-specific fixest stays. --- templates/ed/flake.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index 07603fa..88072d2 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -58,10 +58,7 @@ r = (with pkgs.rpkgs.rPackages; [ - arrow - data_table fixest - pkgs.nvimcom ]) ++ extraRPackages; @@ -125,16 +122,10 @@ packages = [ nv - pkgs.nushell ] ++ nvimConfig.lib.devShellPackages evalResult.config; shellHook = - nvimConfig.lib.shellHook evalResult.config - + '' - if [ -z "''${NO_NUSHELL:-}" ]; then - exec nu - fi - ''; + nvimConfig.lib.shellHook evalResult.config; }; }); }; From da44014e77259f7f19d03ccbc296b4319cda3374 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Tue, 25 Aug 2026 12:58:54 +1000 Subject: [PATCH 2/5] cleanup --- templates/ed/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/ed/.gitignore b/templates/ed/.gitignore index ffc0e1a..c94968a 100644 --- a/templates/ed/.gitignore +++ b/templates/ed/.gitignore @@ -1,2 +1,3 @@ .nvimcom .commandcode/ +.r-* From 2d828960c9a5d202fef8ad81c06e68997537156b Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Tue, 25 Aug 2026 13:19:59 +1000 Subject: [PATCH 3/5] Update --- templates/ed/flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock index 4b8da01..846ccf3 100644 --- a/templates/ed/flake.lock +++ b/templates/ed/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785692966, - "narHash": "sha256-vUfIeBEfpbAfZ5zjgIkYk7eHBeVfCYVjLbWnMkseYnk=", + "lastModified": 1787498568, + "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=", "owner": "nixos", "repo": "nixpkgs", - "rev": "643809054d65fdd466a63e3155b8c498cb483c04", + "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "wrappers": "wrappers" }, "locked": { - "lastModified": 1785383218, - "narHash": "sha256-cR/2VK2RGr9UJsRYAa1LViorru1oBeW3yVTQLkMHt4Y=", + "lastModified": 1787627261, + "narHash": "sha256-069Vyu8pNLUUuKOHPlZvs2cAuRUOL9J62vS5ZEsDgWg=", "owner": "dwinkler1", "repo": "nvimConfig", - "rev": "b8f72cb15045e2615bbac25d3cbcc3cabdb1b520", + "rev": "99aca2b6e7b46a119954eb145a0987cc764e85fd", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1782135443, - "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=", + "lastModified": 1787579952, + "narHash": "sha256-Dn6IPaLyltx8hBTyC4hgNWDb7T7WHRYUG6wWh6KBHXA=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f", + "rev": "b56e973dd2bd62244b44d6542fb52182bc3a3cda", "type": "github" }, "original": { From 078f84d42b9319d20dcee29304e3fff101b4c414 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Tue, 25 Aug 2026 13:20:34 +1000 Subject: [PATCH 4/5] Update --- templates/ed/flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index 88072d2..b10be89 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -133,7 +133,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e"; + #rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e"; + rixpkgs.url = "github:dwinkler1/rixpkgs"; fran = { url = "github:dwinkler1/fran"; From 53599ddedc024e1d773c54f49255012147d7875f Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Tue, 25 Aug 2026 13:21:03 +1000 Subject: [PATCH 5/5] Update --- templates/ed/flake.lock | 8 ++++---- templates/ed/flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock index 846ccf3..de5cd21 100644 --- a/templates/ed/flake.lock +++ b/templates/ed/flake.lock @@ -106,17 +106,17 @@ }, "rixpkgs": { "locked": { - "lastModified": 1771303851, - "narHash": "sha256-tgveHozOJ2D/mi3LxVy/FcmLFDlM5XKZxsNB2XpvzaM=", + "lastModified": 1787585894, + "narHash": "sha256-tp/kigWpoz0DUyDmbqVHLjZova3n98vn7R7HTRtjeWg=", "owner": "dwinkler1", "repo": "rixpkgs", - "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e", + "rev": "5a76f5802a7728c62feff1399c7302b53276ed8f", "type": "github" }, "original": { "owner": "dwinkler1", + "ref": "nixpkgs", "repo": "rixpkgs", - "rev": "af2dd3f7b4b172077747c0869d4e30702fb71b0e", "type": "github" } }, diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index b10be89..aec646b 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -134,7 +134,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; #rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e"; - rixpkgs.url = "github:dwinkler1/rixpkgs"; + rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs"; fran = { url = "github:dwinkler1/fran";