From fb7cd02b65d9332bbb1995eb17d079ea6995876c Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 8 Jan 2020 22:07:32 +0200
Subject: [PATCH] New year, new colorscheme

Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
---
 home/.config/nvim/conf.d/01-plugins.vim     | 11 ++++-----
 home/.config/nvim/conf.d/02-appearance.vim  | 26 +++++++--------------
 home/.config/sway/conf.d/07-appearance.conf |  7 +++---
 home/.config/waybar/style.css               |  8 +++----
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/home/.config/nvim/conf.d/01-plugins.vim b/home/.config/nvim/conf.d/01-plugins.vim
index 0d58dc9..9051ba1 100644
--- a/home/.config/nvim/conf.d/01-plugins.vim
+++ b/home/.config/nvim/conf.d/01-plugins.vim
@@ -21,6 +21,9 @@ let g:coc_global_extensions = [
 
 call plug#begin()
 
+" Light statusline
+Plug 'itchyny/lightline.vim'
+
 " Make editing passwords safer
 Plug 'https://git.zx2c4.com/password-store', { 'rtp': 'contrib/vim/redact_pass.vim' }
 
@@ -41,15 +44,11 @@ Plug 'conornewton/vim-pandoc-markdown-preview'
 Plug 'junegunn/fzf'
 Plug 'junegunn/fzf.vim'
 
-" Airline statusline
-Plug 'vim-airline/vim-airline'
-
 " Syntax plugins
 Plug 'stephpy/vim-yaml'
 Plug 'vim-pandoc/vim-pandoc-syntax'
-Plug 'leafgarland/typescript-vim'
-Plug 'ianks/vim-tsx'
 Plug 'kevinoid/vim-jsonc'
+Plug 'HerringtonDarkholme/yats.vim'
 Plug 'MaxMEllon/vim-jsx-pretty'
 Plug 'zplugin/zplugin-vim-syntax'
 Plug 'aouelete/sway-vim-syntax'
@@ -92,7 +91,7 @@ Plug 'airblade/vim-gitgutter'
 Plug 'jamessan/vim-gnupg'
 
 " Colorscheme
-Plug 'morhetz/gruvbox'
+Plug 'kaicataldo/material.vim'
 
 " Latex plugin
 Plug 'lervag/vimtex'
diff --git a/home/.config/nvim/conf.d/02-appearance.vim b/home/.config/nvim/conf.d/02-appearance.vim
index 439c2ba..e2fafdb 100644
--- a/home/.config/nvim/conf.d/02-appearance.vim
+++ b/home/.config/nvim/conf.d/02-appearance.vim
@@ -1,27 +1,21 @@
 " Set colorscheme
-colorscheme gruvbox
+colorscheme material
 
-" Enable italics
-let g:gruvbox_italic = 1
+" Material theme variant
+let g:material_theme_style = 'palenight'
 
-" Disable mode indicator because airline shows it
+" Material theme for lightline
+let g:lightline = { 'colorscheme': 'material_vim' }
+
+" Disable built-in statusline because lightline shows it
 set noshowmode
 
 " True color support
 set termguicolors
 
-" Airline
-set laststatus=2
-set encoding=utf-8
-let g:airline#extensions#tabline#enabled = 1
-let g:airline_powerline_fonts = 1
-let g:airline_section_warning = ''
-let g:airline_section_error = ''
-let g:airline_theme='gruvbox'
-
 " Line numbering
-set number
 set relativenumber
+set number
 
 " Always show signcolumn
 set signcolumn=yes
@@ -38,7 +32,3 @@ set shiftwidth=4
 " Make gutter and cursorline bg transparent
 highlight CursorLineNr 			guibg=transparent
 highlight SignColumn 			guibg=transparent
-highlight GitGutterAdd 			guibg=transparent guifg=#b8bb26
-highlight GitGutterChange 		guibg=transparent guifg=#8ec07c
-highlight GitGutterDelete 		guibg=transparent guifg=#fb4934
-highlight GitGutterChangeDelete guibg=transparent guifg=#8ec07c
diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf
index 2530337..f7be5af 100644
--- a/home/.config/sway/conf.d/07-appearance.conf
+++ b/home/.config/sway/conf.d/07-appearance.conf
@@ -4,13 +4,14 @@ default_border none
 gaps inner 10
 gaps outer 20
 
+# Hide cursor after 4 seconds of inactivity
 seat * hide_cursor 4000
 
 ###### Borders ######
 # class 					border 	backgr. text 	indicator child_border
-client.focused 				#D65D0E #D65D0E #FFFFFF #D65D0E   #D65D0E
-client.focused_inactive 	#282828 #282828 #FFFFFF #282828   #282828
-client.unfocused 			#282828 #282828 #FFFFFF #282828   #282828
+client.focused 				#8AC6F2 #8AC6F2 #FFFFFF #C4DFF2   #8AC6F2
+client.focused_inactive 	#292D3E #292D3E #FFFFFF #292D3E   #292D3E
+client.unfocused 			#292D3E #292D3E #FFFFFF #282828   #292D3E
 
 for_window [app_id="^.*"] border pixel 4
 for_window [class="^.*"] border pixel 4
diff --git a/home/.config/waybar/style.css b/home/.config/waybar/style.css
index e486177..f8e66d2 100644
--- a/home/.config/waybar/style.css
+++ b/home/.config/waybar/style.css
@@ -7,7 +7,7 @@
 }
 
 window#waybar {
-    background: #282828;
+    background: #292D3E;
     color: white;
 }
 
@@ -63,7 +63,7 @@ window#waybar {
 }
 
 #temperature {
-    background: #a3be8c;
+    background: #97B084;
 	color: black;
 }
 
@@ -78,7 +78,7 @@ window#waybar {
 }
 
 #cpu {
-    background: #2ecc71;
+    background: #BD9B5D;
     color: #000000;
 }
 
@@ -111,7 +111,7 @@ window#waybar {
 }
 
 #custom-playerctl {
-    background: #a3be8c;
+    background: #97B084;
     color: #2a5c45;
 }