dwinkl/nvimConfig
1
0
Fork 0
mirror of https://github.com/dwinkler1/nvimConfig.git synced 2026-02-19 22:40:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

trying new import strategy

Browse source
This commit is contained in:
Daniel Winkler 2026-02-16 16:37:35 +11:00
commit 705ff17e56
4 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

40
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768802006, "lastModified": 1771133455,
"narHash": "sha256-czGb4RwTBahNNK9S7ySXeTWIrn/jKH+74hN/uIS2XrM=", "narHash": "sha256-DvHfkW3DctWV+YnigY4+5Stn9NgI38JqR2IScXDX8z8=",
"owner": "dwinkler1", "owner": "dwinkler1",
"repo": "fran", "repo": "fran",
"rev": "a3879317519fd3685f3b7679a1de4c5ae65a7cb9", "rev": "68b189ab981adae06590ee1929a70c8b86afd2b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1769461804, "lastModified": 1771008912,
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
"plugins-r": { "plugins-r": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769736135, "lastModified": 1770663552,
"narHash": "sha256-T4QgcBL+LCXvrEiRE2JW4jtUKl8DKzFHk8czGUO1jgY=", "narHash": "sha256-vI5XW33cNJdHdVAtLSSbKb5ROdSbeOMb23lXTUbgva8=",
"owner": "R-nvim", "owner": "R-nvim",
"repo": "R.nvim", "repo": "R.nvim",
"rev": "2701ec64f5485e17c0e057081a9ae2058d776464", "rev": "659dc18aba2d2b799c04efbce66a15ea87bd6ec6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,14 +70,18 @@
}, },
"rixpkgs": { "rixpkgs": {
"locked": { "locked": {
"lastModified": 1768825970, "lastModified": 1770939586,
"narHash": "sha256-m/BI9IO7tMuOSdVNSqr0knQ4V9R6rgSXyGQOp3FovSA=", "narHash": "sha256-rp9f5NCjB4jRlY7Hl/I4OLN3i0wXpyBAyQKZYKZPRH0=",
"type": "tarball", "owner": "dwinkler1",
"url": "https://github.com/rstats-on-nix/nixpkgs/archive/2026-01-19.tar.gz" "repo": "rixpkgs",
"rev": "e99809ceb6b4d52b970b2fedfb19c92880cef97a",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "dwinkler1",
"url": "https://github.com/rstats-on-nix/nixpkgs/archive/2026-01-19.tar.gz" "ref": "nixpkgs",
"repo": "rixpkgs",
"type": "github"
} }
}, },
"root": { "root": {
@ -97,11 +101,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769745458, "lastModified": 1771192657,
"narHash": "sha256-Fq6THKEiAKx+wWQ4wTg9HvOAyD6i8JkWfHVQDZH7Byo=", "narHash": "sha256-Ibv5WEXiwr6gIEOajD4QE93TYpXUhEYv1VZV8sdU3IQ=",
"owner": "BirdeeHub", "owner": "BirdeeHub",
"repo": "nix-wrapper-modules", "repo": "nix-wrapper-modules",
"rev": "cc5e052dd1e93ae75dc06e3fabf46f0820c272f2", "rev": "8ba8703b62c2cc7e642f58ff03bd14a2f836e07a",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -10,7 +10,7 @@
url = "github:BirdeeHub/nix-wrapper-modules"; url = "github:BirdeeHub/nix-wrapper-modules";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
rixpkgs.url = "https://github.com/rstats-on-nix/nixpkgs/archive/2026-01-19.tar.gz"; rixpkgs.url = "github:dwinkler1/rixpkgs/nixpkgs";
fran = { fran = {
url = "github:dwinkler1/fran"; url = "github:dwinkler1/fran";
@ -50,7 +50,7 @@
nix = def true; nix = def true;
optional = def false; optional = def false;
python = def false; python = def false;
r = def false; r = true;
}; };
settings = { settings = {
@ -68,6 +68,7 @@
janitor janitor
styler styler
tidyverse tidyverse
pkgs.extraRPackages.synthdid
]; ];
julia = ["DataFramesMeta" "QuackIO"]; julia = ["DataFramesMeta" "QuackIO"];

2
overlays/default.nix
View file

@ -2,7 +2,7 @@
let let
lib = nixpkgs.lib; lib = nixpkgs.lib;
rOverlay = import ./r.nix inputs; rOverlay = import ./r.nix {inherit inputs;};
franOverlay = inputs.fran.overlays.default; franOverlay = inputs.fran.overlays.default;
pythonOverlay = import ./python.nix inputs; pythonOverlay = import ./python.nix inputs;
pluginsOverlay = import ./plugins.nix inputs; pluginsOverlay = import ./plugins.nix inputs;

14
overlays/r.nix
View file

@ -23,13 +23,19 @@
# #
# Update the R snapshot date in flake.nix inputs section: # Update the R snapshot date in flake.nix inputs section:
# rixpkgs.url = "github:rstats-on-nix/nixpkgs/YYYY-MM-DD" # rixpkgs.url = "github:rstats-on-nix/nixpkgs/YYYY-MM-DD"
{rixpkgs, ...}: final: prev: let {
inputs,
...
}: final: prev: let
# R packages from rstats-on-nix for the current system # R packages from rstats-on-nix for the current system
rpkgs = rixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system}; rpkgs = import inputs.rixpkgs {
system = prev.stdenv.hostPlatform.system;
overlays = [inputs.fran.overlays.default];
}; # rixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system};
# Standard R packages used by default in rWrapper and quarto # Standard R packages used by default in rWrapper and quarto
reqPkgs = with rpkgs.rPackages; [ reqPkgs = with rpkgs.rPackages; [
# languageserver # languageserver
]; ];
in { in {
inherit rpkgs; inherit rpkgs;
@ -42,5 +48,5 @@ in {
quarto = rpkgs.quarto.override {extraRPackages = reqPkgs;}; quarto = rpkgs.quarto.override {extraRPackages = reqPkgs;};
# Update helper for rix # Update helper for rix
updateR = import ../scripts/updater.nix { pkgs = final; }; updateR = import ../scripts/updater.nix {pkgs = final;};
} }