From 90bab5a139f270e091f3c014dd4dec9082f31079 Mon Sep 17 00:00:00 2001 From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:52:01 -0400 Subject: [PATCH] Fix cell-path in themes (#911) Four minor changes: * As previously mentioned, updates `make.nu` to use `cell-path` rather than `cellpath` * Slight improvements on #905 (cc @amtoine) - The last theme converted was the only one printed via `info`, but it didn't get removed from the screen. Things moved so fast on my system that it looked like only one theme was being converted, since that's the only message that was left on the screen ;-). Now prints a "Done" message showing how many themes were converted and how many failed. * There was a previous update to `catppuccin-latte.nu` that was apparently made directly to the theme, rather than the custom src. Synced these up. * Bumped `nupm.nuon` --- themes/nupm.nuon | 2 +- themes/src/custom-nu-themes/catppuccin-latte.nu | 3 ++- themes/src/make.nu | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/themes/nupm.nuon b/themes/nupm.nuon index eb2865b..0b7880c 100644 --- a/themes/nupm.nuon +++ b/themes/nupm.nuon @@ -3,6 +3,6 @@ description: "Officially-supported themes for Nushell" documentation: "https://github.com/nushell/nu_scripts/blob/main/README.md" license: "https://github.com/nushell/nu_scripts/blob/main/LICENSE" - version: 0.3.0 + version: 0.4.0 type: "module" } diff --git a/themes/src/custom-nu-themes/catppuccin-latte.nu b/themes/src/custom-nu-themes/catppuccin-latte.nu index c17e791..3523ac4 100644 --- a/themes/src/custom-nu-themes/catppuccin-latte.nu +++ b/themes/src/custom-nu-themes/catppuccin-latte.nu @@ -111,4 +111,5 @@ export def main [] { background: $color_palette.base foreground: $color_palette.text cursor: $color_palette.blue -}} \ No newline at end of file + } +} \ No newline at end of file diff --git a/themes/src/make.nu b/themes/src/make.nu index 20692df..325c851 100755 --- a/themes/src/make.nu +++ b/themes/src/make.nu @@ -84,7 +84,7 @@ def make_color_config [ name: string, source: string = "lemnos" ] { string: '($colors.color7)' nothing: '($colors.color7)' binary: '($colors.color7)' - cellpath: '($colors.color7)' + cell-path: '($colors.color7)' row_index: { fg: '($colors.color2)' attr: 'b' } record: '($colors.color7)' list: '($colors.color7)' @@ -251,10 +251,11 @@ def main [] { $t } } + info -n $"Completed converting (($themes | length) - ($failed | length)) themes \r" print '' if not ($failed | is-empty) { - warn "The following themes have failed:" + warn $"The following ($failed | length) themes have failed:" print $failed } else { print "all done"