From 99614a96afc7d0b91ef87c9fb206feace300e20b Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Mon, 1 Sep 2025 14:53:51 +1000 Subject: [PATCH] new colors --- templates/rde/flake.lock | 6 +++--- templates/rde/flake.nix | 15 +++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/templates/rde/flake.lock b/templates/rde/flake.lock index b2a828e..6eb7ca3 100644 --- a/templates/rde/flake.lock +++ b/templates/rde/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1756689834, - "narHash": "sha256-U0+MEMsvR4DNv7zKi/3kPt4NvSvYcUCMwfMTblqNIec=", + "lastModified": 1756702034, + "narHash": "sha256-BQdMiFEL6z7IbhN+Jb700LDs4C48fTvZ4xxcXZ5EfJ8=", "owner": "dwinkler1", "repo": "nixCatsConfig", - "rev": "fb459451e290fa0a31d7fb096209993a8b18b765", + "rev": "9c31108d0d03489d58c6724badae17af4f63ecf3", "type": "github" }, "original": { diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix index 45669ac..8e1aaee 100644 --- a/templates/rde/flake.nix +++ b/templates/rde/flake.nix @@ -31,7 +31,7 @@ }; theme = rec { ## set colortheme and background here - ### "cyberdream", "ondeark", and "tokyonight" are pre-installed + ### "cyberdream", "onedark", and "tokyonight" are pre-installed colorscheme = "kanagawa"; background = "dark"; ## Add other colortheme packages and config here @@ -319,7 +319,7 @@ python = with pkgs; [ python nodejs - pyright + basedpyright uv ]; r = with pkgs; [ @@ -459,7 +459,13 @@ ]; }; }; - py = let + py = { + enable = config.enabledLanguages.python; + path = { + value = "${pkgs.python.interpreter}"; + }; + }; + ipy = let ipythonInit = '' set -euo pipefail if [[ ! -f "pyproject.toml" ]]; then @@ -597,7 +603,8 @@ (pkgs.lib.optionalString config.enabledLanguages.julia " - ${config.defaultPackageName}-pluto: Launch Pluto.jl notebook") (pkgs.lib.optionalString config.enabledLanguages.julia " - ${config.defaultPackageName}-initJl: Init existing Julia project") (pkgs.lib.optionalString config.enabledLanguages.python " - ${config.defaultPackageName}-marimo: Launch Marimo notebook") - (pkgs.lib.optionalString config.enabledLanguages.python " - ${config.defaultPackageName}-py: Launch IPython REPL") + (pkgs.lib.optionalString config.enabledLanguages.python " - ${config.defaultPackageName}-py: Run python") + (pkgs.lib.optionalString config.enabledLanguages.python " - ${config.defaultPackageName}-ipy: Launch IPython REPL") (pkgs.lib.optionalString config.enabledLanguages.python " - ${config.defaultPackageName}-initPython: Init python project") (pkgs.lib.optionalString config.enabledPackages.devenv " - ${config.defaultPackageName}-initDevenv: Init devenv project") (pkgs.lib.optionalString config.enabledPackages.devenv " - ${config.defaultPackageName}-devenv: Run devenv")