From d9b1150b005708816026fba09a70ce34bd894775 Mon Sep 17 00:00:00 2001 From: jasmine Date: Fri, 7 Mar 2025 10:33:16 +0800 Subject: [PATCH] switch to gruvbox dark medium --- .../sajenim/features/desktop/cava/default.nix | 2 +- .../features/desktop/discord/config/custom.css | 8 ++++---- .../sajenim/features/desktop/dunst/default.nix | 8 ++++---- .../sajenim/features/desktop/rofi/default.nix | 2 +- ...hard.rasi => gruvbox-material-dark-medium.rasi} | 6 +++--- ...hard.toml => gruvbox_material_dark_medium.toml} | 10 +++++----- .../features/desktop/wezterm/config/wezterm.lua | 14 +++++++------- home-manager/sajenim/features/editors/default.nix | 4 ++++ 8 files changed, 29 insertions(+), 25 deletions(-) rename home-manager/sajenim/features/desktop/rofi/gruvbox-material/{gruvbox-material-dark-hard.rasi => gruvbox-material-dark-medium.rasi} (94%) rename home-manager/sajenim/features/desktop/wezterm/config/colors/{gruvbox_material_dark_hard.toml => gruvbox_material_dark_medium.toml} (75%) diff --git a/home-manager/sajenim/features/desktop/cava/default.nix b/home-manager/sajenim/features/desktop/cava/default.nix index 4a97fd6..e7de13e 100644 --- a/home-manager/sajenim/features/desktop/cava/default.nix +++ b/home-manager/sajenim/features/desktop/cava/default.nix @@ -6,7 +6,7 @@ input.method = "pulse"; smoothing.noise_reduction = 88; color = { - background = "'#1d2021'"; + background = "'#32302f'"; foreground = "'#d4be98'"; }; }; diff --git a/home-manager/sajenim/features/desktop/discord/config/custom.css b/home-manager/sajenim/features/desktop/discord/config/custom.css index 6f672d3..19c9084 100644 --- a/home-manager/sajenim/features/desktop/discord/config/custom.css +++ b/home-manager/sajenim/features/desktop/discord/config/custom.css @@ -3,16 +3,16 @@ /* Gruvbox Material Dark Hard */ --fg0: #d4be98; - --bg0: #1d2021; - --bg1: #282828; + --bg0: #282828; + --bg1: #32302f; --grey0: #7c6f64; --grey1: #928374; --grey2: #a89984; /* Midpoints between bg0 + bg1 */ - --bg0_33: #212323; - --bg0_66: #242526; + --bg0_33: #2b2b2a; + --bg0_66: #2f2d2d; } .theme-dark { diff --git a/home-manager/sajenim/features/desktop/dunst/default.nix b/home-manager/sajenim/features/desktop/dunst/default.nix index 39fb00d..8afb5a5 100644 --- a/home-manager/sajenim/features/desktop/dunst/default.nix +++ b/home-manager/sajenim/features/desktop/dunst/default.nix @@ -8,22 +8,22 @@ origin = "top-right"; offset = "20x20"; frame_width = 5; - frame_color = "#282828"; + frame_color = "#32302f"; corner_radius = 10; }; urgency_low = { - background = "#1d2021"; + background = "#282828"; foreground = "#d4be98"; }; urgency_normal = { - background = "#1d2021"; + background = "#282828"; foreground = "#d4be98"; }; urgency_critical = { - background = "#1d2021"; + background = "#282828"; foreground = "#d4be98"; }; }; diff --git a/home-manager/sajenim/features/desktop/rofi/default.nix b/home-manager/sajenim/features/desktop/rofi/default.nix index 2aff585..3c657ad 100644 --- a/home-manager/sajenim/features/desktop/rofi/default.nix +++ b/home-manager/sajenim/features/desktop/rofi/default.nix @@ -5,7 +5,7 @@ plugins = with pkgs; [ rofi-calc ]; - theme = ./gruvbox-material/gruvbox-material-dark-hard.rasi; + theme = ./gruvbox-material/gruvbox-material-dark-medium.rasi; }; xdg.configFile.theme = { diff --git a/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-hard.rasi b/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-medium.rasi similarity index 94% rename from home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-hard.rasi rename to home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-medium.rasi index 0f4e3aa..0181baa 100644 --- a/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-hard.rasi +++ b/home-manager/sajenim/features/desktop/rofi/gruvbox-material/gruvbox-material-dark-medium.rasi @@ -17,9 +17,9 @@ scrollbar: true; /* Gruvbox dark colors */ - gruvbox-dark-bg0: #1d2021; - gruvbox-dark-bg1: #282828; - gruvbox-dark-bg2: #504945; + gruvbox-dark-bg0: #282828; + gruvbox-dark-bg1: #32302f; + gruvbox-dark-bg2: #32302f; gruvbox-dark-fg0: #d4be98; gruvbox-dark-fg1: #ddc7a1; gruvbox-dark-red-dark: #cc241d; diff --git a/home-manager/sajenim/features/desktop/wezterm/config/colors/gruvbox_material_dark_hard.toml b/home-manager/sajenim/features/desktop/wezterm/config/colors/gruvbox_material_dark_medium.toml similarity index 75% rename from home-manager/sajenim/features/desktop/wezterm/config/colors/gruvbox_material_dark_hard.toml rename to home-manager/sajenim/features/desktop/wezterm/config/colors/gruvbox_material_dark_medium.toml index e9daf7a..88ab103 100644 --- a/home-manager/sajenim/features/desktop/wezterm/config/colors/gruvbox_material_dark_hard.toml +++ b/home-manager/sajenim/features/desktop/wezterm/config/colors/gruvbox_material_dark_medium.toml @@ -1,16 +1,16 @@ [colors] -background = '#1d2021' # bg0 +background = '#282828' # bg0 foreground = '#d4be98' # fg0 -selection_bg = '#32302f' # bg_current_word +selection_bg = '#3c3836' # bg_current_word selection_fg = '#a89984' # grey2 -cursor_fg = '#32302f' # bg_current_word +cursor_fg = '#3c3836' # bg_current_word cursor_bg = '#a89984' # grey2 cursor_border = '#a89984' # grey2 ansi = [ - '#1d2021', # bg0 + '#282828', # bg0 '#ea6962', # red '#a9b665', # green '#d8a657', # yellow @@ -34,4 +34,4 @@ brights = [ [colors.indexed] [metadata] -name = 'gruvbox_material_dark_hard' +name = 'gruvbox_material_dark_medium' diff --git a/home-manager/sajenim/features/desktop/wezterm/config/wezterm.lua b/home-manager/sajenim/features/desktop/wezterm/config/wezterm.lua index 4c159d9..30fc21f 100644 --- a/home-manager/sajenim/features/desktop/wezterm/config/wezterm.lua +++ b/home-manager/sajenim/features/desktop/wezterm/config/wezterm.lua @@ -39,7 +39,7 @@ config.font = wezterm.font("Fisa Code") config.font_size = 10.0 --| Color scheme -config.color_scheme = "gruvbox_material_dark_hard" +config.color_scheme = "gruvbox_material_dark_medium" --| Cursor style config.default_cursor_style = "SteadyBar" @@ -71,13 +71,13 @@ config.colors = { tab_bar = { --| Tab Bar Colors - background = "#282828", + background = "#32302f", --| Tab Colors - active_tab = { bg_color = "#282828", fg_color = "#7daea3", intensity = "Normal", italic = false }, - inactive_tab = { bg_color = "#282828", fg_color = "#a89984", intensity = "Normal", italic = false }, - inactive_tab_hover = { bg_color = "#282828", fg_color = "#a89984", intensity = "Normal", italic = false }, - new_tab = { bg_color = "#282828", fg_color = "#a89984", intensity = "Normal", italic = false }, - new_tab_hover = { bg_color = "#282828", fg_color = "#a89984", intensity = "Normal", italic = false }, + active_tab = { bg_color = "#32302f", fg_color = "#7daea3", intensity = "Normal", italic = false }, + inactive_tab = { bg_color = "#32302f", fg_color = "#a89984", intensity = "Normal", italic = false }, + inactive_tab_hover = { bg_color = "#32302f", fg_color = "#a89984", intensity = "Normal", italic = false }, + new_tab = { bg_color = "#32302f", fg_color = "#a89984", intensity = "Normal", italic = false }, + new_tab_hover = { bg_color = "#32302f", fg_color = "#a89984", intensity = "Normal", italic = false }, }, } diff --git a/home-manager/sajenim/features/editors/default.nix b/home-manager/sajenim/features/editors/default.nix index a35e2d1..b671e77 100644 --- a/home-manager/sajenim/features/editors/default.nix +++ b/home-manager/sajenim/features/editors/default.nix @@ -9,6 +9,10 @@ extensions = with pkgs.vscode-extensions; [ sainnhe.gruvbox-material # Gruvbox Material theme ]; + userSettings = { + "window.menuBarVisibility" = "hidden"; + "workbench.colorTheme" = "Gruvbox Material Dark"; + }; }; # List of packages to be installed