README.md

@@ -198,8 +198,7 @@ projectSettings = {
 
 ### Language packages (module defaults)
 
-Add Python/R/Julia libraries. These are appended to the built-in defaults, which
+Add Python/R/Julia libraries that get appended to the module defaults. The built-in defaults are:
-always apply (see `settings.langPackageDefaults` in `modules/module/settings/lang-packages.nix`):
 
 - Python: `duckdb`, `polars`
 - R: `arrow`, `broom`, `data_table`, `janitor`, `styler`
@@ -215,8 +214,7 @@ projectSettings = {
 };
 ```
 
-Use `lib.mkForce` to replace other `lang_packages` assignments; the built-in defaults still apply.
+Use `lib.mkForce` to replace rather than append:
-To exclude defaults, override `catPkgs.<cat>` instead:
 
 ```nix
 projectSettings = {
@@ -339,5 +337,5 @@ cats.nix ───────────────► config.cats        │
 - **Overlays** (`overlays/`) inject dependency package sets into nixpkgs (`rpkgs`, `baseRPackages`, `basePythonPackages`, plugins). Top-level `rWrapper` and `quarto` are compatibility conveniences, but `pkgs.rpkgs` is the canonical R surface for downstream configuration.
 - **cat-packages.nix** is the single source of truth for per-category packages. Each list is gated by its cat toggle.
 - **deps.nix** wires `catPkgs` into the wrapper's runtime PATH.
-- **settings.lang_packages** holds project-specific language libraries appended to the built-in `settings.langPackageDefaults`, used by local outputs and downstream module consumers.
+- **settings.lang_packages** holds the shared defaults used by local outputs and downstream module consumers.
 - **flake.nix** exports `lib.eval`, `lib.mkWrapper`, `lib.devShellPackages`, and `lib.shellHook` as the canonical downstream helpers, and builds `packages.default` and `devShells.default` from the same module config.

flake.lock

@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787498568,
+        "lastModified": 1786384358,
-        "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
+        "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
+        "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a",
         "type": "github"
       },
       "original": {
@@ -36,6 +36,22 @@
         "type": "github"
       }
     },
+    "plugins-bloocky": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1786453931,
+        "narHash": "sha256-OpVm/ubj6rxjGFkjluQLhys/qGWqmN3E7dUMiFUYAZw=",
+        "owner": "atiladefreitas",
+        "repo": "bloocky",
+        "rev": "64a6de6560c40b3351d29545528ddaed98cd9984",
+        "type": "github"
+      },
+      "original": {
+        "owner": "atiladefreitas",
+        "repo": "bloocky",
+        "type": "github"
+      }
+    },
     "plugins-cmp-pandoc-references": {
       "flake": false,
       "locked": {
@@ -52,6 +68,22 @@
         "type": "github"
       }
     },
