rc: Use builtin faces

4 files changed, 13 insertions, 18 deletions

diff --git a/rc/base/d.kak b/rc/base/d.kak
index e866865f..f0f08248 100644
--- a/rc/base/d.kak
+++ b/rc/base/d.kak
@@ -14,15 +14,15 @@ hook global BufCreate .*\.di? %{
 add-highlighter shared/d regions
 add-highlighter shared/d/code default-region group
 add-highlighter shared/d/string region %{(?<!')(?<!'\\)"} %{(?<!\\)(?:\\\\)*"} group
-add-highlighter shared/d/verbatim_string1 region ` ` fill magenta
-add-highlighter shared/d/verbatim_string2 region %{(?<!')(?<!'\\)`} %{(?<!\\)(?:\\\\)*`} fill magenta
-add-highlighter shared/d/verbatim_string_prefixed region %{r`([^(]*)\(} %{\)([^)]*)`} fill magenta
-add-highlighter shared/d/disabled region '/\+[^+]?' '\+/' fill rgb:777777
+add-highlighter shared/d/verbatim_string1 region ` ` fill meta
+add-highlighter shared/d/verbatim_string2 region %{(?<!')(?<!'\\)`} %{(?<!\\)(?:\\\\)*`} fill meta
+add-highlighter shared/d/verbatim_string_prefixed region %{r`([^(]*)\(} %{\)([^)]*)`} fill meta
+add-highlighter shared/d/disabled region '/\+[^+]?' '\+/' fill comment
 add-highlighter shared/d/comment1 region '/\*[^*]?' '\*/' fill comment
 add-highlighter shared/d/comment2 region '//[^/]?' $ fill comment
-add-highlighter shared/d/docstring1 region '/\+\+' '\+/' fill blue
-add-highlighter shared/d/docstring2 region '/\*\*' '\*/' fill blue
-add-highlighter shared/d/docstring3 region /// $ fill blue
+add-highlighter shared/d/docstring1 region '/\+\+' '\+/' fill comment
+add-highlighter shared/d/docstring2 region '/\*\*' '\*/' fill comment
+add-highlighter shared/d/docstring3 region /// $ fill comment
 
 add-highlighter shared/d/string/ fill string
 add-highlighter shared/d/string/ regex %{\\(x[0-9a-fA-F]{2}|[0-7]{1,3}|u[0-9a-fA-F]{4}|U[0-9a-fA-F]{8})\b} 0:value
diff --git a/rc/base/git.kak b/rc/base/git.kak
index 1a6fea11..13d58f0a 100644
--- a/rc/base/git.kak
+++ b/rc/base/git.kak
@@ -14,14 +14,14 @@ hook -group git-commit-highlight global WinSetOption filetype=git-commit %{
     add-highlighter window/git-commit-highlight regions
     add-highlighter window/git-commit-highlight/diff region '^diff --git' '^(?=diff --git)' ref diff # highlight potential diffs from the -v option
     add-highlighter window/git-commit-highlight/comments region '^\h*#' '$' group
-    add-highlighter window/git-commit-highlight/comments/ fill cyan,default
+    add-highlighter window/git-commit-highlight/comments/ fill comment
     add-highlighter window/git-commit-highlight/comments/ regex "\b(?:(modified)|(deleted)|(new file)|(renamed|copied)):([^\n]*)$" 1:yellow 2:red 3:green 4:blue 5:magenta
 
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-commit-highlight }
 }
 
 hook -group git-commit-highlight global WinSetOption filetype=git-notes %{
-    add-highlighter window/git-notes-highlight regex '^\h*#[^\n]*$' 0:cyan
+    add-highlighter window/git-notes-highlight regex '^\h*#[^\n]*$' 0:comment
 
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-notes-highlight }
 }
@@ -33,8 +33,8 @@ hook global BufCreate .*git-rebase-todo %{
 
 hook -group git-rebase-highlight global WinSetOption filetype=git-rebase %{
     add-highlighter window/git-rebase-highlight group
-    add-highlighter window/git-rebase-highlight/ regex "#[^\n]*\n" 0:cyan,default
-    add-highlighter window/git-rebase-highlight/ regex "^(pick|edit|reword|squash|fixup|exec|break|drop|label|reset|merge|[persfxbdltm]) (\w+)" 1:green 2:magenta
+    add-highlighter window/git-rebase-highlight/ regex "#[^\n]*\n" 0:comment
+    add-highlighter window/git-rebase-highlight/ regex "^(pick|edit|reword|squash|fixup|exec|break|drop|label|reset|merge|[persfxbdltm]) (\w+)" 1:keyword 2:meta
 
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-rebase-highlight }
 }
diff --git a/rc/base/mercurial.kak b/rc/base/mercurial.kak
index b1f8a806..3f84eea2 100644
--- a/rc/base/mercurial.kak
+++ b/rc/base/mercurial.kak
@@ -1,11 +1,6 @@
 # https://www.mercurial-scm.org/
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
-# Faces
-# ‾‾‾‾‾
-
-set-face global MercurialCommitComment cyan
-
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -18,6 +13,6 @@ hook global BufCreate .*hg-editor-\w+\.txt$ %{
 
 hook -group hg-commit-highlight global WinSetOption filetype=hg-commit %{
     add-highlighter window/ group hg-commit-highlight
-    add-highlighter window/hg-commit-highlight regex '^HG:[^\n]*' 0:MercurialCommitComment
+    add-highlighter window/hg-commit-highlight regex '^HG:[^\n]*' 0:comment
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/hg-commit-highlight }
 }
diff --git a/rc/base/perl.kak b/rc/base/perl.kak
index 5e5b126a..e69058d3 100644
--- a/rc/base/perl.kak
+++ b/rc/base/perl.kak
@@ -13,7 +13,7 @@ hook global BufCreate .*\.(t|p[lm])$ %{
 
 add-highlighter shared/perl regions
 add-highlighter shared/perl/code default-region group
-add-highlighter shared/perl/command       region (?<!\$)(?<!\\)`   (?<!\\)(\\\\)*` fill magenta
+add-highlighter shared/perl/command       region (?<!\$)(?<!\\)`   (?<!\\)(\\\\)*` fill meta
 add-highlighter shared/perl/double_string region (?<!\$)(?<!\\)"   (?<!\\)(\\\\)*" fill string
 add-highlighter shared/perl/single_string region (?<!\$)(?<!\\\\)' (?<!\\)(\\\\)*' fill string
 add-highlighter shared/perl/comment       region (?<!\$)(?<!\\)#   $               fill comment