add vimwiki, color scheme

5 files changed, 25 insertions, 29 deletions

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 79986e6..a106a7e 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -6,35 +6,30 @@ alt_send_esc: false
 colors:
   # Default colors
   primary:
-    background: '#181818'
-    foreground: '#d8d8d8'
-
-  # Colors the cursor will use if `custom_cursor_colors` is true
-  cursor:
-    text: '#d8d8d8'
-    cursor: '#d8d8d8'
+    background: '0x03050c'
+    foreground: '0xc5c8c6'
 
   # Normal colors
   normal:
-    black:   '#181818'
-    red:     '#ab4642'
-    green:   '#a1b56c'
-    yellow:  '#f7ca88'
-    blue:    '#7cafc2'
-    magenta: '#ba8baf'
-    cyan:    '#86c1b9'
-    white:   '#d8d8d8'
+    black:   '0x282a2e'
+    red:     '0xa54242'
+    green:   '0x8c9440'
+    yellow:  '0xe69862'
+    blue:    '0x5f819d'
+    magenta: '0x85678f'
+    cyan:    '0x5e8d87'
+    white:   '0x707880'
 
   # Bright colors
   bright:
-    black:   '#585858'
-    red:     '#ab4642'
-    green:   '#a1b56c'
-    yellow:  '#f7ca88'
-    blue:    '#7cafc2'
-    magenta: '#ba8baf'
-    cyan:    '#86c1b9'
-    white:   '#f8f8f8'
+    black:   '0x373b41'
+    red:     '0xcc6666'
+    green:   '0x68a2bd'
+    yellow:  '0xf0c674'
+    blue:    '0x81a2be'
+    magenta: '0xb294bb'
+    cyan:    '0x8abeb7'
+    white:   '0xc5c8c6'
 
 background_opacity: 1.0 
 
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 95b4b42..bd6f82e 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -36,6 +36,6 @@ source $HOME/.config/nvim/plug-config/vim-commentary.vim
 source $HOME/.config/nvim/plug-config/vimwiki.vim
 
 " Theme
-" source $HOME/.config/nvim/themes/nord.vim
-source $HOME/.config/nvim/themes/spaceway.vim
+source $HOME/.config/nvim/themes/githubsy.vim
+" source $HOME/.config/nvim/themes/spaceway.vim
 
diff --git a/.config/nvim/lua/statusline.lua b/.config/nvim/lua/statusline.lua
index 76c6812..99904d9 100644
--- a/.config/nvim/lua/statusline.lua
+++ b/.config/nvim/lua/statusline.lua
@@ -22,9 +22,9 @@ local one_dark_colors = {
 }
 
 local nord_colors = {
-  bg = "#181818",  # "#2E3440",
+  bg = "0x03050c",  # "#2E3440",
   fg = "#81A1C1",
-  line_bg = "#181818",  # "#2E3440",
+  line_bg = "0x03050c",  # "#2E3440",
   fg_green = "#8FBCBB",
   yellow = "#EBCB8B",
   cyan = "#A3BE8C",
diff --git a/.config/nvim/vim-plug/plugins.vim b/.config/nvim/vim-plug/plugins.vim
index a0cd1d7..5e306f9 100644
--- a/.config/nvim/vim-plug/plugins.vim
+++ b/.config/nvim/vim-plug/plugins.vim
@@ -31,6 +31,7 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     Plug 'arcticicestudio/nord-vim'
     Plug 'gavinok/spaceway.vim'
     Plug 'rakr/vim-two-firewatch'
+    Plug 'chriskempson/base16-vim'
 
     " Color hex codes
     Plug 'ap/vim-css-color'
diff --git a/.config/tmux/.tmux.conf b/.config/tmux/.tmux.conf
index 65b8d82..79010f3 100644
--- a/.config/tmux/.tmux.conf
+++ b/.config/tmux/.tmux.conf
@@ -60,10 +60,10 @@ set -g @prefix_highlight_copy_mode_attr "fg=black,bg=brightcyan"
 #+--------+
 #+--- Bars ---+
 set -g status-left "#[fg=blue,bg=default,bold] #S "
-set -g status-right "#{prefix_highlight}#[fg=white,bg=default] %a %d %b %H:%M:%S #[fg=white,bg=default,nobold,noitalics,nounderscore]${NORD_TMUX_STATUS_TIME_FORMAT}#[fg=cyan,bg=default,nobold,noitalics,nounderscore] #[fg=white,bg=default] #(whoami)@#(hostname -s) "
+set -g status-right "#{prefix_highlight}#[fg=white,bg=default] #(whoami)@#(hostname -s) | #[fg=white,bg=default] %a %d %b %H:%M:%S #[fg=white,bg=default,nobold,noitalics,nounderscore]${NORD_TMUX_STATUS_TIME_FORMAT}#[fg=cyan,bg=default,nobold,noitalics,nounderscore]"
 
 #+--- Windows ---+
-set -g window-status-format "#[fg=white,bg=black] #I #[fg=white,bg=default]#W #F "
+set -g window-status-format "#[fg=brightblack,bg=default] #I #[fg=white,bg=default]#W #F "
 set -g window-status-current-format "#[fg=blue,bg=default] #I#[fg=blue,bg=default,nobold,noitalics,nounderscore] #[fg=white,bg=default,bold]#W #F "
 set -g window-status-separator ""
 #+--- Colors ---+