From 74600519a5f4a73a96b44156b2f4c5b273d2268b Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Thu, 21 May 2026 18:45:36 +1000 Subject: [PATCH] Simplified codebase --- .commandcode/taste/taste.md | 1 + flake.lock | 6 +- flake.nix | 105 ++++++++-------------- modules/module/settings/cats.nix | 6 +- modules/module/settings/core.nix | 6 +- modules/module/settings/env.nix | 6 +- modules/module/settings/hosts.nix | 2 +- modules/module/settings/lang-packages.nix | 2 +- modules/module/settings/runtime-path.nix | 4 +- modules/module/specs/cats-enable.nix | 51 ----------- modules/module/specs/deps.nix | 66 +++----------- modules/module/specs/plugins.nix | 20 ++--- modules/neovim.nix | 16 ---- overlays/default.nix | 24 ++--- overlays/r.nix | 48 +--------- 15 files changed, 83 insertions(+), 280 deletions(-) delete mode 100644 modules/module/specs/cats-enable.nix diff --git a/.commandcode/taste/taste.md b/.commandcode/taste/taste.md index 4b588b2..54e4488 100644 --- a/.commandcode/taste/taste.md +++ b/.commandcode/taste/taste.md @@ -1,6 +1,7 @@ # nix - For R.nvim in the Nix wrapper, both RNVIM_COMPLDIR (C server compilation) and a writable R_LIBS_USER directory (nvimcom R package installation) must be configured — fixing only one leaves permission errors in the other. Confidence: 0.65 - For R.nvim writable directories (RNVIM_COMPLDIR, R_LIBS_USER, TMPDIR), prefer project-local paths (e.g., $PWD/.Rlibs) over global cache paths — the cache approach may let the build succeed but still fail at runtime. Confidence: 0.70 +- Do not use lib.mkDefault on values consumed by lib.optionals or other boolean-checking functions — mkDefault wraps values in a priority set that fails "expected a Boolean" at evaluation time. Use plain booleans for inline conditionals, reserving mkDefault for module options resolved by the merge system. Confidence: 0.70 # Taste (Continuously Learned by [CommandCode][cmd]) diff --git a/flake.lock b/flake.lock index 9fbb80f..698ccf9 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1779145538, - "narHash": "sha256-j2RQqBLYhPuddU6C8n5hGKboXq1tDLCZ7bWe5/LgTHM=", + "lastModified": 1779297405, + "narHash": "sha256-VFoBwH7ZjVxCnvZTb5ODRXt70sLtWMxstive0N+RS50=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "597b35c93dd0ab0ae38758e3193582b2fd259aa1", + "rev": "e7ed7a1205945befdf2e0d73ba7df91d935e5af1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fa1140a..f84715f 100644 --- a/flake.nix +++ b/flake.nix @@ -1,11 +1,10 @@ -# Copyright (c) 2026 BirdeeHub +# Copyright (c) 2026 Daniel # Licensed under the MIT license { description = "Daniel's NixCats"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - #nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; wrappers = { url = "github:BirdeeHub/nix-wrapper-modules"; inputs.nixpkgs.follows = "nixpkgs"; @@ -40,13 +39,15 @@ wrappers, ... } @ inputs: let - mkWrapperConfig = pkgs: { - cats = { + mkWrapperConfig = pkgs: let + def = pkgs.lib.mkDefault; + in { + cats = pkgs.lib.mapAttrs (_: v: def v) { clickhouse = false; gitPlugins = true; julia = false; lua = true; - markdown = false; + markdown = true; nix = true; optional = false; python = false; @@ -54,46 +55,30 @@ }; settings = { lang_packages = { - python = with pkgs.python3Packages; [ + python = def (with pkgs.python3Packages; [ duckdb polars - ]; - r = with pkgs.rpkgs.rPackages; [ + ]); + r = def ((with pkgs.rpkgs.rPackages; [ arrow broom data_table janitor languageserver styler - pkgs.nvimcom - ]; - julia = ["DataFramesMeta" "QuackIO"]; + ]) ++ [ pkgs.nvimcom ]); + julia = def ["DataFramesMeta" "QuackIO"]; }; - colorscheme = "cyberdream"; - background = "dark"; - wrapRc = true; }; - binName = "vv"; + binName = def "vv"; }; wrapperSettings = pkgs: let cfg = mkWrapperConfig pkgs; - def = pkgs.lib.mkDefault; in wrapper.config.wrap { inherit pkgs; - cats = pkgs.lib.mapAttrs (_: v: def v) cfg.cats; - settings = { - lang_packages = { - python = def cfg.settings.lang_packages.python; - r = def cfg.settings.lang_packages.r; - julia = def cfg.settings.lang_packages.julia; - }; - colorscheme = def cfg.settings.colorscheme; - background = def cfg.settings.background; - wrapRc = def cfg.settings.wrapRc; - }; - binName = def cfg.binName; + inherit (cfg) cats settings binName; }; systems = [ @@ -104,54 +89,39 @@ forAllSystems = nixpkgs.lib.genAttrs systems; - extra_pkg_config = { - allowUnfree = true; - }; - overlayDefs = import ./overlays inputs; - dependencyOverlays = overlayDefs.dependencyOverlays; - - dependencyOverlay = overlayDefs.dependencyOverlay; - mkPkgs = system: import nixpkgs { inherit system; - config = extra_pkg_config; - overlays = [dependencyOverlay]; + config = { allowUnfree = true; }; + overlays = [ overlayDefs.dependencyOverlay ]; }; - module = nixpkgs.lib.modules.importApply ./modules/neovim.nix inputs; + module = (import ./modules/neovim.nix) inputs; wrapper = wrappers.lib.evalModule module; in { overlays = { + # overlay `vv` wraps the module with default settings only. + # For the fully-configured binary (including mkWrapperConfig overrides), + # use `packages..default` instead. default = nixpkgs.lib.composeManyExtensions [ - dependencyOverlay + overlayDefs.dependencyOverlay (final: prev: { vv = wrapper.config.wrap {pkgs = final;}; }) ]; - dependencies = dependencyOverlay; - vv = self.overlays.default; + dependencies = overlayDefs.dependencyOverlay; }; - wrapperModules = { - default = module; - neovim = self.wrapperModules.default; - }; - - wrappers = { - default = wrapper.config; - neovim = self.wrappers.default; - }; + wrapperModules.default = module; + wrapperConfigs.default = wrapper.config; packages = forAllSystems ( system: let pkgs = mkPkgs system; - nvimPkg = wrapperSettings pkgs; in { - default = nvimPkg; - vv = nvimPkg; + default = wrapperSettings pkgs; } ); @@ -208,16 +178,15 @@ shellPackages = [nvimPkg] - ++ pkgs.lib.optionals cfg.cats.python pythonPackages - ++ pkgs.lib.optionals cfg.cats.r rPackages - ++ pkgs.lib.optionals cfg.cats.julia juliaPackages - ++ pkgs.lib.optionals cfg.cats.markdown markdownPackages; + ++ pkgs.lib.optionals wrapper.config.cats.python pythonPackages + ++ pkgs.lib.optionals wrapper.config.cats.r rPackages + ++ pkgs.lib.optionals wrapper.config.cats.julia juliaPackages + ++ pkgs.lib.optionals wrapper.config.cats.markdown markdownPackages; in { default = pkgs.mkShell { name = "vShell"; packages = shellPackages; - nativeBuildInputs = with pkgs; [] ++ (pkgs.lib.optionals cfg.cats.optional [devenv]); - inputsFrom = []; + nativeBuildInputs = pkgs.lib.optionals wrapper.config.cats.optional [ pkgs.devenv ]; shellHook = '' echo 'I am a NixShell' export R_HOME=$(R RHOME) @@ -234,18 +203,11 @@ pkgs = mkPkgs system; nvimPkg = wrapperSettings pkgs; in { - default = nvimPkg; - module-eval = let - _ = wrapper.config; - in - pkgs.runCommand "check-module-eval" {} '' - echo "Module evaluation successful" > $out - ''; - package-build = pkgs.runCommand "check-vv" {} '' + default = pkgs.runCommand "check-vv" {} '' BINARY_PATH="${nvimPkg}/bin/vv" if [ ! -x "$BINARY_PATH" ]; then - echo "Error: Binary n not found or not executable" + echo "Error: Binary not found or not executable" exit 1 fi @@ -258,6 +220,11 @@ cat version_output.txt >> $out fi ''; + module-eval = + let _ = wrapper.config; + in pkgs.runCommand "check-module-eval" {} '' + echo "Module evaluation successful" > $out + ''; } ); diff --git a/modules/module/settings/cats.nix b/modules/module/settings/cats.nix index 3da043e..13758d4 100644 --- a/modules/module/settings/cats.nix +++ b/modules/module/settings/cats.nix @@ -14,7 +14,6 @@ Available categories: - clickhouse: Clickhouse client and tools - - customPlugins: local plugin specs - external: external tools and integrations - general: core Neovim plugins/features - gitPlugins: git-related plugins @@ -25,7 +24,6 @@ - optional: optional tools and utilities - python: Python tooling and plugins - r: R tooling and plugins - - test: test-only tooling (disabled by default) - treesitterParsers: Treesitter parsers - utils: general utilities ''; @@ -33,18 +31,16 @@ config.cats = { clickhouse = lib.mkDefault false; - customPlugins = lib.mkDefault true; external = lib.mkDefault true; general = lib.mkDefault true; gitPlugins = lib.mkDefault true; julia = lib.mkDefault false; lua = lib.mkDefault true; - markdown = lib.mkDefault false; + markdown = lib.mkDefault true; nix = lib.mkDefault true; optional = lib.mkDefault false; python = lib.mkDefault false; r = lib.mkDefault true; - test = lib.mkDefault false; treesitterParsers = lib.mkDefault true; utils = lib.mkDefault true; }; diff --git a/modules/module/settings/core.nix b/modules/module/settings/core.nix index 42e9e11..ec9bb5c 100644 --- a/modules/module/settings/core.nix +++ b/modules/module/settings/core.nix @@ -16,7 +16,7 @@ # Lua packages available to neovim (for :lua require()) config.settings.nvim_lua_env = lp: - lib.optionals (config.cats.general or false) [ lp.tiktoken_core ]; + lib.optionals (config.cats.general or true) [ lp.tiktoken_core ]; # Binary name for the wrapper config.binName = lib.mkDefault "vv"; @@ -25,10 +25,10 @@ config.settings.block_normal_config = true; # Don't symlink the config (we wrap it instead) - config.settings.dont_link = false; + config.settings.dont_link = lib.mkDefault false; # Create additional aliases for the binary - config.settings.aliases = [ "vvim" ]; + config.settings.aliases = lib.mkDefault [ "vvim" ]; # Enable wrapper handling of spec runtimeDeps (template pattern). config.settings.autowrapRuntimeDeps = true; diff --git a/modules/module/settings/env.nix b/modules/module/settings/env.nix index 14e0a32..2fcab8a 100644 --- a/modules/module/settings/env.nix +++ b/modules/module/settings/env.nix @@ -7,11 +7,11 @@ # Environment variables set for the wrapper. # These are available when running neovim. config.env = lib.mkMerge [ - (lib.mkIf (config.cats.python or false) { + (lib.mkIf (config.cats.python or true) { UV_PYTHON_DOWNLOADS = "never"; UV_PYTHON = pkgs.python.interpreter; }) - (lib.mkIf (config.cats.r or false) { + (lib.mkIf (config.cats.r or true) { RNVIM_COMPLDIR = "$PWD/.r-compl"; R_LIBS_USER = "${pkgs.nvimcom}/library:$PWD/.Rlibs"; TMPDIR = "$PWD/.r-tmp"; @@ -20,7 +20,7 @@ # Environment variables with defaults (can be overridden by user) config.envDefault = lib.mkMerge [ - (lib.mkIf (config.cats.r or false) { + (lib.mkIf (config.cats.r or true) { R_LIBS_USER = "${pkgs.nvimcom}/library:$PWD/.Rlibs"; }) ]; diff --git a/modules/module/settings/hosts.nix b/modules/module/settings/hosts.nix index 0743979..f248a00 100644 --- a/modules/module/settings/hosts.nix +++ b/modules/module/settings/hosts.nix @@ -15,7 +15,7 @@ nvim-host.enable = true; nvim-host.package = "${pkgs.neovide}/bin/neovide"; nvim-host.argv0 = "neovide"; - nvim-host.flags."--neovim-bin" = "${placeholder "out"}/bin/${config.binName}"; + nvim-host.flags."--neovim-bin" = "${builtins.placeholder "out"}/bin/${config.binName}"; }; m = { diff --git a/modules/module/settings/lang-packages.nix b/modules/module/settings/lang-packages.nix index 3315363..531b811 100644 --- a/modules/module/settings/lang-packages.nix +++ b/modules/module/settings/lang-packages.nix @@ -26,7 +26,7 @@ }; default = { }; description = '' - Language-specific package overrides appended to each language spec's extraPackages. + Language-specific package overrides appended to each language spec's runtimePackages. Intended for flake.nix overrides via wrapper.config.wrap. ''; }; diff --git a/modules/module/settings/runtime-path.nix b/modules/module/settings/runtime-path.nix index 96c5d0f..b321019 100644 --- a/modules/module/settings/runtime-path.nix +++ b/modules/module/settings/runtime-path.nix @@ -10,14 +10,13 @@ let let is_enabled = if spec ? enable then spec.enable else true; has_runtime_deps = (spec.runtimeDeps or false) == runtime_deps_type; - packages = spec.extraPackages or [ ]; + packages = spec.runtimePackages or [ ]; in acc ++ lib.optionals (is_enabled && has_runtime_deps) packages ) [ ]; prefix_packages = collect_runtime_packages "prefix"; - suffix_packages = collect_runtime_packages "suffix"; to_path_specs = packages: [ { @@ -31,5 +30,4 @@ let in { config.prefixVar = lib.optionals (prefix_packages != [ ]) (to_path_specs prefix_packages); - config.suffixVar = lib.optionals (suffix_packages != [ ]) (to_path_specs suffix_packages); } diff --git a/modules/module/specs/cats-enable.nix b/modules/module/specs/cats-enable.nix deleted file mode 100644 index f5a9826..0000000 --- a/modules/module/specs/cats-enable.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, lib, ... }: -{ - # This module implements category-based enabling of specs. - # It runs early (order 200) so other specMaps can see the enable flags. - # - # How it works: - # 1. For each spec, extract its name (removing -lazy suffix if present) - # 2. Check if there's a corresponding cats. toggle - # 3. Set spec.value.enable based on the cats toggle (default: true) - # 4. This allows specs to be conditionally included based on config.cats settings - # - # Example: If config.cats.python = false, then specs.python.enable = false - - config.specMaps = lib.mkOrder 200 [ - { - name = "CATS_ENABLE"; - data = - list: - map ( - v: - if v.type == "spec" || v.type == "parent" then - let - # Extract spec name, handling lazy specs (remove -lazy suffix) - specName = - if v.name == null then - null - else if lib.hasSuffix "-lazy" v.name then - lib.removeSuffix "-lazy" v.name - else - v.name; - - # Check if this spec has a corresponding cat toggle - catEnabled = - if specName != null && builtins.hasAttr specName config.cats then - config.cats.${specName} - else - true; # Default to enabled if no cat toggle exists - in - v - // { - value = v.value // { - # Use explicit enable if set, otherwise use cat toggle - enable = if v.value ? enable then v.value.enable else catEnabled; - }; - } - else - v - ) list; - } - ]; -} diff --git a/modules/module/specs/deps.nix b/modules/module/specs/deps.nix index a8bfaf6..c3a40ea 100644 --- a/modules/module/specs/deps.nix +++ b/modules/module/specs/deps.nix @@ -5,24 +5,14 @@ wlib, ... }: { - # ============================================================================ - # SPEC MODULE DEFAULTS - # ============================================================================ - # Define default options available to all specs - config.specMods = {parentSpec ? null, ...}: { - options.extraPackages = lib.mkOption { + options.runtimePkgs = lib.mkOption { type = lib.types.listOf wlib.types.stringable; default = []; - description = "a extraPackages spec field to put packages to suffix to the PATH"; + description = "a runtimePkgs spec field to put packages to suffix to the PATH"; }; }; - # ============================================================================ - # EXTERNAL TOOLS SPEC - # ============================================================================ - # Core system tools and utilities - config.specs.external = { data = lib.mkDefault null; before = ["INIT_MAIN"]; @@ -30,7 +20,7 @@ vim.o.shell = "${pkgs.zsh}/bin/zsh" ''; runtimeDeps = "prefix"; - extraPackages = with pkgs; [ + runtimePkgs = with pkgs; [ perl ruby shfmt @@ -39,15 +29,11 @@ ]; }; - # ============================================================================ - # OPTIONAL TOOLS SPEC - # ============================================================================ - config.specs.optional = lib.mkIf (config.cats.optional or true) { data = lib.mkDefault null; runtimeDeps = "prefix"; before = ["INIT_MAIN"]; - extraPackages = with pkgs; [ + runtimePkgs = with pkgs; [ bat broot devenv @@ -76,54 +62,38 @@ ]; }; - # ============================================================================ - # MARKDOWN SPEC - # ============================================================================ - config.specs.markdown = lib.mkIf (config.cats.markdown or true) { data = lib.mkDefault null; runtimeDeps = "prefix"; - extraPackages = with pkgs; [ + runtimePkgs = with pkgs; [ python313Packages.pylatexenc quarto zk ]; }; - # ============================================================================ - # NIX SPEC - # ============================================================================ - config.specs.nix = lib.mkIf (config.cats.nix or true) { data = lib.mkDefault null; runtimeDeps = "prefix"; - extraPackages = with pkgs; [ + runtimePkgs = with pkgs; [ alejandra nix-doc nixd ]; }; - # ============================================================================ - # LUA SPEC - # ============================================================================ - config.specs.lua = lib.mkIf (config.cats.lua or true) { data = lib.mkDefault null; runtimeDeps = "prefix"; - extraPackages = with pkgs; [ + runtimePkgs = with pkgs; [ lua-language-server ]; }; - # ============================================================================ - # PYTHON SPEC - # ============================================================================ - config.specs.python = lib.mkIf (config.cats.python or true) { data = lib.mkDefault null; runtimeDeps = "prefix"; - extraPackages = let + runtimePkgs = let python_packages_fn = if pkgs ? basePythonPackages then ps: pkgs.basePythonPackages ps ++ config.settings.lang_packages.python @@ -139,14 +109,10 @@ ]; }; - # ============================================================================ - # R SPEC - # ============================================================================ - config.specs.r = lib.mkIf (config.cats.r or true) { data = lib.mkDefault null; runtimeDeps = "prefix"; - extraPackages = let + runtimePkgs = let r_packages = (pkgs.baseRPackages or []) ++ config.settings.lang_packages.r; in with pkgs; [ @@ -159,30 +125,22 @@ ]; }; - # ============================================================================ - # JULIA SPEC - # ============================================================================ - config.specs.julia = lib.mkIf (config.cats.julia or true) { data = lib.mkDefault null; runtimeDeps = "prefix"; - extraPackages = let + runtimePkgs = let julia_with_packages = pkgs.julia-bin.withPackages config.settings.lang_packages.julia; in [julia_with_packages]; }; - # ============================================================================ - # CLICKHOUSE SPEC - # ============================================================================ - config.specs.clickhouse = lib.mkIf (config.cats.clickhouse or true) { data = lib.mkDefault null; runtimeDeps = "prefix"; - extraPackages = with pkgs; [ + runtimePkgs = with pkgs; [ clickhouse-lts ]; }; - config.extraPackages = config.specCollect (acc: v: acc ++ (v.extraPackages or [])) []; + config.runtimePkgs = config.specCollect (acc: v: acc ++ (v.runtimePkgs or [])) []; } diff --git a/modules/module/specs/plugins.nix b/modules/module/specs/plugins.nix index 431005d..ff00a72 100644 --- a/modules/module/specs/plugins.nix +++ b/modules/module/specs/plugins.nix @@ -4,11 +4,11 @@ lib, ... }: { - config.specs.gitPlugins = { + config.specs.gitPlugins = lib.mkIf (config.cats.gitPlugins or true) { data = []; }; - config.specs.r = { + config.specs.r = lib.mkIf (config.cats.r or true) { data = with pkgs.vimPlugins; [ pkgs.r-nvim quarto-nvim @@ -19,14 +19,14 @@ ]; }; - config.specs.markdown-lazy = { + config.specs.markdown-lazy = lib.mkIf (config.cats.markdown or true) { lazy = true; data = [ config.nvim-lib.neovimPlugins.cmp-pandoc-references ]; }; - config.specs.general = { + config.specs.general = lib.mkIf (config.cats.general or true) { data = with pkgs.vimPlugins; [ lze lzextras @@ -79,7 +79,7 @@ ]; }; - config.specs.lua = { + config.specs.lua = lib.mkIf (config.cats.lua or true) { data = with pkgs.vimPlugins; [ luvit-meta { @@ -89,7 +89,7 @@ ]; }; - config.specs.markdown = { + config.specs.markdown = lib.mkIf (config.cats.markdown or true) { data = with pkgs.vimPlugins; [ quarto-nvim render-markdown-nvim @@ -104,7 +104,7 @@ ]; }; - config.specs.utils = { + config.specs.utils = lib.mkIf (config.cats.utils or true) { data = with pkgs.vimPlugins; [ blink-cmp nvim-lspconfig @@ -119,7 +119,7 @@ ]; }; - config.specs.treesitterParsers = { + config.specs.treesitterParsers = lib.mkIf (config.cats.treesitterParsers or true) { data = with pkgs.vimPlugins.nvim-treesitter-parsers; [ bash c @@ -158,7 +158,7 @@ ]; }; - config.specs.utils-lazy = { + config.specs.utils-lazy = lib.mkIf (config.cats.utils or true) { lazy = true; data = with pkgs.vimPlugins; [ blink-compat @@ -175,7 +175,7 @@ ]; }; - config.specs.gitPlugins-lazy = { + config.specs.gitPlugins-lazy = lib.mkIf (config.cats.gitPlugins or true) { lazy = true; data = []; }; diff --git a/modules/neovim.nix b/modules/neovim.nix index ba0361c..64d2cda 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -7,16 +7,10 @@ inputs: ... }: { - # ============================================================================ - # IMPORTS - # ============================================================================ - # Import the base neovim wrapper module and all configuration modules - imports = [ wlib.wrapperModules.neovim ./module/specs/deps.nix ./module/specs/plugins.nix - ./module/specs/cats-enable.nix ./module/settings/core.nix ./module/settings/cats.nix ./module/settings/env.nix @@ -25,11 +19,6 @@ inputs: ./module/settings/runtime-path.nix ]; - # ============================================================================ - # HELPER FUNCTIONS - # ============================================================================ - # Utilities for working with plugin inputs - options.nvim-lib.neovimPlugins = lib.mkOption { readOnly = true; type = lib.types.attrsOf wlib.types.stringable; @@ -58,11 +47,6 @@ inputs: ]; }; - # ============================================================================ - # CONFIGURATION - # ============================================================================ - # Pass cats configuration to neovim and expose metadata - config.settings.cats = config.cats; config.info.cats = config.cats; config.info.nixCats_config_location = config.settings.config_directory; diff --git a/overlays/default.nix b/overlays/default.nix index ebb6518..5a4cc6c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,9 +4,8 @@ let rOverlay = import ./r.nix {inherit inputs;}; rNvimNixOverlay = inputs.r-nvim-nix.overlays.default; - franOverlay = inputs.fran.overlays.default; - pythonOverlay = import ./python.nix inputs; - pluginsOverlay = import ./plugins.nix inputs; + pythonOverlay = import ./python.nix {inherit inputs;}; + pluginsOverlay = import ./plugins.nix {inherit inputs;}; dependencyOverlays = [ rOverlay @@ -15,6 +14,11 @@ let pluginsOverlay ]; dependencyOverlay = lib.composeManyExtensions dependencyOverlays; + + # franOverlay provides R-specific tooling (radianWrapper, air-formatter). + # It is scoped to rixpkgs (via overlays/r.nix) rather than the global + # package set, since it only applies to R package derivations. + franOverlay = inputs.fran.overlays.default; in { inherit @@ -26,20 +30,6 @@ in dependencyOverlays dependencyOverlay; - # Named exports for downstream composition. default = dependencyOverlay; dependencies = dependencyOverlays; - - overlays = { - inherit - rOverlay - rNvimNixOverlay - franOverlay - pythonOverlay - pluginsOverlay - dependencyOverlays - dependencyOverlay; - default = dependencyOverlay; - dependencies = dependencyOverlays; - }; } diff --git a/overlays/r.nix b/overlays/r.nix index a9961fb..14c02eb 100644 --- a/overlays/r.nix +++ b/overlays/r.nix @@ -1,55 +1,15 @@ -# R packages overlay (rix) -# -# This overlay provides access to R packages from rstats-on-nix. -# -# rstats-on-nix maintains snapshots of CRAN packages built with Nix: -# - Provides reproducible R package versions -# - Ensures binary cache availability for faster builds -# - Maintained by the rstats-on-nix community -# -# Available attributes after applying this overlay: -# - pkgs.rpkgs: R packages from rstats-on-nix -# - pkgs.rpkgs.rPackages: All CRAN packages -# - pkgs.rpkgs.quarto: Quarto publishing system -# - pkgs.rpkgs.rWrapper: R with package management -# - pkgs.rWrapper: R wrapper with standard packages pre-configured -# - pkgs.quarto: Quarto with R integration and standard packages -# -# Custom R packages and tools (radianWrapper, air-formatter) come from -# the fran overlay which should be applied separately. -# -# To use specific R packages, reference them via: -# with pkgs.rpkgs.rPackages; [ package1 package2 ] -# -# Update the R snapshot date in flake.nix inputs section: -# rixpkgs.url = "github:rstats-on-nix/nixpkgs/YYYY-MM-DD" { inputs, ... }: final: prev: let - # R packages from rstats-on-nix for the current system rpkgs = import inputs.rixpkgs { system = prev.stdenv.hostPlatform.system; overlays = [inputs.fran.overlays.default]; - }; # rixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system}; - - # nvimcom and rnvimserver are provided by the r-nvim-nix flake overlay - # (inputs.r-nvim-nix.overlays.default) - - # Standard R packages used by default in rWrapper and quarto - reqPkgs = with rpkgs.rPackages; [ - # languageserver - ]; + }; in { inherit rpkgs; - baseRPackages = reqPkgs; - - # R wrapper with standard packages - rWrapper = rpkgs.rWrapper.override {packages = reqPkgs;}; - - # Quarto with R integration - quarto = rpkgs.quarto.override {extraRPackages = reqPkgs;}; - - # Update helper for rix + baseRPackages = [ ]; + rWrapper = rpkgs.rWrapper.override {packages = [ ];}; + quarto = rpkgs.quarto.override {extraRPackages = [ ];}; updateR = import ../scripts/updater.nix {pkgs = final;}; }