Fixed merge conflict

alacritty/alacritty.toml

@@ -77,57 +77,36 @@ action = "ScrollToBottom"
 key = "H"
 mods = "Alt"
 
-# Colors (Nord Theme)
+# Colors (Gruvbox dark)
+
+# Default colors
 [colors.primary]
-background = "#2e3440"
+# hard contrast background = = '#1d2021'
-foreground = "#d8dee9"
+background = '#282828'
-dim_foreground = "#a5abb6"
+# soft contrast background = = '#32302f'
-
+foreground = '#ebdbb2'
-[colors.cursor]
-text = "#2e3440"
-cursor = "#d8dee9"
-
-[colors.vi_mode_cursor]
-text = "#2e3440"
-cursor = "#d8dee9"
-
-[colors.selection]
-text = "CellForeground"
-background = "#4c566a"
-
-[colors.search.matches]
-foreground = "CellBackground"
-background = "#88c0d0"
 
+# Normal colors
 [colors.normal]
-black = "#3b4252"
+black   = '#282828'
-red = "#bf616a"
+red     = '#cc241d'
-green = "#a3be8c"
+green   = '#98971a'
-yellow = "#ebcb8b"
+yellow  = '#d79921'
-blue = "#81a1c1"
+blue    = '#458588'
-magenta = "#b48ead"
+magenta = '#b16286'
-cyan = "#88c0d0"
+cyan    = '#689d6a'
-white = "#e5e9f0"
+white   = '#a89984'
 
+# Bright colors
 [colors.bright]
-black = "#4c566a"
+black   = '#928374'
-red = "#bf616a"
+red     = '#fb4934'
-green = "#a3be8c"
+green   = '#b8bb26'
-yellow = "#ebcb8b"
+yellow  = '#fabd2f'
-blue = "#81a1c1"
+blue    = '#83a598'
-magenta = "#b48ead"
+magenta = '#d3869b'
-cyan = "#8fbcbb"
+cyan    = '#8ec07c'
-white = "#eceff4"
+white   = '#ebdbb2'
-
-[colors.dim]
-black = "#373e4d"
-red = "#94545d"
-green = "#809575"
-yellow = "#b29e75"
-blue = "#68809a"
-magenta = "#8c738c"
-cyan = "#6d96a5"
-white = "#aeb3bb"
 
 [mouse]
 hide_when_typing = true

vim/vimrc

@@ -41,14 +41,14 @@ Plugin 'jiangmiao/auto-pairs'    " Pair completion
 Plugin 'lervag/vimtex'           " LaTeX tools
 Plugin 'vim-airline/vim-airline' " Nicer info line
 Plugin 'junegunn/goyo.vim'       " Zen Workspace
-Plugin 'nordtheme/vim'           " Color scheme
+Plugin 'https://github.com/morhetz/gruvbox'         " Color scheme
 Plugin 'https://github.com/ap/vim-css-color'        " highlight color codes in their color
 Plugin 'https://github.com/907th/vim-auto-save.git' " auto save
 Plugin 'https://github.com/github/copilot.vim'      " github copilot
 
 call vundle#end()
 
-colorscheme nord
+colorscheme gruvbox
 
 filetype plugin indent on