+    "plugins-dooing": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1786125118,
+        "narHash": "sha256-Iil8eCCz61T1Hz1y2cij71Hti+QGXbjH49eGCPMqTbA=",
+        "owner": "atiladefreitas",
+        "repo": "dooing",
+        "rev": "2871aaf400c49187aa4216e7cf7abfa37cd32840",
+        "type": "github"
+      },
+      "original": {
+        "owner": "atiladefreitas",
+        "repo": "dooing",
+        "type": "github"
+      }
+    },
     "r-nvim-nix": {
       "inputs": {
         "nixpkgs": [
@@ -76,11 +108,11 @@
     },
     "rixpkgs": {
       "locked": {
-        "lastModified": 1787585894,
+        "lastModified": 1786421894,
-        "narHash": "sha256-tp/kigWpoz0DUyDmbqVHLjZova3n98vn7R7HTRtjeWg=",
+        "narHash": "sha256-BQLZ0kJYdZ3FmC2Vq7PJFmx4wnyifoCdz+5CIkdbDxI=",
         "owner": "dwinkler1",
         "repo": "rixpkgs",
-        "rev": "5a76f5802a7728c62feff1399c7302b53276ed8f",
+        "rev": "9518d16a41413cf08eecde557b337b87f1422e91",
         "type": "github"
       },
       "original": {
@@ -111,7 +143,9 @@
       "inputs": {
         "fran": "fran",
         "nixpkgs": "nixpkgs",
+        "plugins-bloocky": "plugins-bloocky",
         "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
+        "plugins-dooing": "plugins-dooing",
         "r-nvim-nix": "r-nvim-nix",
         "rixpkgs": "rixpkgs",
         "wrappers": "wrappers"
@@ -124,11 +158,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787579952,
+        "lastModified": 1782135443,
-        "narHash": "sha256-Dn6IPaLyltx8hBTyC4hgNWDb7T7WHRYUG6wWh6KBHXA=",
+        "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=",
         "owner": "BirdeeHub",
         "repo": "nix-wrapper-modules",
-        "rev": "b56e973dd2bd62244b44d6542fb52182bc3a3cda",
+        "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -29,6 +29,16 @@
       url = "github:jmbuhr/cmp-pandoc-references";
       flake = false;
     };
+
+    "plugins-bloocky" = {
+      url = "github:atiladefreitas/bloocky";
+      flake = false;
+    };
+
+    "plugins-dooing" = {
+      url = "github:atiladefreitas/dooing";
+      flake = false;
+    };
   };
 
   outputs = {
@@ -206,10 +216,10 @@
             (builtins.length (self.lib.devShellPackages defaultConfig) > 0)
           ];
           overrideAssertions = [
-            (overrideConfig.cats.r or false)
+            (!(overrideConfig.cats.r or false))
             (builtins.length overrideNix == 1)
             ((builtins.head overrideNix) == "alejandra")
-            (builtins.match ".*R RHOME.*" overrideShellHook != null)
+            (builtins.match ".*R RHOME.*" overrideShellHook == null)
           ];
         in
           pkgs.runCommand "check-downstream-overrides" {
@@ -231,36 +241,6 @@
           touch $out
         '';
 
-        # Downstream modules assign settings.lang_packages.<lang> plainly. The
-        # module system replaces same-option defaults, so built-in defaults must
-        # live in langPackageDefaults and be composed at the consumption sites.
-        # This check fails if someone moves defaults back into lang_packages:
-        # then a downstream assignment would silently drop lintr etc.
-        append-semantics = let
-          downstreamCfg = (self.lib.eval {
-            inherit pkgs;
-            modules = [
-              {
-                cats.r = true;
-                settings.lang_packages.r = [ pkgs.rpkgs.rPackages.fixest ];
-              }
-            ];
-          }).config;
-          rWrapperPkg = builtins.head downstreamCfg.catPkgs.r;
-        in
-          pkgs.runCommand "check-lang-packages-append" { } ''
-            script=$(readlink -f "${rWrapperPkg}/bin/R")
-            grep -q "r-lintr-" "$script" || {
-              echo "default R packages were dropped by a downstream lang_packages assignment" >&2
-              exit 1
-            }
-            grep -q "r-fixest-" "$script" || {
-              echo "downstream lang_packages.r additions were not appended" >&2
-              exit 1
-            }
-            echo "lang_packages append semantics OK" > $out
-          '';
-
         smoke-test = pkgs.runCommand "smoke-test" {} ''
           # The Nix build sandbox has a read-only HOME; point XDG dirs at a
           # writable location so vim.lsp/shaDa can write state headlessly.

modules/module/settings/cat-packages.nix

@@ -9,17 +9,14 @@ let
   # NOTE: Package list expressions are lazily evaluated, and derivations are
   # not built until needed, so keep side-effecting expressions out of these
   # lists.
-  maybe = cat: pkgsList: lib.optionals (config.cats.${cat} or false) pkgsList;
+  maybe = cat: pkgsList:
-  rPackages =
+    lib.optionals (config.cats.${cat} or false) pkgsList;
-    (pkgs.baseRPackages or [ ])
+  rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
-    ++ config.settings.langPackageDefaults.r
-    ++ config.settings.lang_packages.r;
   rWrapperPackages = rPackages;
   quartoPkg =
-    if config.cats.r or false then
+    if config.cats.r or false
-      pkgs.rpkgs.quarto.override { extraRPackages = rPackages; }
+    then pkgs.rpkgs.quarto.override { extraRPackages = rPackages; }
-    else
+    else pkgs.quarto;
-      pkgs.quarto;
 in
 {
   options.catPkgs = lib.mkOption {
@@ -28,107 +25,83 @@ in
   };
 
   config.catPkgs = {
-    always = maybe "always" (
+    always = maybe "always" (with pkgs; [
-      with pkgs;
+      ripgrep
-      [
+    ]);
-        ripgrep
-      ]
-    );
 
     clickhouse = maybe "clickhouse" (with pkgs; [ clickhouse-lts ]);
 
-    external = maybe "external" (
+    external = maybe "external" (with pkgs; [
-      with pkgs;
+      nodejs
-      [
+      perl
-        nodejs
+      ruby
-        perl
+      shfmt
-        ruby
+      sqlfluff
-        shfmt
+      tree-sitter
-        sqlfluff
+    ]);
-        tree-sitter
-      ]
-    );
 
     julia = maybe "julia" [
-      (pkgs.julia-bin.withPackages (
+      (pkgs.julia-bin.withPackages config.settings.lang_packages.julia)
-        config.settings.langPackageDefaults.julia ++ config.settings.lang_packages.julia
-      ))
     ];
 
     lua = maybe "lua" (with pkgs; [ lua-language-server ]);
 
-    markdown = maybe "markdown" (
+    markdown = maybe "markdown" (with pkgs; [
-      with pkgs;
+      python3Packages.pylatexenc
-      [
+      quartoPkg
-        python3Packages.pylatexenc
+      zk
-        quartoPkg
+      marksman
-        zk
+      texlab
-        marksman
+      imagemagick
-        texlab
+      harper
-        imagemagick
+    ]);
-        harper
-      ]
-    );
 
-    nix = maybe "nix" (
+    nix = maybe "nix" (with pkgs; [
-      with pkgs;
+      alejandra
-      [
+      nix-doc
-        alejandra
+      nixd
-        nix-doc
+    ]);
-        nixd
-      ]
-    );
 
-    optional = maybe "optional" (
+    optional = maybe "optional" (with pkgs; [
-      with pkgs;
+      bat
-      [
+      broot
-        bat
+      devenv
-        broot
+      dust
-        devenv
+      fd
-        dust
+      fzf
-        fd
+      gawk
-        fzf
+      gh
-        gawk
+      git
-        gh
+      hunspell
-        git
+      hunspellDicts.de-at
-        hunspell
+      hunspellDicts.en-us
-        hunspellDicts.de-at
+      ispell
-        hunspellDicts.en-us
+      jq
-        ispell
+      just
-        jq
+      lazygit
-        just
+      man
-        lazygit
+      ncdu
-        man
+      pigz
-        ncdu
+      poppler
-        pigz
+      ripgrep
-        poppler
+      tokei
-        ripgrep
+      wget
-        tokei
+      yq
-        wget
+    ]);
-        yq
-      ]
-    );
 
-    python = maybe "python" (
+    python = maybe "python" (let
-      let
+      python_packages_fn =
-        python_packages_fn =
+        if pkgs ? basePythonPackages
-          if pkgs ? basePythonPackages then
+        then ps: pkgs.basePythonPackages ps ++ config.settings.lang_packages.python
-            ps:
+        else _: config.settings.lang_packages.python;
-            pkgs.basePythonPackages ps
+      python_with_packages = pkgs.python3.withPackages python_packages_fn;
-            ++ config.settings.langPackageDefaults.python
+    in
-            ++ config.settings.lang_packages.python
+      with pkgs; [
-          else
-            _: config.settings.langPackageDefaults.python ++ config.settings.lang_packages.python;
-        python_with_packages = pkgs.python3.withPackages python_packages_fn;
-      in
-      with pkgs;
-      [
         python_with_packages
         ruff
         basedpyright
         uv
-      ]
+      ]);
-    );
 
     r = maybe "r" [
       (pkgs.rpkgs.rWrapper.override { packages = rWrapperPackages; })

modules/module/settings/core.nix

@@ -8,7 +8,7 @@
   config.settings.config_directory = ../../..;
 
   # Default colorscheme and background
-  config.settings.colorscheme = lib.mkDefault "kanagawa";
+  config.settings.colorscheme = lib.mkDefault "cyberdream";
   config.settings.background = lib.mkDefault "dark";
 
   # Enable RC wrapping (allows neovim to find the config)

modules/module/settings/env.nix

@@ -14,15 +14,6 @@
     # R.nvim v1.x owns its cache and temporary directories and exports
     # RNVIM_COMPLDIR/RNVIM_TMPDIR during setup. Do not inject literal `$PWD`
     # values into the wrapper environment.
-    #
-    # ponytail: with R_LIBS_USER unset-or-empty, loading compiled namespaces
-    # (S7 via btw) segfaults on macOS for bare-terminal launches outside the
-    # devShell hook. Any non-empty value avoids it; this store path exists,
-    # contains no libraries, and stays inert. The devShell hook overrides it
-    # with $PWD/.r-libs. Upgrade path: teach wlib to emit expandable defaults.
-    (lib.mkIf (config.cats.r or false) {
-      R_LIBS_USER = "${pkgs.rpkgs.rWrapper}";
-    })
   ];
 
   # Environment variables with defaults (can be overridden by user)

modules/module/settings/hosts.nix

@@ -5,10 +5,7 @@
   ...
 }:
 let
-  rPackages =
+  rPackages = (pkgs.baseRPackages or [ ]) ++ config.settings.lang_packages.r;
-    (pkgs.baseRPackages or [ ])
-    ++ config.settings.langPackageDefaults.r
-    ++ config.settings.lang_packages.r;
   rWrapperPkg = pkgs.rpkgs.rWrapper.override { packages = rPackages ++ [pkgs.nvimcom]; };
 in
 {

modules/module/settings/lang-packages.nix

@@ -5,75 +5,53 @@
   ...
 }:
 {
-  options.settings = {
+  options.settings.lang_packages = lib.mkOption {
-    # Built-in language libraries composed into every language spec.
+    type = lib.types.submodule {
-    # Consumers extend via settings.lang_packages, which is APPENDED to these.
+      options = {
-    langPackageDefaults = lib.mkOption {
+        python = lib.mkOption {
-      type = lib.types.submodule {
+          type = lib.types.listOf lib.types.package;
-        options = {
+          default = [ ];
-          python = lib.mkOption {
+          description = "Additional Python-related packages appended to the python spec (overlay defaults remain).";
-            type = lib.types.listOf lib.types.package;
+        };
-            default = [ ];
+        r = lib.mkOption {
-          };
+          type = lib.types.listOf lib.types.package;
-          r = lib.mkOption {
+          default = [ ];
-            type = lib.types.listOf lib.types.package;
+          description = "Additional R-related packages appended to the r spec (overlay defaults remain).";
-            default = [ ];
+        };
-          };
+        julia = lib.mkOption {
-          julia = lib.mkOption {
+          type = lib.types.listOf lib.types.str;
-            type = lib.types.listOf lib.types.str;
+          default = [ ];
-            default = [ ];
+          description = "Additional Julia packages (names) passed to julia-bin.withPackages.";
-          };
         };
       };
-      default = { };
-    };
-
-    lang_packages = lib.mkOption {
-      type = lib.types.submodule {
-        options = {
-          python = lib.mkOption {
-            type = lib.types.listOf lib.types.package;
-            default = [ ];
-            description = "Additional Python-related packages appended to the python spec (overlay defaults remain).";
-          };
-          r = lib.mkOption {
-            type = lib.types.listOf lib.types.package;
-            default = [ ];
-            description = "Additional R-related packages appended to the r spec (overlay defaults remain).";
-          };
-          julia = lib.mkOption {
-            type = lib.types.listOf lib.types.str;
-            default = [ ];
-            description = "Additional Julia packages (names) passed to julia-bin.withPackages.";
-          };
-        };
-      };
-      default = { };
-      description = ''
-        Project-specific language libraries. Appended to settings.langPackageDefaults
-        in each language spec's runtime packages.
-      '';
     };
+    default = { };
+    description = ''
+      Language-specific package defaults and downstream overrides appended to each
+      language spec's runtime packages.
+    '';
   };
 
-  config.settings.langPackageDefaults = {
+  config.settings.lang_packages = {
-    python = with pkgs.python3Packages; [
+    python = lib.mkDefault (with pkgs.python3Packages; [
       duckdb
       polars
-    ];
+    ]);
-    r = with pkgs.rpkgs.rPackages; [
+    r = lib.mkDefault (
-      arrow
+      (with pkgs.rpkgs.rPackages; [
-      broom
+        arrow
-      data_table
+        broom
-      janitor
+        data_table
-      styler
+        janitor
-      # vscDebugger is not on CRAN/Bioconductor, so it is not available in
+        styler
-      # pkgs.rpkgs.rPackages. Install it manually in your R library if you
+        # vscDebugger is not on CRAN/Bioconductor, so it is not available in
-      # want to use the nvim-dap R adapter (see plugin/26_dap.lua).
+        # pkgs.rpkgs.rPackages. Install it manually in your R library if you
-      # vscDebugger
+        # want to use the nvim-dap R adapter (see plugin/26_dap.lua).
-      lintr
+        # vscDebugger
-    ];
+        lintr
-    julia = [
+      ])
+    );
+    julia = lib.mkDefault [
       "DataFramesMeta"
       "QuackIO"
     ];

modules/module/specs/plugins.nix

@@ -80,6 +80,8 @@ in {
       plenary-nvim
       vimtex
       neogit
+      config.nvim-lib.neovimPlugins.bloocky
+      config.nvim-lib.neovimPlugins.dooing
       {
         data = mini-nvim;
         pname = "mini.nvim";