diff --git a/hm_modules/alacritty.nix b/hm_modules/alacritty.nix index ea28ad4..dd49103 100644 --- a/hm_modules/alacritty.nix +++ b/hm_modules/alacritty.nix @@ -2,14 +2,9 @@ let strPalette = with pkgs.rice; pkgs.lib.rice.palette.toRgbHex rec { - inherit (colorPalette) normal bright; + inherit (colorPalette) normal bright primary; dim = colorPalette.dark; - primary = { - background = normal.black; - foreground = normal.white; - dim_foreground = dim.white; - }; cursor = { cursor = normal.white; text = normal.black; diff --git a/hm_modules/helix.nix b/hm_modules/helix.nix index 7520331..aafdbf0 100644 --- a/hm_modules/helix.nix +++ b/hm_modules/helix.nix @@ -42,7 +42,7 @@ package = pkgs.unstable.helix; languages = [ ]; settings = { - theme = "monokai_pro_octagon"; + theme = "ayu_mirage"; editor.lsp.display-messages = true; editor.scrolloff = 5; editor.true-color = true; diff --git a/hm_modules/kitty.nix b/hm_modules/kitty.nix index c12b694..ebe7f84 100644 --- a/hm_modules/kitty.nix +++ b/hm_modules/kitty.nix @@ -2,8 +2,8 @@ let strPalette = with pkgs.rice; pkgs.lib.rice.palette.toRgbHex rec { - foreground = colorPalette.normal.white; - background = colorPalette.normal.black; + foreground = colorPalette.primary.foreground; + background = colorPalette.primary.background; color0 = colorPalette.normal.black; color1 = colorPalette.normal.red; color2 = colorPalette.normal.green; diff --git a/rice.nix b/rice.nix index 19f4b4d..a4c5dff 100644 --- a/rice.nix +++ b/rice.nix @@ -4,19 +4,27 @@ let # onedark = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/onedark.nix); # tomorrow-night = prev.lib.rice.palette.tPalette prev.lib.rice.color.hexToRgba (import ./themes/tomorrow-night.nix); # mkpm = with prev.lib.rice; palette.tPalette color.hexToRgba (import ./themes/monokai-pro-machine.nix); - bloom = with prev.lib.rice; - palette.tPalette color.hexToRgba (import ./themes/bloom.nix); + # bloom = with prev.lib.rice; + # palette.tPalette color.hexToRgba (import ./themes/bloom.nix); + ayu-mirage = with prev.lib.rice; + palette.tPalette color.hexToRgba (import ./themes/ayu-mirage.nix); in (rec { rice = { colorPalette = with prev.lib.rice; rec { normal = palette.defaultPalette // { - inherit (bloom.normal) black red green yellow blue magenta cyan white; + inherit (ayu-mirage.normal) black red green yellow blue magenta cyan white; }; bright = palette.brighten 10 normal // { - inherit (bloom.bright) black red green yellow blue magenta cyan white; + inherit (ayu-mirage.bright) black red green yellow blue magenta cyan white; }; dark = palette.darken 10 normal; + primary = { + background = color.black; + foreground = color.white; + bright_foreground = color.white; + dim_foreground = dark.white; + } // ayu-mirage.primary; }; font = { normal = { diff --git a/themes/ayu-mirage.nix b/themes/ayu-mirage.nix new file mode 100644 index 0000000..d24c680 --- /dev/null +++ b/themes/ayu-mirage.nix @@ -0,0 +1,27 @@ +{ + primary = { + background = "#1f2430"; + foreground = "#cbccc6"; + bright_foreground = "#f28779"; + }; + normal = { + black = "#212733"; + red = "#f08778"; + green = "#53bf97"; + yellow = "#fdcc60"; + blue = "#60b8d6"; + magenta = "#ec7171"; + cyan = "#98e6ca"; + white = "#fafafa"; + }; + bright = { + black = "#686868"; + red = "#f58c7d"; + green = "#58c49c"; + yellow = "#ffd165"; + blue = "#65bddb"; + magenta = "#f17676"; + cyan = "#9debcf"; + white = "#ffffff"; + }; +}