From 896632d080be3fe61a3840d61a2cc890ae929eca Mon Sep 17 00:00:00 2001
From: Stefan Imhoff <stefan@imhoff.name>
Date: Fri, 30 Sep 2022 20:16:26 +0200
Subject: [PATCH] feat: change colorscheme to Tokyo Night

---
 .gitignore                         |  1 +
 kitty/current-theme.conf           | 47 ++++++++++++++++++++++++++++++
 kitty/kitty.conf                   |  5 ++++
 kitty/themes/tokyonight_day.conf   | 47 ++++++++++++++++++++++++++++++
 kitty/themes/tokyonight_moon.conf  | 47 ++++++++++++++++++++++++++++++
 kitty/themes/tokyonight_night.conf | 47 ++++++++++++++++++++++++++++++
 kitty/themes/tokyonight_storm.conf | 47 ++++++++++++++++++++++++++++++
 nvim/after/plugin/lualine.lua      |  3 +-
 nvim/lua/kogakure/colorscheme.lua  |  5 +++-
 nvim/lua/kogakure/plugins.lua      |  1 +
 tmux.conf                          | 36 +++++++++++++++++------
 11 files changed, 275 insertions(+), 11 deletions(-)
 create mode 100644 kitty/current-theme.conf
 create mode 100644 kitty/themes/tokyonight_day.conf
 create mode 100644 kitty/themes/tokyonight_moon.conf
 create mode 100644 kitty/themes/tokyonight_night.conf
 create mode 100644 kitty/themes/tokyonight_storm.conf

diff --git a/.gitignore b/.gitignore
index 940f606..69e1422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ nvim/plugin
 .vale/proselint
 .vale/Readability
 .vale/write-good
+kitty/kitty.conf.bak
diff --git a/kitty/current-theme.conf b/kitty/current-theme.conf
new file mode 100644
index 0000000..d14010a
--- /dev/null
+++ b/kitty/current-theme.conf
@@ -0,0 +1,47 @@
+# vim:ft=kitty
+
+## name: Tokyo Night
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
+
+
+background #1a1b26
+foreground #c0caf5
+selection_background #33467c
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #1a1b26
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #16161e
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #15161e
+
+# normal
+color0 #15161e
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8 #414868
+color9 #f7768e
+color10 #9ece6a
+color11 #e0af68
+color12 #7aa2f7
+color13 #bb9af7
+color14 #7dcfff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
+  
\ No newline at end of file
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index d6027d0..f17dd4e 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -18,3 +18,8 @@ enable_audio_bell no
 macos_traditional_fullscreen yes
 
 map cmd+enter toggle_fullscreen
