clean up colorschemes

This commit is contained in:
Noah Masur 2023-07-09 23:06:36 -06:00
parent febf1071af
commit 2ddd980436
7 changed files with 25 additions and 36 deletions

2
.gitignore vendored
View File

@ -3,8 +3,6 @@
*.db *.db
**/.direnv/** **/.direnv/**
result result
.luarc.json
private/** private/**
templates/**/flake.lock templates/**/flake.lock
!private/**.age !private/**.age
!private/**.sha512

View File

@ -5,7 +5,7 @@
program = "${ program = "${
(import ../modules/common/neovim/package { (import ../modules/common/neovim/package {
inherit pkgs; inherit pkgs;
colors = (import ../colorscheme/gruvbox).dark; colors = (import ../colorscheme/nord).dark;
}) })
}/bin/nvim"; }/bin/nvim";

View File

@ -1,20 +1,24 @@
{ {
name = "everforest"; # dark, hard name = "everforest"; # dark, hard
author = "Sainnhe Park"; author = "Sainnhe Park";
base00 = "#2b3339"; # Default Background dark = {
base01 = "#323c41"; # Lighter Background base00 = "#2b3339"; # Default Background
base02 = "#503946"; # Selection Background base01 = "#323c41"; # Lighter Background
base03 = "#868d80"; # Comments, Invisibles, Line Highlighting base02 = "#503946"; # Selection Background
base04 = "#d3c6aa"; # Dark Foreground (Used for status bars) base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
base06 = "#e9e8d2"; # Light Foreground (Not often used) base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
base07 = "#fff9e8"; # Light Background (Not often used) base06 = "#e9e8d2"; # Light Foreground (Not often used)
base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ... base07 = "#fff9e8"; # Light Background (Not often used)
base09 = "#d699b6"; # Integers, Boolean, Constants, ... base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
base0A = "#83c092"; # Classes, Markup Bold, Search Text Background base09 = "#d699b6"; # Integers, Boolean, Constants, ...
base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ... base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ... base0E =
"#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
base0F =
"#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
};
} }

View File

@ -1,7 +1,7 @@
{ {
name = "nord";
author = "arcticicestudio";
dark = { dark = {
name = "nord";
author = "arcticicestudio";
base00 = "#2E3440"; base00 = "#2E3440";
base01 = "#3B4252"; base01 = "#3B4252";
base02 = "#434C5E"; base02 = "#434C5E";

View File

@ -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

View File

@ -21,7 +21,7 @@ inputs.darwin.lib.darwinSystem {
identityFile = "/Users/Noah.Masur/.ssh/id_ed25519"; identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
gui.enable = true; gui.enable = true;
theme = { theme = {
colors = (import ../../colorscheme/gruvbox).dark; colors = (import ../../colorscheme/gruvbox-dark).dark;
dark = true; dark = true;
}; };
mail.user = globals.user; mail.user = globals.user;

View File

@ -2,7 +2,7 @@
plugins = [ pkgs.vimPlugins.lualine-nvim ]; plugins = [ pkgs.vimPlugins.lualine-nvim ];
setup.lualine = { setup.lualine = {
options = { options = {
theme = "gruvbox"; theme = "base16";
icons_enabled = true; icons_enabled = true;
}; };
}; };