From 5158fb400778549227f080d3ac3a8ce0d54e304f Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Sat, 23 Aug 2025 01:04:17 +1000 Subject: [PATCH] working setup --- templates/n/.envrc | 1 + templates/n/flake.lock | 182 +++++++++++++++++++++++++++++++++++++++++ templates/n/flake.nix | 13 +-- 3 files changed, 190 insertions(+), 6 deletions(-) create mode 100644 templates/n/.envrc create mode 100644 templates/n/flake.lock diff --git a/templates/n/.envrc b/templates/n/.envrc new file mode 100644 index 0000000..3550a30 --- /dev/null +++ b/templates/n/.envrc @@ -0,0 +1 @@ +use flake diff --git a/templates/n/flake.lock b/templates/n/flake.lock new file mode 100644 index 0000000..62ab0dc --- /dev/null +++ b/templates/n/flake.lock @@ -0,0 +1,182 @@ +{ + "nodes": { + "nixCats": { + "inputs": { + "nixCats": "nixCats_2", + "nixpkgs": [ + "nixpkgs" + ], + "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references", + "plugins-cmp-r": "plugins-cmp-r", + "plugins-r": "plugins-r", + "rixpkgs": [ + "rixpkgs" + ] + }, + "locked": { + "lastModified": 1755872133, + "narHash": "sha256-E9GBi7PYnFSjMkovuEYK87hl8+POko9ZXMAY3hZFNBU=", + "owner": "dwinkler1", + "repo": "nixCatsConfig", + "rev": "63953ae7d806b91e339a7da241751a033a6d9979", + "type": "github" + }, + "original": { + "owner": "dwinkler1", + "repo": "nixCatsConfig", + "type": "github" + } + }, + "nixCats_2": { + "locked": { + "lastModified": 1755685723, + "narHash": "sha256-WU7yfMmEbYmJnTWPe0RQpZyjf3c+btJ3BfE9RlnTtU0=", + "owner": "BirdeeHub", + "repo": "nixCats-nvim", + "rev": "515fb737c41504df023f9638aa0b63111a881c76", + "type": "github" + }, + "original": { + "owner": "BirdeeHub", + "repo": "nixCats-nvim", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1755736253, + "narHash": "sha256-jlIQRypNhB1PcB1BE+expE4xZeJxzoAGr1iUbHQta8s=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "596312aae91421d6923f18cecce934a7d3bfd6b8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "plugins-cmp-pandoc-references": { + "flake": false, + "locked": { + "lastModified": 1743491695, + "narHash": "sha256-XsdneGNJzmRBggk8lz9JNDQYk7wbYfUAF2oZLXzFb9c=", + "owner": "jmbuhr", + "repo": "cmp-pandoc-references", + "rev": "130eae4f75029d6495808e0ea4b769fa1ce4c9ac", + "type": "github" + }, + "original": { + "owner": "jmbuhr", + "repo": "cmp-pandoc-references", + "type": "github" + } + }, + "plugins-cmp-pandoc-references_2": { + "flake": false, + "locked": { + "lastModified": 1743491695, + "narHash": "sha256-XsdneGNJzmRBggk8lz9JNDQYk7wbYfUAF2oZLXzFb9c=", + "owner": "jmbuhr", + "repo": "cmp-pandoc-references", + "rev": "130eae4f75029d6495808e0ea4b769fa1ce4c9ac", + "type": "github" + }, + "original": { + "owner": "jmbuhr", + "repo": "cmp-pandoc-references", + "type": "github" + } + }, + "plugins-cmp-r": { + "flake": false, + "locked": { + "lastModified": 1746709841, + "narHash": "sha256-TwmLSILu1H3RyRivCQlbsgUN4dsEqO1E8Hx71N/lFws=", + "owner": "R-nvim", + "repo": "cmp-r", + "rev": "602f399c4efde01147cadfebcc884b7aa154f8b7", + "type": "github" + }, + "original": { + "owner": "R-nvim", + "repo": "cmp-r", + "type": "github" + } + }, + "plugins-cmp-r_2": { + "flake": false, + "locked": { + "lastModified": 1746709841, + "narHash": "sha256-TwmLSILu1H3RyRivCQlbsgUN4dsEqO1E8Hx71N/lFws=", + "owner": "R-nvim", + "repo": "cmp-r", + "rev": "602f399c4efde01147cadfebcc884b7aa154f8b7", + "type": "github" + }, + "original": { + "owner": "R-nvim", + "repo": "cmp-r", + "type": "github" + } + }, + "plugins-r": { + "flake": false, + "locked": { + "lastModified": 1755532199, + "narHash": "sha256-mb8HCaMasPUP9JZUkH1sPrtdbhM2HMUkJEKDsRt6wTs=", + "owner": "R-nvim", + "repo": "R.nvim", + "rev": "fd992e1c13ad3df794a30af2e937b994bf7bf4db", + "type": "github" + }, + "original": { + "owner": "R-nvim", + "repo": "R.nvim", + "type": "github" + } + }, + "plugins-r_2": { + "flake": false, + "locked": { + "lastModified": 1755532199, + "narHash": "sha256-mb8HCaMasPUP9JZUkH1sPrtdbhM2HMUkJEKDsRt6wTs=", + "owner": "R-nvim", + "repo": "R.nvim", + "rev": "fd992e1c13ad3df794a30af2e937b994bf7bf4db", + "type": "github" + }, + "original": { + "owner": "R-nvim", + "repo": "R.nvim", + "type": "github" + } + }, + "rixpkgs": { + "locked": { + "lastModified": 1754915244, + "narHash": "sha256-WtdFq/HbvAgq03AMhSAJW35go6R5bqhGNf2KBzXqH2U=", + "type": "tarball", + "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-08-11.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/rstats-on-nix/nixpkgs/archive/2025-08-11.tar.gz" + } + }, + "root": { + "inputs": { + "nixCats": "nixCats", + "nixpkgs": "nixpkgs", + "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references_2", + "plugins-cmp-r": "plugins-cmp-r_2", + "plugins-r": "plugins-r_2", + "rixpkgs": "rixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/templates/n/flake.nix b/templates/n/flake.nix index a3df71c..6229781 100644 --- a/templates/n/flake.nix +++ b/templates/n/flake.nix @@ -122,7 +122,6 @@ ]; r = with pkgs; [ rWrapper - radianWrapper quarto air-formatter ]; @@ -229,24 +228,26 @@ enable = true; path = { value = "${pkgs.marimo}/bin/marimo"; - args = ["--add-flags" "run marimo edit"]; + args = ["--add-flags" "edit"]; }; }; jl = { enable = true; path = { value = "${pkgs.julia-bin}/bin/julia"; - args = ["--project=@."]; + args = [ + "--add-flags" + "--project=@." + ]; }; }; - python3.enable = true; r = { enable = true; path = { value = "${pkgs.rWrapper}/bin/R"; args = [ - "--no-save" - "--no-restore" + "--add-flags" + "--no-save --no-restore" ]; }; };