refactor(core): move from base16 themes to nord

This is moves everything I can think of. A lot of the things I use have
this built in. The vim and tmux themes has been added so the place I
spend all my time looks nice.

modules/nvim.lua

@@ -27,7 +27,7 @@ for _, dir in ipairs(dirs_to_link) do
 end
 
 local start_plugins = {
-  ["base16-vim"] = { url = "https://github.com/tinted-theming/base16-vim.git", revision = "main" },
+  ["nord.nvim"] = { url = "https://github.com/gbprod/nord.nvim.git", revision = "main" },
   ["cmp_luasnip"] = { url = "https://github.com/saadparwaiz1/cmp_luasnip.git" },
   ["cmp-buffer"] = { url = "https://github.com/hrsh7th/cmp-buffer.git", revision = "main" },
   ["cmp-nvim-lsp"] = { url = "https://github.com/hrsh7th/cmp-nvim-lsp.git", revision = "main" },
@@ -80,3 +80,4 @@ configz.run(string.format("rm -rf %s/orgmode", nvim_plugin_dir_start))
 configz.run(string.format("rm -rf %s/indent-line", nvim_plugin_dir_start))
 configz.run(string.format("rm -rf %s/auto-pairs", nvim_plugin_dir_start))
 configz.run(string.format("rm -rf %s/vim-puppet", nvim_plugin_dir_start))
+configz.run(string.format("rm -rf %s/base16-vim", nvim_plugin_dir_start))

modules/tmux.lua

@@ -17,7 +17,7 @@ local plugins = {
   ["tmux-yank"] = { url = "https://github.com/tmux-plugins/tmux-yank.git" },
   ["tmux-open"] = { url = "https://github.com/tmux-plugins/tmux-open.git" },
   ["tmux-copycat"] = { url = "https://github.com/tmux-plugins/tmux-copycat.git" },
-  ["base16-tmux"] = { url = "https://github.com/tinted-theming/base16-tmux.git", revision = "main" },
+  ["tmux-nord"] = { url = "https://github.com/nordtheme/tmux.git", revision = "main" },
 }
 
 for plugin, config in pairs(plugins) do
@@ -27,3 +27,5 @@ for plugin, config in pairs(plugins) do
     version = config.revision or "master",
   }
 end
+
+configz.run(string.format("rm -rf %s/base16-tmux", plugin_dir))

site-modules/core/files/tmux.conf

@@ -84,3 +84,12 @@ set -g pane-base-index 1
 # Also need by vim plugin tmux-focus-events.vim
 set -g focus-events on
 
+# Make sure terminal colors are correct, there seems to be an issue with
+# detecting we are on a 256 color terminal
+# https://github.com/nordtheme/vim/issues/72#issuecomment-345441764
+set -ga terminal-overrides ",xterm-256color:Tc"
+
+# Setup the nord theme
+set -g @nord_tmux_no_patched_font "1"
+run-shell "~/.tmux/plugins/tmux/nord.tmux"
+

site-modules/core/files/vim/plugin/colors.vim

@@ -1,8 +1,9 @@
 " Set color theme
-if exists('$BASE16_THEME') && (!exists('g:colors_name') || g:colors_name != 'base16-$BASE16_THEME')
+lua << EOF
-  let base16colorspace=256
+  require("nord").setup({})
-  colorscheme base16-$BASE16_THEME
+EOF
-endif
+
+colorscheme nord
 
 " Set tailing white space to errors
 match ErrorMsg '\s\+$'

site-modules/core/files/wezterm.lua

@@ -1,23 +1,22 @@
 local wezterm = require "wezterm"
 
--- Base16 Theme: Tomorrow
--- local window_frame_fg = "#000000"
--- local window_frame_bg = "#ffffff"
-
--- Base16 Theme: Tomorrow Night
-local window_frame_bg = "#1d1f21"
-local window_frame_fg = "#ffffff"
-
 return {
   -- Use a sexy terminal font with ligatures.
-  --font = wezterm.font("Liga SFMono Nerd Font"),
+  -- You will need to install the beta version of the font to get the ligatures
+  -- https://github.com/intel/intel-one-mono/issues/9#issuecomment-1994958719
   font = wezterm.font {
-    family = "CommitMono",
+    family = "Intel One Mono",
   },
 
+  -- The nord theme to fit with everyting else
+  color_scheme = 'nord',
+
   -- Give the font some more line height, just makes thinks look a bit nicer
   line_height = 1.4,
 
+  -- Remove the window boarders so we have a nice clean look
+  window_decorations = "NONE",
+
   -- Who wants their music interrupted every time there is no tab completion
   -- available in the shell, Who wants their music interrupted evert time there
   -- is no tab completion available in the shell
@@ -28,7 +27,7 @@ return {
 
   -- Disabled all the padding, this makes vim look a lot nicer when all the
   -- window bars go to the edges of the terminal
-  window_padding = { left = 0, right = 0, top = 0, bottom = 0 },
+  window_padding = { left = 0, right = 0, top = 10, bottom = 0 },
 
   warn_about_missing_glyphs = false,
 
@@ -45,17 +44,4 @@ return {
       action = wezterm.action.SendKey { mods = "CTRL", key = "w" },
     },
   },
-
-  window_frame = {
-    inactive_titlebar_bg = window_frame_bg,
-    active_titlebar_bg = window_frame_bg,
-    inactive_titlebar_fg = window_frame_fg,
-    active_titlebar_fg = window_frame_fg,
-    inactive_titlebar_border_bottom = window_frame_bg,
-    active_titlebar_border_bottom = window_frame_bg,
-    button_fg = window_frame_fg,
-    button_bg = window_frame_bg,
-    button_hover_fg = window_frame_bg,
-    button_hover_bg = window_frame_fg,
-  },
 }

site-modules/core/files/zshrc

@@ -43,16 +43,6 @@ xmodmap -e 'clear Lock' -e 'keycode 0x42 = Escape'
 #
 printf '\033[5 q'
 
-#
-# Configure base16 shell for colors if the terminal is not running inside of
-# emacs or vim
-#
-if [[ -z "$VIM" ]] && [[ -z "$INSIDE_EMACS" ]] && [[ "$TERM_PROGRAM" != "WarpTerminal" ]] && [[ -z "$SSH_TTY" ]] ; then
-  export BASE16_SHELL_ENABLE_VARS=1
-  BASE16_CONFIG_PATH="$HOME/.config/base16-shell/"
-  [ -s "$BASE16_CONFIG_PATH/profile_helper.sh" ] && source "$BASE16_CONFIG_PATH/profile_helper.sh"
-fi
-
 #
 # Setup and export $PATH
 #
@@ -124,9 +114,8 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
-# Export the bat theme to integrate with base16 nicely
 # https://github.com/sharkdp/bat#highlighting-theme
-export BAT_THEME="base16"
+export BAT_THEME="Nord"
 
 #
 # Init oh-my-zsh

site-modules/core/templates/gitconfig.liquid

@@ -39,8 +39,3 @@
   file-added-label = "added:"
   file-renamed-label = "renamed:"
 
-[include]
-  # Import ${XDG_CONFIG_HOME:-$HOME/.config}/tinted-theming/delta.gitconfig.
-  # It will set delta.light=(true|false):
-  path = ~/.config/base16-shell/delta.gitconfig
-