diff --git a/home/modules/appearance/gtkCss.nix b/home/modules/appearance/gtkCss.nix index 30ea38c..6f72f40 100644 --- a/home/modules/appearance/gtkCss.nix +++ b/home/modules/appearance/gtkCss.nix @@ -5,9 +5,9 @@ in #css '' - @define-color accent_color #${blue}; - @define-color accent_bg_color #${dull-blue}; - @define-color accent_fg_color #${text}; + @define-color accent_color #${green}; + @define-color accent_bg_color #${text}; + @define-color accent_fg_color #${mantle}; @define-color destructive_color #${blue}; @define-color destructive_bg_color #${dull-blue}; @define-color destructive_fg_color #${text}; @@ -24,6 +24,14 @@ in @define-color window_fg_color #${text}; @define-color view_bg_color #${mantle}; @define-color view_fg_color #${text}; + @define-color sidebar_bg_color #${crust}; + @define-color sidebar_fg_color #${text}; + @define-color sidebar_backdrop_color @window_bg_color; + @define-color sidebar_shade_color rgba(0, 0, 0, 0.07); + @define-color secondary_sidebar_bg_color @sidebar_bg_color; + @define-color secondary_sidebar_fg_color @sidebar_fg_color; + @define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color; + @define-color secondary_sidebar_shade_color @sidebar_shade_color; @define-color headerbar_bg_color #${base}; @define-color headerbar_fg_color #${text}; @define-color headerbar_border_color #${text}; diff --git a/home/modules/desktop/terminal/foot.nix b/home/modules/desktop/terminal/foot.nix index 624227a..f807ee6 100644 --- a/home/modules/desktop/terminal/foot.nix +++ b/home/modules/desktop/terminal/foot.nix @@ -45,20 +45,20 @@ in { foreground = "${palette.base05}"; background = "${palette.base00}"; regular0 = "${palette.base00}"; # black - regular1 = "${palette.base08}"; # red - regular2 = "${palette.base0B}"; # green - regular3 = "${palette.base0A}"; # yellow - regular4 = "${palette.base0D}"; # blue - regular5 = "${palette.base0E}"; # magenta - regular6 = "${palette.base0C}"; # cyan + regular1 = "${palette.red}"; # red + regular2 = "${palette.green}"; # green + regular3 = "${palette.yellow}"; # yellow + regular4 = "${palette.blue}"; # blue + regular5 = "${palette.purple}"; # magenta + regular6 = "${palette.cyan}"; # cyan regular7 = "${palette.base05}"; # white bright0 = "${palette.base03}"; # bright black - bright1 = "${palette.base08}"; # bright red - bright2 = "${palette.base0B}"; # bright green - bright3 = "${palette.base0A}"; # bright yellow - bright4 = "${palette.base0D}"; # bright blue - bright5 = "${palette.base0E}"; # bright magenta - bright6 = "${palette.base0C}"; # bright cyan + bright1 = "${palette.bright-red}"; # bright red + bright2 = "${palette.bright-green}"; # bright green + bright3 = "${palette.bright-yellow}"; # bright yellow + bright4 = "${palette.bright-blue}"; # bright blue + bright5 = "${palette.bright-purple}"; # bright magenta + bright6 = "${palette.bright-cyan}"; # bright cyan bright7 = "${palette.base07}"; # bright white "16" = "${palette.base09}"; "17" = "${palette.base0F}"; diff --git a/nixos/modules/theme/minimal.nix b/nixos/modules/theme/minimal.nix index 9adfa5e..c0ffa14 100644 --- a/nixos/modules/theme/minimal.nix +++ b/nixos/modules/theme/minimal.nix @@ -33,7 +33,7 @@ in { }; colorscheme = { - name = "hozen"; + name = "gruvbox-material-medium"; variant = "dark"; }; }; diff --git a/nixos/options/appearance/colors.nix b/nixos/options/appearance/colors.nix deleted file mode 100644 index 6ad26aa..0000000 --- a/nixos/options/appearance/colors.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib) mkOption; - inherit (lib.types) str enum attrsOf; - - cfg = config.ooknet.colorscheme; -in { - # simple colorscheme module bases on misterio77/nix-colors - options.ooknet.colorscheme = { - name = mkOption { - type = enum ["hozen"]; - default = "hozen"; - }; - variant = mkOption { - type = enum ["dark" "light"]; - default = "dark"; - }; - slug = mkOption { - type = str; - default = "${toString cfg.name-cfg.variant}"; - }; - palette = { - type = attrsOf str; - default = (import ./palettes/${cfg.slug}.nix).colorscheme.palette; - }; - }; -} diff --git a/nixos/options/appearance/default.nix b/nixos/options/appearance/default.nix index 70d25c2..2bfa092 100644 --- a/nixos/options/appearance/default.nix +++ b/nixos/options/appearance/default.nix @@ -25,7 +25,7 @@ cfg = config.ooknet.appearance; in { - imports = [./palettes]; + # imports = [./palettes]; options.ooknet.appearance = { theme = mkOption { type = nullOr (enum ["minimal" "phone"]); @@ -57,7 +57,7 @@ in { }; colorscheme = { name = mkOption { - type = enum ["hozen"]; + type = enum ["hozen" "gruvbox-material-medium"]; default = "hozen"; }; variant = mkOption { @@ -70,7 +70,7 @@ in { }; palette = mkOption { type = attrsOf (coercedTo str (removePrefix "#") hexColorType); - default = {}; + default = (import ./palettes/${config.ooknet.appearance.colorscheme.slug}.nix).colorscheme.palette; }; }; }; diff --git a/nixos/options/appearance/palettes/gruvbox-material-medium-dark.nix b/nixos/options/appearance/palettes/gruvbox-material-medium-dark.nix new file mode 100644 index 0000000..a42c3ec --- /dev/null +++ b/nixos/options/appearance/palettes/gruvbox-material-medium-dark.nix @@ -0,0 +1,65 @@ +{ + colorscheme = { + palette = { + crust = "#282828"; + mantle = "#32302f"; + base = "#3a3735"; + surface-0 = "#45403d"; + surface-1 = "#504945"; + surface-2 = "#5A524C"; + overlay-0 = "#696059"; + overlay-1 = "#70665C"; + overlay-2 = "#7C6F64"; + subtext-0 = "#928374"; + subtext-1 = "#A89984"; + text = "#d4be98"; + + red = "#ea6962"; + dull-red = "#D87974"; + bright-red = "#F47771"; + orange = "#e78a4e"; + dull-orange = "#D39063"; + bright-orange = "#F3995E"; + yellow = "#d8a657"; + dull-yellow = "#c2A16B"; + bright-yellow = "#E5B361"; + green = "#a9b665"; + dull-green = "#989F7A"; + bright-green = "#B8C86A"; + cyan = "#89b482"; + dull-cyan = "#93A790"; + bright-cyan = "#92C78A"; + blue = "#7daea3"; + dull-blue = "#939A98"; + bright-blue = "#85C1B4"; + purple = "#d3869b"; + dull-purple = "#C397A3"; + bright-purple = "#E193A8"; + + base00 = "#282828"; + base01 = "#32302f"; + base02 = "#504945"; + base03 = "#7C6F64"; + base04 = "#A89984"; + base05 = "#D4BE98"; + base06 = "#DDc7a1"; + base07 = "#FBF1C7"; + base08 = "#EA6962"; + base09 = "#E78A4E"; + base0A = "#d8a657"; + base0B = "#A9B665"; + base0C = "#89B482"; + base0D = "#7DAEA3"; + base0E = "#D3869B"; + base0F = "#E37B35"; + base10 = "#141617"; + base11 = "#050505"; + base12 = "#F47771"; + base13 = "#D8A657"; + base14 = "#B7C86A"; + base15 = "#92C78A"; + base16 = "#85C1B4"; + base17 = "#E193A8"; + }; + }; +} diff --git a/nixos/options/appearance/palettes/hozen-dark.nix b/nixos/options/appearance/palettes/hozen-dark.nix index a2f6492..05adb63 100644 --- a/nixos/options/appearance/palettes/hozen-dark.nix +++ b/nixos/options/appearance/palettes/hozen-dark.nix @@ -1,12 +1,5 @@ { - config, - lib, - ... -}: let - cfg = config.ooknet.appearance.colorscheme; - inherit (lib) mkIf; -in { - ooknet.appearance.colorscheme = mkIf (cfg.name == "hozen" && cfg.variant == "dark") { + colorscheme = { palette = { crust = "2b2927"; mantle = "33312e";