setup working

This commit is contained in:
Daniel Winkler 2026-05-24 00:13:24 +10:00
commit d90f82b2bb
2 changed files with 133 additions and 217 deletions

View file

@ -6,233 +6,152 @@
nixpkgs,
nvimConfig,
...
} @ inputs: let
# ── Shared language support flags ──────────────────────────────
# Used by both the neovim wrapper module and the devShell
cats = {
clickhouse = false;
gitPlugins = false;
julia = false;
lua = false;
markdown = false;
nix = true;
optional = false;
python = false;
r = false;
};
# ── Language package lists ────────────────────────────────────
# Shared between wrapper lang_packages and devShell toolchains.
# Accept pkgs so they work inside forAllSystems for each system.
rPackages = pkgs:
(with pkgs.rpkgs.rPackages; [
fixest
])
++ (
if builtins.pathExists ./r-packages.nix
# p: with p.rPackages; [ ... ]
then import ./r-packages.nix pkgs.rpkgs
else []
);
pythonPackages = pkgs:
(with pkgs.python3Packages; [
duckdb
polars
])
++ (
if builtins.pathExists ./python-packages.nix
# p: with p; [ ... ]
then import ./python-packages.nix pkgs.python3Packages
else []
);
juliaPackages =
["StatsBase"]
++ (
if builtins.pathExists ./julia-packages.nix
# [ ... ]
then import ./julia-packages.nix
else []
);
# ── Per-language runtime dependencies ──────────────────────────
# Single source of truth for system/toolchain packages that
# flow to both runtimePkgs (wrapper PATH) and devShells.
mkRuntimeDeps = pkgs: {
always = [
pkgs.git
pkgs.pre-commit
pkgs.cowsay
];
nix = [
pkgs.nil
pkgs.nixfmt
];
r = let
r_packages = (pkgs.baseRPackages or []) ++ rPackages pkgs;
in [
(pkgs.rWrapper.override {packages = r_packages;})
pkgs.radianWrapper
pkgs.air-formatter
pkgs.yaml-language-server
pkgs.nvimcom
pkgs.rnvimserver
];
python = [
(pkgs.python3.withPackages (ps:
(pkgs.basePythonPackages or (_: [])) ps
++ pythonPackages pkgs))
pkgs.nodejs
pkgs.ruff
pkgs.basedpyright
pkgs.uv
];
julia = [
(pkgs.julia-bin.withPackages juliaPackages)
];
markdown = let
r_packages = (pkgs.baseRPackages or []) ++ rPackages pkgs;
quarto =
if cats.r
then pkgs.quarto.override {extraRPackages = r_packages;}
else pkgs.quarto;
in [
pkgs.python313Packages.pylatexenc
quarto
pkgs.zk
];
};
enabledRuntimeDeps = pkgs: let
deps = mkRuntimeDeps pkgs;
in
deps.always
++ (
if cats.nix
then deps.nix
else []
)
++ (
if cats.r
then deps.r
else []
)
++ (
if cats.python
then deps.python
else []
)
++ (
if cats.julia
then deps.julia
else []
)
++ (
if cats.markdown
then deps.markdown
else []
);
}: let
systems = ["aarch64-darwin" "x86_64-linux" "aarch64-linux"];
forAllSystems = nixpkgs.lib.genAttrs systems;
overlays = [inputs.nvimConfig.overlays.dependencies];
in {
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt);
packages = forAllSystems (system: let
pkgs = import nixpkgs {
inherit system overlays;
config = {allowUnfree = true;};
mkPkgs = system:
import nixpkgs {
inherit system;
config.allowUnfree = true;
overlays = [nvimConfig.overlays.dependencies];
};
# Plain attrset — pkgs is captured from the surrounding scope,
# so the module system does not need lazy _module.args resolution.
projectSettings = {
inherit cats;
settings = let
# With `replace` packages are replaced otherwise they are merged with base packages
replace = pkgs.lib.mkForce;
in {
lang_packages = {
python = replace (pythonPackages pkgs);
r = replace (rPackages pkgs);
julia = replace juliaPackages;
};
colorscheme = "kanagawa";
background = "dark";
wrapRc = true;
};
binName = "nv";
env = {
IS_PROJECT_EDITOR = "1";
};
projectModule = pkgs: let
baseConfig = nvimConfig.wrapperConfigs.default {inherit pkgs;};
extraRPackages =
if builtins.pathExists ./r-packages.nix
then import ./r-packages.nix pkgs.rpkgs
else [];
runtimePkgs = enabledRuntimeDeps pkgs;
extraPythonPackages =
if builtins.pathExists ./python-packages.nix
then import ./python-packages.nix pkgs.python3Packages
else [];
specs.extraLua = let
name = builtins.baseNameOf (builtins.toString "${self.outPath}");
in {
data = pkgs.vimPlugins.mini-notify;
before = ["INIT_MAIN"];
config = ''
require("mini.notify").setup()
vim.notify = MiniNotify.make_notify()
vim.notify("Welcome to ${name}!")
'';
};
extraJuliaPackages =
if builtins.pathExists ./julia-packages.nix
then import ./julia-packages.nix
else [];
projectName = builtins.baseNameOf (toString self.outPath);
in {
cats = {
clickhouse = false;
gitPlugins = false;
julia = false;
lua = false;
markdown = false;
nix = true;
optional = false;
python = false;
r = true;
};
evalResult = nvimConfig.inputs.wrappers.lib.evalModules {
modules = [
nvimConfig.wrapperModules.default
projectSettings
settings = {
lang_packages = {
python = with pkgs.python3Packages;
[
requests
]
++ extraPythonPackages;
r =
(with pkgs.rpkgs.rPackages; [
arrow
data_table
fixest
pkgs.nvimcom
])
++ extraRPackages;
julia =
["StatsBase"]
++ extraJuliaPackages;
};
colorscheme = "tokyonight"; #"kanagawa";
background = "dark";
wrapRc = true;
};
binName = "nv";
env.IS_PROJECT_EDITOR = "1";
catPkgs = {
always = [
pkgs.git
pkgs.pre-commit
pkgs.cowsay
];
nix = [
pkgs.nil
pkgs.nixfmt
];
};
specs.extraLua = {
before = ["INIT_MAIN"];
data = pkgs.writeText "project-startup.lua" ''
require("mini.notify").setup()
vim.notify = MiniNotify.make_notify()
vim.notify("Welcome to ${projectName}!")
'';
};
};
in {
formatter = forAllSystems (system: (mkPkgs system).nixfmt-tree);
packages = forAllSystems (system: let
pkgs = mkPkgs system;
in {
default = evalResult.config.wrap {inherit pkgs;};
default = nvimConfig.lib.mkWrapper {
inherit pkgs;
modules = [(projectModule pkgs)];
};
});
devShells = forAllSystems (system: let
pkgs = import nixpkgs {
inherit system overlays;
config = {allowUnfree = true;};
pkgs = mkPkgs system;
evalResult = nvimConfig.lib.eval {
inherit pkgs;
modules = [(projectModule pkgs)];
};
nv = self.packages.${system}.default;
nv = evalResult.config.wrap {inherit pkgs;};
in {
default = pkgs.mkShell {
shellHook = ''
exec nu
alias gst='git status'
alias glol='git log --oneline --graph --decorate'
alias gc='git commit'
alias gl='git pull'
alias gp='git push'
'';
packages =
[
nv
pkgs.nushell
]
++ enabledRuntimeDeps pkgs;
++ nvimConfig.lib.devShellPackages evalResult.config;
shellHook =
nvimConfig.lib.shellHook evalResult.config
+ ''
exec nu
'';
};
});
};
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
rixpkgs.url = "github:dwinkler1/rixpkgs/af2dd3f7b4b172077747c0869d4e30702fb71b0e";
fran = {
url = "github:dwinkler1/fran";
inputs = {
nixpkgs.follows = "rixpkgs";
};
inputs.nixpkgs.follows = "rixpkgs";
};
nvimConfig = {
url = "github:dwinkler1/nvimConfig";
inputs = {
rixpkgs.follows = "rixpkgs";
nixpkgs.follows = "nixpkgs";
rixpkgs.follows = "rixpkgs";
fran.follows = "fran";
};
};