From 35c22b334bbd57a18d89ad4ee11d65f3fe610c8b Mon Sep 17 00:00:00 2001 From: Julien Klaer Date: Tue, 23 Apr 2024 12:00:08 +0200 Subject: [PATCH 1/2] feat: alacritty replaced yml format for toml --- packages/alacritty/README.md | 7 +++---- packages/alacritty/aura-theme.toml | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 packages/alacritty/aura-theme.toml diff --git a/packages/alacritty/README.md b/packages/alacritty/README.md index 268b8b7..d3c9840 100644 --- a/packages/alacritty/README.md +++ b/packages/alacritty/README.md @@ -23,11 +23,10 @@ # Installation -1. Open [aura-theme.yml](https://raw.githubusercontent.com/daltonmenezes/aura-theme/main/packages/alacritty/aura-theme.yml) and save it in `~/.config/alacritty` +1. Open [aura-theme.toml](https://raw.githubusercontent.com/daltonmenezes/aura-theme/main/packages/alacritty/aura-theme.toml) and save it in `~/.config/alacritty` 2. Edit the Alacritty config file by adding: - ```yml - import: - - ~/.config/alacritty/aura-theme.yml + ```toml + import = ["~/.config/alacritty/aura-theme.toml"] ```
diff --git a/packages/alacritty/aura-theme.toml b/packages/alacritty/aura-theme.toml new file mode 100644 index 0000000..8422e3e --- /dev/null +++ b/packages/alacritty/aura-theme.toml @@ -0,0 +1,28 @@ +foreground = "#edecee" + +[colors.cursor] +cursor = "#a277ff" + +[colors.selection] +text = "CellForeground" +background = "#29263c" + +[colors.normal] +black = "#110f18" +red = "#ff6767" +green = "#61ffca" +yellow = "#ffca85" +blue = "#a277ff" +magenta = "#a277ff" +cyan = "#61ffca" +white = "#edecee" + +[colors.bright] +black = "#4d4d4d" +red = "#ff6767" +green = "#61ffca" +yellow = "#ffca85" +blue = "#a277ff" +magenta = "#a277ff" +cyan = "#61ffca" +white = "#edecee" \ No newline at end of file From 65f8febbbf1a3f148c0efc49f6ca649b149a8fbe Mon Sep 17 00:00:00 2001 From: Julien Klaer Date: Fri, 17 May 2024 16:58:26 +0200 Subject: [PATCH 2/2] fix(alacritty): following proper way of updating a port --- packages/alacritty/README.md | 10 +++- packages/alacritty/aura-theme.toml | 53 +++++++++++-------- packages/alacritty/aura-theme.yml | 35 ------------ src/ports/alacritty/index.ts | 4 +- src/ports/alacritty/templates/README.md | 15 ++++-- src/ports/alacritty/templates/aura-theme.toml | 35 ++++++++++++ src/ports/alacritty/templates/aura-theme.yml | 35 ------------ 7 files changed, 87 insertions(+), 100 deletions(-) delete mode 100644 packages/alacritty/aura-theme.yml create mode 100644 src/ports/alacritty/templates/aura-theme.toml delete mode 100644 src/ports/alacritty/templates/aura-theme.yml diff --git a/packages/alacritty/README.md b/packages/alacritty/README.md index d3c9840..e1fdb04 100644 --- a/packages/alacritty/README.md +++ b/packages/alacritty/README.md @@ -13,7 +13,7 @@ - version + version

@@ -50,6 +50,13 @@ Done! ✨ 🎉

+ +

+ + + +

