This commit is contained in:
Daniel Winkler 2026-05-21 20:38:02 +10:00
commit 5c851aecba

View file

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