diff --git a/bat/config b/bat/config index f8567dd..7f1c2de 100644 --- a/bat/config +++ b/bat/config @@ -1 +1 @@ ---theme="ayu_mirage" +--theme="norrsken" diff --git a/bat/themes/Catppuccin Macchiato.tmTheme b/bat/themes/Catppuccin Macchiato.tmTheme deleted file mode 100644 index a676454..0000000 --- a/bat/themes/Catppuccin Macchiato.tmTheme +++ /dev/null @@ -1,2021 +0,0 @@ - - - - - name - Catppuccin Macchiato - semanticClass - theme.dark.catppuccin-macchiato - uuid - 02b2bdf3-9eb7-4396-bf04-f17f1468f99f - author - Catppuccin Org - colorSpaceName - sRGB - settings - - - settings - - background - #24273a - foreground - #cad3f5 - caret - #f4dbd6 - lineHighlight - #cad3f512 - misspelling - #ed8796 - accent - #c6a0f6 - selection - #939ab740 - activeGuide - #494d64 - findHighlight - #455c6d - gutterForeground - #8087a2 - - - - name - Basic text & variable names (incl. leading punctuation) - scope - text, source, variable.other.readwrite, punctuation.definition.variable - settings - - foreground - #cad3f5 - - - - name - Parentheses, Brackets, Braces - scope - punctuation - settings - - foreground - #939ab7 - fontStyle - - - - - name - Comments - scope - comment, punctuation.definition.comment - settings - - foreground - #6e738d - fontStyle - italic - - - - scope - string, punctuation.definition.string - settings - - foreground - #a6da95 - - - - scope - constant.character.escape - settings - - foreground - #f5bde6 - - - - name - Booleans, constants, numbers - scope - constant.numeric, variable.other.constant, entity.name.constant, constant.language.boolean, constant.language.false, constant.language.true, keyword.other.unit.user-defined, keyword.other.unit.suffix.floating-point - settings - - foreground - #f5a97f - - - - scope - keyword, keyword.operator.word, keyword.operator.new, variable.language.super, support.type.primitive, storage.type, storage.modifier, punctuation.definition.keyword - settings - - foreground - #c6a0f6 - fontStyle - - - - - scope - entity.name.tag.documentation - settings - - foreground - #c6a0f6 - - - - name - Punctuation - scope - keyword.operator, punctuation.accessor, punctuation.definition.generic, meta.function.closure punctuation.section.parameters, punctuation.definition.tag, punctuation.separator.key-value - settings - - foreground - #8bd5ca - - - - scope - entity.name.function, meta.function-call.method, support.function, support.function.misc, variable.function - settings - - foreground - #8aadf4 - fontStyle - italic - - - - name - Classes - scope - entity.name.class, entity.other.inherited-class, support.class, meta.function-call.constructor, entity.name.struct - settings - - foreground - #eed49f - fontStyle - italic - - - - name - Enum - scope - entity.name.enum - settings - - foreground - #eed49f - fontStyle - italic - - - - name - Enum member - scope - meta.enum variable.other.readwrite, variable.other.enummember - settings - - foreground - #8bd5ca - - - - name - Object properties - scope - meta.property.object - settings - - foreground - #8bd5ca - - - - name - Types - scope - meta.type, meta.type-alias, support.type, entity.name.type - settings - - foreground - #eed49f - fontStyle - italic - - - - name - Decorators - scope - meta.annotation variable.function, meta.annotation variable.annotation.function, meta.annotation punctuation.definition.annotation, meta.decorator, punctuation.decorator - settings - - foreground - #f5a97f - - - - scope - variable.parameter, meta.function.parameters - settings - - foreground - #ee99a0 - fontStyle - italic - - - - name - Built-ins - scope - constant.language, support.function.builtin - settings - - foreground - #ed8796 - - - - scope - entity.other.attribute-name.documentation - settings - - foreground - #ed8796 - - - - name - Preprocessor directives - scope - keyword.control.directive, punctuation.definition.directive - settings - - foreground - #eed49f - - - - name - Type parameters - scope - punctuation.definition.typeparameters - settings - - foreground - #91d7e3 - - - - name - Namespaces - scope - entity.name.namespace - settings - - foreground - #eed49f - - - - name - Property names (left hand assignments in json/yaml/css) - scope - support.type.property-name.css - settings - - foreground - #8aadf4 - fontStyle - - - - - name - This/Self keyword - scope - variable.language.this, variable.language.this punctuation.definition.variable - settings - - foreground - #ed8796 - - - - name - Object properties - scope - variable.object.property - settings - - foreground - #cad3f5 - - - - name - String template interpolation - scope - string.template variable, string variable - settings - - foreground - #cad3f5 - - - - name - `new` as bold - scope - keyword.operator.new - settings - - fontStyle - bold - - - - name - C++ extern keyword - scope - storage.modifier.specifier.extern.cpp - settings - - foreground - #c6a0f6 - - - - name - C++ scope resolution - scope - entity.name.scope-resolution.template.call.cpp, entity.name.scope-resolution.parameter.cpp, entity.name.scope-resolution.cpp, entity.name.scope-resolution.function.definition.cpp - settings - - foreground - #eed49f - - - - name - C++ doc keywords - scope - storage.type.class.doxygen - settings - - fontStyle - - - - - name - C++ operators - scope - storage.modifier.reference.cpp - settings - - foreground - #8bd5ca - - - - name - C# Interpolated Strings - scope - meta.interpolation.cs - settings - - foreground - #cad3f5 - - - - name - C# xml-style docs - scope - comment.block.documentation.cs - settings - - foreground - #cad3f5 - - - - name - Classes, reflecting the className color in JSX - scope - source.css entity.other.attribute-name.class.css, entity.other.attribute-name.parent-selector.css punctuation.definition.entity.css - settings - - foreground - #eed49f - - - - name - Operators - scope - punctuation.separator.operator.css - settings - - foreground - #8bd5ca - - - - name - Pseudo classes - scope - source.css entity.other.attribute-name.pseudo-class - settings - - foreground - #8bd5ca - - - - scope - source.css constant.other.unicode-range - settings - - foreground - #f5a97f - - - - scope - source.css variable.parameter.url - settings - - foreground - #a6da95 - fontStyle - - - - - name - CSS vendored property names - scope - support.type.vendored.property-name - settings - - foreground - #91d7e3 - - - - name - Less/SCSS right-hand variables (@/$-prefixed) - scope - source.css meta.property-value variable, source.css meta.property-value variable.other.less, source.css meta.property-value variable.other.less punctuation.definition.variable.less, meta.definition.variable.scss - settings - - foreground - #ee99a0 - - - - name - CSS variables (--prefixed) - scope - source.css meta.property-list variable, meta.property-list variable.other.less, meta.property-list variable.other.less punctuation.definition.variable.less - settings - - foreground - #8aadf4 - - - - name - CSS Percentage values, styled the same as numbers - scope - keyword.other.unit.percentage.css - settings - - foreground - #f5a97f - - - - name - CSS Attribute selectors, styled the same as strings - scope - source.css meta.attribute-selector - settings - - foreground - #a6da95 - - - - name - JSON/YAML keys, other left-hand assignments - scope - keyword.other.definition.ini, punctuation.support.type.property-name.json, support.type.property-name.json, punctuation.support.type.property-name.toml, support.type.property-name.toml, entity.name.tag.yaml, punctuation.support.type.property-name.yaml, support.type.property-name.yaml - settings - - foreground - #8aadf4 - fontStyle - - - - - name - JSON/YAML constants - scope - constant.language.json, constant.language.yaml - settings - - foreground - #f5a97f - - - - name - YAML anchors - scope - entity.name.type.anchor.yaml, variable.other.alias.yaml - settings - - foreground - #eed49f - fontStyle - - - - - name - TOML tables / ini groups - scope - support.type.property-name.table, entity.name.section.group-title.ini - settings - - foreground - #eed49f - - - - name - TOML dates - scope - constant.other.time.datetime.offset.toml - settings - - foreground - #f5bde6 - - - - name - YAML anchor puctuation - scope - punctuation.definition.anchor.yaml, punctuation.definition.alias.yaml - settings - - foreground - #f5bde6 - - - - name - YAML triple dashes - scope - entity.other.document.begin.yaml - settings - - foreground - #f5bde6 - - - - name - Markup Diff - scope - markup.changed.diff - settings - - foreground - #f5a97f - - - - name - Diff - scope - meta.diff.header.from-file, meta.diff.header.to-file, punctuation.definition.from-file.diff, punctuation.definition.to-file.diff - settings - - foreground - #8aadf4 - - - - name - Diff Inserted - scope - markup.inserted.diff - settings - - foreground - #a6da95 - - - - name - Diff Deleted - scope - markup.deleted.diff - settings - - foreground - #ed8796 - - - - name - dotenv left-hand side assignments - scope - variable.other.env - settings - - foreground - #8aadf4 - - - - name - dotenv reference to existing env variable - scope - string.quoted variable.other.env - settings - - foreground - #cad3f5 - - - - name - GDScript functions - scope - support.function.builtin.gdscript - settings - - foreground - #8aadf4 - - - - name - GDScript constants - scope - constant.language.gdscript - settings - - foreground - #f5a97f - - - - name - Comment keywords - scope - comment meta.annotation.go - settings - - foreground - #ee99a0 - - - - name - go:embed, go:build, etc. - scope - comment meta.annotation.parameters.go - settings - - foreground - #f5a97f - - - - name - Go constants (nil, true, false) - scope - constant.language.go - settings - - foreground - #f5a97f - - - - name - GraphQL variables - scope - variable.graphql - settings - - foreground - #cad3f5 - - - - name - GraphQL aliases - scope - string.unquoted.alias.graphql - settings - - foreground - #f0c6c6 - - - - name - GraphQL enum members - scope - constant.character.enum.graphql - settings - - foreground - #8bd5ca - - - - name - GraphQL field in types - scope - meta.objectvalues.graphql constant.object.key.graphql string.unquoted.graphql - settings - - foreground - #f0c6c6 - - - - name - HTML/XML DOCTYPE as keyword - scope - keyword.other.doctype, meta.tag.sgml.doctype punctuation.definition.tag, meta.tag.metadata.doctype entity.name.tag, meta.tag.metadata.doctype punctuation.definition.tag - settings - - foreground - #c6a0f6 - - - - name - HTML/XML-like <tags/> - scope - entity.name.tag - settings - - foreground - #8aadf4 - fontStyle - - - - - name - Special characters like &amp; - scope - text.html constant.character.entity, text.html constant.character.entity punctuation, constant.character.entity.xml, constant.character.entity.xml punctuation, constant.character.entity.js.jsx, constant.charactger.entity.js.jsx punctuation, constant.character.entity.tsx, constant.character.entity.tsx punctuation - settings - - foreground - #ed8796 - - - - name - HTML/XML tag attribute values - scope - entity.other.attribute-name - settings - - foreground - #eed49f - - - - name - Components - scope - support.class.component, support.class.component.jsx, support.class.component.tsx, support.class.component.vue - settings - - foreground - #f5bde6 - fontStyle - - - - - name - Annotations - scope - punctuation.definition.annotation, storage.type.annotation - settings - - foreground - #f5a97f - - - - name - Java enums - scope - constant.other.enum.java - settings - - foreground - #8bd5ca - - - - name - Java imports - scope - storage.modifier.import.java - settings - - foreground - #cad3f5 - - - - name - Javadoc - scope - comment.block.javadoc.java keyword.other.documentation.javadoc.java - settings - - fontStyle - - - - - name - Exported Variable - scope - meta.export variable.other.readwrite.js - settings - - foreground - #ee99a0 - - - - name - JS/TS constants & properties - scope - variable.other.constant.js, variable.other.constant.ts, variable.other.property.js, variable.other.property.ts - settings - - foreground - #cad3f5 - - - - name - JSDoc; these are mainly params, so styled as such - scope - variable.other.jsdoc, comment.block.documentation variable.other - settings - - foreground - #ee99a0 - fontStyle - - - - - name - JSDoc keywords - scope - storage.type.class.jsdoc - settings - - fontStyle - - - - - scope - support.type.object.console.js - settings - - foreground - #cad3f5 - - - - name - Node constants as keywords (module, etc.) - scope - support.constant.node, support.type.object.module.js - settings - - foreground - #c6a0f6 - - - - name - implements as keyword - scope - storage.modifier.implements - settings - - foreground - #c6a0f6 - - - - name - Builtin types - scope - constant.language.null.js, constant.language.null.ts, constant.language.undefined.js, constant.language.undefined.ts, support.type.builtin.ts - settings - - foreground - #c6a0f6 - - - - scope - variable.parameter.generic - settings - - foreground - #eed49f - - - - name - Arrow functions - scope - keyword.declaration.function.arrow.js, storage.type.function.arrow.ts - settings - - foreground - #8bd5ca - - - - name - Decorator punctuations (decorators inherit from blue functions, instead of styleguide peach) - scope - punctuation.decorator.ts - settings - - foreground - #8aadf4 - fontStyle - italic - - - - name - Extra JS/TS keywords - scope - keyword.operator.expression.in.js, keyword.operator.expression.in.ts, keyword.operator.expression.infer.ts, keyword.operator.expression.instanceof.js, keyword.operator.expression.instanceof.ts, keyword.operator.expression.is, keyword.operator.expression.keyof.ts, keyword.operator.expression.of.js, keyword.operator.expression.of.ts, keyword.operator.expression.typeof.ts - settings - - foreground - #c6a0f6 - - - - name - Julia macros - scope - support.function.macro.julia - settings - - foreground - #8bd5ca - fontStyle - italic - - - - name - Julia language constants (true, false) - scope - constant.language.julia - settings - - foreground - #f5a97f - - - - name - Julia other constants (these seem to be arguments inside arrays) - scope - constant.other.symbol.julia - settings - - foreground - #ee99a0 - - - - name - LaTeX preamble - scope - text.tex keyword.control.preamble - settings - - foreground - #8bd5ca - - - - name - LaTeX be functions - scope - text.tex support.function.be - settings - - foreground - #91d7e3 - - - - name - LaTeX math - scope - constant.other.general.math.tex - settings - - foreground - #f0c6c6 - - - - name - Lua docstring keywords - scope - comment.line.double-dash.documentation.lua storage.type.annotation.lua - settings - - foreground - #c6a0f6 - fontStyle - - - - - name - Lua docstring variables - scope - comment.line.double-dash.documentation.lua entity.name.variable.lua, comment.line.double-dash.documentation.lua variable.lua - settings - - foreground - #cad3f5 - - - - scope - heading.1.markdown punctuation.definition.heading.markdown, heading.1.markdown, markup.heading.atx.1.mdx, markup.heading.atx.1.mdx punctuation.definition.heading.mdx, markup.heading.setext.1.markdown, markup.heading.heading-0.asciidoc - settings - - foreground - #ed8796 - - - - scope - heading.2.markdown punctuation.definition.heading.markdown, heading.2.markdown, markup.heading.atx.2.mdx, markup.heading.atx.2.mdx punctuation.definition.heading.mdx, markup.heading.setext.2.markdown, markup.heading.heading-1.asciidoc - settings - - foreground - #f5a97f - - - - scope - heading.3.markdown punctuation.definition.heading.markdown, heading.3.markdown, markup.heading.atx.3.mdx, markup.heading.atx.3.mdx punctuation.definition.heading.mdx, markup.heading.heading-2.asciidoc - settings - - foreground - #eed49f - - - - scope - heading.4.markdown punctuation.definition.heading.markdown, heading.4.markdown, markup.heading.atx.4.mdx, markup.heading.atx.4.mdx punctuation.definition.heading.mdx, markup.heading.heading-3.asciidoc - settings - - foreground - #a6da95 - - - - scope - heading.5.markdown punctuation.definition.heading.markdown, heading.5.markdown, markup.heading.atx.5.mdx, markup.heading.atx.5.mdx punctuation.definition.heading.mdx, markup.heading.heading-4.asciidoc - settings - - foreground - #8aadf4 - - - - scope - heading.6.markdown punctuation.definition.heading.markdown, heading.6.markdown, markup.heading.atx.6.mdx, markup.heading.atx.6.mdx punctuation.definition.heading.mdx, markup.heading.heading-5.asciidoc - settings - - foreground - #c6a0f6 - - - - scope - markup.bold - settings - - foreground - #ed8796 - fontStyle - bold - - - - scope - markup.italic - settings - - foreground - #ed8796 - fontStyle - italic - - - - scope - markup.strikethrough - settings - - foreground - #a5adcb - fontStyle - strikethrough - - - - name - Markdown auto links - scope - punctuation.definition.link, markup.underline.link - settings - - foreground - #8aadf4 - - - - name - Markdown links - scope - text.html.markdown punctuation.definition.link.title, string.other.link.title.markdown, markup.link, punctuation.definition.constant.markdown, constant.other.reference.link.markdown, markup.substitution.attribute-reference - settings - - foreground - #b7bdf8 - - - - name - Markdown code spans - scope - punctuation.definition.raw.markdown, markup.inline.raw.string.markdown, markup.raw.block.markdown - settings - - foreground - #a6da95 - - - - name - Markdown triple backtick language identifier - scope - fenced_code.block.language - settings - - foreground - #91d7e3 - - - - name - Markdown triple backticks - scope - markup.fenced_code.block punctuation.definition, markup.raw support.asciidoc - settings - - foreground - #939ab7 - - - - name - Markdown quotes - scope - markup.quote, punctuation.definition.quote.begin - settings - - foreground - #f5bde6 - - - - name - Markdown separators - scope - meta.separator.markdown - settings - - foreground - #8bd5ca - - - - name - Markdown list bullets - scope - punctuation.definition.list.begin.markdown, markup.list.bullet - settings - - foreground - #8bd5ca - - - - name - Nix attribute names - scope - entity.other.attribute-name.multipart.nix, entity.other.attribute-name.single.nix - settings - - foreground - #8aadf4 - - - - name - Nix parameter names - scope - variable.parameter.name.nix - settings - - foreground - #cad3f5 - fontStyle - - - - - name - Nix interpolated parameter names - scope - meta.embedded variable.parameter.name.nix - settings - - foreground - #b7bdf8 - fontStyle - - - - - name - Nix paths - scope - string.unquoted.path.nix - settings - - foreground - #f5bde6 - fontStyle - - - - - name - PHP Attributes - scope - support.attribute.builtin, meta.attribute.php - settings - - foreground - #eed49f - - - - name - PHP Parameters (needed for the leading dollar sign) - scope - meta.function.parameters.php punctuation.definition.variable.php - settings - - foreground - #ee99a0 - - - - name - PHP Constants (null, __FILE__, etc.) - scope - constant.language.php - settings - - foreground - #c6a0f6 - - - - name - PHP functions - scope - text.html.php support.function - settings - - foreground - #91d7e3 - - - - name - PHPdoc keywords - scope - keyword.other.phpdoc.php - settings - - fontStyle - - - - - name - Python argument functions reset to text, otherwise they inherit blue from function-call - scope - support.variable.magic.python, meta.function-call.arguments.python - settings - - foreground - #cad3f5 - - - - name - Python double underscore functions - scope - support.function.magic.python - settings - - foreground - #91d7e3 - fontStyle - italic - - - - name - Python `self` keyword - scope - variable.parameter.function.language.special.self.python, variable.language.special.self.python - settings - - foreground - #ed8796 - fontStyle - italic - - - - name - python keyword flow/logical (for ... in) - scope - keyword.control.flow.python, keyword.operator.logical.python - settings - - foreground - #c6a0f6 - - - - name - python storage type - scope - storage.type.function.python - settings - - foreground - #c6a0f6 - - - - name - python function support - scope - support.token.decorator.python, meta.function.decorator.identifier.python - settings - - foreground - #91d7e3 - - - - name - python function calls - scope - meta.function-call.python - settings - - foreground - #8aadf4 - - - - name - python function decorators - scope - entity.name.function.decorator.python, punctuation.definition.decorator.python - settings - - foreground - #f5a97f - fontStyle - italic - - - - name - python placeholder reset to normal string - scope - constant.character.format.placeholder.other.python - settings - - foreground - #f5bde6 - - - - name - Python exception & builtins such as exit() - scope - support.type.exception.python, support.function.builtin.python - settings - - foreground - #f5a97f - - - - name - entity.name.type - scope - support.type.python - settings - - foreground - #f5a97f - - - - name - python constants (True/False) - scope - constant.language.python - settings - - foreground - #c6a0f6 - - - - name - Arguments accessed later in the function body - scope - meta.indexed-name.python, meta.item-access.python - settings - - foreground - #ee99a0 - fontStyle - italic - - - - name - Python f-strings/binary/unicode storage types - scope - storage.type.string.python - settings - - foreground - #a6da95 - fontStyle - italic - - - - name - Python type hints - scope - meta.function.parameters.python - settings - - fontStyle - - - - - name - Regex string begin/end in JS/TS - scope - string.regexp punctuation.definition.string.begin, string.regexp punctuation.definition.string.end - settings - - foreground - #f5bde6 - - - - name - Regex anchors (^, $) - scope - keyword.control.anchor.regexp - settings - - foreground - #c6a0f6 - - - - name - Regex regular string match - scope - string.regexp.ts - settings - - foreground - #cad3f5 - - - - name - Regex group parenthesis & backreference (\1, \2, \3, ...) - scope - punctuation.definition.group.regexp, keyword.other.back-reference.regexp - settings - - foreground - #a6da95 - - - - name - Regex character class [] - scope - punctuation.definition.character-class.regexp - settings - - foreground - #eed49f - - - - name - Regex character classes (\d, \w, \s) - scope - constant.other.character-class.regexp - settings - - foreground - #f5bde6 - - - - name - Regex range - scope - constant.other.character-class.range.regexp - settings - - foreground - #f4dbd6 - - - - name - Regex quantifier - scope - keyword.operator.quantifier.regexp - settings - - foreground - #8bd5ca - - - - name - Regex constant/numeric - scope - constant.character.numeric.regexp - settings - - foreground - #f5a97f - - - - name - Regex lookaheads, negative lookaheads, lookbehinds, negative lookbehinds - scope - punctuation.definition.group.no-capture.regexp, meta.assertion.look-ahead.regexp, meta.assertion.negative-look-ahead.regexp - settings - - foreground - #8aadf4 - - - - name - Rust attribute - scope - meta.annotation.rust, meta.annotation.rust punctuation, meta.attribute.rust, punctuation.definition.attribute.rust - settings - - foreground - #eed49f - fontStyle - italic - - - - name - Rust attribute strings - scope - meta.attribute.rust string.quoted.double.rust, meta.attribute.rust string.quoted.single.char.rust - settings - - fontStyle - - - - - name - Rust keyword - scope - entity.name.function.macro.rules.rust, storage.type.module.rust, storage.modifier.rust, storage.type.struct.rust, storage.type.enum.rust, storage.type.trait.rust, storage.type.union.rust, storage.type.impl.rust, storage.type.rust, storage.type.function.rust, storage.type.type.rust - settings - - foreground - #c6a0f6 - fontStyle - - - - - name - Rust u/i32, u/i64, etc. - scope - entity.name.type.numeric.rust - settings - - foreground - #c6a0f6 - fontStyle - - - - - name - Rust generic - scope - meta.generic.rust - settings - - foreground - #f5a97f - - - - name - Rust impl - scope - entity.name.impl.rust - settings - - foreground - #eed49f - fontStyle - italic - - - - name - Rust module - scope - entity.name.module.rust - settings - - foreground - #f5a97f - - - - name - Rust trait - scope - entity.name.trait.rust - settings - - foreground - #eed49f - fontStyle - italic - - - - name - Rust struct - scope - storage.type.source.rust - settings - - foreground - #eed49f - - - - name - Rust union - scope - entity.name.union.rust - settings - - foreground - #eed49f - - - - name - Rust enum member - scope - meta.enum.rust storage.type.source.rust - settings - - foreground - #8bd5ca - - - - name - Rust macro - scope - support.macro.rust, meta.macro.rust support.function.rust, entity.name.function.macro.rust - settings - - foreground - #8aadf4 - fontStyle - italic - - - - name - Rust lifetime - scope - storage.modifier.lifetime.rust, entity.name.type.lifetime - settings - - foreground - #8aadf4 - fontStyle - italic - - - - name - Rust string formatting - scope - string.quoted.double.rust constant.other.placeholder.rust - settings - - foreground - #f5bde6 - - - - name - Rust return type generic - scope - meta.function.return-type.rust meta.generic.rust storage.type.rust - settings - - foreground - #cad3f5 - - - - name - Rust functions - scope - meta.function.call.rust - settings - - foreground - #8aadf4 - - - - name - Rust angle brackets - scope - punctuation.brackets.angle.rust - settings - - foreground - #91d7e3 - - - - name - Rust constants - scope - constant.other.caps.rust - settings - - foreground - #f5a97f - - - - name - Rust function parameters - scope - meta.function.definition.rust variable.other.rust - settings - - foreground - #ee99a0 - - - - name - Rust closure variables - scope - meta.function.call.rust variable.other.rust - settings - - foreground - #cad3f5 - - - - name - Rust self - scope - variable.language.self.rust - settings - - foreground - #ed8796 - - - - name - Rust metavariable names - scope - variable.other.metavariable.name.rust, meta.macro.metavariable.rust keyword.operator.macro.dollar.rust - settings - - foreground - #f5bde6 - - - - name - Shell shebang - scope - comment.line.shebang, comment.line.shebang punctuation.definition.comment, comment.line.shebang, punctuation.definition.comment.shebang.shell, meta.shebang.shell - settings - - foreground - #f5bde6 - fontStyle - italic - - - - name - Shell shebang command - scope - comment.line.shebang constant.language - settings - - foreground - #8bd5ca - fontStyle - italic - - - - name - Shell interpolated command - scope - meta.function-call.arguments.shell punctuation.definition.variable.shell, meta.function-call.arguments.shell punctuation.section.interpolation, meta.function-call.arguments.shell punctuation.definition.variable.shell, meta.function-call.arguments.shell punctuation.section.interpolation - settings - - foreground - #ed8796 - - - - name - Shell interpolated command variable - scope - meta.string meta.interpolation.parameter.shell variable.other.readwrite - settings - - foreground - #f5a97f - fontStyle - italic - - - - scope - source.shell punctuation.section.interpolation, punctuation.definition.evaluation.backticks.shell - settings - - foreground - #8bd5ca - - - - name - Shell EOF - scope - entity.name.tag.heredoc.shell - settings - - foreground - #c6a0f6 - - - - name - Shell quoted variable - scope - string.quoted.double.shell variable.other.normal.shell - settings - - foreground - #cad3f5 - - - - scope - markup.heading.synopsis.man, markup.heading.title.man, markup.heading.other.man, markup.heading.env.man - settings - - foreground - #c6a0f6 - - - - scope - markup.heading.commands.man - settings - - foreground - #8aadf4 - - - - scope - markup.heading.env.man - settings - - foreground - #f5bde6 - - - - - \ No newline at end of file diff --git a/bat/themes/ayu_mirage.tmTheme b/bat/themes/ayu_mirage.tmTheme deleted file mode 100644 index ba0d8a1..0000000 --- a/bat/themes/ayu_mirage.tmTheme +++ /dev/null @@ -1,2613 +0,0 @@ - - - - - - name - Ayu Mirage - semanticClass - theme.dark.ayu-mirage - uuid - - 02b2bdf3-9eb7-4396-bf04-f17f1468f99f - author - Ayu Team - colorSpaceName - sRGB - - - settings - - - - settings - - - - - - - - - - - - - background - #1F2430 - foreground - #CCCAC2 - caret - #FFCC66 - lineHighlight - #232A4C - misspelling - #FF6666 - accent - #FFCC66 - selection - #274364 - activeGuide - #444A55 - findHighlight - #FFD173 - gutterForeground - #707A8C - - - - - - name - Basic text & variable names (incl. leading punctuation) - scope - text, source, variable.other.readwrite, punctuation.definition.variable - settings - - - foreground - #CCCAC2 - - - - - - name - Parentheses, Brackets, Braces - scope - punctuation - settings - - - foreground - #F29E74 - - - - - - name - Comments - scope - comment, punctuation.definition.comment - settings - - - foreground - #6C7A8B - fontStyle - italic - - - - - - scope - string, punctuation.definition.string - settings - - - foreground - #D5FF80 - - - - - - scope - constant.character.escape - settings - - - foreground - #DFBFFF - - - - - - name - Booleans, constants, numbers - scope - constant.numeric, variable.other.constant, entity.name.constant, constant.language.boolean, constant.language.false, constant.language.true, keyword.other.unit.user-defined, keyword.other.unit.suffix.floating-point - settings - - - foreground - #DFBFFF - - - - - - scope - keyword, keyword.operator.word, keyword.operator.new, variable.language.super, support.type.primitive, storage.type, storage.modifier, punctuation.definition.keyword - settings - - - foreground - #FFAD66 - - - - - - scope - entity.name.tag.documentation - settings - - - foreground - #FFAD66 - - - - - - name - Punctuation - scope - keyword.operator, punctuation.accessor, punctuation.definition.generic, meta.function.closure punctuation.section.parameters, punctuation.definition.tag, punctuation.separator.key-value - settings - - - foreground - #F29E74 - - - - - - scope - entity.name.function, meta.function-call.method, support.function, support.function.misc, variable.function - settings - - - foreground - #FFD173 - fontStyle - italic - - - - - - name - Classes - scope - entity.name.class, entity.other.inherited-class, support.class, meta.function-call.constructor, entity.name.struct - settings - - - foreground - #FFDFB3 - fontStyle - italic - - - - - - name - Enum - scope - entity.name.enum - settings - - - foreground - #FFDFB3 - fontStyle - italic - - - - - - name - Enum member - scope - meta.enum variable.other.readwrite, variable.other.enummember - settings - - - foreground - #F29E74 - - - - - - name - Object properties - scope - meta.property.object - settings - - - foreground - #F29E74 - - - - - - name - Types - scope - meta.type, meta.type-alias, support.type, entity.name.type - settings - - - foreground - #FFDFB3 - fontStyle - italic - - - - - - name - Decorators - scope - meta.annotation variable.function, meta.annotation variable.annotation.function, meta.annotation punctuation.definition.annotation, meta.decorator, punctuation.decorator - settings - - - foreground - #F28779 - - - - - - scope - variable.parameter, meta.function.parameters - settings - - - foreground - #D3B8F9 - fontStyle - italic - - - - - - name - Built-ins - scope - constant.language, support.function.builtin - settings - - - foreground - #F28779 - - - - - - scope - entity.other.attribute-name.documentation - settings - - - foreground - #F28779 - - - - - - name - Preprocessor directives - scope - keyword.control.directive, punctuation.definition.directive - settings - - - foreground - #FFDFB3 - - - - - - name - Type parameters - scope - punctuation.definition.typeparameters - settings - - - foreground - #5CCFE6 - - - - - - name - Namespaces - scope - entity.name.namespace - settings - - - foreground - #FFDFB3 - - - - - - name - Property names (left hand assignments in json/yaml/css) - scope - support.type.property-name.css - settings - - - foreground - #73D0FF - - - - - - name - This/Self keyword - scope - variable.language.this, variable.language.this punctuation.definition.variable - settings - - - foreground - #F28779 - - - - - - name - Object properties - scope - variable.object.property - settings - - - foreground - #CCCAC2 - - - - - - name - String template interpolation - scope - string.template variable, string variable - settings - - - foreground - #CCCAC2 - - - - - - name - `new` as bold - scope - keyword.operator.new - settings - - fontStyle - bold - - - - - - name - C++ extern keyword - scope - storage.modifier.specifier.extern.cpp - settings - - - foreground - #FFAD66 - - - - - - name - C++ scope resolution - scope - entity.name.scope-resolution.template.call.cpp, entity.name.scope-resolution.parameter.cpp, entity.name.scope-resolution.cpp, entity.name.scope-resolution.function.definition.cpp - settings - - - foreground - #FFDFB3 - - - - - - name - C++ doc keywords - scope - storage.type.class.doxygen - settings - - - - - - - - name - C++ operators - scope - storage.modifier.reference.cpp - settings - - - foreground - #F29E74 - - - - - - name - C# Interpolated Strings - scope - meta.interpolation.cs - settings - - - foreground - #CCCAC2 - - - - - - name - C# xml-style docs - scope - comment.block.documentation.cs - settings - - - foreground - #CCCAC2 - - - - - - name - Classes, reflecting the className color in JSX - scope - source.css entity.other.attribute-name.class.css, entity.other.attribute-name.parent-selector.css punctuation.definition.entity.css - settings - - - foreground - #FFDFB3 - - - - - - name - Operators - scope - punctuation.separator.operator.css - settings - - - foreground - #F29E74 - - - - - - name - Pseudo classes - scope - source.css entity.other.attribute-name.pseudo-class - settings - - - foreground - #F29E74 - - - - - - scope - source.css constant.other.unicode-range - settings - - - foreground - #DFBFFF - - - - - - scope - source.css variable.parameter.url - settings - - - foreground - #D5FF80 - - - - - - name - CSS vendored property names - scope - support.type.vendored.property-name - settings - - - foreground - #5CCFE6 - - - - - - name - Less/SCSS right-hand variables (@/$-prefixed) - scope - source.css meta.property-value variable, source.css meta.property-value variable.other.less, source.css meta.property-value variable.other.less punctuation.definition.variable.less, meta.definition.variable.scss - settings - - - foreground - #D3B8F9 - - - - - - name - CSS variables (--prefixed) - scope - source.css meta.property-list variable, meta.property-list variable.other.less, meta.property-list variable.other.less punctuation.definition.variable.less - settings - - - foreground - #73D0FF - - - - - - name - CSS Percentage values, styled the same as numbers - scope - keyword.other.unit.percentage.css - settings - - - foreground - #DFBFFF - - - - - - name - CSS Attribute selectors, styled the same as strings - scope - source.css meta.attribute-selector - settings - - - foreground - #D5FF80 - - - - - - name - JSON/YAML keys, other left-hand assignments - scope - keyword.other.definition.ini, punctuation.support.type.property-name.json, support.type.property-name.json, punctuation.support.type.property-name.toml, support.type.property-name.toml, entity.name.tag.yaml, punctuation.support.type.property-name.yaml, support.type.property-name.yaml - settings - - - foreground - #73D0FF - - - - - - name - JSON/YAML constants - scope - constant.language.json, constant.language.yaml - settings - - - foreground - #DFBFFF - - - - - - name - YAML anchors - scope - entity.name.type.anchor.yaml, variable.other.alias.yaml - settings - - - foreground - #FFDFB3 - - - - - - name - TOML tables / ini groups - scope - support.type.property-name.table, entity.name.section.group-title.ini - settings - - - foreground - #FFDFB3 - - - - - - name - TOML dates - scope - constant.other.time.datetime.offset.toml - settings - - - foreground - #DFBFFF - - - - - - name - YAML anchor puctuation - scope - punctuation.definition.anchor.yaml, punctuation.definition.alias.yaml - settings - - - foreground - #DFBFFF - - - - - - name - YAML triple dashes - scope - entity.other.document.begin.yaml - settings - - - foreground - #DFBFFF - - - - - - name - Markup Diff - scope - markup.changed.diff - settings - - - foreground - #F28779 - - - - - - name - Diff - scope - meta.diff.header.from-file, meta.diff.header.to-file, punctuation.definition.from-file.diff, punctuation.definition.to-file.diff - settings - - - foreground - #73D0FF - - - - - - name - Diff Inserted - scope - markup.inserted.diff - settings - - - foreground - #D5FF80 - - - - - - name - Diff Deleted - scope - markup.deleted.diff - settings - - - foreground - #FF6666 - - - - - - name - dotenv left-hand side assignments - scope - variable.other.env - settings - - - foreground - #73D0FF - - - - - - name - dotenv reference to existing env variable - scope - string.quoted variable.other.env - settings - - - foreground - #CCCAC2 - - - - - - name - GDScript functions - scope - support.function.builtin.gdscript - settings - - - foreground - #FFD173 - - - - - - name - GDScript constants - scope - constant.language.gdscript - settings - - - foreground - #DFBFFF - - - - - - name - Comment keywords - scope - comment meta.annotation.go - settings - - - foreground - #D3B8F9 - - - - - - name - go:embed, go:build, etc. - scope - comment meta.annotation.parameters.go - settings - - - foreground - #DFBFFF - - - - - - name - Go constants (nil, true, false) - scope - constant.language.go - settings - - - foreground - #DFBFFF - - - - - - name - GraphQL variables - scope - variable.graphql - settings - - - foreground - #CCCAC2 - - - - - - name - GraphQL aliases - scope - string.unquoted.alias.graphql - settings - - - foreground - #F28779 - - - - - - name - GraphQL enum members - scope - constant.character.enum.graphql - settings - - - foreground - #F29E74 - - - - - - name - GraphQL field in types - scope - meta.objectvalues.graphql constant.object.key.graphql string.unquoted.graphql - settings - - - foreground - #F28779 - - - - - - name - HTML/XML DOCTYPE as keyword - scope - keyword.other.doctype, meta.tag.sgml.doctype punctuation.definition.tag, meta.tag.metadata.doctype entity.name.tag, meta.tag.metadata.doctype punctuation.definition.tag - settings - - - foreground - #FFAD66 - - - - - - name - HTML/XML-like <tags/> - scope - entity.name.tag - settings - - - foreground - #5CCFE6 - - - - - - name - Special characters like &amp; - scope - - text.html constant.character.entity, - text.html constant.character.entity punctuation, - constant.character.entity.xml, - constant.character.entity.xml punctuation, - constant.character.entity.js.jsx, - constant.charactger.entity.js.jsx punctuation, - constant.character.entity.tsx, - constant.character.entity.tsx punctuation - - settings - - - foreground - #F28779 - - - - - - name - HTML/XML tag attribute values - scope - entity.other.attribute-name - settings - - - foreground - #FFDFB3 - - - - - - name - Components - scope - support.class.component, support.class.component.jsx, support.class.component.tsx, support.class.component.vue - settings - - - foreground - #DFBFFF - - - - - - name - Annotations - scope - punctuation.definition.annotation, storage.type.annotation - settings - - - foreground - #F28779 - - - - - - name - Java enums - scope - constant.other.enum.java - settings - - - foreground - #F29E74 - - - - - - name - Java imports - scope - storage.modifier.import.java - settings - - - foreground - #CCCAC2 - - - - - - name - Javadoc - scope - comment.block.javadoc.java keyword.other.documentation.javadoc.java - settings - - - - - - - - name - Exported Variable - scope - meta.export variable.other.readwrite.js - settings - - - foreground - #D3B8F9 - - - - - - name - JS/TS constants & properties - scope - variable.other.constant.js, variable.other.constant.ts, variable.other.property.js, variable.other.property.ts - settings - - - foreground - #CCCAC2 - - - - - - name - JSDoc; these are mainly params, so styled as such - scope - variable.other.jsdoc, comment.block.documentation variable.other - settings - - - foreground - #D3B8F9 - - - - - - name - JSDoc keywords - scope - storage.type.class.jsdoc - settings - - - - - - - scope - support.type.object.console.js - settings - - - foreground - #CCCAC2 - - - - - - name - Node constants as keywords (module, etc.) - scope - support.constant.node, support.type.object.module.js - settings - - - foreground - #FFAD66 - - - - - - name - implements as keyword - scope - storage.modifier.implements - settings - - - foreground - #FFAD66 - - - - - - name - Builtin types - scope - - constant.language.null.js, - constant.language.null.ts, - constant.language.undefined.js, - constant.language.undefined.ts, - support.type.builtin.ts - - settings - - - foreground - #FFAD66 - - - - - - scope - variable.parameter.generic - settings - - - foreground - #FFDFB3 - - - - - - name - Arrow functions - scope - keyword.declaration.function.arrow.js, storage.type.function.arrow.ts - settings - - - foreground - #F29E74 - - - - - - name - Decorator punctuations (decorators inherit from blue functions, instead of styleguide peach) - scope - punctuation.decorator.ts - settings - - - foreground - #5CCFE6 - fontStyle - italic - - - - - - name - Extra JS/TS keywords - scope - - keyword.operator.expression.in.js, - keyword.operator.expression.in.ts, - keyword.operator.expression.infer.ts, - keyword.operator.expression.instanceof.js, - keyword.operator.expression.instanceof.ts, - keyword.operator.expression.is, - keyword.operator.expression.keyof.ts, - keyword.operator.expression.of.js, - keyword.operator.expression.of.ts, - keyword.operator.expression.typeof.ts - - settings - - - foreground - #FFAD66 - - - - - - name - Julia macros - scope - support.function.macro.julia - settings - - - foreground - #F29E74 - fontStyle - italic - - - - - - name - Julia language constants (true, false) - scope - constant.language.julia - settings - - - foreground - #DFBFFF - - - - - - name - Julia other constants (these seem to be arguments inside arrays) - scope - constant.other.symbol.julia - settings - - - foreground - #D3B8F9 - - - - - - name - LaTeX preamble - scope - text.tex keyword.control.preamble - settings - - - foreground - #F29E74 - - - - - - name - LaTeX be functions - scope - text.tex support.function.be - settings - - - foreground - #5CCFE6 - - - - - - name - LaTeX math - scope - constant.other.general.math.tex - settings - - - foreground - #F28779 - - - - - - name - Lua docstring keywords - scope - comment.line.double-dash.documentation.lua storage.type.annotation.lua - settings - - - foreground - #FFAD66 - - - - - - name - Lua docstring variables - scope - comment.line.double-dash.documentation.lua entity.name.variable.lua, comment.line.double-dash.documentation.lua variable.lua - settings - - - foreground - #CCCAC2 - - - - - - - scope - - heading.1.markdown punctuation.definition.heading.markdown, - heading.1.markdown, - markup.heading.atx.1.mdx, - markup.heading.atx.1.mdx punctuation.definition.heading.mdx, - markup.heading.setext.1.markdown, - markup.heading.heading-0.asciidoc - - settings - - foreground - #F28779 - - - - - scope - - heading.2.markdown punctuation.definition.heading.markdown, - heading.2.markdown, - markup.heading.atx.2.mdx, - markup.heading.atx.2.mdx punctuation.definition.heading.mdx, - markup.heading.setext.2.markdown, - markup.heading.heading-1.asciidoc - - settings - - foreground - #FFAD66 - - - - - scope - - heading.3.markdown punctuation.definition.heading.markdown, - heading.3.markdown, - markup.heading.atx.3.mdx, - markup.heading.atx.3.mdx punctuation.definition.heading.mdx, - markup.heading.heading-2.asciidoc - - settings - - foreground - #FFDFB3 - - - - - scope - - heading.4.markdown punctuation.definition.heading.markdown, - heading.4.markdown, - markup.heading.atx.4.mdx, - markup.heading.atx.4.mdx punctuation.definition.heading.mdx, - markup.heading.heading-3.asciidoc - - settings - - foreground - #D5FF80 - - - - - scope - - heading.5.markdown punctuation.definition.heading.markdown, - heading.5.markdown, - markup.heading.atx.5.mdx, - markup.heading.atx.5.mdx punctuation.definition.heading.mdx, - markup.heading.heading-4.asciidoc - - settings - - foreground - #5CCFE6 - - - - - scope - - heading.6.markdown punctuation.definition.heading.markdown, - heading.6.markdown, - markup.heading.atx.6.mdx, - markup.heading.atx.6.mdx punctuation.definition.heading.mdx, - markup.heading.heading-5.asciidoc - - settings - - foreground - #DFBFFF - - - - - - scope - markup.bold - settings - - - foreground - #F28779 - fontStyle - bold - - - - - scope - markup.italic - settings - - - foreground - #F28779 - fontStyle - italic - - - - - scope - markup.strikethrough - settings - - - foreground - #707A8C - fontStyle - strikethrough - - - - - - name - Markdown auto links - scope - punctuation.definition.link, markup.underline.link - settings - - - foreground - #5CCFE6 - - - - - name - Markdown links - scope - - text.html.markdown punctuation.definition.link.title, - string.other.link.title.markdown, - markup.link, - punctuation.definition.constant.markdown, - constant.other.reference.link.markdown, - markup.substitution.attribute-reference - - settings - - - foreground - #73D0FF - - - - - - name - Markdown code spans - scope - punctuation.definition.raw.markdown, markup.inline.raw.string.markdown, markup.raw.block.markdown - settings - - - foreground - #D5FF80 - - - - - - name - Markdown triple backtick language identifier - scope - fenced_code.block.language - settings - - - foreground - #5CCFE6 - - - - - - name - Markdown triple backticks - scope - markup.fenced_code.block punctuation.definition, markup.raw support.asciidoc - settings - - - foreground - #707A8C - - - - - - name - Markdown quotes - scope - markup.quote, punctuation.definition.quote.begin - settings - - - foreground - #DFBFFF - - - - - - name - Markdown separators - scope - meta.separator.markdown - settings - - - foreground - #F29E74 - - - - - - name - Markdown list bullets - scope - punctuation.definition.list.begin.markdown, markup.list.bullet - settings - - - foreground - #F29E74 - - - - - - name - Nix attribute names - scope - entity.other.attribute-name.multipart.nix, entity.other.attribute-name.single.nix - settings - - - foreground - #73D0FF - - - - - - name - Nix parameter names - scope - variable.parameter.name.nix - settings - - - foreground - #CCCAC2 - - - - - - name - Nix interpolated parameter names - scope - meta.embedded variable.parameter.name.nix - settings - - - foreground - #73D0FF - - - - - - name - Nix paths - scope - string.unquoted.path.nix - settings - - - foreground - #DFBFFF - - - - - - name - PHP Attributes - scope - support.attribute.builtin, meta.attribute.php - settings - - - foreground - #FFDFB3 - - - - - - name - PHP Parameters (needed for the leading dollar sign) - scope - meta.function.parameters.php punctuation.definition.variable.php - settings - - - foreground - #D3B8F9 - - - - - - name - PHP Constants (null, __FILE__, etc.) - scope - constant.language.php - settings - - - foreground - #FFAD66 - - - - - - name - PHP functions - scope - text.html.php support.function - settings - - - foreground - #5CCFE6 - - - - - - name - PHPdoc keywords - scope - keyword.other.phpdoc.php - settings - - - - - - - name - Python argument functions reset to text, otherwise they inherit blue from function-call - scope - support.variable.magic.python, meta.function-call.arguments.python - settings - - - foreground - #CCCAC2 - - - - - - name - Python double underscore functions - scope - support.function.magic.python - settings - - - foreground - #5CCFE6 - fontStyle - italic - - - - - - name - Python `self` keyword - scope - variable.parameter.function.language.special.self.python, variable.language.special.self.python - settings - - - foreground - #F28779 - fontStyle - italic - - - - - - name - python keyword flow/logical (for ... in) - scope - keyword.control.flow.python, keyword.operator.logical.python - settings - - - foreground - #FFAD66 - - - - - - name - python storage type - scope - storage.type.function.python - settings - - - foreground - #FFAD66 - - - - - - name - python function support - scope - support.token.decorator.python, meta.function.decorator.identifier.python - settings - - - foreground - #5CCFE6 - - - - - - name - python function calls - scope - meta.function-call.python - settings - - - foreground - #FFD173 - - - - - - name - python function decorators - scope - entity.name.function.decorator.python, punctuation.definition.decorator.python - settings - - - foreground - #F28779 - fontStyle - italic - - - - - - name - python placeholder reset to normal string - scope - constant.character.format.placeholder.other.python - settings - - - foreground - #DFBFFF - - - - - - name - Python exception & builtins such as exit() - scope - support.type.exception.python, support.function.builtin.python - settings - - - foreground - #DFBFFF - - - - - - name - entity.name.type - scope - support.type.python - settings - - - foreground - #DFBFFF - - - - - - name - python constants (True/False) - scope - constant.language.python - settings - - - foreground - #FFAD66 - - - - - - name - Arguments accessed later in the function body - scope - meta.indexed-name.python, meta.item-access.python - settings - - - foreground - #D3B8F9 - fontStyle - italic - - - - - - name - Python f-strings/binary/unicode storage types - scope - storage.type.string.python - settings - - - foreground - #D5FF80 - fontStyle - italic - - - - - - name - Python type hints - scope - meta.function.parameters.python - settings - - - - - - - name - Regex string begin/end in JS/TS - scope - - string.regexp punctuation.definition.string.begin, - string.regexp punctuation.definition.string.end - - settings - - - foreground - #DFBFFF - - - - - name - Regex anchors (^, $) - scope - keyword.control.anchor.regexp - settings - - - foreground - #FFAD66 - - - - - name - Regex regular string match - scope - string.regexp.ts - settings - - - foreground - #CCCAC2 - - - - - name - Regex group parenthesis & backreference (\1, \2, ...) - scope - punctuation.definition.group.regexp, keyword.other.back-reference.regexp - settings - - - foreground - #D5FF80 - - - - - name - Regex character class [] - scope - punctuation.definition.character-class.regexp - settings - - - foreground - #FFDFB3 - - - - - name - Regex character classes (\d, \w, \s) - scope - constant.other.character-class.regexp - settings - - - foreground - #DFBFFF - - - - - name - Regex range - scope - constant.other.character-class.range.regexp - settings - - - foreground - #CCCAC2 - - - - - name - Regex quantifier - scope - keyword.operator.quantifier.regexp - settings - - - foreground - #F29E74 - - - - - name - Regex constant/numeric - scope - constant.character.numeric.regexp - settings - - - foreground - #DFBFFF - - - - - name - Regex lookaheads/lookbehinds - scope - punctuation.definition.group.no-capture.regexp, meta.assertion.look-ahead.regexp, meta.assertion.negative-look-ahead.regexp - settings - - - foreground - #5CCFE6 - - - - - - name - Rust attribute - scope - meta.annotation.rust, meta.annotation.rust punctuation, meta.attribute.rust, punctuation.definition.attribute.rust - settings - - - foreground - #FFDFB3 - fontStyle - italic - - - - - - name - Rust attribute strings - scope - meta.attribute.rust string.quoted.double.rust, meta.attribute.rust string.quoted.single.char.rust - settings - - - - - - - name - Rust keyword - scope - - entity.name.function.macro.rules.rust, - storage.type.module.rust, - storage.modifier.rust, - storage.type.struct.rust, - storage.type.enum.rust, - storage.type.trait.rust, - storage.type.union.rust, - storage.type.impl.rust, - storage.type.rust, - storage.type.function.rust, - storage.type.type.rust - - settings - - - foreground - #FFAD66 - - - - - - name - Rust u/i32, u/i64, etc. - scope - entity.name.type.numeric.rust - settings - - - foreground - #FFAD66 - - - - - - name - Rust generic - scope - meta.generic.rust - settings - - - foreground - #DFBFFF - - - - - - name - Rust impl - scope - entity.name.impl.rust - settings - - - foreground - #FFDFB3 - fontStyle - italic - - - - - - name - Rust module - scope - entity.name.module.rust - settings - - - foreground - #DFBFFF - - - - - - name - Rust trait - scope - entity.name.trait.rust - settings - - - foreground - #FFDFB3 - fontStyle - italic - - - - - - name - Rust struct - scope - storage.type.source.rust - settings - - - foreground - #FFDFB3 - - - - - - name - Rust union - scope - entity.name.union.rust - settings - - - foreground - #FFDFB3 - - - - - - name - Rust enum member - scope - meta.enum.rust storage.type.source.rust - settings - - - foreground - #F29E74 - - - - - - name - Rust macro - scope - support.macro.rust, meta.macro.rust support.function.rust, entity.name.function.macro.rust - settings - - - foreground - #FFD173 - fontStyle - italic - - - - - - name - Rust lifetime - scope - storage.modifier.lifetime.rust, entity.name.type.lifetime - settings - - - foreground - #5CCFE6 - fontStyle - italic - - - - - - name - Rust string formatting - scope - string.quoted.double.rust constant.other.placeholder.rust - settings - - - foreground - #DFBFFF - - - - - - name - Rust return type generic - scope - meta.function.return-type.rust meta.generic.rust storage.type.rust - settings - - - foreground - #CCCAC2 - - - - - - name - Rust functions - scope - meta.function.call.rust - settings - - - foreground - #FFD173 - - - - - - name - Rust angle brackets - scope - punctuation.brackets.angle.rust - settings - - - foreground - #5CCFE6 - - - - - - name - Rust constants - scope - constant.other.caps.rust - settings - - - foreground - #DFBFFF - - - - - - name - Rust function parameters - scope - meta.function.definition.rust variable.other.rust - settings - - - foreground - #D3B8F9 - - - - - - name - Rust closure variables - scope - meta.function.call.rust variable.other.rust - settings - - - foreground - #CCCAC2 - - - - - - name - Rust self - scope - variable.language.self.rust - settings - - - foreground - #F28779 - - - - - - name - Rust metavariable names - scope - variable.other.metavariable.name.rust, meta.macro.metavariable.rust keyword.operator.macro.dollar.rust - settings - - - foreground - #DFBFFF - - - - - - name - Shell shebang - scope - - comment.line.shebang, - comment.line.shebang punctuation.definition.comment, - comment.line.shebang, - punctuation.definition.comment.shebang.shell, - meta.shebang.shell - - settings - - - foreground - #DFBFFF - fontStyle - italic - - - - - - name - Shell shebang command - scope - comment.line.shebang constant.language - settings - - - foreground - #F29E74 - fontStyle - italic - - - - - - name - Shell interpolated command - scope - - meta.function-call.arguments.shell punctuation.definition.variable.shell, - meta.function-call.arguments.shell punctuation.section.interpolation, - meta.function-call.arguments.shell punctuation.definition.variable.shell, - meta.function-call.arguments.shell punctuation.section.interpolation - - settings - - - foreground - #F28779 - - - - - - name - Shell interpolated command variable - scope - meta.string meta.interpolation.parameter.shell variable.other.readwrite - settings - - - foreground - #DFBFFF - fontStyle - italic - - - - - - scope - source.shell punctuation.section.interpolation, punctuation.definition.evaluation.backticks.shell - settings - - - foreground - #F29E74 - - - - - - name - Shell EOF - scope - entity.name.tag.heredoc.shell - settings - - - foreground - #FFAD66 - - - - - - name - Shell quoted variable - scope - string.quoted.double.shell variable.other.normal.shell - settings - - - foreground - #CCCAC2 - - - - - - scope - markup.heading.synopsis.man, markup.heading.title.man, markup.heading.other.man, markup.heading.env.man - settings - - - foreground - #FFAD66 - - - - - scope - markup.heading.commands.man - settings - - - foreground - #5CCFE6 - - - - - scope - markup.heading.env.man - settings - - - foreground - #DFBFFF - - - - - - - diff --git a/bat/themes/norrsken.tmTheme b/bat/themes/norrsken.tmTheme new file mode 100644 index 0000000..861077f --- /dev/null +++ b/bat/themes/norrsken.tmTheme @@ -0,0 +1,542 @@ + + + + + name + Norrsken + settings + + + + + settings + + background + #020222 + foreground + #eeeef5 + caret + #D4973E + lineHighlight + #161636 + selection + #2a2a4a + selectionBorder + #202040 + findHighlight + #FF761A + findHighlightForeground + #020222 + invisibles + #393959 + guide + #202040 + activeGuide + #393959 + stackGuide + #161636 + + + + + + name + Comment + scope + comment, punctuation.definition.comment + settings + + foreground + #5c5c7c + fontStyle + italic + + + + + + name + String + scope + string, string.quoted, string.template + settings + + foreground + #CFC1B2 + + + + + + name + String Escape + scope + constant.character.escape, string.regexp + settings + + foreground + #9BCCBF + + + + + + name + Number + scope + constant.numeric + settings + + foreground + #CFC1B2 + + + + + + name + Built-in Constants + scope + constant.language, constant.other + settings + + foreground + #CFC1B2 + + + + + + name + Keyword + scope + keyword, keyword.control, keyword.operator.word, storage, storage.type, storage.modifier + settings + + foreground + #D4973E + + + + + + name + Control Flow + scope + keyword.control.return, keyword.control.flow, keyword.control.conditional, keyword.control.loop, keyword.control.exception + settings + + foreground + #34BFA4 + + + + + + name + Import / Include + scope + keyword.control.import, keyword.control.include, keyword.control.from, keyword.other.using, keyword.control.export + settings + + foreground + #9BCCBF + + + + + + name + Operator + scope + keyword.operator, punctuation.separator, punctuation.terminator + settings + + foreground + #B4B4B9 + + + + + + name + Punctuation + scope + punctuation.definition, punctuation.accessor, punctuation.section, meta.brace, meta.bracket + settings + + foreground + #B4B4B9 + + + + + + name + Function Definition + scope + entity.name.function, support.function + settings + + foreground + #34BFA4 + + + + + + name + Function Call + scope + meta.function-call entity.name.function, variable.function, meta.method-call entity.name.function + settings + + foreground + #34BFA4 + + + + + + name + Built-in Function + scope + support.function.builtin, keyword.other.special-method + settings + + foreground + #D4973E + + + + + + name + Macro / Preprocessor + scope + meta.preprocessor, entity.name.function.preprocessor, keyword.control.directive, support.function.macro + settings + + foreground + #9BCCBF + + + + + + name + Type + scope + entity.name.type, entity.name.class, entity.name.struct, entity.name.interface, entity.name.enum, support.type, support.class + settings + + foreground + #7ab4f5 + + + + + + name + Type Parameter + scope + entity.name.type.parameter, storage.type.generic + settings + + foreground + #7ab4f5 + + + + + + name + Namespace / Module + scope + entity.name.namespace, entity.name.module, support.other.namespace, entity.name.package + settings + + foreground + #607a94 + + + + + + name + Variable + scope + variable, variable.other + settings + + foreground + #eeeef5 + + + + + + name + Built-in Variable + scope + variable.language + settings + + foreground + #D4973E + + + + + + name + Parameter + scope + variable.parameter + settings + + foreground + #eeeef5 + fontStyle + italic + + + + + + name + Member / Property + scope + variable.other.member, variable.other.property, variable.other.object.property + settings + + foreground + #eeeef5 + fontStyle + bold + + + + + + name + Tag + scope + entity.name.tag + settings + + foreground + #D4973E + + + + + + name + Tag Attribute + scope + entity.other.attribute-name + settings + + foreground + #34BFA4 + + + + + + name + CSS Value / Color + scope + support.constant.color, constant.other.color, meta.property-value support.constant + settings + + foreground + #FFB07B + + + + + + name + CSS Property + scope + support.type.property-name, meta.property-name + settings + + foreground + #34BFA4 + + + + + + name + Diff Added + scope + markup.inserted + settings + + foreground + #34BFA4 + + + + + + name + Diff Deleted + scope + markup.deleted + settings + + foreground + #ff5555 + + + + + + name + Diff Changed + scope + markup.changed + settings + + foreground + #D4973E + + + + + + name + Markup Heading + scope + markup.heading, entity.name.section + settings + + foreground + #D4973E + fontStyle + bold + + + + + + name + Markup Bold + scope + markup.bold + settings + + foreground + #eeeef5 + fontStyle + bold + + + + + + name + Markup Italic + scope + markup.italic + settings + + foreground + #eeeef5 + fontStyle + italic + + + + + + name + Markup Inline Code + scope + markup.inline.raw, markup.raw.inline + settings + + foreground + #9BCCBF + + + + + + name + Markup Link + scope + markup.underline.link, string.other.link + settings + + foreground + #7ab4f5 + + + + + + name + Markup List + scope + markup.list punctuation.definition.list, markup.list.bullet + settings + + foreground + #34BFA4 + + + + + + name + Markup Quote + scope + markup.quote + settings + + foreground + #5c5c7c + fontStyle + italic + + + + + + name + Invalid + scope + invalid, invalid.illegal + settings + + foreground + #ff5555 + + + + + + name + Deprecated + scope + invalid.deprecated + settings + + foreground + #5c5c7c + fontStyle + strikethrough + + + + + uuid + 3f2e1d0c-9b8a-7f6e-5d4c-3b2a1f0e9d8c + + diff --git a/colorsync/colorsyncrc b/colorsync/colorsyncrc index 344be5f..0c400d5 100644 --- a/colorsync/colorsyncrc +++ b/colorsync/colorsyncrc @@ -1,3 +1 @@ -ayudark -ayumirage -ayulight +norrsken diff --git a/flake.lock b/flake.lock index 6c675a4..ba7ae23 100644 --- a/flake.lock +++ b/flake.lock @@ -394,11 +394,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1773282481, + "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127", "type": "github" }, "original": { diff --git a/ghostty/config b/ghostty/config index d551d44..231728e 100644 --- a/ghostty/config +++ b/ghostty/config @@ -35,9 +35,6 @@ clipboard-paste-protection = false window-decoration = false shell-integration = zsh -# This is the default fallback theme. This is only used -# if the colorsync handled theme file doesn't exist. -theme = Ayu config-file = ?colorsync_ghostty_theme background-opacity = 1.0 background-blur-radius = 7 diff --git a/ghostty/ghostty-change-theme.sh b/ghostty/ghostty-change-theme.sh index 3780f7d..74d545f 100755 --- a/ghostty/ghostty-change-theme.sh +++ b/ghostty/ghostty-change-theme.sh @@ -5,19 +5,13 @@ THEME=$(colorsync get) OUTPUT="$HOME/.config/ghostty/colorsync_ghostty_theme" default() { - printf "theme = Ayu" > "$OUTPUT" + printf "theme = norrsken" > "$OUTPUT" } case "$THEME" in - ayudark) + norrsken) default ;; - ayumirage) - printf "theme = Ayu Mirage" > "$OUTPUT" - ;; - ayulight) - printf "theme = ayu_light" > "$OUTPUT" - ;; *) default ;; diff --git a/ghostty/shaders/cursor_blaze_no_trail.glsl b/ghostty/shaders/cursor_blaze_no_trail.glsl index 5331210..3f71cd5 100644 --- a/ghostty/shaders/cursor_blaze_no_trail.glsl +++ b/ghostty/shaders/cursor_blaze_no_trail.glsl @@ -20,8 +20,8 @@ float ease(float x) { } // Toned down colors with reduced alpha -const vec4 TRAIL_COLOR = vec4(0.7, 0.495, 0.111, 0.5); -const vec4 TRAIL_COLOR_ACCENT = vec4(0.8, 0., 0., 0.6); +const vec4 TRAIL_COLOR = vec4(0.204, 0.749, 0.643, 0.5); +const vec4 TRAIL_COLOR_ACCENT = vec4(1.0, 0.773, 0.322, 0.6); const float DURATION = 0.25; const float EXPANSION_FACTOR = 0.05; diff --git a/ghostty/themes/norrsken b/ghostty/themes/norrsken new file mode 100644 index 0000000..f970357 --- /dev/null +++ b/ghostty/themes/norrsken @@ -0,0 +1,19 @@ +background = #020222 +foreground = #eeeef5 + +palette = 0=#020222 +palette = 1=#ff5555 +palette = 2=#9BCCBF +palette = 3=#D4973E +palette = 4=#7ab4f5 +palette = 5=#99A4BC +palette = 6=#34BFA4 +palette = 7=#B4B4B9 +palette = 8=#393959 +palette = 9=#ff5555 +palette = 10=#34BFA4 +palette = 11=#D4973E +palette = 12=#BFDAFF +palette = 13=#99A4BC +palette = 14=#39c5cf +palette = 15=#eeeef5 diff --git a/nvim/init.lua b/nvim/init.lua index fa5cc3c..5213f75 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,3 +1,5 @@ +vim.api.nvim_create_augroup("ColorsyncEvents", { clear = true }) + -- Load keymaps before loading any plugins require("keymaps") diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 7db5c43..96e807e 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,24 +1,22 @@ { "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, - "arrow.nvim": { "branch": "master", "commit": "6e0f726f55f99332dd726a53effd6813786b6d49" }, - "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, - "codecompanion-spinner.nvim": { "branch": "main", "commit": "7797a81141e5de62eecebf2af561698ed58900dc" }, - "codecompanion.nvim": { "branch": "main", "commit": "bade4034395d327f1fd3defd34cce4793e412a27" }, - "codediff.nvim": { "branch": "main", "commit": "3891eeb60a3e511c016f3aa9611442f27021dbb1" }, - "copilot.vim": { "branch": "release", "commit": "a12fd5672110c8aa7e3c8419e28c96943ca179be" }, - "fff.nvim": { "branch": "main", "commit": "ac8df4c9e4926d23f196f30be052518454dfe251" }, + "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, + "codediff.nvim": { "branch": "main", "commit": "93cd80c56f71af4671388c568a37d4c84c3ddefa" }, + "colorful-menu.nvim": { "branch": "master", "commit": "b51a659459df8d078201aefc995db8175ed55e84" }, + "demicolon.nvim": { "branch": "main", "commit": "a9ca137474b3a02e1d6ac48bfdb1985172e2ec9a" }, + "fff.nvim": { "branch": "main", "commit": "dd56a3a8a8a5a85522badaf6485f28c8f7a7c840" }, "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, "goto-preview": { "branch": "main", "commit": "d2d6923c9b9e0e43f0b9b566f261a8b1ae016540" }, "incline.nvim": { "branch": "main", "commit": "8b54c59bcb23366645ae10edca6edfb9d3a0853e" }, - "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, + "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" }, "live-rename.nvim": { "branch": "main", "commit": "3a3cddf23b89a17992f9ca67afc5858077769462" }, "logger.nvim": { "branch": "main", "commit": "63dd10c9b9a159fd6cfe08435d9606384ff103c5" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "markview.nvim": { "branch": "main", "commit": "fdc8bac74550f2ac847578cb74c7ad99b3421bc2" }, - "neogit": { "branch": "master", "commit": "8fd90675caf8b847280ca56f464b66030adad876" }, - "neovim-ayu": { "branch": "master", "commit": "e5a9f0fa2918d6b5f57c21b3ac014314ee5e41c8" }, + "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" }, + "markview.nvim": { "branch": "main", "commit": "1861f959599ae03cfd59f56222a542035b0cd947" }, + "neogit": { "branch": "master", "commit": "d3890fc3cdf0859845a86b2be306bba01458df1a" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, @@ -29,16 +27,17 @@ "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, "nvim-lightbulb": { "branch": "master", "commit": "aa3a8b0f4305b25cfe368f6c9be9923a7c9d0805" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-norrsken": { "branch": "master", "commit": "692c2a0f81905dc6fd3011361740d610dfa8052d" }, "nvim-surround": { "branch": "main", "commit": "61319d4bd1c5e336e197defa15bd104c51f0fb29" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "529ee357b8c03d76ff71233afed68fd0f5fe10b1" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, - "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" }, + "nvim-treesitter": { "branch": "main", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-context": { "branch": "master", "commit": "9a8e39993e3b895601bf8227124a48ea8268149e" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, + "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "persistent-breakpoints.nvim": { "branch": "main", "commit": "d1656221836207787b8a7969cc2dc72668c4742a" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, - "snacks.nvim": { "branch": "main", "commit": "9912042fc8bca2209105526ac7534e9a0c2071b2" }, + "snacks.nvim": { "branch": "main", "commit": "e6fd58c82f2f3fcddd3fe81703d47d6d48fc7b9f" }, "tiny-glimmer.nvim": { "branch": "main", "commit": "932e6c2cc4a43ce578f007db1f8f61ad6798f938" }, "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "ba133b3e932416e4b9507095731a6d7276878fe8" }, "visual-whitespace.nvim": { "branch": "main", "commit": "49ff2b1c572ed7033a584381fa23aad2bf3bb258" } diff --git a/nvim/lua/diagnostics.lua b/nvim/lua/diagnostics.lua index d5def0a..8641060 100644 --- a/nvim/lua/diagnostics.lua +++ b/nvim/lua/diagnostics.lua @@ -1,38 +1,6 @@ -local utils = require("utils") - -local function setup_colors() - -- These are not apart of the Ayu color theme, however, I needed these - -- colors while still fitting in with the rest - local ayu_turquoise = "#5CCFE6" - local ayu_dark_blue = "#3A7BD5" - - local colors = { - info = ayu_dark_blue, - hint = ayu_turquoise, - warning = utils.ayu_colors.warning, - error = utils.ayu_colors.error, - } - - for _, highlight in ipairs({ - { "DiagnosticUnderlineInfo", { undercurl = true, sp = colors.info } }, - { "DiagnosticUnderlineHint", { undercurl = true, sp = colors.hint } }, - { "DiagnosticUnderlineWarn", { undercurl = true, sp = colors.warning } }, - { "DiagnosticUnderlineError", { undercurl = true, sp = colors.error } }, - { "DiagnosticInfo", { fg = colors.info } }, - { "DiagnosticHint", { fg = colors.hint } }, - { "DiagnosticWarn", { fg = colors.warning } }, - { "DiagnosticError", { fg = colors.error } }, - }) do - vim.api.nvim_set_hl(0, highlight[1], highlight[2]) - end -end - -utils.create_user_event_cb("ColorsyncThemeChanged", setup_colors, "ColorsyncEvents") -setup_colors() - local sev = vim.diagnostic.severity vim.diagnostic.config({ - underline = true, + -- underline = true, -- This enables the diagnostics at end of line -- virtual_text = { -- prefix = "●", diff --git a/nvim/lua/plugs/ayu.lua b/nvim/lua/plugs/ayu.lua deleted file mode 100644 index 742a9b5..0000000 --- a/nvim/lua/plugs/ayu.lua +++ /dev/null @@ -1,153 +0,0 @@ -local uv = vim.loop -local utils = require("utils") - -local function force_color_from_reference_on_others(others, reference) - local reference_hl = vim.api.nvim_get_hl(0, { name = reference }) - for _, member in ipairs(others) do - local property = vim.api.nvim_get_hl(0, { name = member }) - property.fg = reference_hl.fg - vim.api.nvim_set_hl(0, member, property) - end -end - -local function reset_hl_groups_for_ft(groups_to_reset) - for _, group in ipairs(groups_to_reset) do - local ft = group[1] - local groups = group[2] - - vim.api.nvim_create_autocmd("FileType", { - pattern = ft, - callback = function() - for _, group_name in ipairs(groups) do - vim.api.nvim_set_hl(0, group_name, {}) - end - end, - }) - end -end - -return { - "Shatur/neovim-ayu", - priority = 1010, - config = function() - local function set_colorscheme() - utils.colorsync_theme = vim.fn.system({ "colorsync", "get" }):gsub("%s+", "") - vim.o.background = utils.colorsync_theme == "ayulight" and "light" or "dark" - - local is_mirage = utils.colorsync_theme == "ayumirage" - - local ayu = require("ayu") - utils.ayu_colors = require("ayu.colors") - utils.ayu_colors.generate(is_mirage) - - local overrides = { - global_variable = { - underline = true, - italic = true, - }, - member_variable = { - bold = true, - }, - namespace = { - italic = true, - fg = utils.ayu_colors.markup, - }, - pre_process = { - fg = utils.ayu_colors.keyword, - }, - default_type = { - fg = utils.ayu_colors.regexp - }, - type = { - fg = utils.ayu_colors.entity, - }, - } - - ayu.setup({ - mirage = is_mirage, - terminal = false, - overrides = { - -- TRANSPARENCY - -- Normal = { bg = "none" }, - -- NormalFloat = { bg = "none" }, - -- ColorColumn = { bg = "none" }, - -- SignColumn = { bg = "none" }, - -- Folded = { bg = "none" }, - -- FoldColumn = { bg = "none" }, - -- CursorColumn = { bg = "none" }, - -- VertSplit = { bg = "none" }, - -- TRANSPARENCY - CursorLineNr = { bg = "none" }, - ["@property"] = overrides.member_variable, - ["PreProc"] = overrides.pre_process, - --CPP - ["@lsp.typemod.variable.fileScope.cpp"] = overrides.global_variable, - ["@lsp.type.namespace.cpp"] = overrides.namespace, - ["@type.builtin.cpp"] = overrides.default_type, - -- CPP - -- - -- Rust - ["@lsp.type.struct.rust"] = overrides.type, - ["@lsp.type.namespace.rust"] = overrides.namespace, - ["@lsp.type.builtinType.rust"] = overrides.default_type, - -- Rust - -- - -- C - ["@lsp.typemod.variable.globalScope.c"] = overrides.global_variable, - ["@type.builtin.c"] = overrides.default_type, - -- C - -- - -- Go - -- ["@module.go"] = overrides.namespace, -- The go LSP is not reliable enough for this sadly, sometimes it adds module tokens and sometimes it doesnt. - ["@variable.member.go"] = overrides.member_variable, - ["@type.builtin.go"] = overrides.default_type, - -- Go - -- - -- Zig - ["@module.zig"] = overrides.namespace, - ["@lsp.type.namespace.zig"] = overrides.namespace, - ["@type.builtin.zig"] = overrides.default_type, - ["@function.builtin.zig"] = overrides.default_type, - ["@lsp.type.struct.zig"] = overrides.type, - -- ["@variable.member.zig"] = overrides.member_variable,-- Cant have bold member variable in zig, they don't differentiate function calls/accessors from variables, they are all just "members" .... BS LSP - -- ["@variable.parameter"] = {},-- Zig LSP is lacking, a parameter is marked as a regular variable outside of it's definition, can't separate between them. - -- Zig - }, - }) - - ayu.colorscheme() - end - - vim.api.nvim_create_augroup("ColorsyncEvents", { clear = true }) - - local filepath = os.getenv("HOME") .. "/.local/state/colorsync/current" - local handle = uv.new_fs_event() - handle:start(filepath, {}, function(err) - if err then - vim.notify("Error watching: " .. filepath .. "\n" .. err) - return - end - - vim.schedule(function() - set_colorscheme() - vim.api.nvim_exec_autocmds("User", { pattern = "ColorsyncThemeChanged" }) - vim.api.nvim_exec_autocmds("ColorScheme", {}) - end) - end) - - set_colorscheme() - - -- Fix nuances of the colorscheme in different languages. - -- These changes needs to run after the colorscheme is set. - force_color_from_reference_on_others({ - "@property", - "@variable.member.go", - "@variable.member", - "@variable.member.zig", - }, "@variable") - - reset_hl_groups_for_ft({ - { "go", { "@property", } }, - }) - end -} diff --git a/nvim/lua/plugs/incline.lua b/nvim/lua/plugs/incline.lua index 811e6fe..478ad70 100644 --- a/nvim/lua/plugs/incline.lua +++ b/nvim/lua/plugs/incline.lua @@ -98,8 +98,6 @@ return { end return { - guibg = utils.ayu_colors.panel_bg, - guifg = utils.ayu_colors.fg, { " " }, { get_diagnostic_label() }, { get_git_diff() }, diff --git a/nvim/lua/plugs/lualine.lua b/nvim/lua/plugs/lualine.lua index 6788ef7..a762b90 100644 --- a/nvim/lua/plugs/lualine.lua +++ b/nvim/lua/plugs/lualine.lua @@ -32,7 +32,7 @@ return { local function setup_lualine() require("lualine").setup({ options = { - theme = "ayu", + theme = require("norrsken.integrations.lualine"), globalstatus = true, section_separators = { left = "", diff --git a/nvim/lua/plugs/norrsken.lua b/nvim/lua/plugs/norrsken.lua new file mode 100644 index 0000000..a531c1e --- /dev/null +++ b/nvim/lua/plugs/norrsken.lua @@ -0,0 +1,14 @@ +return { + "LarssonMartin1998/nvim-norrsken", + priority = 1010, + opts = { + integrations = { + lualine = true, + blink = true, + noice = true, + incline = true, + neogit = true, + tiny_inline_diagnostics = true, + }, + }, +} diff --git a/nvim/lua/utils.lua b/nvim/lua/utils.lua index 66de1de..5d57418 100644 --- a/nvim/lua/utils.lua +++ b/nvim/lua/utils.lua @@ -1,7 +1,6 @@ local M = {} M.colorsync_theme = nil -M.ayu_colors = nil function M.set_keymap_list(keymap_list, mode) mode = mode or "n" diff --git a/nvim/lua/vim_opt.lua b/nvim/lua/vim_opt.lua index 27f198a..26abc4d 100644 --- a/nvim/lua/vim_opt.lua +++ b/nvim/lua/vim_opt.lua @@ -10,7 +10,7 @@ opt.clipboard = "unnamedplus" -- Highlight the currently selected row opt.cursorline = true -opt.cursorlineopt = "number" +opt.cursorlineopt = "both" opt.breakindent = true opt.breakindentopt = "list:-1" diff --git a/tmux/tmux-status-right.sh b/tmux/tmux-status-right.sh index 33ed983..b78f9af 100755 --- a/tmux/tmux-status-right.sh +++ b/tmux/tmux-status-right.sh @@ -1,25 +1,15 @@ THEME=$(colorsync get) default() { - bg="#95E6CB" - fg="#000000" - text_col="#BFBDB6" + bg="#34BFA4" + fg="#020222" + text_col="#eeeef5" } case "$THEME" in - ayudark) + norrsken) default ;; - ayumirage) - bg="#95E6CB" - fg="#101521" - text_col="#CCCAC2" - ;; - ayulight) - bg="#4CBF99" - fg="#F3F4F5" - text_col="#5C6166" - ;; *) default ;; diff --git a/tmux/tmux-statusbar-color.sh b/tmux/tmux-statusbar-color.sh index b24f216..830c6bf 100755 --- a/tmux/tmux-statusbar-color.sh +++ b/tmux/tmux-statusbar-color.sh @@ -3,25 +3,15 @@ THEME=$(colorsync get) default() { - tmux set-option -g status-bg "#000000" - tmux setw -g window-status-format "#[bg=#000000,fg=#BFBDB6] #[bold]#I #[default] #[fg=#59C2FF]#W #[default]" - tmux setw -g window-status-current-format "#[bg=#95E6CB,fg=#000000] #[bold]#I #[default] #[fg=#FF8F40]#W #[default]" + tmux set-option -g status-bg "#0b0b2b" + tmux setw -g window-status-format "#[bg=#0b0b2b,fg=#eeeef5] #[bold]#I #[default] #[fg=#34BFA4]#W #[default]" + tmux setw -g window-status-current-format "#[bg=#34BFA4,fg=#020222] #[bold]#I #[default] #[fg=#D4973E]#W #[default]" } case "$THEME" in - ayudark) + norrsken) default ;; - ayumirage) - tmux set-option -g status-bg "#101521" - tmux setw -g window-status-format "#[bg=#101521,fg=#CCCAC2] #[bold]#I #[default] #[fg=#73D0FF]#W #[default]" - tmux setw -g window-status-current-format "#[bg=#95E6CB,fg=#101521] #[bold]#I #[default] #[fg=#FFCC66]#W #[default]" - ;; - ayulight) - tmux set-option -g status-bg "#F0F0F0" - tmux setw -g window-status-format "#[bg=#F0F0F0,fg=#5C6166] #[bold]#I #[default] #[fg=#399EE6]#W #[default]" - tmux setw -g window-status-current-format "#[bg=#4CBF99,fg=#F0F0F0] #[bold]#I #[default] #[fg=#FA8D3E]#W #[default]" - ;; *) default ;;