From 3fea0df70f410d1837cce5cd196ab3b952a1902b Mon Sep 17 00:00:00 2001 From: ful1e5 <24286590+ful1e5@users.noreply.github.com> Date: Sun, 20 Jun 2021 11:20:54 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=96=8C=EF=B8=8F=20Linting=20fixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .luacheckrc | 5 +-- extras/alacritty_onedark_.yml | 2 - extras/kitty_onedark_.conf | 79 ++++++++++++++++---------------- lua/onedark/colors.lua | 4 +- lua/onedark/extra/alacritty.lua | 3 +- lua/onedark/extra/kitty.lua | 80 ++++++++++++++++----------------- lua/onedark/theme.lua | 2 +- 7 files changed, 84 insertions(+), 91 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index e67ca30..02d32c2 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,3 +1,2 @@ -globals = { - "vim", -} +globals = {"vim"} +max_comment_line_length = false diff --git a/extras/alacritty_onedark_.yml b/extras/alacritty_onedark_.yml index 90dabd4..d6697b5 100644 --- a/extras/alacritty_onedark_.yml +++ b/extras/alacritty_onedark_.yml @@ -30,5 +30,3 @@ colors: indexed_colors: - { index: 16, color: '0xd19a66' } - { index: 17, color: '0xf65866' } - - \ No newline at end of file diff --git a/extras/kitty_onedark_.conf b/extras/kitty_onedark_.conf index 5ba9e7e..bf1fdf4 100644 --- a/extras/kitty_onedark_.conf +++ b/extras/kitty_onedark_.conf @@ -1,40 +1,39 @@ - # onedark colors for Kitty - - background #282c34 - foreground #abb2bf - selection_background #393f4a - selection_foreground #abb2bf - url_color #98c379 - cursor #abb2bf - - # Tabs - active_tab_background #61afef - active_tab_foreground #282c34 - inactive_tab_background #abb2bf - inactive_tab_foreground #282c34 - #tab_bar_background #20232A - - # normal - color0 #20232A - color1 #e86671 - color2 #98c379 - color3 #e0af68 - color4 #61afef - color5 #c678dd - color6 #56b6c2 - color7 #798294 - - # bright - color8 #5c6370 - color9 #e86671 - color10 #98c379 - color11 #e0af68 - color12 #61afef - color13 #c678dd - color14 #56b6c2 - color15 #abb2bf - - # extended colors - color16 #d19a66 - color17 #f65866 - \ No newline at end of file +# onedark colors for Kitty + +background #282c34 +foreground #abb2bf +selection_background #393f4a +selection_foreground #abb2bf +url_color #98c379 +cursor #abb2bf + +# Tabs +active_tab_background #61afef +active_tab_foreground #282c34 +inactive_tab_background #abb2bf +inactive_tab_foreground #282c34 +#tab_bar_background #20232A + +# normal +color0 #20232A +color1 #e86671 +color2 #98c379 +color3 #e0af68 +color4 #61afef +color5 #c678dd +color6 #56b6c2 +color7 #798294 + +# bright +color8 #5c6370 +color9 #e86671 +color10 #98c379 +color11 #e0af68 +color12 #61afef +color13 #c678dd +color14 #56b6c2 +color15 #abb2bf + +# extended colors +color16 #d19a66 +color17 #f65866 diff --git a/lua/onedark/colors.lua b/lua/onedark/colors.lua index 69e56a1..ff0dc5c 100644 --- a/lua/onedark/colors.lua +++ b/lua/onedark/colors.lua @@ -10,9 +10,7 @@ function M.setup(config) -- Color Palette ---@class ColorScheme - local colors = {} - - colors = { + local colors = { none = "NONE", bg = "#282c34", bg2 = "#21252b", diff --git a/lua/onedark/extra/alacritty.lua b/lua/onedark/extra/alacritty.lua index 017f8e4..090f583 100644 --- a/lua/onedark/extra/alacritty.lua +++ b/lua/onedark/extra/alacritty.lua @@ -46,8 +46,7 @@ colors: indexed_colors: - { index: 16, color: '${orange}' } - { index: 17, color: '${red1}' } - - ]], alacrittyColors) +]], alacrittyColors) return alacritty end diff --git a/lua/onedark/extra/kitty.lua b/lua/onedark/extra/kitty.lua index b3b5c71..c755893 100644 --- a/lua/onedark/extra/kitty.lua +++ b/lua/onedark/extra/kitty.lua @@ -9,46 +9,46 @@ function M.kitty(config) local colors = require("onedark.colors").setup(config) local kitty = util.template([[ - # onedark colors for Kitty - - background ${bg} - foreground ${fg} - selection_background ${bg_visual} - selection_foreground ${fg} - url_color ${green} - cursor ${fg} - - # Tabs - active_tab_background ${blue} - active_tab_foreground ${bg} - inactive_tab_background ${fg} - inactive_tab_foreground ${bg} - #tab_bar_background ${black} - - # normal - color0 ${black} - color1 ${red} - color2 ${green} - color3 ${yellow} - color4 ${blue} - color5 ${purple} - color6 ${cyan} - color7 ${fg_dark} - - # bright - color8 ${fg_gutter} - color9 ${red} - color10 ${green} - color11 ${yellow} - color12 ${blue} - color13 ${purple} - color14 ${cyan} - color15 ${fg} - - # extended colors - color16 ${orange} - color17 ${red1} - ]], colors) +# onedark colors for Kitty + +background ${bg} +foreground ${fg} +selection_background ${bg_visual} +selection_foreground ${fg} +url_color ${green} +cursor ${fg} + +# Tabs +active_tab_background ${blue} +active_tab_foreground ${bg} +inactive_tab_background ${fg} +inactive_tab_foreground ${bg} +#tab_bar_background ${black} + +# normal +color0 ${black} +color1 ${red} +color2 ${green} +color3 ${yellow} +color4 ${blue} +color5 ${purple} +color6 ${cyan} +color7 ${fg_dark} + +# bright +color8 ${fg_gutter} +color9 ${red} +color10 ${green} +color11 ${yellow} +color12 ${blue} +color13 ${purple} +color14 ${cyan} +color15 ${fg} + +# extended colors +color16 ${orange} +color17 ${red1} +]], colors) return kitty end diff --git a/lua/onedark/theme.lua b/lua/onedark/theme.lua index 43098e9..2d612d2 100644 --- a/lua/onedark/theme.lua +++ b/lua/onedark/theme.lua @@ -15,7 +15,7 @@ function M.setup(config) theme.colors = colors.setup(config) local c = theme.colors - theme.base = { + theme.base = { -- luacheck: ignore Comment = {fg = c.fg_gutter, style = config.commentStyle}, -- any comment ColorColumn = {bg = c.bg_visual}, -- used for the columns set with 'colorcolumn' Conceal = {fg = c.fg_gutter}, -- placeholder characters substituted for concealed text (see 'conceallevel')