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-* diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock index 4b8da01..de5cd21 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": { @@ -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" } }, @@ -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": { diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index 07603fa..aec646b 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; }; }); }; @@ -142,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/nixpkgs"; fran = { url = "github:dwinkler1/fran";