Changed terminal stuff to use nord theme instead of gruvbox

3 files changed, 80 insertions, 36 deletions

diff --git a/config/alacritty/alacritty.darwin.yml b/config/alacritty/alacritty.darwin.yml
index beb10ac..bedd44d 100644
--- a/config/alacritty/alacritty.darwin.yml
+++ b/config/alacritty/alacritty.darwin.yml
@@ -28,31 +28,55 @@ key_bindings:
   - { key: Return, mods: Command, action: ToggleSimpleFullScreen }
   - { key: Q, mods: Command, chars: "" }
 
-# gruvbox_dark: https://github.com/eendroroy/alacritty-theme/blob/master/schemes.yaml
+# Colors (Nord)
 colors:
   primary:
-    # hard contrast: background = '0x1d2021'
-    background: '0x282828'
-      # soft contrast: background = '0x32302f'
-    foreground: '0xebdbb2'
+    background: '0x2E3440'
+    foreground: '0xD8DEE9'
   normal:
-    black:   '0x282828'
-    red:     '0xcc241d'
-    green:   '0x98971a'
-    yellow:  '0xd79921'
-    blue:    '0x458588'
-    magenta: '0xb16286'
-    cyan:    '0x689d6a'
-    white:   '0xa89984'
+    black:   '0x3B4252'
+    red:     '0xBF616A'
+    green:   '0xA3BE8C'
+    yellow:  '0xEBCB8B'
+    blue:    '0x81A1C1'
+    magenta: '0xB48EAD'
+    cyan:    '0x88C0D0'
+    white:   '0xE5E9F0'
   bright:
-    black:   '0x928374'
-    red:     '0xfb4934'
-    green:   '0xb8bb26'
-    yellow:  '0xfabd2f'
-    blue:    '0x83a598'
-    magenta: '0xd3869b'
-    cyan:    '0x8ec07c'
-    white:   '0xebdbb2'
+    black:   '0x4C566A'
+    red:     '0xBF616A'
+    green:   '0xA3BE8C'
+    yellow:  '0xEBCB8B'
+    blue:    '0x81A1C1'
+    magenta: '0xB48EAD'
+    cyan:    '0x8FBCBB'
+    white:   '0xECEFF4'
+
+# gruvbox_dark: https://github.com/eendroroy/alacritty-theme/blob/master/schemes.yaml
+# colors:
+#   primary:
+#     # hard contrast: background = '0x1d2021'
+#     background: '0x282828'
+#       # soft contrast: background = '0x32302f'
+#     foreground: '0xebdbb2'
+#   normal:
+#     black:   '0x282828'
+#     red:     '0xcc241d'
+#     green:   '0x98971a'
+#     yellow:  '0xd79921'
+#     blue:    '0x458588'
+#     magenta: '0xb16286'
+#     cyan:    '0x689d6a'
+#     white:   '0xa89984'
+#   bright:
+#     black:   '0x928374'
+#     red:     '0xfb4934'
+#     green:   '0xb8bb26'
+#     yellow:  '0xfabd2f'
+#     blue:    '0x83a598'
+#     magenta: '0xd3869b'
+#     cyan:    '0x8ec07c'
+#     white:   '0xebdbb2'
 
 
 # # colorscheme (Dracula)
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index e820099..b26decb 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -7,6 +7,7 @@ return require('packer').startup(function()
     use 'FooSoft/vim-argwrap'       -- Put arguments on multiple lines
     use 'tpope/vim-eunuch'          -- basic commands on current file (Rename/Remove)
     use 'romainl/vim-cool'          -- only highlight search matches when searching
+    use 'lukas-reineke/indent-blankline.nvim'
 
     -- tags managment
     use {
@@ -118,20 +119,32 @@ return require('packer').startup(function()
             require('Comment').setup()
         end
     }
-    -- color scheme
+    -- gruvbox color scheme
+    -- use {
+    --     'ellisonleao/gruvbox.nvim',
+    --     requires = {'rktjmp/lush.nvim'},
+    --     config = function()
+    --         vim.opt.termguicolors = true
+    --         vim.opt.background = "dark"
+    --         -- vim.cmd [[ colorscheme gruvbox ]]
+    --         vim.g.gruvbox_italic = 1
+    --         vim.g.gruvbox_bold = 1
+    --         vim.g.gruvbox_termcolors = 256
+    --         vim.g.gruvbox_contrast_dark = 'medium'
+    --         vim.g.gruvbox_contrast_light = 'hard'
+    --         vim.g.gruvbox_invert_selection = 0
+    --     end
+    -- }
+    -- nord color scheme
     use {
-        'ellisonleao/gruvbox.nvim',
-        requires = {'rktjmp/lush.nvim'},
+        'shaunsingh/nord.nvim',
         config = function()
             vim.opt.termguicolors = true
             vim.opt.background = "dark"
-            vim.cmd [[ colorscheme gruvbox ]]
-            vim.g.gruvbox_italic = 1
-            vim.g.gruvbox_bold = 1
-            vim.g.gruvbox_termcolors = 256
-            vim.g.gruvbox_contrast_dark = 'medium'
-            vim.g.gruvbox_contrast_light = 'hard'
-            vim.g.gruvbox_invert_selection = 0
+            vim.cmd [[ colorscheme nord ]]
+            vim.g.nord_contrast = true
+            vim.g.nord_borders = true
+            vim.g.nord_italic = true
         end
     }
     -- status line
@@ -141,7 +154,8 @@ return require('packer').startup(function()
         config = function()
             require('lualine').setup {
                 options = {
-                    theme = 'gruvbox',
+                    -- theme = 'gruvbox',
+                    theme = 'nord',
                     icons_enabled = true,
                     section_separators = '',
                     component_separators = ''
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index c514718..fa4c03a 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -2,7 +2,11 @@ unbind C-b
 set -g prefix C-a
 bind C-a send-prefix
 
-set -g default-terminal "xterm-256color"
+# set -g default-terminal "xterm-256color"
+set-option -g default-terminal "screen-256color"
+set-option -sa terminal-overrides ',xterm-256color:RGB'
+
+set-option -g focus-events on
 set -g mouse on
 setw -g mode-keys vi
 
@@ -13,11 +17,13 @@ bind '"' split-window -c "#{pane_current_path}"
 bind '%' split-window -c "#{pane_current_path}" -h
 bind 'c' new-window -c "#{pane_current_path}"
 
-
 set -g @plugin 'tmux-plugins/tpm'
 
-set -g @plugin 'egel/tmux-gruvbox'
-set -g @tmux-gruvbox 'dark'
+# set -g @plugin 'egel/tmux-gruvbox'
+# set -g @tmux-gruvbox 'dark'
+
+set -g @plugin 'arcticicestudio/nord-tmux'
+
 # set -g @plugin 'tomhey/tmux-remote-sessions'
 
 run "$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm"