mirror of
https://github.com/dwinkler1/np.git
synced 2026-02-19 22:40:57 -05:00
Rebrading
This commit is contained in:
parent
e19f843e06
commit
2e8a70ce5f
4 changed files with 3 additions and 15 deletions
|
|
@ -1,476 +0,0 @@
|
|||
{
|
||||
description = "New Project";
|
||||
inputs = {
|
||||
rixpkgs.url = "https://github.com/rstats-on-nix/nixpkgs/archive/2025-08-11.tar.gz";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
nixCats = {
|
||||
url = "github:dwinkler1/nixCatsConfig";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.rixpkgs.follows = "rixpkgs";
|
||||
};
|
||||
## Git Plugins
|
||||
"plugins-r" = {
|
||||
url = "github:R-nvim/R.nvim";
|
||||
flake = false;
|
||||
};
|
||||
"plugins-cmp-r" = {
|
||||
url = "github:R-nvim/cmp-r";
|
||||
flake = false;
|
||||
};
|
||||
"plugins-cmp-pandoc-references" = {
|
||||
url = "github:jmbuhr/cmp-pandoc-references";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
nixCats,
|
||||
...
|
||||
} @ inputs: let
|
||||
#######################
|
||||
### PROJECT CONFIG ####
|
||||
#######################
|
||||
## Set options below:
|
||||
config = rec {
|
||||
## Set project name
|
||||
defaultPackageName = "p";
|
||||
## Enable languages
|
||||
enabledLanguages = {
|
||||
julia = false;
|
||||
python = false;
|
||||
r = false;
|
||||
};
|
||||
## Enable packages
|
||||
enabledPackages = {
|
||||
## Plugins loaded via flake input
|
||||
### Always enable when R is enabled
|
||||
### You can use your own R installation and just enable the plugin
|
||||
gitPlugins = enabledLanguages.r;
|
||||
};
|
||||
};
|
||||
# R packages
|
||||
rixOverlay = final: prev: {rpkgs = inputs.rixpkgs.legacyPackages.${prev.system};};
|
||||
rOverlay = final: prev: let
|
||||
reqPkgs = with final.rpkgs.rPackages; [
|
||||
broom
|
||||
data_table
|
||||
janitor
|
||||
languageserver
|
||||
reprex
|
||||
styler
|
||||
tidyverse
|
||||
(buildRPackage {
|
||||
name = "nvimcom";
|
||||
src = inputs.plugins-r;
|
||||
sourceRoot = "source/nvimcom";
|
||||
buildInputs = with prev.rpkgs; [
|
||||
R
|
||||
stdenv.cc.cc
|
||||
gnumake
|
||||
];
|
||||
propagatedBuildInputs = [];
|
||||
})
|
||||
];
|
||||
in {
|
||||
quarto = final.rpkgs.quarto.override {extraRPackages = reqPkgs;};
|
||||
rWrapper = final.rpkgs.rWrapper.override {packages = reqPkgs;};
|
||||
};
|
||||
|
||||
# Python packages
|
||||
pythonOverlay = final: prev: {
|
||||
python = prev.python3.withPackages (pyPackages:
|
||||
with pyPackages; [
|
||||
requests
|
||||
]);
|
||||
};
|
||||
|
||||
###################################
|
||||
## ⬆️ BASIC CONFIG ABOVE HERE ⬆️ ##
|
||||
###################################
|
||||
|
||||
projectScriptsOverlay = final: prev: let
|
||||
initPython = ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
if [[ ! -f "pyproject.toml" ]]; then
|
||||
echo "🐍 Initializing UV project..."
|
||||
uv init
|
||||
echo "📦 Adding ipython and marimo..."
|
||||
uv add ipython
|
||||
uv add marimo
|
||||
echo "--------------------------------------------------------------------------"
|
||||
echo "✅ Python project initialized!"
|
||||
echo "--------------------------------------------------------------------------"
|
||||
else
|
||||
echo "--------------------------------------------------------------------------"
|
||||
echo "🔄 Existing Python project detected."
|
||||
echo "Run '${config.defaultPackageName}-updateDeps' to update dependencies."
|
||||
echo "--------------------------------------------------------------------------"
|
||||
fi
|
||||
'';
|
||||
|
||||
mkDirsScript = ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
PROJECT_NAME="''${1:-${config.defaultPackageName}}"
|
||||
|
||||
echo "🚀 Setting up project: $PROJECT_NAME"
|
||||
|
||||
# Create directory structure
|
||||
directories=(
|
||||
"data/raw"
|
||||
"data/processed"
|
||||
"data/interim"
|
||||
"docs"
|
||||
"figures"
|
||||
"tables"
|
||||
"src/analysis"
|
||||
"src/data_prep"
|
||||
"src/explore"
|
||||
"src/utils"
|
||||
)
|
||||
|
||||
for dir in "''${directories[@]}"; do
|
||||
mkdir -p "$dir"
|
||||
echo "✓ Created $dir/"
|
||||
done
|
||||
|
||||
# Create essential files
|
||||
if [[ ! -f "README.md" ]]; then
|
||||
cat > README.md << 'EOF'
|
||||
# $PROJECT_NAME
|
||||
|
||||
## Project Structure
|
||||
- `data/`: Data files (gitignored)
|
||||
- `docs/`: Documentation
|
||||
- `figures/`: Output figures
|
||||
- `tables/`: Output tables
|
||||
- `src/`: Source code
|
||||
|
||||
## Usage
|
||||
- Julia environment: `$PROJECT_NAME-jl`
|
||||
- Python environment: `$PROJECT_NAME-m` (Marimo)
|
||||
- R environment: `$PROJECT_NAME-r`
|
||||
- Neovide: `$PROJECT_NAME-g`
|
||||
- Neovim: `$PROJECT_NAME`
|
||||
- Update: `$PROJECT_NAME-updateDeps`
|
||||
EOF
|
||||
fi
|
||||
|
||||
# Create .gitignore
|
||||
if [[ ! -f ".gitignore" ]]; then
|
||||
cat > .gitignore << 'EOF'
|
||||
# Data files
|
||||
data/
|
||||
*.csv
|
||||
*.docx
|
||||
*.xlsx
|
||||
*.parquet
|
||||
|
||||
# R specific
|
||||
.Rproj.user/
|
||||
.Rhistory
|
||||
.RData
|
||||
.Ruserdata
|
||||
*.Rproj
|
||||
.Rlibs/
|
||||
|
||||
# Python specific
|
||||
__pycache__/
|
||||
*.pyc
|
||||
.pytest_cache/
|
||||
.venv/
|
||||
|
||||
# Jupyter
|
||||
.ipynb_checkpoints/
|
||||
|
||||
# IDE
|
||||
.vscode/
|
||||
.idea/
|
||||
|
||||
# OS
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
EOF
|
||||
fi
|
||||
|
||||
echo "✅ Project setup completed successfully!"
|
||||
'';
|
||||
|
||||
updateDepsScript = ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
echo "🔄 Updating project dependencies..."
|
||||
|
||||
if [[ -f "flake.lock" ]]; then
|
||||
nix flake update
|
||||
echo "✅ Flake inputs updated"
|
||||
fi
|
||||
|
||||
if [[ -f "pyproject.toml" ]]; then
|
||||
uv sync --upgrade
|
||||
echo "✅ Python dependencies updated"
|
||||
fi
|
||||
|
||||
if [[ -f "Project.toml" ]]; then
|
||||
${config.defaultPackageName}-jl -e "using Pkg; Pkg.update()"
|
||||
echo "✅ Julia dependencies updated"
|
||||
fi
|
||||
|
||||
echo "🎉 All dependencies updated!"
|
||||
'';
|
||||
in {
|
||||
initPython = prev.writeShellScriptBin "initPython" initPython;
|
||||
mkDirs = prev.writeShellScriptBin "mkDirs" mkDirsScript;
|
||||
updateDeps = prev.writeShellScriptBin "updateDeps" updateDepsScript;
|
||||
};
|
||||
forSystems = nixpkgs.lib.genAttrs nixpkgs.lib.platforms.all;
|
||||
projectConfig = forSystems (
|
||||
system: let
|
||||
inherit (nixCats) utils;
|
||||
inherit (config) defaultPackageName;
|
||||
prevPackage = nixCats.packages.${system}.default;
|
||||
finalPackage = prevPackage.override (prev: {
|
||||
name = config.defaultPackageName;
|
||||
dependencyOverlays =
|
||||
prev.dependencyOverlays
|
||||
++ [
|
||||
(utils.standardPluginOverlay inputs)
|
||||
rixOverlay
|
||||
rOverlay
|
||||
pythonOverlay
|
||||
projectScriptsOverlay
|
||||
];
|
||||
categoryDefinitions = utils.mergeCatDefs prev.categoryDefinitions (
|
||||
{
|
||||
pkgs,
|
||||
settings,
|
||||
categories,
|
||||
name,
|
||||
extra,
|
||||
mkPlugin,
|
||||
...
|
||||
} @ packageDef: {
|
||||
lspsAndRuntimeDeps = {
|
||||
project = with pkgs; [
|
||||
];
|
||||
julia = with pkgs; [
|
||||
julia-bin
|
||||
];
|
||||
python = with pkgs; [
|
||||
python
|
||||
nodejs
|
||||
pyright
|
||||
uv
|
||||
];
|
||||
r = with pkgs; [
|
||||
rWrapper
|
||||
quarto
|
||||
air-formatter
|
||||
];
|
||||
};
|
||||
|
||||
startupPlugins = {
|
||||
project = with pkgs.vimPlugins; [
|
||||
];
|
||||
gitPlugins = with pkgs.neovimPlugins; [
|
||||
{
|
||||
plugin = r;
|
||||
config.lua = "vim.notify('Using project local R plugin')";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
optionalPlugins = {
|
||||
project = with pkgs.vimPlugins; [
|
||||
];
|
||||
gitPlugins = with pkgs.neovimPlugins; [
|
||||
cmp-r
|
||||
cmp-pandoc-references
|
||||
];
|
||||
};
|
||||
optionalLuaPreInit = {
|
||||
project = [
|
||||
''
|
||||
local predicate = function(notif)
|
||||
if not (notif.data.source == "lsp_progress" and notif.data.client_name == "lua_ls") then
|
||||
return true
|
||||
end
|
||||
-- Filter out some LSP progress notifications from 'lua_ls'
|
||||
return notif.msg:find("Diagnosing") == nil and notif.msg:find("semantic tokens") == nil
|
||||
end
|
||||
local custom_sort = function(notif_arr)
|
||||
return MiniNotify.default_sort(vim.tbl_filter(predicate, notif_arr))
|
||||
end
|
||||
require("mini.notify").setup({ content = { sort = custom_sort } })
|
||||
vim.notify = MiniNotify.make_notify()
|
||||
''
|
||||
];
|
||||
};
|
||||
optionalLuaAdditions = {
|
||||
project = [
|
||||
"vim.notify('Project loaded: ${name}')"
|
||||
];
|
||||
};
|
||||
sharedLibraries = {
|
||||
project = {
|
||||
};
|
||||
};
|
||||
|
||||
environmentVariables = {
|
||||
project = {
|
||||
};
|
||||
julia = {
|
||||
JULIA_NUM_THREADS = "auto";
|
||||
};
|
||||
python = {
|
||||
# Prevent uv from managing Python downloads
|
||||
UV_PYTHON_DOWNLOADS = "never";
|
||||
# Force uv to use nixpkgs Python interpreter
|
||||
UV_PYTHON = pkgs.python.interpreter;
|
||||
};
|
||||
r = {
|
||||
R_LIBS_USER = "./.Rlibs";
|
||||
};
|
||||
};
|
||||
|
||||
extraWrapperArgs = {
|
||||
python = [
|
||||
"--unset PYTHONPATH"
|
||||
];
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
packageDefinitions =
|
||||
prev.packageDefinitions
|
||||
// {
|
||||
p = utils.mergeCatDefs prev.packageDefinitions.n (
|
||||
{
|
||||
pkgs,
|
||||
name,
|
||||
...
|
||||
}: {
|
||||
settings = {
|
||||
suffix-path = false;
|
||||
suffix-LD = false;
|
||||
# your alias may not conflict with your other packages.
|
||||
aliases = ["pvim"];
|
||||
hosts = {
|
||||
g = {
|
||||
enable = true;
|
||||
path = {
|
||||
value = "${pkgs.neovide}/bin/neovide";
|
||||
args = [
|
||||
"--add-flags"
|
||||
"--neovim-bin ${name}"
|
||||
];
|
||||
};
|
||||
};
|
||||
m = let
|
||||
marimoInit = ''
|
||||
set -euo pipefail
|
||||
echo "🔄 Syncing existing project..."
|
||||
uv sync
|
||||
'';
|
||||
in {
|
||||
enable = config.enabledLanguages.python;
|
||||
path = {
|
||||
value = "${pkgs.uv}/bin/uv";
|
||||
args = [
|
||||
"--run"
|
||||
"${marimoInit}"
|
||||
"--add-flags"
|
||||
"run marimo edit \"$@\""
|
||||
];
|
||||
};
|
||||
};
|
||||
jl = {
|
||||
enable = config.enabledLanguages.julia;
|
||||
path = {
|
||||
value = "${pkgs.julia-bin}/bin/julia";
|
||||
args = ["--add-flags" "--project=."];
|
||||
};
|
||||
};
|
||||
r = {
|
||||
enable = config.enabledLanguages.r;
|
||||
path = {
|
||||
value = "${pkgs.rWrapper}/bin/R";
|
||||
args = ["--add-flags" "--no-save --no-restore"];
|
||||
};
|
||||
};
|
||||
initPython = {
|
||||
enable = config.enabledLanguages.python;
|
||||
path.value = "${pkgs.initPython}/bin/initPython";
|
||||
};
|
||||
mkDirs = {
|
||||
enable = true;
|
||||
path = {
|
||||
value = "${pkgs.mkDirs}/bin/mkDirs";
|
||||
};
|
||||
};
|
||||
updateDeps = {
|
||||
enable = true;
|
||||
path = {
|
||||
value = "${pkgs.updateDeps}/bin/updateDeps";
|
||||
};
|
||||
};
|
||||
node.enable = true;
|
||||
perl.enable = true;
|
||||
ruby.enable = true;
|
||||
};
|
||||
};
|
||||
categories = {
|
||||
julia = config.enabledLanguages.julia;
|
||||
python = config.enabledLanguages.python;
|
||||
r = config.enabledLanguages.r;
|
||||
project = true;
|
||||
gitPlugins = config.enabledPackages.gitPlugins;
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
});
|
||||
in
|
||||
utils.mkAllWithDefault finalPackage
|
||||
);
|
||||
in {
|
||||
packages = projectConfig;
|
||||
devShells = forSystems (system: let
|
||||
pkgs = import nixpkgs {inherit system;};
|
||||
in {
|
||||
default = let
|
||||
shellCmds = pkgs.lib.concatLines (pkgs.lib.filter (cmd: cmd != "") [
|
||||
(pkgs.lib.optionalString config.enabledLanguages.r " - ${config.defaultPackageName}-r: Launch R console")
|
||||
(pkgs.lib.optionalString config.enabledLanguages.julia " - ${config.defaultPackageName}-jl: Launch Julia REPL")
|
||||
(pkgs.lib.optionalString config.enabledLanguages.python " - ${config.defaultPackageName}-m: Launch Marimo notebook")
|
||||
"See options in flake.nix"
|
||||
]);
|
||||
in
|
||||
pkgs.mkShell {
|
||||
name = config.defaultPackageName;
|
||||
packages = [projectConfig.${system}.default];
|
||||
inputsFrom = [];
|
||||
shellHook = ''
|
||||
echo ""
|
||||
${pkgs.lib.optionalString config.enabledLanguages.python "${config.defaultPackageName}-initPython"}
|
||||
echo "=========================================================================="
|
||||
echo "🎯 ${config.defaultPackageName} Development Environment"
|
||||
echo "---"
|
||||
echo "📝 Run '${config.defaultPackageName}-mkDirs' to set up project structure"
|
||||
echo "🔄 Run '${config.defaultPackageName}-updateDeps' to update all dependencies"
|
||||
echo "---"
|
||||
echo "🚀 Available commands:"
|
||||
echo " - ${config.defaultPackageName}: Launch Neovim"
|
||||
echo " - ${config.defaultPackageName}-g: Launch Neovide"
|
||||
echo "${shellCmds}"
|
||||
echo "=========================================================================="
|
||||
echo ""
|
||||
'';
|
||||
};
|
||||
});
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue