From 2ddd980436a72facc44a476cf89450e7a35c1559 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 9 Jul 2023 23:06:36 -0600
Subject: [PATCH] clean up colorschemes

---
 .gitignore                                  |  2 --
 apps/neovim.nix                             |  2 +-
 colorscheme/everforest/default.nix          | 36 ++++++++++++---------
 colorscheme/nord/default.nix                |  4 +--
 colorscheme/nord/neovim.lua                 | 13 --------
 hosts/lookingglass/default.nix              |  2 +-
 modules/common/neovim/config/statusline.nix |  2 +-
 7 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100644 colorscheme/nord/neovim.lua

diff --git a/.gitignore b/.gitignore
index ebcd258..4db9c3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,6 @@
 *.db
 **/.direnv/**
 result
-.luarc.json
 private/**
 templates/**/flake.lock
 !private/**.age
-!private/**.sha512
diff --git a/apps/neovim.nix b/apps/neovim.nix
index c944af9..aa4e608 100644
--- a/apps/neovim.nix
+++ b/apps/neovim.nix
@@ -5,7 +5,7 @@
   program = "${
       (import ../modules/common/neovim/package {
         inherit pkgs;
-        colors = (import ../colorscheme/gruvbox).dark;
+        colors = (import ../colorscheme/nord).dark;
       })
     }/bin/nvim";
 
diff --git a/colorscheme/everforest/default.nix b/colorscheme/everforest/default.nix
index 9048323..3287ee2 100644
--- a/colorscheme/everforest/default.nix
+++ b/colorscheme/everforest/default.nix
@@ -1,20 +1,24 @@
 {
   name = "everforest"; # dark, hard
   author = "Sainnhe Park";
-  base00 = "#2b3339"; # Default Background
-  base01 = "#323c41"; # Lighter Background
-  base02 = "#503946"; # Selection Background
-  base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
-  base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
-  base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
-  base06 = "#e9e8d2"; # Light Foreground (Not often used)
-  base07 = "#fff9e8"; # Light Background (Not often used)
-  base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
-  base09 = "#d699b6"; # Integers, Boolean, Constants, ...
-  base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
-  base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
-  base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
-  base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
-  base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-  base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
+  dark = {
+    base00 = "#2b3339"; # Default Background
+    base01 = "#323c41"; # Lighter Background
+    base02 = "#503946"; # Selection Background
+    base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
+    base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
+    base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
+    base06 = "#e9e8d2"; # Light Foreground (Not often used)
+    base07 = "#fff9e8"; # Light Background (Not often used)
+    base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
+    base09 = "#d699b6"; # Integers, Boolean, Constants, ...
+    base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
+    base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
+    base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
+    base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
+    base0E =
+      "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+    base0F =
+      "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
+  };
 }
diff --git a/colorscheme/nord/default.nix b/colorscheme/nord/default.nix
index 99f711d..90b57d6 100644
--- a/colorscheme/nord/default.nix
+++ b/colorscheme/nord/default.nix
@@ -1,7 +1,7 @@
 {
+  name = "nord";
+  author = "arcticicestudio";
   dark = {
-    name = "nord";
-    author = "arcticicestudio";
     base00 = "#2E3440";
     base01 = "#3B4252";
     base02 = "#434C5E";
diff --git a/colorscheme/nord/neovim.lua b/colorscheme/nord/neovim.lua
deleted file mode 100644
index baef2ba..0000000
--- a/colorscheme/nord/neovim.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local M = {}
-
-M.packer = function(use)
-    use({
-        "shaunsingh/nord.nvim",
-        config = function()
-            vim.g.nord_italic = true
-            vim.cmd("colorscheme nord")
-        end,
-    })
-end
-
-return M
diff --git a/hosts/lookingglass/default.nix b/hosts/lookingglass/default.nix
index ea7df5c..f6d9db6 100644
--- a/hosts/lookingglass/default.nix
+++ b/hosts/lookingglass/default.nix
@@ -21,7 +21,7 @@ inputs.darwin.lib.darwinSystem {
       identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
       gui.enable = true;
       theme = {
-        colors = (import ../../colorscheme/gruvbox).dark;
+        colors = (import ../../colorscheme/gruvbox-dark).dark;
         dark = true;
       };
       mail.user = globals.user;
diff --git a/modules/common/neovim/config/statusline.nix b/modules/common/neovim/config/statusline.nix
index 96c8bf7..8771d15 100644
--- a/modules/common/neovim/config/statusline.nix
+++ b/modules/common/neovim/config/statusline.nix
@@ -2,7 +2,7 @@
   plugins = [ pkgs.vimPlugins.lualine-nvim ];
   setup.lualine = {
     options = {
-      theme = "gruvbox";
+      theme = "base16";
       icons_enabled = true;
     };
   };