From 0775ad0789befafd8812bce67fb9d2ce6eaacc28 Mon Sep 17 00:00:00 2001
From: Joshua Potter <jrpotter2112@gmail.com>
Date: Wed, 29 Nov 2023 20:22:47 -0700
Subject: [PATCH] Use the same color scheme across wezterm/neovim.

---
 jrpotter/neovim/default.nix  | 60 +++++++++++++++++++-----------------
 jrpotter/wezterm/wezterm.lua |  2 +-
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/jrpotter/neovim/default.nix b/jrpotter/neovim/default.nix
index 78a7362..8c3f496 100644
--- a/jrpotter/neovim/default.nix
+++ b/jrpotter/neovim/default.nix
@@ -2,6 +2,15 @@ args @ { config, pkgs, lib, ... }:
 let
   utils = import ./utils.nix args;
 
+  nightfox = {
+    plugin = utils.pluginGit
+      "eb82712f86319272f4b7b9dbb4ec6df650e6987f"
+      "EdenEast/nightfox.nvim";
+    config = ''
+      vim.cmd('colorscheme nordfox')
+    '';
+  };
+
   nvim-cmp = {
     plugin = pkgs.vimPlugins.nvim-cmp;
     config = ''
@@ -84,6 +93,7 @@ in
           inherit (p) plugin;
           config = "lua << EOF\n${p.config}\nEOF";
         } else p) [
+        nightfox
         nvim-cmp
         nvim-dap
         nvim-lspconfig
@@ -98,33 +108,27 @@ in
       vimAlias = true;
     };
 
-    xdg.configFile."nvim/init.lua".text = lib.mkMerge [
-      # Extra Lua configuration to be prepended to `init.lua`. Extend the Lua
-      # loader to search for our /nix/store/.../?.lua files.
-      (let
-        lua = pkgs.stdenv.mkDerivation {
-          name = "lua";
-          src = ./lua;
-          installPhase = ''
-            mkdir -p $out/
-            cp -r ./* $out/
-          '';
-        };
-        in lib.mkBefore ''
-          package.path = '${lua}/?.lua;' .. package.path
-        '')
-
-      # Extra Lua configuration to be appended to `init.lua`.
-      (lib.mkAfter ''
-        vim.g.mapleader = ' '
-        vim.g.maplocalleader = '\\'
-        vim.o.colorcolumn = '80,100'
-        vim.o.equalalways = false  -- Disable auto window resize.
-        vim.o.expandtab = true     -- Spaces instead of tabs.
-        vim.o.list = true          -- Show hidden characters.
-        vim.o.shiftwidth = 2       -- # of spaces to use for each (auto)indent.
-        vim.o.tabstop = 2          -- # of spaces a <Tab> in the file counts for.
-      '')
-    ];
+    xdg.configFile."nvim/init.lua".text =
+      let
+        lua = import ./lua { inherit pkgs; };
+      in
+        lib.mkMerge [
+          # Extra Lua configuration to be prepended to `init.lua`. Extend the
+          # Lua loader to search for our /nix/store/.../?.lua files.
+          (lib.mkBefore ''
+            package.path = '${lua}/?.lua;' .. package.path
+          '')
+          # Extra Lua configuration to be appended to `init.lua`.
+          (lib.mkAfter ''
+            vim.g.mapleader = ' '
+            vim.g.maplocalleader = '\\'
+            vim.o.colorcolumn = '80,100'
+            vim.o.equalalways = false -- Disable auto window resize.
+            vim.o.expandtab = true    -- Spaces instead of tabs.
+            vim.o.list = true         -- Show hidden characters.
+            vim.o.shiftwidth = 2      -- # of spaces to use for each (auto)indent.
+            vim.o.tabstop = 2         -- # of spaces a <Tab> in the file counts for.
+          '')
+        ];
   };
 }
diff --git a/jrpotter/wezterm/wezterm.lua b/jrpotter/wezterm/wezterm.lua
index da0d908..1cf269c 100644
--- a/jrpotter/wezterm/wezterm.lua
+++ b/jrpotter/wezterm/wezterm.lua
@@ -2,7 +2,7 @@ local wezterm = require('wezterm')
 
 return {
   check_for_updates = false,
-  color_scheme = 'Chalk (Gogh)',
+  color_scheme = 'nordfox',
   font = wezterm.font 'Iosevka',
   keys = {
     {