From ebccf92d9848c7f9af621260a1705a419a51140d Mon Sep 17 00:00:00 2001
From: Ian Mancini <ianmethyst@gmail.com>
Date: Mon, 6 Sep 2021 21:18:45 -0300
Subject: [PATCH] Add tokyo_night and small improvements in vim files

---
 appearances/jp.toml                           |  6 ++--
 colorschemes/tokyo_night.toml                 | 28 +++++++++++++++++++
 .../nvim/.config/nvim/lua/plugins/init.lua    |  4 ++-
 .../nvim/.config/nvim/lua/plugins/lualine.lua | 22 +++++++--------
 filesets/base/polybar/.config/polybar/config  |  2 +-
 typographies/iosevka-nerd.toml                |  6 ++--
 6 files changed, 49 insertions(+), 19 deletions(-)
 create mode 100644 colorschemes/tokyo_night.toml

diff --git a/appearances/jp.toml b/appearances/jp.toml
index 6482800..75417df 100644
--- a/appearances/jp.toml
+++ b/appearances/jp.toml
@@ -3,8 +3,8 @@ extends = "base"
 
 [custom.polybar]
 modules_left = "i3"
-modules_center = "time date"
-modules_right = "cpu memory xkeyboard"
+modules_center = "time "
+modules_right = "cpu memory xkeyboard date"
 text_offset = "2"
 icon_font_scale ="8"
 antialias = "true"
@@ -13,7 +13,7 @@ height = "32"
 i3_label = "%icon%"
 cpu_icon = "CPU:"
 ram_icon = "RAM:"
-layout_icon = "KEY:"
+layout_icon = "KB:"
 ws0_icon = "一"
 ws1_icon = "二"
 ws2_icon = "三"
diff --git a/colorschemes/tokyo_night.toml b/colorschemes/tokyo_night.toml
new file mode 100644
index 0000000..76eb2dc
--- /dev/null
+++ b/colorschemes/tokyo_night.toml
@@ -0,0 +1,28 @@
+name = "Tokyo Night"
+extends = "base"
+
+[colors.base16]
+
+[colors.terminal]
+bg = "#1a1b26"
+fg = "#c0caf5"
+
+color0 = "#15161E"
+color1 = "#f7768e"
+color2 = "#9ece6a"
+color3 = "#e0af68"
+color4 = "#7aa2f7"
+color5 = "#bb9af7"
+color6 = "#7dcfff"
+color7 = "#a9b1d6"
+color8  = "#414868"
+color9  = "#f7768e"
+color10 = "#9ece6a"
+color11 = "#e0af68"
+color12 = "#7aa2f7"
+color13 = "#bb9af7"
+color14 = "#7dcfff"
+color15 = "#c0caf5"
+
+[custom]
+vim_colorscheme = "vim.g.tokyonight_style = 'night'\nvim.cmd('colorscheme tokyonight')"
diff --git a/filesets/base/nvim/.config/nvim/lua/plugins/init.lua b/filesets/base/nvim/.config/nvim/lua/plugins/init.lua
index c0f0bb5..3c84275 100644
--- a/filesets/base/nvim/.config/nvim/lua/plugins/init.lua
+++ b/filesets/base/nvim/.config/nvim/lua/plugins/init.lua
@@ -130,9 +130,11 @@ return require('packer').startup(function()
     }
     use { 'RRethy/nvim-base16' }
     use { 'NTBBloodbath/doom-one.nvim' }
+    use { 'folke/tokyonight.nvim' }
+    use { 'marko-cerovac/material.nvim' }
 
     -- Cursorline
-    use { 'xiyaowong/nvim-cursorword' }
+    -- use { 'xiyaowong/nvim-cursorword' }
     -- use { 'yamatsum/nvim-cursorline' }
 
     use {
diff --git a/filesets/base/nvim/.config/nvim/lua/plugins/lualine.lua b/filesets/base/nvim/.config/nvim/lua/plugins/lualine.lua
index 9329654..c0590aa 100644
--- a/filesets/base/nvim/.config/nvim/lua/plugins/lualine.lua
+++ b/filesets/base/nvim/.config/nvim/lua/plugins/lualine.lua
@@ -5,17 +5,17 @@ local lualine = require 'lualine'
 
 -- Color table for highlights
 local colors = {
-  bg = '#202328',
-  fg = '#bbc2cf',
-  yellow = '#ECBE7B',
-  cyan = '#008080',
-  darkblue = '#081633',
-  green = '#98be65',
-  orange = '#FF8800',
-  violet = '#a9a1e1',
-  magenta = '#c678dd',
-  blue = '#51afef',
-  red = '#ec5f67'
+  bg = '{{colors.light_bg}}',
+  fg = '{{colors.fg}}',
+  yellow = '{{colors.yellow}}',
+  cyan = '{{colors.cyan}}',
+  darkblue = '{{colors.alt_blue}}',
+  green = '{{colors.green}}',
+  orange = '{{colors.orange}}',
+  violet = '{{colors.alt_magenta}}',
+  magenta = '{{colors.magenta}}',
+  blue = '{{colors.blue}}',
+  red = '{{colors.red}}'
 }
 
 local conditions = {
diff --git a/filesets/base/polybar/.config/polybar/config b/filesets/base/polybar/.config/polybar/config
index 0df03c3..55eb1c3 100755
--- a/filesets/base/polybar/.config/polybar/config
+++ b/filesets/base/polybar/.config/polybar/config
@@ -1,6 +1,6 @@
 [colors]
 background = {{colors.bg}}
-background-alt = {{colors.comment}}
+background-alt = {{colors.light_bg}}
 foreground = {{colors.fg}}
 red = {{colors.red}}
 green = {{colors.green}}
diff --git a/typographies/iosevka-nerd.toml b/typographies/iosevka-nerd.toml
index c23009d..8719367 100644
--- a/typographies/iosevka-nerd.toml
+++ b/typographies/iosevka-nerd.toml
@@ -6,11 +6,11 @@ extends = "base"
 [custom.mono]
 font = "Iosevka Nerd Font"
 weight = "Medium"
-bold = "Bold"
+bold = "Heavy"
 italic = "Oblique"
-bold_italic = "Bold Oblique"
+bold_italic = "Heavy Oblique"
 size = 14
 
 [custom.kitty]
 font = "Iosevka"
-append = "Nerd Font Complete Monospace"
+append = "Nerd Font Complete"