From b0969c7402c1f970733b08e437e0d09139ad28a4 Mon Sep 17 00:00:00 2001 From: Ben Smith Date: Wed, 28 Apr 2021 18:08:11 -0700 Subject: [PATCH] Updated awesome with tokyonight theme, added tokyonight colorscheme to files --- awesome/theme.lua | 45 ++++++++++++++++++--------- colorschemes/tokyo-night.scss | 19 +++++++++++ nvim/after/ftplugin/markdown.vim | 8 ++--- nvim/lua/my/plugconfigs/colorizer.lua | 2 +- 4 files changed, 55 insertions(+), 19 deletions(-) create mode 100644 colorschemes/tokyo-night.scss diff --git a/awesome/theme.lua b/awesome/theme.lua index 0c7cfbb..778a05c 100644 --- a/awesome/theme.lua +++ b/awesome/theme.lua @@ -13,24 +13,41 @@ local theme = {} theme.font = 'Iosevka Nerd Font Bold 12' -theme.bg_normal = '#27212e' -theme.bg_focus = '#27212e' --- theme.bg_focus = '#382f47' -theme.bg_urgent = '#27212e' -theme.bg_minimize = '#e0dfe1' +-- Laserwave theme +-- theme.bg_normal = '#27212e' +-- theme.bg_focus = '#27212e' +-- theme.bg_urgent = '#27212e' +-- theme.bg_minimize = '#e0dfe1' +-- theme.bg_systray = theme.bg_focus + +-- theme.fg_normal = '#91889b' +-- theme.fg_focus = '#eb64b9' +-- theme.fg_urgent = '#ffe261' +-- theme.fg_minimize = '#b381c5' + +-- theme.useless_gap = dpi(4) +-- theme.border_width = dpi(2) +-- theme.border_normal = '#27212e' +-- theme.border_focus = '#eb64b9' +-- theme.border_marked = '#40b4c4' + +-- Tokyo Night theme +theme.bg_normal = '#24283b' +theme.bg_focus = '#24283b' +theme.bg_urgent = '#24283b' +theme.bg_minimize = '#a9b1d6' theme.bg_systray = theme.bg_focus -theme.fg_normal = '#91889b' -theme.fg_focus = '#eb64b9' -theme.fg_urgent = '#ffe261' -theme.fg_minimize = '#b381c5' +theme.fg_normal = '#a9b1d6' +theme.fg_focus = '#f7768e' +theme.fg_urgent = '#9ece6a' +theme.fg_minimize = '#7aa2f7' theme.useless_gap = dpi(4) theme.border_width = dpi(2) -theme.border_normal = '#27212e' -theme.border_focus = '#eb64b9' -theme.border_marked = '#40b4c4' - +theme.border_normal = '#1a1b26' +theme.border_focus = '#bb9af7' +theme.border_marked = '#ff9e64' -- There are other variable sets -- overriding the default one when -- defined, the sets are: @@ -98,7 +115,7 @@ theme.titlebar_maximized_button_focus_inactive = themes_path..'default/titlebar theme.titlebar_maximized_button_normal_active = themes_path..'default/titlebar/maximized_normal_active.png' theme.titlebar_maximized_button_focus_active = themes_path..'default/titlebar/maximized_focus_active.png' -theme.wallpaper = '/home/smithbm/pictures/linux/Laserwave-Linux-1920x1080p.png' +theme.wallpaper = '/home/smithbm/pictures/retrowave-landscape/retrowave42.jpg' -- You can use your own layout icons like this: theme.layout_fairh = themes_path..'default/layouts/fairhw.png' diff --git a/colorschemes/tokyo-night.scss b/colorschemes/tokyo-night.scss new file mode 100644 index 0000000..84b741e --- /dev/null +++ b/colorschemes/tokyo-night.scss @@ -0,0 +1,19 @@ +/* Tokyo Night and Tokyo Night Storm */ +$color: #f7768e; /* This keyword, HTML elements, Regex group symbol, CSS units, Terminal Red */ +$color: #ff9e64; /* Number and Boolean constants, Language support constants */ +$color: #e0af68; /* Function parameters, Regex character sets, Terminal Yellow */ +$color: #9ece6a; /* Strings, CSS class names */ +$color: #73daca; /* Object literal keys, Markdown links, Terminal Green */ +$color: #b4f9f8; /* Regex literal strings */ +$color: #2ac3de; /* Language support functions, CSS HTML elements */ +$color: #7dcfff; /* Object properties, Regex quantifiers and flags, Markdown headings, Terminal Cyan, Markdown code, Import/export keywords */ +$color: #7aa2f7; /* Function names, CSS property names, Terminal Blue */ +$color: #bb9af7; /* Control Keywords, Storage Types, Regex symbols and operators, HTML Attributes, Terminal Magenta */ +$color: #c0caf5; /* Variables, Class names, Terminal White */ +$color: #a9b1d6; /* Editor Foreground */ +$color: #9aa5ce; /* Markdown Text, HTML Text */ +$color: #cfc9c2; /* Parameters inside functions (semantic highlighting only) */ +$color: #565f89; /* Comments */ +$color: #414868; /* Terminal Black */ +$color: #24283b; /* Editor Background (Storm) */ +$color: #1a1b26; /* Editor Background (Night) */ diff --git a/nvim/after/ftplugin/markdown.vim b/nvim/after/ftplugin/markdown.vim index f3af12f..6db15bd 100644 --- a/nvim/after/ftplugin/markdown.vim +++ b/nvim/after/ftplugin/markdown.vim @@ -1,7 +1,7 @@ -setlocal spell spelllang=en_us -setlocal wrap -setlocal linebreak -setlocal scrolloff=0 +" setlocal spell spelllang=en_us +" setlocal wrap +" setlocal linebreak +" setlocal scrolloff=0 " mapping to make movements operate on 1 screen line in wrap mode " https://stackoverflow.com/questions/4946421/vim-moving-with-hjkl-in-long-lines-screen-lines diff --git a/nvim/lua/my/plugconfigs/colorizer.lua b/nvim/lua/my/plugconfigs/colorizer.lua index d8242ee..c430a8e 100644 --- a/nvim/lua/my/plugconfigs/colorizer.lua +++ b/nvim/lua/my/plugconfigs/colorizer.lua @@ -9,6 +9,6 @@ require'colorizer'.setup( hsl_fn = true; css = true; css_fn = true; - mode = 'foreground'; + mode = 'background'; } )