From b8dc4fde4667c86edb4b963f31cfa133527f24ef Mon Sep 17 00:00:00 2001 From: notgne2 Date: Fri, 21 Jan 2022 01:05:51 -0700 Subject: [PATCH] clean up base16-ing a bit --- flake.nix | 8 + home-manager/data/codium-base16.nix | 1134 --------------------------- home-manager/data/vim-base16.nix | 401 ---------- home-manager/modules/colors.nix | 4 +- 4 files changed, 10 insertions(+), 1537 deletions(-) delete mode 100644 home-manager/data/codium-base16.nix delete mode 100644 home-manager/data/vim-base16.nix diff --git a/flake.nix b/flake.nix index a16456c..8635029 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,14 @@ url = "github:kdrag0n/base16-kitty"; flake = false; }; + base16-vscode = { + url = "github:golf1052/base16-vscode"; + flake = false; + }; + base16-vim = { + url = "github:chriskempson/base16-vim"; + flake = false; + }; rycee = { url = "gitlab:rycee/nur-expressions"; flake = false; diff --git a/home-manager/data/codium-base16.nix b/home-manager/data/codium-base16.nix deleted file mode 100644 index ea49e1a..0000000 --- a/home-manager/data/codium-base16.nix +++ /dev/null @@ -1,1134 +0,0 @@ -base16: - -'' - { - "name": "Base16 generated", - "type": "dark", - "colors": { - // Contrast colors - // "contrastActiveBorder": "#f00", //7 - // "contrastBorder": "#f00", //6 - - // Base colors - // "focusBorder": "#f00", //7 - "foreground": "#${base16."base05"}", //5 - "widget.shadow": "#${base16."base00"}", //0 - "selection.background": "#${base16."base0D"}", //D - "errorForeground": "#${base16."base08"}", //8 - - // Button control - "button.background": "#${base16."base01"}", //1 - "button.foreground": "#${base16."base07"}", //7 - "button.hoverBackground": "#${base16."base04"}", //4 - - // Dropdown control - "dropdown.background": "#${base16."base00"}", //0 - // "dropdown.border": "#f00", //2 - "dropdown.foreground": "#${base16."base05"}", //5 - - // Input control - "input.background": "#${base16."base00"}", //0 - // "input.border": "#f00", //0 - "input.foreground": "#${base16."base05"}", //5 - "input.placeholderForeground": "#${base16."base03"}", //3 - "inputOption.activeBorder": "#${base16."base09"}", //9 - "inputValidation.errorBackground": "#${base16."base08"}", //8 - "inputValidation.errorBorder": "#${base16."base08"}", //8 - "inputValidation.infoBackground": "#${base16."base0D"}", //D - "inputValidation.infoBorder": "#${base16."base0D"}", //D - "inputValidation.warningBackground": "#${base16."base0A"}", //A - "inputValidation.warningBorder": "#${base16."base0A"}", //A - - // Scroll bar control - "scrollbar.shadow": "#${base16."base01"}", //1 - "scrollbarSlider.activeBackground": "#${base16."base04"}6f", //4 - "scrollbarSlider.background": "#${base16."base02"}6f", //2 - "scrollbarSlider.hoverBackground": "#${base16."base03"}6f", //3 - - // Badge - "badge.background": "#${base16."base00"}", //0 - "badge.foreground": "#${base16."base05"}", //5 - - // Progress bar - "progressBar.background": "#${base16."base03"}", //3 - - // Lists and trees - "list.activeSelectionBackground": "#${base16."base02"}", //2 - "list.activeSelectionForeground": "#${base16."base05"}", //5 - "list.dropBackground": "#${base16."base07"}", //7 - "list.focusBackground": "#${base16."base02"}", //2 - "list.focusForeground": "#${base16."base05"}", //5 - "list.highlightForeground": "#${base16."base07"}", //7 - "list.hoverBackground": "#${base16."base03"}", //3 - "list.hoverForeground": "#${base16."base05"}", //5 - "list.inactiveSelectionBackground": "#${base16."base02"}", //2 - "list.inactiveSelectionForeground": "#${base16."base05"}", //5 - "list.inactiveFocusBackground": "#${base16."base02"}", //2 - "list.invalidItemForeground": "#${base16."base08"}", //8 - "list.errorForeground": "#${base16."base08"}", //8 - "list.warningForeground": "#${base16."base09"}", //9 - - // Activity bar - "activityBar.background": "#${base16."base00"}", //0 - // "activityBar.border": "#f00", //0 - "activityBar.dropBackground": "#${base16."base07"}", //7 - "activityBar.foreground": "#${base16."base05"}", //5 - "activityBarBadge.background": "#${base16."base0D"}", //D - "activityBarBadge.foreground": "#${base16."base07"}", //7 - - // Side bar - "sideBar.background": "#${base16."base01"}", //1 - // "sideBar.border": "#f00", //1 - "sideBar.foreground": "#${base16."base05"}", //5 - "sideBarSectionHeader.background": "#${base16."base03"}", //3 - "sideBarSectionHeader.foreground": "#${base16."base05"}", //5 - "sideBarTitle.foreground": "#${base16."base05"}", //5 - - // Editor groups and tabs - "editorGroup.background": "#${base16."base00"}", //0 - // "editorGroup.border": "#f00", - "editorGroup.dropBackground": "#${base16."base02"}6f", //2 - "editorGroupHeader.noTabsBackground": "#${base16."base01"}", //1 - "editorGroupHeader.tabsBackground": "#${base16."base01"}", //1 - // "editorGroupHeader.tabsBorder": "#f00", - "tab.activeBackground": "#${base16."base00"}", //0 - "tab.activeForeground": "#${base16."base05"}", //5 - // "tab.border": "#f00", - // "tab.unfocusedActiveBorder": "#f00", - // "tab.activeBorderTop": "#f00", - "tab.inactiveBackground": "#${base16."base01"}", //1 - "tab.inactiveForeground": "#${base16."base03"}", //3 - "tab.unfocusedActiveForeground": "#${base16."base04"}", //4 - "tab.unfocusedInactiveForeground": "#${base16."base03"}", //3 - "tab.hoverBackground": "#${base16."base02"}", //2 - "tab.unfocusedHoverBackground": "#${base16."base02"}", //2 - // "tab.hoverBorder": "#f00", - // "tab.unfocusedHoverBorder": "#f00", - - // Editor colors - "editor.background": "#${base16."base00"}", //0 - "editor.foreground": "#${base16."base05"}", //5 - "editorLineNumber.foreground": "#${base16."base03"}", //3 - "editorCursor.foreground": "#${base16."base05"}", //5 - "editor.selectionBackground": "#${base16."base02"}", //2 - "editor.selectionHighlightBackground": "#${base16."base01"}", //1 - "editor.inactiveSelectionBackground": "#${base16."base02"}", //2 - "editor.wordHighlightBackground": "#${base16."base02"}", //2 - "editor.wordHighlightStrongBackground": "#${base16."base03"}", //3 - "editor.findMatchBackground": "#${base16."base0A"}6f", //A - "editor.findMatchHighlightBackground": "#${base16."base09"}6f", //9 - "editor.findRangeHighlightBackground": "#${base16."base01"}", //1 - "editor.hoverHighlightBackground": "#${base16."base02"}", //2 - "editor.lineHighlightBackground": "#${base16."base01"}", //1 - // "editor.lineHighlightBorder": "#f00", - "editorLink.activeForeground": "#${base16."base0D"}", //D - "editor.rangeHighlightBackground": "#${base16."base01"}", //1 - "editorWhitespace.foreground": "#${base16."base03"}", //3 - "editorIndentGuide.background": "#${base16."base03"}", //3 - "editorIndentGuide.activeBackground": "#${base16."base04"}", //4 - "editorRuler.foreground": "#${base16."base03"}", //3 - "editorCodeLens.foreground": "#${base16."base02"}", //2 - "editorBracketMatch.background": "#${base16."base02"}", //2 - // "editorBracketMatch.border": "#f00", - // "editorError.border": "#f0f", - - // Overview ruler - // "editorOverviewRuler.border": "#f00", - "editorOverviewRuler.findMatchForeground": "#${base16."base0A"}", //A - "editorOverviewRuler.rangeHighlightForeground": "#${ - base16."base03" - }", //3 - "editorOverviewRuler.selectionHighlightForeground": "#${ - base16."base02" - }", //2 - "editorOverviewRuler.wordHighlightForeground": "#${ - base16."base07" - }", //7 - "editorOverviewRuler.wordHighlightStrongForeground": "#${ - base16."base0D" - }", //D - "editorOverviewRuler.modifiedForeground": "#${base16."base0E"}", //E - "editorOverviewRuler.addedForeground": "#${base16."base0B"}", //B - "editorOverviewRuler.deletedForeground": "#${base16."base08"}", //8 - "editorOverviewRuler.errorForeground": "#${base16."base08"}", //8 - "editorOverviewRuler.warningForeground": "#${base16."base0A"}", //A - "editorOverviewRuler.infoForeground": "#${base16."base0C"}", //C - - // Errors and warnings - "editorError.foreground": "#${base16."base08"}", //8 - // "editorError.border": "", - "editorWarning.foreground": "#${base16."base0A"}", //A - // "editorWarning.border": "#f00", - "editorInfo.foreground": "#${base16."base0C"}", //C - // "editorInfo.border": "", - "editorGutter.addedBackground": "#${base16."base0B"}", //B - "editorGutter.background": "#${base16."base00"}", //0 - "editorGutter.deletedBackground": "#${base16."base08"}", //8 - "editorGutter.modifiedBackground": "#${base16."base0E"}", //E - - // Diff editor colors - "diffEditor.insertedTextBackground": "#${base16."base0B"}20", - // "diffEditor.insertedTextBorder": "#f00", - "diffEditor.removedTextBackground": "#${base16."base08"}20", - // "diffEditor.removedTextBorder": "#f00", - - // Editor widget colors - "editorWidget.background": "#${base16."base00"}", //0 - // "editorWidget.border": "#f00", - "editorSuggestWidget.background": "#${base16."base01"}", //1 - // "editorSuggestWidget.border": "#f00", - "editorSuggestWidget.foreground": "#${base16."base05"}", //5 - "editorSuggestWidget.highlightForeground": "#${base16."base0D"}", //D - "editorSuggestWidget.selectedBackground": "#${base16."base02"}", //2 - "editorHoverWidget.background": "#${base16."base00"}", //1 - // "editorHoverWidget.border": "#f00", - "debugExceptionWidget.background": "#${base16."base01"}", //1 - // "debugExceptionWidget.border": "#f00", - "editorMarkerNavigation.background": "#${base16."base01"}", //1 - "editorMarkerNavigationError.background": "#${base16."base08"}", //8 - "editorMarkerNavigationWarning.background": "#${base16."base0A"}", //A - - // Peek view colors - // "peekView.border": "#f00", - "peekViewEditor.background": "#${base16."base01"}", //1 - "peekViewEditor.matchHighlightBackground": "#${ - base16."base09" - }6f", //9 - "peekViewEditorGutter.background": "#${base16."base01"}", //1 - "peekViewResult.background": "#${base16."base00"}", //0 - "peekViewResult.fileForeground": "#${base16."base05"}", //5 - "peekViewResult.lineForeground": "#${base16."base03"}", //3 - "peekViewResult.matchHighlightBackground": "#${ - base16."base09" - }6f", //9 - "peekViewResult.selectionBackground": "#${base16."base02"}", //2 - "peekViewResult.selectionForeground": "#${base16."base05"}", //5 - "peekViewTitle.background": "#${base16."base02"}", //2 - "peekViewTitleDescription.foreground": "#${base16."base03"}", //3 - "peekViewTitleLabel.foreground": "#${base16."base05"}", //5 - - // Merge conflicts - // "merge.border": "#f00", - "merge.currentContentBackground": "#${base16."base0D"}40", //D - "merge.currentHeaderBackground": "#${base16."base0D"}40", //D - "merge.incomingContentBackground": "#${base16."base0B"}60", //B - "merge.incomingHeaderBackground": "#${base16."base0B"}60", //B - "editorOverviewRuler.currentContentForeground": "#${ - base16."base0D" - }", //D - "editorOverviewRuler.incomingContentForeground": "#${ - base16."base0B" - }", //B - "editorOverviewRuler.commonContentForeground": "#${ - base16."base0F" - }", //F - - // Panel colors - "panel.background": "#${base16."base00"}", //0 - // "panel.border": "#f00", - // "panelTitle.activeBorder": "#f00", - "panelTitle.activeForeground": "#${base16."base05"}", //5 - "panelTitle.inactiveForeground": "#${base16."base03"}", //3 - - // Status bar colors - "statusBar.background": "#${base16."base0D"}", //D - // "statusBar.border": "#f00", - "statusBar.debuggingBackground": "#${base16."base09"}", //9 - "statusBar.debuggingForeground": "#${base16."base07"}", //7 - // "statusBar.debuggingBorder": "", - "statusBar.foreground": "#${base16."base07"}", //7 - "statusBar.noFolderBackground": "#${base16."base0E"}", //E - "statusBar.noFolderForeground": "#${base16."base07"}", //7 - // "statusBar.noFolderBorder": "", - "statusBarItem.activeBackground": "#${base16."base03"}", //3 - "statusBarItem.hoverBackground": "#${base16."base02"}", //2 - "statusBarItem.prominentBackground": "#f0f", - "statusBarItem.prominentHoverBackground": "#f00", - - // Title bar colors (macOS) - "titleBar.activeBackground": "#${base16."base00"}", //0 - "titleBar.activeForeground": "#${base16."base05"}", //5 - "titleBar.inactiveBackground": "#${base16."base01"}", //1 - "titleBar.inactiveForeground": "#${base16."base03"}", //3 - - // Notification dialog colors - // "notificationCenter.border": "", - "notificationCenterHeader.foreground": "#${base16."base05"}", //5 - "notificationCenterHeader.background": "#${base16."base01"}", //1 - // "notificationToast.border": "", - "notifications.foreground": "#${base16."base05"}", //5 - "notifications.background": "#${base16."base02"}", //2 - // "notifications.border": "", - "notificationLink.foreground": "#${base16."base0D"}", //D - - // Below is no longer supported as of 1.21 - "notification.background": "#${base16."base02"}", //2 - "notification.foreground": "#${base16."base05"}", //5 - "notification.buttonBackground": "#${base16."base0D"}", //D - "notification.buttonHoverBackground": "#${base16."base02"}", //2 - "notification.buttonForeground": "#${base16."base07"}", //7 - "notification.infoBackground": "#${base16."base0C"}", //C - "notification.infoForeground": "#${base16."base07"}", //7 - "notification.warningBackground": "#${base16."base0A"}", //A - "notification.warningForeground": "#${base16."base07"}", //7 - "notification.errorBackground": "#${base16."base08"}", //8 - "notification.errorForeground": "#${base16."base07"}", //7 - // Above is no longer supported as of 1.21 - - // Extensions - "extensionButton.prominentBackground": "#${base16."base0B"}", //B - "extensionButton.prominentForeground": "#${base16."base07"}", //7 - "extensionButton.prominentHoverBackground": "#${base16."base02"}", //2 - - // Quick picker - // "pickerGroup.border": "#f00", - "pickerGroup.foreground": "#${base16."base03"}", //3 - - // Integrated terminal colors - "terminal.background": "#${base16."base00"}", //0 - "terminal.foreground": "#${base16."base05"}", //5 - "terminal.ansiBlack": "#${base16."base02"}", //2 - "terminal.ansiBrightBlack": "#${base16."base03"}", //3 - "terminal.ansiRed": "#${base16."base08"}", //8 - "terminal.ansiBrightRed": "#${base16."base08"}", //8 - "terminal.ansiYellow": "#${base16."base09"}", //9 - "terminal.ansiBrightYellow": "#${base16."base0A"}", //A - "terminal.ansiGreen": "#${base16."base0B"}", //B - "terminal.ansiBrightGreen": "#${base16."base0B"}", //B - "terminal.ansiCyan": "#${base16."base0C"}", //C - "terminal.ansiBrightCyan": "#${base16."base0C"}", //C - "terminal.ansiBlue": "#${base16."base0D"}", //D - "terminal.ansiBrightBlue": "#${base16."base0D"}", //D - "terminal.ansiMagenta": "#${base16."base0E"}", //E - "terminal.ansiBrightMagenta": "#${base16."base0E"}", //E - "terminal.ansiWhite": "#${base16."base06"}", //6 - "terminal.ansiBrightWhite": "#${base16."base07"}", //7 - - // Debug - "debugToolBar.background": "#${base16."base01"}", //1 - - // Welcome page - "welcomePage.buttonBackground": "#${base16."base01"}", //1 - "welcomePage.buttonHoverBackground": "#${base16."base02"}", //2 - "walkThrough.embeddedEditorBackground": "#${base16."base00"}", //0 - - // Git colors - "gitDecoration.modifiedResourceForeground": "#${base16."base0E"}", //E - "gitDecoration.deletedResourceForeground": "#${base16."base08"}", //8 - "gitDecoration.untrackedResourceForeground": "#${ - base16."base0B" - }", //B - "gitDecoration.ignoredResourceForeground": "#${base16."base03"}", //3 - "gitDecoration.conflictingResourceForeground": "#${ - base16."base0A" - }", //A - - // Settings editor colors - "settings.headerForeground": "#${base16."base05"}", //5 - "settings.modifiedItemForeground": "#${base16."base0B"}", //B - // "settings.inactiveSelectedItemBorder": "", - "settings.dropdownBackground": "#${base16."base01"}", //1 - "settings.dropdownForeground": "#${base16."base05"}", //5 - // "settings.dropdownBorder": "", - // "settings.dropdownListBorder": "", - "settings.checkboxBackground": "#${base16."base01"}", //1 - "settings.checkboxForeground": "#${base16."base05"}", //5 - // "settings.checkboxBorder": "", - "settings.textInputBackground": "#${base16."base01"}", //1 - "settings.textInputForeground": "#${base16."base05"}", //5 - // "settings.textInputBorder": "", - "settings.numberInputBackground": "#${base16."base01"}", //1 - "settings.numberInputForeground": "#${base16."base05"}", //5 - // "settings.numberInputBorder": "", - "settings.modifiedItemIndicator": "#${base16."base0D"}", //D - - // Breadcrumbs - "breadcrumb.foreground": "#${base16."base05"}", //5 - "breadcrumb.background": "#${base16."base01"}", //1 - "breadcrumb.focusForeground": "#${base16."base06"}", //6 - "breadcrumb.activeSelectionForeground": "#${base16."base07"}", //7 - "breadcrumbPicker.background": "#${base16."base01"}", //1 - - // Unknown - "descriptionForeground": "#${base16."base03"}", //3 - "textBlockQuote.background": "#${base16."base01"}", //1 - "textBlockQuote.border": "#${base16."base0D"}", //D - "textCodeBlock.background": "#${base16."base00"}", //0 - "textLink.activeForeground": "#${base16."base0C"}", //C - "textLink.foreground": "#${base16."base0D"}", //D - "textPreformat.foreground": "#${base16."base0D"}", //D - "textSeparator.foreground": "#f0f" - }, - "tokenColors": [ - { - "settings": { - "foreground": "#eeffffff", - "background": "#263238ff" - } - }, - { - "name": "Comment", - "scope": [ - "comment", - "punctuation.definition.comment" - ], - "settings": { - "fontStyle": "italic", - "foreground": "#${base16."base03"}" //3 - } - }, - { - "name": "Variables, Parameters", - "scope": [ - "variable", - "string constant.other.placeholder", - "entity.name.variable.parameter", - "entity.name.variable.local", - "variable.parameter" - ], - "settings": { - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Properties", - "scope": [ - "variable.other.object.property" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "Colors", - "scope": [ - "constant.other.color" - ], - "settings": { - "foreground": "#0f0" - } - }, - { - "name": "Invalid", - "scope": [ - "invalid", - "invalid.illegal" - ], - "settings": { - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Invalid - Deprecated", - "scope": [ - "invalid.deprecated" - ], - "settings": { - "foreground": "#${base16."base0F"}" //F - } - }, - { - "name": "Keyword, Storage", - "scope": [ - "keyword", - "storage.modifier" - ], - "settings": { - "foreground": "#${base16."base0E"}" //E - } - }, - { - "name": "Keyword Control", - "scope": [ - "keyword.control", - "keyword.control.flow", - "keyword.control.from", - "keyword.control.import", - "keyword.control.as" - ], - "settings": { - "foreground": "#${base16."base0E"}" //E - } - }, - { - "name": "Keyword", - "scope": [ - "keyword.other.using", - "keyword.other.namespace", - "keyword.other.class", - "keyword.other.new", - "keyword.other.event", - "keyword.other.this", - "keyword.other.await", - "keyword.other.var", - "keyword.other.package", - "keyword.other.import", - "variable.language.this", - "storage.type.ts" - ], - "settings": { - "foreground": "#${base16."base0E"}" //E - } - }, - { - "name": "Types, Primitives", - "scope": [ - "keyword.type", - "storage.type.primitive" - ], - "settings": { - "foreground": "#${base16."base0C"}" //C - } - }, - { - "name": "Function", - "scope": [ - "storage.type.function" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "Operator, Misc", - "scope": [ - "constant.other.color", - "punctuation", - "punctuation.section.class.end", - "meta.tag", - "punctuation.definition.tag", - "punctuation.separator.inheritance.php", - "punctuation.definition.tag.html", - "punctuation.definition.tag.begin.html", - "punctuation.definition.tag.end.html", - "keyword.other.template", - "keyword.other.substitution" - ], - "settings": { - "foreground": "#${base16."base05"}" //5 - } - }, - { - "name": "Embedded", - "scope": [ - "punctuation.section.embedded", - "variable.interpolation" - ], - "settings": { - "foreground": "#${base16."base0F"}" //F - } - }, - { - "name": "Tag", - "scope": [ - "entity.name.tag", - "meta.tag.sgml", - "markup.deleted.git_gutter" - ], - "settings": { - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Function, Special Method", - "scope": [ - "entity.name.function", - "meta.function-call", - "variable.function", - "support.function", - "keyword.other.special-method" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "Block Level Variables", - "scope": [ - "meta.block variable.other" - ], - "settings": { - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Other Variable, String Link", - "scope": [ - "support.other.variable", - "string.other.link" - ], - "settings": { - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Number, Constant, Function Argument, Tag Attribute, Embedded", - "scope": [ - "constant.numeric", - "constant.language", - "support.constant", - "constant.character", - "constant.escape", - "keyword.other.unit", - "keyword.other" - ], - "settings": { - "foreground": "#${base16."base09"}" //9 - } - }, - { - "name": "String, Symbols, Inherited Class, Markup Heading", - "scope": [ - "string", - "constant.other.symbol", - "constant.other.key", - "entity.other.inherited-class", - "markup.heading", - "markup.inserted.git_gutter", - "meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js" - ], - "settings": { - "fontStyle": "normal", - "foreground": "#${base16."base0B"}" //B - } - }, - { - "name": "Class, Support", - "scope": [ - "entity.name", - "support.type", - "support.class", - "support.orther.namespace.use.php", - "meta.use.php", - "support.other.namespace.php", - "markup.changed.git_gutter", - "support.type.sys-types" - ], - "settings": { - "foreground": "#${base16."base0A"}" //A - } - }, - { - "name": "Storage Type, Import Class", - "scope": [ - "storage.type", - "storage.modifier.package", - "storage.modifier.import" - ], - "settings": { - "foreground": "#${base16."base0A"}" //A - } - }, - { - "name": "Fields", - "scope": [ - "entity.name.variable.field" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "Entity Types", - "scope": [ - "support.type" - ], - "settings": { - "foreground": "#${base16."base0C"}" //C - } - }, - { - "name": "CSS Class and Support", - "scope": [ - "source.css support.type.property-name", - "source.sass support.type.property-name", - "source.scss support.type.property-name", - "source.less support.type.property-name", - "source.stylus support.type.property-name", - "source.postcss support.type.property-name" - ], - "settings": { - "foreground": "#${base16."base0C"}" //C - } - }, - { - "name": "Sub-methods", - "scope": [ - "entity.name.module.js", - "variable.import.parameter.js", - "variable.other.class.js" - ], - "settings": { - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Language methods", - "scope": [ - "variable.language" - ], - "settings": { - "fontStyle": "italic", - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "entity.name.method.js", - "scope": [ - "entity.name.method.js" - ], - "settings": { - "fontStyle": "italic", - "foreground": "#82AAFF" - } - }, - { - "name": "meta.method.js", - "scope": [ - "meta.class-method.js entity.name.function.js", - "variable.function.constructor" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "Attributes", - "scope": [ - "entity.other.attribute-name" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "HTML Attributes", - "scope": [ - "text.html.basic entity.other.attribute-name.html", - "text.html.basic entity.other.attribute-name" - ], - "settings": { - "fontStyle": "italic", - "foreground": "#${base16."base0A"}" //A - } - }, - { - "name": "CSS Classes", - "scope": [ - "entity.other.attribute-name.class" - ], - "settings": { - "foreground": "#${base16."base0A"}" //A - } - }, - { - "name": "CSS ID's", - "scope": [ - "source.sass keyword.control" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "Inserted", - "scope": [ - "markup.inserted" - ], - "settings": { - "foreground": "#${base16."base0B"}" //B - } - }, - { - "name": "Deleted", - "scope": [ - "markup.deleted" - ], - "settings": { - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Changed", - "scope": [ - "markup.changed" - ], - "settings": { - "foreground": "#${base16."base0E"}" //E - } - }, - { - "name": "Regular Expressions", - "scope": [ - "string.regexp" - ], - "settings": { - "foreground": "#${base16."base0C"}" //C - } - }, - { - "name": "Escape Characters", - "scope": [ - "constant.character.escape" - ], - "settings": { - "foreground": "#${base16."base0C"}" //C - } - }, - { - "name": "URL", - "scope": [ - "*url*", - "*link*", - "*uri*" - ], - "settings": { - "fontStyle": "underline" - } - }, - { - "name": "Decorators", - "scope": [ - "tag.decorator.js entity.name.tag.js", - "tag.decorator.js punctuation.definition.tag.js" - ], - "settings": { - "fontStyle": "italic", - "foreground": "#${base16."base0D"}" // D - } - }, - { - "name": "ES7 Bind Operator", - "scope": [ - "source.js constant.other.object.key.js string.unquoted.label.js" - ], - "settings": { - "fontStyle": "italic", - "foreground": "#FF5370" - } - }, - { - "name": "JSON Key - Level 0", - "scope": [ - "source.json meta.structure.dictionary.json support.type.property-name.json" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "JSON Key - Level 1", - "scope": [ - "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "JSON Key - Level 2", - "scope": [ - "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "JSON Key - Level 3", - "scope": [ - "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "JSON Key - Level 4", - "scope": [ - "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "JSON Key - Level 5", - "scope": [ - "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "JSON Key - Level 6", - "scope": [ - "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "JSON Key - Level 7", - "scope": [ - "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "JSON Key - Level 8", - "scope": [ - "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "Markdown - Plain", - "scope": [ - "text.html.markdown", - "punctuation.definition.list_item.markdown" - ], - "settings": { - "foreground": "#${base16."base05"}" //5 - } - }, - { - "name": "Markdown - Markup Raw Inline", - "scope": [ - "text.html.markdown markup.inline.raw.markdown" - ], - "settings": { - "foreground": "#${base16."base0E"}" //E - } - }, - { - "name": "Markdown - Markup Raw Inline Punctuation", - "scope": [ - "text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown" - ], - "settings": { - "foreground": "#${base16."base0C"}" //C - } - }, - { - "name": "Markdown - Line Break", - "scope": [ - "text.html.markdown meta.dummy.line-break" - ], - "settings": { - "foreground": "" - } - }, - { - "name": "Markdown - Heading", - "scope": [ - "markdown.heading", - "markup.heading | markup.heading entity.name", - "markup.heading.markdown punctuation.definition.heading.markdown" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "Markup - Italic", - "scope": [ - "markup.italic" - ], - "settings": { - "fontStyle": "italic", - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Markup - Bold", - "scope": [ - "markup.bold", - "markup.bold string" - ], - "settings": { - "fontStyle": "bold", - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Markup - Bold-Italic", - "scope": [ - "markup.bold markup.italic", - "markup.italic markup.bold", - "markup.quote markup.bold", - "markup.bold markup.italic string", - "markup.italic markup.bold string", - "markup.quote markup.bold string" - ], - "settings": { - "fontStyle": "bold", - "foreground": "#${base16."base08"}" //8 - } - }, - { - "name": "Markup - Underline", - "scope": [ - "markup.underline" - ], - "settings": { - "fontStyle": "underline", - "foreground": "#${base16."base09"}" //9 - } - }, - { - "name": "Markup - Strike", - "scope": [ - "markup.strike" - ], - "settings": { - "fontStyle": "strike", - "foreground": "" - } - }, - { - "name": "Markdown - Blockquote", - "scope": [ - "markup.quote punctuation.definition.blockquote.markdown" - ], - "settings": { - "background": "#${base16."base0C"}", //C - "foreground": "#${base16."base0C"}" //C - } - }, - { - "name": "Markup - Quote", - "scope": [ - "markup.quote" - ], - "settings": { - "fontStyle": "italic", - "foreground": "" - } - }, - { - "name": "Markdown - Link", - "scope": [ - "string.other.link.title.markdown" - ], - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "name": "Markdown - Link Description", - "scope": [ - "string.other.link.description.title.markdown" - ], - "settings": { - "foreground": "#${base16."base0E"}" //E - } - }, - { - "name": "Markdown - Link Anchor", - "scope": [ - "constant.other.reference.link.markdown" - ], - "settings": { - "foreground": "#${base16."base0A"}" //A - } - }, - { - "name": "Markup - Raw Block", - "scope": [ - "markup.raw.block" - ], - "settings": { - "foreground": "#${base16."base0E"}" //E - } - }, - { - "name": "Markdown - Raw Block Fenced", - "scope": [ - "markup.raw.block.fenced.markdown" - ], - "settings": { - "foreground": "#00000050" - } - }, - { - "name": "Markdown - Fenced Bode Block", - "scope": [ - "punctuation.definition.fenced.markdown" - ], - "settings": { - "foreground": "#00000050" - } - }, - { - "name": "Markdown - Fenced Bode Block Variable", - "scope": [ - "markup.raw.block.fenced.markdown", - "variable.language.fenced.markdown" - ], - "settings": { - "foreground": "#f0f" - } - }, - { - "name": "Markdown - Fenced Language", - "scope": [ - "variable.language.fenced.markdown" - ], - "settings": { - "foreground": "#f00" - } - }, - { - "name": "Markdown - Separator", - "scope": [ - "meta.separator" - ], - "settings": { - "fontStyle": "bold", - "background": "#00000050", - "foreground": "#${base16."base0C"}" //C - } - }, - { - "name": "Markup - Table", - "scope": [ - "markup.table" - ], - "settings": { - "foreground": "#f0f" - } - }, - { - "scope": "token.info-token", - "settings": { - "foreground": "#${base16."base0D"}" //D - } - }, - { - "scope": "token.warn-token", - "settings": { - "foreground": "#${base16."base0A"}" //A - } - }, - { - "scope": "token.error-token", - "settings": { - "foreground": "#${base16."base08"}" //8 - } - }, - { - "scope": "token.debug-token", - "settings": { - "foreground": "#${base16."base0E"}" //E - } - } - ] - } -'' diff --git a/home-manager/data/vim-base16.nix b/home-manager/data/vim-base16.nix deleted file mode 100644 index 4e776d4..0000000 --- a/home-manager/data/vim-base16.nix +++ /dev/null @@ -1,401 +0,0 @@ -base16: - -'' - " GUI color definitions - let s:gui00 = "${base16.base00}" - let g:base16_gui00 = "${base16.base00}" - let s:gui01 = "${base16.base01}" - let g:base16_gui01 = "${base16.base01}" - let s:gui02 = "${base16.base02}" - let g:base16_gui02 = "${base16.base02}" - let s:gui03 = "${base16.base03}" - let g:base16_gui03 = "${base16.base03}" - let s:gui04 = "${base16.base04}" - let g:base16_gui04 = "${base16.base04}" - let s:gui05 = "${base16.base05}" - let g:base16_gui05 = "${base16.base05}" - let s:gui06 = "${base16.base06}" - let g:base16_gui06 = "${base16.base06}" - let s:gui07 = "${base16.base07}" - let g:base16_gui07 = "${base16.base07}" - let s:gui08 = "${base16.base08}" - let g:base16_gui08 = "${base16.base08}" - let s:gui09 = "${base16.base09}" - let g:base16_gui09 = "${base16.base09}" - let s:gui0A = "${base16.base0A}" - let g:base16_gui0A = "${base16.base0A}" - let s:gui0B = "${base16.base0B}" - let g:base16_gui0B = "${base16.base0B}" - let s:gui0C = "${base16.base0C}" - let g:base16_gui0C = "${base16.base0C}" - let s:gui0D = "${base16.base0D}" - let g:base16_gui0D = "${base16.base0D}" - let s:gui0E = "${base16.base0E}" - let g:base16_gui0E = "${base16.base0E}" - let s:gui0F = "${base16.base0F}" - let g:base16_gui0F = "${base16.base0F}" - - " Terminal color definitions - let s:cterm00 = "00" - let g:base16_cterm00 = "00" - let s:cterm03 = "08" - let g:base16_cterm03 = "08" - let s:cterm05 = "07" - let g:base16_cterm05 = "07" - let s:cterm07 = "15" - let g:base16_cterm07 = "15" - let s:cterm08 = "01" - let g:base16_cterm08 = "01" - let s:cterm0A = "03" - let g:base16_cterm0A = "03" - let s:cterm0B = "02" - let g:base16_cterm0B = "02" - let s:cterm0C = "06" - let g:base16_cterm0C = "06" - let s:cterm0D = "04" - let g:base16_cterm0D = "04" - let s:cterm0E = "05" - let g:base16_cterm0E = "05" - if exists("base16colorspace") && base16colorspace == "256" - let s:cterm01 = "18" - let g:base16_cterm01 = "18" - let s:cterm02 = "19" - let g:base16_cterm02 = "19" - let s:cterm04 = "20" - let g:base16_cterm04 = "20" - let s:cterm06 = "21" - let g:base16_cterm06 = "21" - let s:cterm09 = "16" - let g:base16_cterm09 = "16" - let s:cterm0F = "17" - let g:base16_cterm0F = "17" - else - let s:cterm01 = "10" - let g:base16_cterm01 = "10" - let s:cterm02 = "11" - let g:base16_cterm02 = "11" - let s:cterm04 = "12" - let g:base16_cterm04 = "12" - let s:cterm06 = "13" - let g:base16_cterm06 = "13" - let s:cterm09 = "09" - let g:base16_cterm09 = "09" - let s:cterm0F = "14" - let g:base16_cterm0F = "14" - endif - - " Neovim terminal colours - if has("nvim") - let g:terminal_color_0 = "#${base16.base00}" - let g:terminal_color_1 = "#${base16.base08}" - let g:terminal_color_2 = "#${base16.base0B}" - let g:terminal_color_3 = "#${base16.base0A}" - let g:terminal_color_4 = "#${base16.base0D}" - let g:terminal_color_5 = "#${base16.base0E}" - let g:terminal_color_6 = "#${base16.base0C}" - let g:terminal_color_7 = "#${base16.base05}" - let g:terminal_color_8 = "#${base16.base03}" - let g:terminal_color_9 = "#${base16.base08}" - let g:terminal_color_10 = "#${base16.base0B}" - let g:terminal_color_11 = "#${base16.base0A}" - let g:terminal_color_12 = "#${base16.base0D}" - let g:terminal_color_13 = "#${base16.base0E}" - let g:terminal_color_14 = "#${base16.base0C}" - let g:terminal_color_15 = "#${base16.base07}" - let g:terminal_color_background = g:terminal_color_0 - let g:terminal_color_foreground = g:terminal_color_5 - if &background == "light" - let g:terminal_color_background = g:terminal_color_7 - let g:terminal_color_foreground = g:terminal_color_2 - endif - elseif has("terminal") - let g:terminal_ansi_colors = [ - \ "#${base16.base00}", - \ "#${base16.base08}", - \ "#${base16.base0B}", - \ "#${base16.base0A}", - \ "#${base16.base0D}", - \ "#${base16.base0E}", - \ "#${base16.base0C}", - \ "#${base16.base05}", - \ "#${base16.base03}", - \ "#${base16.base08}", - \ "#${base16.base0B}", - \ "#${base16.base0A}", - \ "#${base16.base0D}", - \ "#${base16.base0E}", - \ "#${base16.base0C}", - \ "#${base16.base07}", - \ ] - endif - - " Theme setup - hi clear - syntax reset - let g:colors_name = "base16" - - " Highlighting function - " Optional variables are attributes and guisp - function! g:Base16hi(group, guifg, guibg, ctermfg, ctermbg, ...) - let l:attr = get(a:, 1, "") - let l:guisp = get(a:, 2, "") - - if a:guifg != "" - exec "hi " . a:group . " guifg=#" . a:guifg - endif - if a:guibg != "" - exec "hi " . a:group . " guibg=#" . a:guibg - endif - if a:ctermfg != "" - exec "hi " . a:group . " ctermfg=" . a:ctermfg - endif - if a:ctermbg != "" - exec "hi " . a:group . " ctermbg=" . a:ctermbg - endif - if l:attr != "" - exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr - endif - if l:guisp != "" - exec "hi " . a:group . " guisp=#" . l:guisp - endif - endfunction - - - fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) - call g:Base16hi(a:group, a:guifg, a:guibg, a:ctermfg, a:ctermbg, a:attr, a:guisp) - endfun - - " Vim editor colors - call hi("Normal", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") - call hi("Bold", "", "", "", "", "bold", "") - call hi("Debug", s:gui08, "", s:cterm08, "", "", "") - call hi("Directory", s:gui0D, "", s:cterm0D, "", "", "") - call hi("Error", s:gui00, s:gui08, s:cterm00, s:cterm08, "", "") - call hi("ErrorMsg", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") - call hi("Exception", s:gui08, "", s:cterm08, "", "", "") - call hi("FoldColumn", s:gui0C, s:gui01, s:cterm0C, s:cterm01, "", "") - call hi("Folded", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") - call hi("IncSearch", s:gui01, s:gui09, s:cterm01, s:cterm09, "none", "") - call hi("Italic", "", "", "", "", "none", "") - call hi("Macro", s:gui08, "", s:cterm08, "", "", "") - call hi("MatchParen", "", s:gui03, "", s:cterm03, "", "") - call hi("ModeMsg", s:gui0B, "", s:cterm0B, "", "", "") - call hi("MoreMsg", s:gui0B, "", s:cterm0B, "", "", "") - call hi("Question", s:gui0D, "", s:cterm0D, "", "", "") - call hi("Search", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "", "") - call hi("Substitute", s:gui01, s:gui0A, s:cterm01, s:cterm0A, "none", "") - call hi("SpecialKey", s:gui03, "", s:cterm03, "", "", "") - call hi("TooLong", s:gui08, "", s:cterm08, "", "", "") - call hi("Underlined", s:gui08, "", s:cterm08, "", "", "") - call hi("Visual", "", s:gui02, "", s:cterm02, "", "") - call hi("VisualNOS", s:gui08, "", s:cterm08, "", "", "") - call hi("WarningMsg", s:gui08, "", s:cterm08, "", "", "") - call hi("WildMenu", s:gui08, s:gui0A, s:cterm08, "", "", "") - call hi("Title", s:gui0D, "", s:cterm0D, "", "none", "") - call hi("Conceal", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") - call hi("Cursor", s:gui00, s:gui05, s:cterm00, s:cterm05, "", "") - call hi("NonText", s:gui03, "", s:cterm03, "", "", "") - call hi("LineNr", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") - call hi("SignColumn", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") - call hi("StatusLine", s:gui04, s:gui02, s:cterm04, s:cterm02, "none", "") - call hi("StatusLineNC", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") - call hi("VertSplit", s:gui02, s:gui02, s:cterm02, s:cterm02, "none", "") - call hi("ColorColumn", "", s:gui01, "", s:cterm01, "none", "") - call hi("CursorColumn", "", s:gui01, "", s:cterm01, "none", "") - call hi("CursorLine", "", s:gui01, "", s:cterm01, "none", "") - call hi("CursorLineNr", s:gui04, s:gui01, s:cterm04, s:cterm01, "", "") - call hi("QuickFixLine", "", s:gui01, "", s:cterm01, "none", "") - call hi("PMenu", s:gui05, s:gui01, s:cterm05, s:cterm01, "none", "") - call hi("PMenuSel", s:gui01, s:gui05, s:cterm01, s:cterm05, "", "") - call hi("TabLine", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") - call hi("TabLineFill", s:gui03, s:gui01, s:cterm03, s:cterm01, "none", "") - call hi("TabLineSel", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "none", "") - - " Standard syntax highlighting - call hi("Boolean", s:gui09, "", s:cterm09, "", "", "") - call hi("Character", s:gui08, "", s:cterm08, "", "", "") - call hi("Comment", s:gui03, "", s:cterm03, "", "", "") - call hi("Conditional", s:gui0E, "", s:cterm0E, "", "", "") - call hi("Constant", s:gui09, "", s:cterm09, "", "", "") - call hi("Define", s:gui0E, "", s:cterm0E, "", "none", "") - call hi("Delimiter", s:gui0F, "", s:cterm0F, "", "", "") - call hi("Float", s:gui09, "", s:cterm09, "", "", "") - call hi("Function", s:gui0D, "", s:cterm0D, "", "", "") - call hi("Identifier", s:gui08, "", s:cterm08, "", "none", "") - call hi("Include", s:gui0D, "", s:cterm0D, "", "", "") - call hi("Keyword", s:gui0E, "", s:cterm0E, "", "", "") - call hi("Label", s:gui0A, "", s:cterm0A, "", "", "") - call hi("Number", s:gui09, "", s:cterm09, "", "", "") - call hi("Operator", s:gui05, "", s:cterm05, "", "none", "") - call hi("PreProc", s:gui0A, "", s:cterm0A, "", "", "") - call hi("Repeat", s:gui0A, "", s:cterm0A, "", "", "") - call hi("Special", s:gui0C, "", s:cterm0C, "", "", "") - call hi("SpecialChar", s:gui0F, "", s:cterm0F, "", "", "") - call hi("Statement", s:gui08, "", s:cterm08, "", "", "") - call hi("StorageClass", s:gui0A, "", s:cterm0A, "", "", "") - call hi("String", s:gui0B, "", s:cterm0B, "", "", "") - call hi("Structure", s:gui0E, "", s:cterm0E, "", "", "") - call hi("Tag", s:gui0A, "", s:cterm0A, "", "", "") - call hi("Todo", s:gui0A, s:gui01, s:cterm0A, s:cterm01, "", "") - call hi("Type", s:gui0A, "", s:cterm0A, "", "none", "") - call hi("Typedef", s:gui0A, "", s:cterm0A, "", "", "") - - " C highlighting - call hi("cOperator", s:gui0C, "", s:cterm0C, "", "", "") - call hi("cPreCondit", s:gui0E, "", s:cterm0E, "", "", "") - - " C# highlighting - call hi("csClass", s:gui0A, "", s:cterm0A, "", "", "") - call hi("csAttribute", s:gui0A, "", s:cterm0A, "", "", "") - call hi("csModifier", s:gui0E, "", s:cterm0E, "", "", "") - call hi("csType", s:gui08, "", s:cterm08, "", "", "") - call hi("csUnspecifiedStatement", s:gui0D, "", s:cterm0D, "", "", "") - call hi("csContextualStatement", s:gui0E, "", s:cterm0E, "", "", "") - call hi("csNewDecleration", s:gui08, "", s:cterm08, "", "", "") - - " CSS highlighting - call hi("cssBraces", s:gui05, "", s:cterm05, "", "", "") - call hi("cssClassName", s:gui0E, "", s:cterm0E, "", "", "") - call hi("cssColor", s:gui0C, "", s:cterm0C, "", "", "") - - " Diff highlighting - call hi("DiffAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") - call hi("DiffChange", s:gui03, s:gui01, s:cterm03, s:cterm01, "", "") - call hi("DiffDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - call hi("DiffText", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") - call hi("DiffAdded", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") - call hi("DiffFile", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") - call hi("DiffNewFile", s:gui0B, s:gui00, s:cterm0B, s:cterm00, "", "") - call hi("DiffLine", s:gui0D, s:gui00, s:cterm0D, s:cterm00, "", "") - call hi("DiffRemoved", s:gui08, s:gui00, s:cterm08, s:cterm00, "", "") - - " Git highlighting - call hi("gitcommitOverflow", s:gui08, "", s:cterm08, "", "", "") - call hi("gitcommitSummary", s:gui0B, "", s:cterm0B, "", "", "") - call hi("gitcommitComment", s:gui03, "", s:cterm03, "", "", "") - call hi("gitcommitUntracked", s:gui03, "", s:cterm03, "", "", "") - call hi("gitcommitDiscarded", s:gui03, "", s:cterm03, "", "", "") - call hi("gitcommitSelected", s:gui03, "", s:cterm03, "", "", "") - call hi("gitcommitHeader", s:gui0E, "", s:cterm0E, "", "", "") - call hi("gitcommitSelectedType", s:gui0D, "", s:cterm0D, "", "", "") - call hi("gitcommitUnmergedType", s:gui0D, "", s:cterm0D, "", "", "") - call hi("gitcommitDiscardedType", s:gui0D, "", s:cterm0D, "", "", "") - call hi("gitcommitBranch", s:gui09, "", s:cterm09, "", "bold", "") - call hi("gitcommitUntrackedFile", s:gui0A, "", s:cterm0A, "", "", "") - call hi("gitcommitUnmergedFile", s:gui08, "", s:cterm08, "", "bold", "") - call hi("gitcommitDiscardedFile", s:gui08, "", s:cterm08, "", "bold", "") - call hi("gitcommitSelectedFile", s:gui0B, "", s:cterm0B, "", "bold", "") - - " GitGutter highlighting - call hi("GitGutterAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") - call hi("GitGutterChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") - call hi("GitGutterDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - call hi("GitGutterChangeDelete", s:gui0E, s:gui01, s:cterm0E, s:cterm01, "", "") - - " HTML highlighting - call hi("htmlBold", s:gui0A, "", s:cterm0A, "", "", "") - call hi("htmlItalic", s:gui0E, "", s:cterm0E, "", "", "") - call hi("htmlEndTag", s:gui05, "", s:cterm05, "", "", "") - call hi("htmlTag", s:gui05, "", s:cterm05, "", "", "") - - " JavaScript highlighting - call hi("javaScript", s:gui05, "", s:cterm05, "", "", "") - call hi("javaScriptBraces", s:gui05, "", s:cterm05, "", "", "") - call hi("javaScriptNumber", s:gui09, "", s:cterm09, "", "", "") - " pangloss/vim-javascript highlighting - call hi("jsOperator", s:gui0D, "", s:cterm0D, "", "", "") - call hi("jsStatement", s:gui0E, "", s:cterm0E, "", "", "") - call hi("jsReturn", s:gui0E, "", s:cterm0E, "", "", "") - call hi("jsThis", s:gui08, "", s:cterm08, "", "", "") - call hi("jsClassDefinition", s:gui0A, "", s:cterm0A, "", "", "") - call hi("jsFunction", s:gui0E, "", s:cterm0E, "", "", "") - call hi("jsFuncName", s:gui0D, "", s:cterm0D, "", "", "") - call hi("jsFuncCall", s:gui0D, "", s:cterm0D, "", "", "") - call hi("jsClassFuncName", s:gui0D, "", s:cterm0D, "", "", "") - call hi("jsClassMethodType", s:gui0E, "", s:cterm0E, "", "", "") - call hi("jsRegexpString", s:gui0C, "", s:cterm0C, "", "", "") - call hi("jsGlobalObjects", s:gui0A, "", s:cterm0A, "", "", "") - call hi("jsGlobalNodeObjects", s:gui0A, "", s:cterm0A, "", "", "") - call hi("jsExceptions", s:gui0A, "", s:cterm0A, "", "", "") - call hi("jsBuiltins", s:gui0A, "", s:cterm0A, "", "", "") - - " Mail highlighting - call hi("mailQuoted1", s:gui0A, "", s:cterm0A, "", "", "") - call hi("mailQuoted2", s:gui0B, "", s:cterm0B, "", "", "") - call hi("mailQuoted3", s:gui0E, "", s:cterm0E, "", "", "") - call hi("mailQuoted4", s:gui0C, "", s:cterm0C, "", "", "") - call hi("mailQuoted5", s:gui0D, "", s:cterm0D, "", "", "") - call hi("mailQuoted6", s:gui0A, "", s:cterm0A, "", "", "") - call hi("mailURL", s:gui0D, "", s:cterm0D, "", "", "") - call hi("mailEmail", s:gui0D, "", s:cterm0D, "", "", "") - - " Markdown highlighting - call hi("markdownCode", s:gui0B, "", s:cterm0B, "", "", "") - call hi("markdownError", s:gui05, s:gui00, s:cterm05, s:cterm00, "", "") - call hi("markdownCodeBlock", s:gui0B, "", s:cterm0B, "", "", "") - call hi("markdownHeadingDelimiter", s:gui0D, "", s:cterm0D, "", "", "") - - " NERDTree highlighting - call hi("NERDTreeDirSlash", s:gui0D, "", s:cterm0D, "", "", "") - call hi("NERDTreeExecFile", s:gui05, "", s:cterm05, "", "", "") - - " PHP highlighting - call hi("phpMemberSelector", s:gui05, "", s:cterm05, "", "", "") - call hi("phpComparison", s:gui05, "", s:cterm05, "", "", "") - call hi("phpParent", s:gui05, "", s:cterm05, "", "", "") - call hi("phpMethodsVar", s:gui0C, "", s:cterm0C, "", "", "") - - " Python highlighting - call hi("pythonOperator", s:gui0E, "", s:cterm0E, "", "", "") - call hi("pythonRepeat", s:gui0E, "", s:cterm0E, "", "", "") - call hi("pythonInclude", s:gui0E, "", s:cterm0E, "", "", "") - call hi("pythonStatement", s:gui0E, "", s:cterm0E, "", "", "") - - " Ruby highlighting - call hi("rubyAttribute", s:gui0D, "", s:cterm0D, "", "", "") - call hi("rubyConstant", s:gui0A, "", s:cterm0A, "", "", "") - call hi("rubyInterpolationDelimiter", s:gui0F, "", s:cterm0F, "", "", "") - call hi("rubyRegexp", s:gui0C, "", s:cterm0C, "", "", "") - call hi("rubySymbol", s:gui0B, "", s:cterm0B, "", "", "") - call hi("rubyStringDelimiter", s:gui0B, "", s:cterm0B, "", "", "") - - " SASS highlighting - call hi("sassidChar", s:gui08, "", s:cterm08, "", "", "") - call hi("sassClassChar", s:gui09, "", s:cterm09, "", "", "") - call hi("sassInclude", s:gui0E, "", s:cterm0E, "", "", "") - call hi("sassMixing", s:gui0E, "", s:cterm0E, "", "", "") - call hi("sassMixinName", s:gui0D, "", s:cterm0D, "", "", "") - - " Signify highlighting - call hi("SignifySignAdd", s:gui0B, s:gui01, s:cterm0B, s:cterm01, "", "") - call hi("SignifySignChange", s:gui0D, s:gui01, s:cterm0D, s:cterm01, "", "") - call hi("SignifySignDelete", s:gui08, s:gui01, s:cterm08, s:cterm01, "", "") - - " Spelling highlighting - call hi("SpellBad", "", "", "", "", "undercurl", s:gui08) - call hi("SpellLocal", "", "", "", "", "undercurl", s:gui0C) - call hi("SpellCap", "", "", "", "", "undercurl", s:gui0D) - call hi("SpellRare", "", "", "", "", "undercurl", s:gui0E) - - " Startify highlighting - call hi("StartifyBracket", s:gui03, "", s:cterm03, "", "", "") - call hi("StartifyFile", s:gui07, "", s:cterm07, "", "", "") - call hi("StartifyFooter", s:gui03, "", s:cterm03, "", "", "") - call hi("StartifyHeader", s:gui0B, "", s:cterm0B, "", "", "") - call hi("StartifyNumber", s:gui09, "", s:cterm09, "", "", "") - call hi("StartifyPath", s:gui03, "", s:cterm03, "", "", "") - call hi("StartifySection", s:gui0E, "", s:cterm0E, "", "", "") - call hi("StartifySelect", s:gui0C, "", s:cterm0C, "", "", "") - call hi("StartifySlash", s:gui03, "", s:cterm03, "", "", "") - call hi("StartifySpecial", s:gui03, "", s:cterm03, "", "", "") - - " Java highlighting - call hi("javaOperator", s:gui0D, "", s:cterm0D, "", "", "") - - " Remove functions - delf hi - - " Remove color variables - unlet s:gui00 s:gui01 s:gui02 s:gui03 s:gui04 s:gui05 s:gui06 s:gui07 s:gui08 s:gui09 s:gui0A s:gui0B s:gui0C s:gui0D s:gui0E s:gui0F - unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F -'' diff --git a/home-manager/modules/colors.nix b/home-manager/modules/colors.nix index a141b64..e4a4311 100644 --- a/home-manager/modules/colors.nix +++ b/home-manager/modules/colors.nix @@ -300,7 +300,7 @@ in ''; # neovim - xdg.configFile."nvim/colors/base16.vim".text = import ../data/vim-base16.nix cfg.base16; + xdg.configFile."nvim/colors/base16.vim".source = "${genTheme inputs.base16-vim}"; programs.neovim.extraConfig = '' colorscheme base16 set termguicolors @@ -335,7 +335,7 @@ in [ ( mkIf config.programs.vscode.enable { - ".vscode-oss/extensions/base16-1.0.0/themes/nix-colors.json".text = import ../data/codium-base16.nix cfg.base16; + ".vscode-oss/extensions/base16-1.0.0/themes/nix-colors.json".source = genTheme inputs.base16-vscode; ".vscode-oss/extensions/base16-1.0.0/package.json".text = builtins.toJSON { name = "nix colors"; displayName = "Automatic Nix-generated base16 colors";