From bcd297526991948cf8c0b1a66ef7e4acfed93d96 Mon Sep 17 00:00:00 2001 From: Chiru B <33750251+itsezc@users.noreply.github.com> Date: Wed, 28 Sep 2022 21:46:56 +0100 Subject: [PATCH] 0.1.8 (#15) * remove: `.config` directory * chore: bump version * update(setup): replace `fish` with `bash` * update(theme): MD, TOML and JSON tokens --- .config/fish/README.md | 1 - .config/fish/config.fish | 12 -- .config/starship.toml | 26 ---- packages/frontend-toolkit/package.json | 2 +- packages/rust-toolkit/package.json | 2 +- packages/vscode/package.json | 4 +- packages/vscode/themes/README.md | 15 +++ packages/vscode/themes/cosmos.json | 157 +++++++++++++++++-------- setup.sh | 2 +- 9 files changed, 129 insertions(+), 92 deletions(-) delete mode 100644 .config/fish/README.md delete mode 100644 .config/fish/config.fish delete mode 100644 .config/starship.toml create mode 100644 packages/vscode/themes/README.md diff --git a/.config/fish/README.md b/.config/fish/README.md deleted file mode 100644 index 58ba190..0000000 --- a/.config/fish/README.md +++ /dev/null @@ -1 +0,0 @@ -# Fish Shell \ No newline at end of file diff --git a/.config/fish/config.fish b/.config/fish/config.fish deleted file mode 100644 index 784d835..0000000 --- a/.config/fish/config.fish +++ /dev/null @@ -1,12 +0,0 @@ -set -x isLocal true -set -gx EDITOR nano - -function fish_greeting -end - -function fish_prompt - printf '%s %s%s%s > ' $USER \ - (set_color $fish_color_cwd) (prompt_pwd) (set_color normal) -end - -starship init fish | source diff --git a/.config/starship.toml b/.config/starship.toml deleted file mode 100644 index 287a649..0000000 --- a/.config/starship.toml +++ /dev/null @@ -1,26 +0,0 @@ -'$schema' = 'https://starship.rs/config-schema.json' - -continuation_prompt = 'β–Άβ–Ά' - -[character] -success_symbol = '[➜](bold green)' - -[username] -style_user = 'bold green' -style_root = 'bold black' -format = '[$user]($style)@' -disabled = false -show_always = true - -[directory] -style = 'bold blue' -home_symbol = '🏠' - -[git_status] -conflicted = '🚩' -untracked = '✨' -staged = '[++\($count\)](green)' - -[time] -disabled = false -style = 'bold white' diff --git a/packages/frontend-toolkit/package.json b/packages/frontend-toolkit/package.json index 09ad40e..c7c541f 100644 --- a/packages/frontend-toolkit/package.json +++ b/packages/frontend-toolkit/package.json @@ -3,7 +3,7 @@ "displayName": "Foretag Frontend Toolkit", "description": "A collection of tools and extensions to enhance your frontend development experience.", "publisher": "foretag", - "version": "0.1.7", + "version": "0.1.8", "icon": "assets/images/foretag_logo_yellow.png", "author": "foretag", "repository": { diff --git a/packages/rust-toolkit/package.json b/packages/rust-toolkit/package.json index fb3abfa..5b0ba93 100644 --- a/packages/rust-toolkit/package.json +++ b/packages/rust-toolkit/package.json @@ -3,7 +3,7 @@ "displayName": "Foretag Rust Toolkit", "description": "A collection of tools and extensions to enhance your Rust development experience.", "publisher": "foretag", - "version": "0.1.6", + "version": "0.1.8", "icon": "assets/images/foretag_logo_yellow.png", "keywords": [ "rust", diff --git a/packages/vscode/package.json b/packages/vscode/package.json index df0184f..825e2dd 100644 --- a/packages/vscode/package.json +++ b/packages/vscode/package.json @@ -3,7 +3,7 @@ "displayName": "Foretag Development Toolkit", "description": "Foretag themes, icons, extensions, languages, snippets and more for VS Code", "publisher": "foretag", - "version": "0.1.7", + "version": "0.1.8", "icon": "assets/images/foretag_logo_yellow.png", "keywords": [ "themes", @@ -42,10 +42,8 @@ "foretag.rust-toolkit", "redhat.vscode-xml", "redhat.vscode-yaml", - "dtsvet.vscode-wasm", "editorconfig.editorconfig", "hashicorp.terraform", - "ms-kubernetes-tools.vscode-kubernetes-tools", "ms-azuretools.vscode-docker", "joshbolduc.commitlint", "CucumberOpen.cucumber-official" diff --git a/packages/vscode/themes/README.md b/packages/vscode/themes/README.md new file mode 100644 index 0000000..d84b32d --- /dev/null +++ b/packages/vscode/themes/README.md @@ -0,0 +1,15 @@ +## Supported languages + +- Bash +- Rust +- TypeScript +- JavaScript +- JSX +- TOML +- JSON +- YAML +- SurrealQL +- MasterCSS +- CSS +- HTML +- Markdown \ No newline at end of file diff --git a/packages/vscode/themes/cosmos.json b/packages/vscode/themes/cosmos.json index e991590..1463ca5 100644 --- a/packages/vscode/themes/cosmos.json +++ b/packages/vscode/themes/cosmos.json @@ -3,17 +3,17 @@ "type": "dark", "semanticHighlighting": true, "colors": { - "focusBorder": "#555555", + "focusBorder": "#303030", "button.background": "#5D21D2", "button.foreground": "#F1EDF1", "progressBar.background": "#5D21D2", "list.focusBackground": "#555555", "list.focusForeground": "#F1EDF1", - "list.hoverBackground": "#444444", + "list.hoverBackground": "#1C1C1C", "list.hoverForeground": "#7B797B", "list.activeSelectionForeground": "#f2eeff", - "list.activeSelectionBackground": "#303030", - "list.inactiveSelectionBackground": "#303030", + "list.activeSelectionBackground": "#26262650", + "list.inactiveSelectionBackground": "#1C1C1C", "scrollbarSlider.background": "#303030", "scrollbarSlider.activeBackground": "#555555", "scrollbarSlider.hoverBackground": "#444444", @@ -28,10 +28,7 @@ "editorLineNumber.activeForeground": "#7B797B", "editor.lineHighlightBorder": "#303030", "editor.lineHighlightBackground": "#303030", - "editor.wordHighlightBackground": "#4c496b", - "editor.findMatchBackground": "#534f79", "editor.foldBackground": "#7B797B25", - "editorMarkerNavigation.background": "#161526", "editorBracketMatch.background": "#303030", "editorBracketMatch.border": "#303030", "editorIndentGuide.background": "#303030", @@ -66,13 +63,13 @@ "peekViewResult.background": "#191919", "peekViewResult.lineForeground": "#7B797B", "peekViewResult.fileForeground": "#7B797B", - "breadcrumb.background": "#1C1C1C", + "breadcrumb.background": "#191919", "breadcrumb.foreground": "#7B797B", "breadcrumb.focusForeground": "#F1EDF1", "pickerGroup.foreground": "#7b797b", "sideBarTitle.foreground": "#fff", "sideBar.border": "#191919", - "sideBarSectionHeader.background": "#1C1C1C", + "sideBarSectionHeader.background": "#191919", "sideBarSectionHeader.border": "#1C1C1C", "sideBar.background": "#191919", "sideBar.foreground": "#e7e3f5ef", @@ -82,14 +79,14 @@ "tab.activeBackground": "#1C1C1C", "tab.activeForeground": "#F1EDF1", "tab.hoverForeground": "#d3cfe5", - "tab.hoverBackground": "#303030", + "tab.hoverBackground": "#1C1C1C", "editorGroupHeader.tabsBackground": "#191919", "titleBar.activeBackground": "#191919", "titleBar.activeForeground": "#7B797B", "titleBar.inactiveBackground": "#191919", "titleBar.inactiveForeground": "#7B797B", "menu.background": "#303030", - "menu.border": "#1c1c1c", + "menu.border": "#1C1C1C", "menu.separatorBackground": "#262626", "menu.selectionBackground": "#1C1C1C", "menu.selectionForeground": "#F1EDF1", @@ -126,8 +123,8 @@ "panelTitle.inactiveForeground": "#7B797B", "commandCenter.background": "#191919", "commandCenter.foreground": "#555555", - "commandCenter.activeBackground": "#1c1c1c", - "commandCenter.border": "#1c1c1c", + "commandCenter.activeBackground": "#1C1C1C", + "commandCenter.border": "#1C1C1C", "welcomePage.progress.foreground": "#5D21D2", "welcomePage.progress.background": "#1C1C1C", "welcomePage.tileBackground": "#191919", @@ -160,7 +157,7 @@ "foreground": "#FFC2A9" }, "function": { - "foreground": "#A0C4FF" + "foreground": "#FDFFB6" }, "method": { "foreground": "#A0C4FF" @@ -209,11 +206,39 @@ } }, "tokenColors": [ + { + "name": "Docs - Pargraph", + "scope": [ + "meta.paragraph.markdown" + ], + "settings": { + "foreground": "#7B797B" + } + }, + { + "name": "Docs - Heading", + "scope": [ + "markup.heading.markdown" + ], + "settings": { + "foreground": "#FF61AB" + } + }, + { + "name": "Docs - Code block", + "scope": [ + "markup.fenced_code.block.markdown" + ], + "settings": { + "foreground": "#FDFFB6" + } + }, { "name": "Comment", "scope": [ "comment", - "punctuation.definition.comment" + "punctuation.definition.comment", + "string.quoted.docstring" ], "settings": { "fontStyle": "italic", @@ -230,13 +255,28 @@ "foreground": "#82AAFF" } }, + { + "name": "Function", + "scope": [ + "entity.name.function.tsx", + "variable.other.readwrite.alias.tsx" + ], + "settings": { + "foreground": "#FDFFB6" + } + }, { "name": "Primitives", "scope": [ "string.template.ts", "string.quoted.single.tsx", "string.quoted.single.ts", - "constant.numeric.decimal.ts" + "string.template.tsx", + "string.template.ts", + "constant.numeric.decimal.ts", + "string.quoted.double.json", + "constant.language.boolean.true.tsx", + "constant.language.boolean.true.ts" ], "settings": { "foreground": "#FF61AB" @@ -260,7 +300,7 @@ "meta.brace.square.ts" ], "settings": { - "foreground": "#f9e2af" + "foreground": "#F1EDF1" } }, { @@ -279,12 +319,20 @@ "name": "Keyword", "scope": [ "storage.type.tsx", + "storage.type.function.ts", + "storage.type.function.tsx", + "keyword.control.export.ts", "keyword.control.export.tsx", "keyword.control.import.tsx", - "storage.type.class.tsx" + "keyword.control.from.tsx", + "storage.type.class.tsx", + "keyword.control.flow.ts", + "keyword.control.flow.tsx", + "keyword.control.default.ts", + "keyword.control.default.tsx" ], "settings": { - "foreground": "#FF61AB" + "foreground": "#B4BEFE" } }, { @@ -298,29 +346,48 @@ } }, { - "name": "Block", + "name": "Punctuation - Default", "scope": [ - "meta.block.tsx", - "meta.block.ts" + "meta.brace.round.ts" ], "settings": { - "foreground": "#FFC6FF" + "foreground": "#F1EDF1" } }, - // TS { - "name": "Punctuation - Default", + "name": "Punctuation - Highlighted", "scope": [ - "meta.brace.round.ts" + "storage.type.function.arrow.tsx", + "keyword.operator.assignment.tsx" ], "settings": { - "foreground": "#F1EDF1" + "foreground": "#B4BEFE" + } + }, + { + "name": "Property", + "scope": [ + "support.type.property-name.json", + "support.type.property-name.toml" + ], + "settings": { + "foreground": "#dc8a78" + } + }, + { + "name": "Property Blocks", + "scope": [ + "support.type.property-name.table.toml" + ], + "settings": { + "foreground": "#FFC6FF" } }, { "name": "TS - Native objects", "scope": [ - "variable.other.object.ts" + "variable.other.object.ts", + "variable.other.object.tsx" ], "settings": { "foreground": "#FCA669" @@ -364,15 +431,6 @@ "foreground": "#f5c2e7" } }, - { - "name": "TS - return Keyword", - "scope": [ - "keyword.control.flow.ts" - ], - "settings": { - "foreground": "#737994" - } - }, { "name": "TS - Variable / Constants - Keyword", "scope": [ @@ -388,17 +446,16 @@ "variable.other.constant" ], "settings": { - "foreground": "#e78284" + "foreground": "#F1EDF1" } }, { "name": "TS - Variable", "scope": [ "meta.definition.variable.ts", - "variable.other.readwrite.ts" ], "settings": { - "foreground": "#94e2d5" + "foreground": "#F1EDF1" } }, { @@ -411,23 +468,29 @@ } }, { - "name": "TS - Export", + "name": "TSX - Value", "scope": [ - "keyword.control.export.ts" + "constant.language.null.tsx" ], "settings": { - "foreground": "" + "foreground": "#FF6A99" } }, { - "name": "TSX - Value", + "name": "TSX - Children", "scope": [ - "constant.language.null.tsx" + "meta.jsx.children.tsx" ], "settings": { - "foreground": "#FF6A99" + "foreground": "#A6ADC8" } }, - // Rust + { + "name": "MasterCSS - Class", + "scope": "meta.embedded.block.master-css.class", + "settings": { + "foreground": "#E0DF94" + } + } ] } \ No newline at end of file diff --git a/setup.sh b/setup.sh index 7736046..8b1921b 100644 --- a/setup.sh +++ b/setup.sh @@ -2,7 +2,7 @@ apk update apk upgrade -apk add --no-cache --update fish curl +apk add --no-cache --update bash curl # Rust and Cargo curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh