mirror of
https://github.com/dwinkler1/np.git
synced 2026-05-23 13:43:31 -04:00
setup working
This commit is contained in:
parent
f844bdff2f
commit
d90f82b2bb
2 changed files with 133 additions and 217 deletions
63
templates/ed/flake.lock
generated
63
templates/ed/flake.lock
generated
|
|
@ -22,15 +22,15 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1778869304,
|
||||
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1779357205,
|
||||
"narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
|
||||
"rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
|
@ -45,7 +45,6 @@
|
|||
"nixpkgs"
|
||||
],
|
||||
"plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
|
||||
"plugins-r": "plugins-r",
|
||||
"r-nvim-nix": "r-nvim-nix",
|
||||
"rixpkgs": [
|
||||
"rixpkgs"
|
||||
|
|
@ -53,11 +52,11 @@
|
|||
"wrappers": "wrappers"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1779362150,
|
||||
"narHash": "sha256-y3JTpxmNgtEYG1m21Ymvdmrul/WvJzOCX45AlV21aak=",
|
||||
"lastModified": 1779544872,
|
||||
"narHash": "sha256-AnuNQ9nbXrDYmL97TOejAds/FQOgD6FEOHABp/8dmsU=",
|
||||
"owner": "dwinkler1",
|
||||
"repo": "nvimConfig",
|
||||
"rev": "af6d975129768cce36ac4c46198ab2b3ebaafad3",
|
||||
"rev": "aec9110e709e1aa50d78f06293c4bde14974b23f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -82,44 +81,25 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plugins-r": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1776905071,
|
||||
"narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=",
|
||||
"owner": "R-nvim",
|
||||
"repo": "R.nvim",
|
||||
"rev": "582f2af11290ac067e49018db38e12a511325556",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "R-nvim",
|
||||
"ref": "v0.99.4",
|
||||
"repo": "R.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"r-nvim-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nvimConfig",
|
||||
"rixpkgs"
|
||||
],
|
||||
"rnvimsrc": [
|
||||
"nvimConfig",
|
||||
"plugins-r"
|
||||
]
|
||||
"rnvimsrc": "rnvimsrc"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778684156,
|
||||
"narHash": "sha256-Z4y1tQfkIsPK4NRxGn668HMDfWxnxNxSJ0CAOOXiIfY=",
|
||||
"lastModified": 1779438909,
|
||||
"narHash": "sha256-1lvv0bdvSVyeCIgeZ7Ws7ffbDFurA5LJscS9dRLHzC8=",
|
||||
"owner": "dwinkler1",
|
||||
"repo": "r_nvim_nix",
|
||||
"rev": "2f49dfee27886068e2f49cbd54558ce4cc424c82",
|
||||
"rev": "ec17e22ab362a0ddfd6c2e9c5e95d43897a143be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "dwinkler1",
|
||||
"ref": "v0.99.4",
|
||||
"repo": "r_nvim_nix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -140,6 +120,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rnvimsrc": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1776905071,
|
||||
"narHash": "sha256-dXox6qEs1VDE7vPNDoN8bY4g06uj1IEs6uki72w8lpA=",
|
||||
"owner": "R-nvim",
|
||||
"repo": "R.nvim",
|
||||
"rev": "582f2af11290ac067e49018db38e12a511325556",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "R-nvim",
|
||||
"ref": "v0.99.4",
|
||||
"repo": "R.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"fran": "fran",
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue