From be32cdaefcf4e29946394437fbdcb04944ebe9c2 Mon Sep 17 00:00:00 2001
From: OJarrisonn_ <j.h.m.t.v.10@gmail.com>
Date: Sun, 21 Jul 2024 09:00:51 -0300
Subject: [PATCH] fix: catppuccin themes declared a `const` inside a record
 (#907)

---
 themes/nu-themes/catppuccin-latte.nu | 164 +++++++++++++-------------
 themes/nu-themes/catppuccin-mocha.nu | 168 ++++++++++++++-------------
 2 files changed, 168 insertions(+), 164 deletions(-)

diff --git a/themes/nu-themes/catppuccin-latte.nu b/themes/nu-themes/catppuccin-latte.nu
index 659c7f0..4b6672f 100644
--- a/themes/nu-themes/catppuccin-latte.nu
+++ b/themes/nu-themes/catppuccin-latte.nu
@@ -1,5 +1,5 @@
 # Retrieve the theme settings
-export def main [] { return {
+export def main [] { 
     const color_palette = {
         rosewater: "#dc8a78"
         flamingo: "#dd7878"
@@ -29,89 +29,91 @@ export def main [] { return {
         base: "#eff1f5"
     }
 
-    separator: $color_palette.overlay0
-    leading_trailing_space_bg: { attr: "n" }
-    header: { fg: $color_palette.blue attr: "b" }
-    empty: $color_palette.lavender
-    bool: $color_palette.lavender
-    int: $color_palette.peach
-    duration: $color_palette.text
-    filesize: {|e|
-          if $e < 1mb {
-            $color_palette.green
-        } else if $e < 100mb {
-            $color_palette.yellow
-        } else if $e < 500mb {
-            $color_palette.peach
-        } else if $e < 800mb {
-            $color_palette.maroon
-        } else if $e > 800mb {
-            $color_palette.red
+    return {
+        separator: $color_palette.overlay0
+        leading_trailing_space_bg: { attr: "n" }
+        header: { fg: $color_palette.blue attr: "b" }
+        empty: $color_palette.lavender
+        bool: $color_palette.lavender
+        int: $color_palette.peach
+        duration: $color_palette.text
+        filesize: {|e|
+            if $e < 1mb {
+                $color_palette.green
+            } else if $e < 100mb {
+                $color_palette.yellow
+            } else if $e < 500mb {
+                $color_palette.peach
+            } else if $e < 800mb {
+                $color_palette.maroon
+            } else if $e > 800mb {
+                $color_palette.red
+            }
         }
-    }
-    date: {|| (date now) - $in |
-        if $in < 1hr {
-            $color_palette.green
-        } else if $in < 1day {
-            $color_palette.yellow
-        } else if $in < 3day {
-            $color_palette.peach
-        } else if $in < 1wk {
-            $color_palette.maroon
-        } else if $in > 1wk {
-            $color_palette.red
+        date: {|| (date now) - $in |
+            if $in < 1hr {
+                $color_palette.green
+            } else if $in < 1day {
+                $color_palette.yellow
+            } else if $in < 3day {
+                $color_palette.peach
+            } else if $in < 1wk {
+                $color_palette.maroon
+            } else if $in > 1wk {
+                $color_palette.red
+            }
         }
+        range: $color_palette.text
+        float: $color_palette.text
+        string: $color_palette.text
+        nothing: $color_palette.text
+        binary: $color_palette.text
+        cellpath: $color_palette.text
+        row_index: { fg: $color_palette.mauve attr: "b" }
+        record: $color_palette.text
+        list: $color_palette.text
+        block: $color_palette.text
+        hints: $color_palette.overlay1
+        search_result: { fg: $color_palette.red bg: $color_palette.text }
+
+        shape_and: { fg: $color_palette.pink attr: "b" }
+        shape_binary: { fg: $color_palette.pink attr: "b" }
+        shape_block: { fg: $color_palette.blue attr: "b" }
+        shape_bool: $color_palette.teal
+        shape_custom: $color_palette.green
+        shape_datetime: { fg: $color_palette.teal attr: "b" }
+        shape_directory: $color_palette.teal
+        shape_external: $color_palette.teal
+        shape_externalarg: { fg: $color_palette.green attr: "b" }
+        shape_filepath: $color_palette.teal
+        shape_flag: { fg: $color_palette.blue attr: "b" }
+        shape_float: { fg: $color_palette.pink attr: "b" }
+        shape_garbage: { fg: $color_palette.text bg: $color_palette.red attr: "b" }
+        shape_globpattern: { fg: $color_palette.teal attr: "b" }
+        shape_int: { fg: $color_palette.pink attr: "b" }
+        shape_internalcall: { fg: $color_palette.teal attr: "b" }
+        shape_list: { fg: $color_palette.teal attr: "b" }
+        shape_literal: $color_palette.blue
+        shape_match_pattern: $color_palette.green
+        shape_matching_brackets: { attr: "u" }
+        shape_nothing: $color_palette.teal
+        shape_operator: $color_palette.peach
+        shape_or: { fg: $color_palette.pink attr: "b" }
+        shape_pipe: { fg: $color_palette.pink attr: "b" }
+        shape_range: { fg: $color_palette.peach attr: "b" }
+        shape_record: { fg: $color_palette.teal attr: "b" }
+        shape_redirection: { fg: $color_palette.pink attr: "b" }
+        shape_signature: { fg: $color_palette.green attr: "b" }
+        shape_string: $color_palette.green
+        shape_string_interpolation: { fg: $color_palette.teal attr: "b" }
+        shape_table: { fg: $color_palette.blue attr: "b" }
+        shape_variable: $color_palette.pink
+
+        background: $color_palette.base
+        foreground: $color_palette.text
+        cursor: $color_palette.blue
     }
-    range: $color_palette.text
-    float: $color_palette.text
-    string: $color_palette.text
-    nothing: $color_palette.text
-    binary: $color_palette.text
-    cellpath: $color_palette.text
-    row_index: { fg: $color_palette.mauve attr: "b" }
-    record: $color_palette.text
-    list: $color_palette.text
-    block: $color_palette.text
-    hints: $color_palette.overlay1
-    search_result: { fg: $color_palette.red bg: $color_palette.text }
-
-    shape_and: { fg: $color_palette.pink attr: "b" }
-    shape_binary: { fg: $color_palette.pink attr: "b" }
-    shape_block: { fg: $color_palette.blue attr: "b" }
-    shape_bool: $color_palette.teal
-    shape_custom: $color_palette.green
-    shape_datetime: { fg: $color_palette.teal attr: "b" }
-    shape_directory: $color_palette.teal
-    shape_external: $color_palette.teal
-    shape_externalarg: { fg: $color_palette.green attr: "b" }
-    shape_filepath: $color_palette.teal
-    shape_flag: { fg: $color_palette.blue attr: "b" }
-    shape_float: { fg: $color_palette.pink attr: "b" }
-    shape_garbage: { fg: $color_palette.text bg: $color_palette.red attr: "b" }
-    shape_globpattern: { fg: $color_palette.teal attr: "b" }
-    shape_int: { fg: $color_palette.pink attr: "b" }
-    shape_internalcall: { fg: $color_palette.teal attr: "b" }
-    shape_list: { fg: $color_palette.teal attr: "b" }
-    shape_literal: $color_palette.blue
-    shape_match_pattern: $color_palette.green
-    shape_matching_brackets: { attr: "u" }
-    shape_nothing: $color_palette.teal
-    shape_operator: $color_palette.peach
-    shape_or: { fg: $color_palette.pink attr: "b" }
-    shape_pipe: { fg: $color_palette.pink attr: "b" }
-    shape_range: { fg: $color_palette.peach attr: "b" }
-    shape_record: { fg: $color_palette.teal attr: "b" }
-    shape_redirection: { fg: $color_palette.pink attr: "b" }
-    shape_signature: { fg: $color_palette.green attr: "b" }
-    shape_string: $color_palette.green
-    shape_string_interpolation: { fg: $color_palette.teal attr: "b" }
-    shape_table: { fg: $color_palette.blue attr: "b" }
-    shape_variable: $color_palette.pink
-
-    background: $color_palette.base
-    foreground: $color_palette.text
-    cursor: $color_palette.blue
-}}
+}
 
 # Update the Nushell configuration
 export def --env "set color_config" [] {
diff --git a/themes/nu-themes/catppuccin-mocha.nu b/themes/nu-themes/catppuccin-mocha.nu
index e096a62..b011098 100644
--- a/themes/nu-themes/catppuccin-mocha.nu
+++ b/themes/nu-themes/catppuccin-mocha.nu
@@ -1,5 +1,5 @@
 # Retrieve the theme settings
-export def main [] { return {
+export def main [] { 
     const color_palette = {
         rosewater: "#f5e0dc"
         flamingo: "#f2cdcd"
@@ -27,91 +27,93 @@ export def main [] { return {
         base: "#1e1e2e"
         mantle: "#181825"
         crust: "#11111b"
-    }
-
-    separator: $color_palette.overlay0
-    leading_trailing_space_bg: { attr: "n" }
-    header: { fg: $color_palette.blue attr: "b" }
-    empty: $color_palette.lavender
-    bool: $color_palette.lavender
-    int: $color_palette.peach
-    duration: $color_palette.text
-    filesize: {|e|
-          if $e < 1mb {
-            $color_palette.green
-        } else if $e < 100mb {
-            $color_palette.yellow
-        } else if $e < 500mb {
-            $color_palette.peach
-        } else if $e < 800mb {
-            $color_palette.maroon
-        } else if $e > 800mb {
-            $color_palette.red
         }
-    }
-    date: {|| (date now) - $in |
-        if $in < 1hr {
-            $color_palette.green
-        } else if $in < 1day {
-            $color_palette.yellow
-        } else if $in < 3day {
-            $color_palette.peach
-        } else if $in < 1wk {
-            $color_palette.maroon
-        } else if $in > 1wk {
-            $color_palette.red
+        
+    return {
+        separator: $color_palette.overlay0
+        leading_trailing_space_bg: { attr: "n" }
+        header: { fg: $color_palette.blue attr: "b" }
+        empty: $color_palette.lavender
+        bool: $color_palette.lavender
+        int: $color_palette.peach
+        duration: $color_palette.text
+        filesize: {|e|
+            if $e < 1mb {
+                $color_palette.green
+            } else if $e < 100mb {
+                $color_palette.yellow
+            } else if $e < 500mb {
+                $color_palette.peach
+            } else if $e < 800mb {
+                $color_palette.maroon
+            } else if $e > 800mb {
+                $color_palette.red
+            }
         }
+        date: {|| (date now) - $in |
+            if $in < 1hr {
+                $color_palette.green
+            } else if $in < 1day {
+                $color_palette.yellow
+            } else if $in < 3day {
+                $color_palette.peach
+            } else if $in < 1wk {
+                $color_palette.maroon
+            } else if $in > 1wk {
+                $color_palette.red
+            }
+        }
+        range: $color_palette.text
+        float: $color_palette.text
+        string: $color_palette.text
+        nothing: $color_palette.text
+        binary: $color_palette.text
+        cellpath: $color_palette.text
+        row_index: { fg: $color_palette.mauve attr: "b" }
+        record: $color_palette.text
+        list: $color_palette.text
+        block: $color_palette.text
+        hints: $color_palette.overlay1
+        search_result: { fg: $color_palette.red bg: $color_palette.text }
+
+        shape_and: { fg: $color_palette.pink attr: "b" }
+        shape_binary: { fg: $color_palette.pink attr: "b" }
+        shape_block: { fg: $color_palette.blue attr: "b" }
+        shape_bool: $color_palette.teal
+        shape_custom: $color_palette.green
+        shape_datetime: { fg: $color_palette.teal attr: "b" }
+        shape_directory: $color_palette.teal
+        shape_external: $color_palette.teal
+        shape_externalarg: { fg: $color_palette.green attr: "b" }
+        shape_filepath: $color_palette.teal
+        shape_flag: { fg: $color_palette.blue attr: "b" }
+        shape_float: { fg: $color_palette.pink attr: "b" }
+        shape_garbage: { fg: $color_palette.text bg: $color_palette.red attr: "b" }
+        shape_globpattern: { fg: $color_palette.teal attr: "b" }
+        shape_int: { fg: $color_palette.pink attr: "b" }
+        shape_internalcall: { fg: $color_palette.teal attr: "b" }
+        shape_list: { fg: $color_palette.teal attr: "b" }
+        shape_literal: $color_palette.blue
+        shape_match_pattern: $color_palette.green
+        shape_matching_brackets: { attr: "u" }
+        shape_nothing: $color_palette.teal
+        shape_operator: $color_palette.peach
+        shape_or: { fg: $color_palette.pink attr: "b" }
+        shape_pipe: { fg: $color_palette.pink attr: "b" }
+        shape_range: { fg: $color_palette.peach attr: "b" }
+        shape_record: { fg: $color_palette.teal attr: "b" }
+        shape_redirection: { fg: $color_palette.pink attr: "b" }
+        shape_signature: { fg: $color_palette.green attr: "b" }
+        shape_string: $color_palette.green
+        shape_string_interpolation: { fg: $color_palette.teal attr: "b" }
+        shape_table: { fg: $color_palette.blue attr: "b" }
+        shape_variable: $color_palette.pink
+
+        background: $color_palette.base
+        foreground: $color_palette.text
+        cursor: $color_palette.blue
     }
-    range: $color_palette.text
-    float: $color_palette.text
-    string: $color_palette.text
-    nothing: $color_palette.text
-    binary: $color_palette.text
-    cellpath: $color_palette.text
-    row_index: { fg: $color_palette.mauve attr: "b" }
-    record: $color_palette.text
-    list: $color_palette.text
-    block: $color_palette.text
-    hints: $color_palette.overlay1
-    search_result: { fg: $color_palette.red bg: $color_palette.text }
-
-    shape_and: { fg: $color_palette.pink attr: "b" }
-    shape_binary: { fg: $color_palette.pink attr: "b" }
-    shape_block: { fg: $color_palette.blue attr: "b" }
-    shape_bool: $color_palette.teal
-    shape_custom: $color_palette.green
-    shape_datetime: { fg: $color_palette.teal attr: "b" }
-    shape_directory: $color_palette.teal
-    shape_external: $color_palette.teal
-    shape_externalarg: { fg: $color_palette.green attr: "b" }
-    shape_filepath: $color_palette.teal
-    shape_flag: { fg: $color_palette.blue attr: "b" }
-    shape_float: { fg: $color_palette.pink attr: "b" }
-    shape_garbage: { fg: $color_palette.text bg: $color_palette.red attr: "b" }
-    shape_globpattern: { fg: $color_palette.teal attr: "b" }
-    shape_int: { fg: $color_palette.pink attr: "b" }
-    shape_internalcall: { fg: $color_palette.teal attr: "b" }
-    shape_list: { fg: $color_palette.teal attr: "b" }
-    shape_literal: $color_palette.blue
-    shape_match_pattern: $color_palette.green
-    shape_matching_brackets: { attr: "u" }
-    shape_nothing: $color_palette.teal
-    shape_operator: $color_palette.peach
-    shape_or: { fg: $color_palette.pink attr: "b" }
-    shape_pipe: { fg: $color_palette.pink attr: "b" }
-    shape_range: { fg: $color_palette.peach attr: "b" }
-    shape_record: { fg: $color_palette.teal attr: "b" }
-    shape_redirection: { fg: $color_palette.pink attr: "b" }
-    shape_signature: { fg: $color_palette.green attr: "b" }
-    shape_string: $color_palette.green
-    shape_string_interpolation: { fg: $color_palette.teal attr: "b" }
-    shape_table: { fg: $color_palette.blue attr: "b" }
-    shape_variable: $color_palette.pink
-
-    background: $color_palette.base
-    foreground: $color_palette.text
-    cursor: $color_palette.blue
-}}
+}
 
 # Update the Nushell configuration
 export def --env "set color_config" [] {