+
+# BEGIN_KITTY_THEME
+# Tokyo Night
+include current-theme.conf
+# END_KITTY_THEME
diff --git a/kitty/themes/tokyonight_day.conf b/kitty/themes/tokyonight_day.conf
new file mode 100644
index 0000000..ba10859
--- /dev/null
+++ b/kitty/themes/tokyonight_day.conf
@@ -0,0 +1,47 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Day
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_day.conf
+
+
+background #e1e2e7
+foreground #3760bf
+selection_background #99a7df
+selection_foreground #3760bf
+url_color #387068
+cursor #3760bf
+cursor_text_color #e1e2e7
+
+# Tabs
+active_tab_background #2e7de9
+active_tab_foreground #e9e9ec
+inactive_tab_background #c4c8da
+inactive_tab_foreground #8990b3
+#tab_bar_background #e9e9ed
+
+# normal
+color0 #e9e9ed
+color1 #f52a65
+color2 #587539
+color3 #8c6c3e
+color4 #2e7de9
+color5 #9854f1
+color6 #007197
+color7 #6172b0
+
+# bright
+color8 #a1a6c5
+color9 #f52a65
+color10 #587539
+color11 #8c6c3e
+color12 #2e7de9
+color13 #9854f1
+color14 #007197
+color15 #3760bf
+
+# extended colors
+color16 #b15c00
+color17 #c64343
+  
\ No newline at end of file
diff --git a/kitty/themes/tokyonight_moon.conf b/kitty/themes/tokyonight_moon.conf
new file mode 100644
index 0000000..f12985c
--- /dev/null
+++ b/kitty/themes/tokyonight_moon.conf
@@ -0,0 +1,47 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Moon
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_moon.conf
+
+
+background #222436
+foreground #c8d3f5
+selection_background #3654a7
+selection_foreground #c8d3f5
+url_color #4fd6be
+cursor #c8d3f5
+cursor_text_color #222436
+
+# Tabs
+active_tab_background #82aaff
+active_tab_foreground #1e2030
+inactive_tab_background #2f334d
+inactive_tab_foreground #545c7e
+#tab_bar_background #1b1d2b
+
+# normal
+color0 #1b1d2b
+color1 #ff757f
+color2 #c3e88d
+color3 #ffc777
+color4 #82aaff
+color5 #c099ff
+color6 #86e1fc
+color7 #828bb8
+
+# bright
+color8 #444a73
+color9 #ff757f
+color10 #c3e88d
+color11 #ffc777
+color12 #82aaff
+color13 #c099ff
+color14 #86e1fc
+color15 #c8d3f5
+
+# extended colors
+color16 #ff966c
+color17 #c53b53
+  
\ No newline at end of file
diff --git a/kitty/themes/tokyonight_night.conf b/kitty/themes/tokyonight_night.conf
new file mode 100644
index 0000000..d14010a
--- /dev/null
+++ b/kitty/themes/tokyonight_night.conf
@@ -0,0 +1,47 @@
+# vim:ft=kitty
+
+## name: Tokyo Night
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_night.conf
+
+
+background #1a1b26
+foreground #c0caf5
+selection_background #33467c
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #1a1b26
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #16161e
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #15161e
+
+# normal
+color0 #15161e
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8 #414868
+color9 #f7768e
+color10 #9ece6a
+color11 #e0af68
+color12 #7aa2f7
+color13 #bb9af7
+color14 #7dcfff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
+  
\ No newline at end of file
diff --git a/kitty/themes/tokyonight_storm.conf b/kitty/themes/tokyonight_storm.conf
new file mode 100644
index 0000000..aed67c9
--- /dev/null
+++ b/kitty/themes/tokyonight_storm.conf
@@ -0,0 +1,47 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Storm
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf
+
+
+background #24283b
+foreground #c0caf5
+selection_background #364a82
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #24283b
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #1f2335
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #1d202f
+
+# normal
+color0 #1d202f
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8 #414868
+color9 #f7768e
+color10 #9ece6a
+color11 #e0af68
+color12 #7aa2f7
+color13 #bb9af7
+color14 #7dcfff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
+  
\ No newline at end of file
diff --git a/nvim/after/plugin/lualine.lua b/nvim/after/plugin/lualine.lua
index bd04e1d..4338be5 100644
--- a/nvim/after/plugin/lualine.lua
+++ b/nvim/after/plugin/lualine.lua
@@ -7,7 +7,8 @@ end
 lualine.setup({
 	options = {
 		icons_enabled = true,
-		theme = "onedark",
+		--[[ theme = "onedark", ]]
+		theme = "tokyonight",
 		component_separators = { left = "", right = "" },
 		section_separators = { left = "", right = "" },
 		disabled_filetypes = { "alpha", "dashboard", "NvimTree", "Outline " },
diff --git a/nvim/lua/kogakure/colorscheme.lua b/nvim/lua/kogakure/colorscheme.lua
index a2b72b1..29c5a4b 100644
--- a/nvim/lua/kogakure/colorscheme.lua
+++ b/nvim/lua/kogakure/colorscheme.lua
@@ -1,13 +1,16 @@
 -- Colorscheme
+
+-- Base16
 local source = "~/.vimrc_background"
 local status_ok, _ = pcall(vim.cmd, "source " .. source)
 
 if not status_ok then
-	vim.notify("Error sourcing " .. source)
+	--[[ vim.notify("Error sourcing " .. source) ]]
 	return
 end
 
 vim.cmd([[
+colorscheme tokyonight-night
 highlight ColorColumn guibg=#202224
 highlight SpellBad guifg=red
 ]])
diff --git a/nvim/lua/kogakure/plugins.lua b/nvim/lua/kogakure/plugins.lua
index 8793033..e7c284d 100644
--- a/nvim/lua/kogakure/plugins.lua
+++ b/nvim/lua/kogakure/plugins.lua
@@ -50,6 +50,7 @@ return packer.startup(function(use)
 
 	-- Colorscheme
 	use("chriskempson/base16-vim") -- Base16 colorschemes
+	use("folke/tokyonight.nvim") -- Tokyo Night color scheme
 
 	-- CMP
 	use("hrsh7th/nvim-cmp") -- The completion plugin
diff --git a/tmux.conf b/tmux.conf
index 732b4db..8f7ea9b 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,4 +1,6 @@
-set -g default-terminal "tmux-256color"
+set -g default-terminal "${TERM}"
+set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'  # undercurl support
+set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'  # underscore colours - needs tmux-3.0
 
 # Base index for windows
 set -g base-index 1
@@ -30,18 +32,34 @@ setw -g mode-keys vi
 # Renumber windows sequentially after closing any of them
 set -g renumber-windows on
 
-# Status Bar
-set-window-option -g status-style fg='#A3AAB7',bg='#2C323C' # Background
+# TokyoNight colors for Tmux
+set -g mode-style "fg=#7aa2f7,bg=#3b4261"
 
-set-window-option -g status-left-length 300
-set-window-option -g status-left '#[fg=#2C323C,bg=#98C379] #S #[fg=#98C379,bg=#2C323C] ' # Left Side
+set -g message-style "fg=#7aa2f7,bg=#3b4261"
+set -g message-command-style "fg=#7aa2f7,bg=#3b4261"
 
-set-window-option -g  status-right '#[fg=#3E4452,bg=#2C323C]#[fg=#A3AAB7,bg=#3E4452] ﮣ #{battery_percentage} '
-set-window-option -ga status-right '#[fg=#98C379,bg=#3E4452]#[fg=#282C34,bg=#98C379] %a %d.%m.%Y %H:%M ' # Right Side
+set -g pane-border-style "fg=#3b4261"
+set -g pane-active-border-style "fg=#7aa2f7"
 
-set-window-option -g window-status-format '#[fg=#A3AAB7,bg=#2C323C] #I · #W' # Inactive Tab
+set -g status "on"
+set -g status-justify "left"
 
-set-window-option -g window-status-current-format '#[fg=#A3AAB7,bg=#2C323C]#[fg=#A3AAB7,bg=#3E4452]#[fg=#3E4452,bg=#A3AAB7]  · #W #[fg=#A3AAB7,bg=#2C323C]' # Active Tab
+set -g status-style "fg=#7aa2f7,bg=#16161e"
+
+set -g status-left-length "100"
+set -g status-right-length "100"
+
+set -g status-left-style NONE
+set -g status-right-style NONE
+
+set -g status-left "#[fg=#15161e,bg=#7aa2f7,bold] #S #[fg=#7aa2f7,bg=#16161e,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=#16161e,bg=#16161e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#16161e] #{prefix_highlight} #[fg=#3b4261,bg=#16161e,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261] %d.%m.%Y  %H:%M #[fg=#7aa2f7,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#15161e,bg=#7aa2f7,bold] #h "
+
+setw -g window-status-activity-style "underscore,fg=#a9b1d6,bg=#16161e"
+setw -g window-status-separator ""
+setw -g window-status-style "NONE,fg=#a9b1d6,bg=#16161e"
+setw -g window-status-format "#[fg=#16161e,bg=#16161e,nobold,nounderscore,noitalics]#[default] #I  #W #F #[fg=#16161e,bg=#16161e,nobold,nounderscore,noitalics]"
+setw -g window-status-current-format "#[fg=#16161e,bg=#3b4261,nobold,nounderscore,noitalics]#[fg=#7aa2f7,bg=#3b4261,bold] #I  #W #F #[fg=#3b4261,bg=#16161e,nobold,nounderscore,noitalics]"
 
 # Swap Window to Position 1
 bind-key T swap-window -t 1