+ @@ -57,6 +64,7 @@ Done! ✨ 🎉 Dalton Menezes João Pedro Alves + Julien Klaer diff --git a/packages/alacritty/aura-theme.toml b/packages/alacritty/aura-theme.toml index 8422e3e..ae4740b 100644 --- a/packages/alacritty/aura-theme.toml +++ b/packages/alacritty/aura-theme.toml @@ -1,28 +1,35 @@ -foreground = "#edecee" +# Colors (Aura Theme) -[colors.cursor] -cursor = "#a277ff" - -[colors.selection] -text = "CellForeground" -background = "#29263c" +# Default colors +[colors.primary] +background = '#15141b' +foreground = '#edecee' +# Normal colors [colors.normal] -black = "#110f18" -red = "#ff6767" -green = "#61ffca" -yellow = "#ffca85" -blue = "#a277ff" -magenta = "#a277ff" -cyan = "#61ffca" -white = "#edecee" +black = '#110f18' +red = '#ff6767' +green = '#61ffca' +yellow = '#ffca85' +blue = '#a277ff' +magenta = '#a277ff' +cyan = '#61ffca' +white = '#edecee' +# Bright colors [colors.bright] -black = "#4d4d4d" -red = "#ff6767" -green = "#61ffca" -yellow = "#ffca85" -blue = "#a277ff" -magenta = "#a277ff" -cyan = "#61ffca" -white = "#edecee" \ No newline at end of file +black = '#4d4d4d' +red = '#ff6767' +green = '#61ffca' +yellow = '#ffca85' +blue = '#a277ff' +magenta = '#a277ff' +cyan = '#61ffca' +white = '#edecee' + +[colors.selection] +text = 'CellForeground' +background = '#29263c' + +[colors.cursor] +cursor = '#a277ff' diff --git a/packages/alacritty/aura-theme.yml b/packages/alacritty/aura-theme.yml deleted file mode 100644 index ec54d06..0000000 --- a/packages/alacritty/aura-theme.yml +++ /dev/null @@ -1,35 +0,0 @@ -# Colors (Aura Theme) -colors: - # Default colors - primary: - background: '#15141b' - foreground: '#edecee' - - cursor: - cursor: '#a277ff' - - selection: - text: CellForeground - background: '#29263c' - - # Normal colors - normal: - black: '#110f18' - red: '#ff6767' - green: '#61ffca' - yellow: '#ffca85' - blue: '#a277ff' - magenta: '#a277ff' - cyan: '#61ffca' - white: '#edecee' - - # Bright colors - bright: - black: '#4d4d4d' - red: '#ff6767' - green: '#61ffca' - yellow: '#ffca85' - blue: '#a277ff' - magenta: '#a277ff' - cyan: '#61ffca' - white: '#edecee' diff --git a/src/ports/alacritty/index.ts b/src/ports/alacritty/index.ts index e33c979..e011884 100644 --- a/src/ports/alacritty/index.ts +++ b/src/ports/alacritty/index.ts @@ -6,12 +6,12 @@ export async function AlacrittyPort(Aura: AuraAPI) { const { info } = constants const portName = 'Alacritty terminal' - const version = '1.0.1' + const version = '1.1.0' const previewURL = `https://github.com/${info.author.username}/assets/blob/master/images/${info.slug}/aura-alacritty-preview.png?raw=true` const templateFolder = resolve(__dirname, 'templates') await createPort({ - template: resolve(templateFolder, `${info.slug}.yml`), + template: resolve(templateFolder, `${info.slug}.toml`), replacements: { ...colorSchemes.dark, ...info, diff --git a/src/ports/alacritty/templates/README.md b/src/ports/alacritty/templates/README.md index 22df314..964bed8 100644 --- a/src/ports/alacritty/templates/README.md +++ b/src/ports/alacritty/templates/README.md @@ -1,11 +1,10 @@ {{{ basic-heading }}} # Installation -1. Open [{{ slug }}.yml](https://raw.githubusercontent.com/{{ author.username }}/{{ slug }}/main/packages/alacritty/{{ slug }}.yml) and save it in `~/.config/alacritty` +1. Open [{{ slug }}.toml](https://raw.githubusercontent.com/{{ author.username }}/{{ slug }}/main/packages/alacritty/{{ slug }}.toml) and save it in `~/.config/alacritty` 2. Edit the Alacritty config file by adding: - ```yml - import: - - ~/.config/alacritty/{{ slug }}.yml + ```toml + import = ["~/.config/alacritty/{{ slug }}.toml"] ``` {{{ done }}} @@ -22,6 +21,13 @@

+ +

+ + + +

+ @@ -29,6 +35,7 @@ {{{ author-tbody }}} João Pedro Alves + Julien Klaer diff --git a/src/ports/alacritty/templates/aura-theme.toml b/src/ports/alacritty/templates/aura-theme.toml new file mode 100644 index 0000000..17597c8 --- /dev/null +++ b/src/ports/alacritty/templates/aura-theme.toml @@ -0,0 +1,35 @@ +# Colors ({{ displayName }}) + +# Default colors +[colors.primary] +background = '{{ accent12 }}' +foreground = '{{ accent7 }}' + +# Normal colors +[colors.normal] +black = '{{ accent21 }}' +red = '{{ accent5 }}' +green = '{{ accent2 }}' +yellow = '{{ accent3 }}' +blue = '{{ accent1 }}' +magenta = '{{ accent1 }}' +cyan = '{{ accent2 }}' +white = '{{ accent7 }}' + +# Bright colors +[colors.bright] +black = '{{ accent15 }}' +red = '{{ accent5 }}' +green = '{{ accent2 }}' +yellow = '{{ accent3 }}' +blue = '{{ accent1 }}' +magenta = '{{ accent1 }}' +cyan = '{{ accent2 }}' +white = '{{ accent7 }}' + +[colors.selection] +text = 'CellForeground' +background = '{{ accent38 }}' + +[colors.cursor] +cursor = '{{ accent1 }}' diff --git a/src/ports/alacritty/templates/aura-theme.yml b/src/ports/alacritty/templates/aura-theme.yml deleted file mode 100644 index 15adb09..0000000 --- a/src/ports/alacritty/templates/aura-theme.yml +++ /dev/null @@ -1,35 +0,0 @@ -# Colors ({{ displayName }}) -colors: - # Default colors - primary: - background: '{{ accent12 }}' - foreground: '{{ accent7 }}' - - cursor: - cursor: '{{ accent1 }}' - - selection: - text: CellForeground - background: '{{ accent38 }}' - - # Normal colors - normal: - black: '{{ accent21 }}' - red: '{{ accent5 }}' - green: '{{ accent2 }}' - yellow: '{{ accent3 }}' - blue: '{{ accent1 }}' - magenta: '{{ accent1 }}' - cyan: '{{ accent2 }}' - white: '{{ accent7 }}' - - # Bright colors - bright: - black: '{{ accent15 }}' - red: '{{ accent5 }}' - green: '{{ accent2 }}' - yellow: '{{ accent3 }}' - blue: '{{ accent1 }}' - magenta: '{{ accent1 }}' - cyan: '{{ accent2 }}' - white: '{{ accent7 }}'