From 5f3c9de7e7e34dfc2362a79f3842f016eb1a794b Mon Sep 17 00:00:00 2001 From: ooks-io Date: Sun, 19 May 2024 17:12:40 +1200 Subject: [PATCH] fix(nix-colors): config.colorscheme.colors -> config.colorscheme.palette --- .../modules/console/editor/nvim/default.nix | 34 ++++----- .../modules/console/editor/nvim/settings.nix | 34 ++++----- .../console/multiplexer/tmux/default.nix | 10 +-- .../console/multiplexer/zellij/default.nix | 29 ++++---- .../zellij/layouts/defaultLayout.nix | 40 +++++------ .../zellij/layouts/flakeLayout.nix | 40 +++++------ .../zellij/layouts/scriptLayout.nix | 40 +++++------ .../modules/console/shell/zsh/default.nix | 2 +- .../desktop/browser/schizofox/default.nix | 8 +-- .../desktop/communication/discord/default.nix | 20 +++--- .../desktop/media/music/tui/default.nix | 22 +++--- .../desktop/productivity/zathura/default.nix | 42 +++++------ .../modules/desktop/terminal/foot/default.nix | 50 ++++++------- .../desktop/terminal/kitty/default.nix | 72 +++++++++---------- .../desktop/wayland/bar/waybar/default.nix | 28 ++++---- .../desktop/wayland/launcher/rofi/default.nix | 10 +-- .../desktop/wayland/launcher/tofi/default.nix | 12 ++-- .../wayland/lockscreen/hyprlock/default.nix | 14 ++-- .../wayland/lockscreen/swaylock/default.nix | 40 +++++------ .../wayland/notification/mako/default.nix | 12 ++-- .../hyprland/settings/appearance.nix | 5 +- 21 files changed, 282 insertions(+), 282 deletions(-) diff --git a/inputs/home/modules/console/editor/nvim/default.nix b/inputs/home/modules/console/editor/nvim/default.nix index 293cb4b..619924c 100644 --- a/inputs/home/modules/console/editor/nvim/default.nix +++ b/inputs/home/modules/console/editor/nvim/default.nix @@ -1,7 +1,7 @@ { config, lib, inputs, pkgs, ... }: let - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; cfg = config.homeModules.console.editor.nvim; in @@ -34,22 +34,22 @@ in enable = true; colorscheme = config.colorscheme.slug; customColorScheme = { - base00 = "#${colors.base00}"; - base01 = "#${colors.base01}"; - base02 = "#${colors.base02}"; - base03 = "#${colors.base03}"; - base04 = "#${colors.base04}"; - base05 = "#${colors.base05}"; - base06 = "#${colors.base06}"; - base07 = "#${colors.base07}"; - base08 = "#${colors.base08}"; - base09 = "#${colors.base09}"; - base0A = "#${colors.base0A}"; - base0B = "#${colors.base0B}"; - base0C = "#${colors.base0C}"; - base0D = "#${colors.base0D}"; - base0E = "#${colors.base0E}"; - base0F = "#${colors.base0F}"; + base00 = "#${palette.base00}"; + base01 = "#${palette.base01}"; + base02 = "#${palette.base02}"; + base03 = "#${palette.base03}"; + base04 = "#${palette.base04}"; + base05 = "#${palette.base05}"; + base06 = "#${palette.base06}"; + base07 = "#${palette.base07}"; + base08 = "#${palette.base08}"; + base09 = "#${palette.base09}"; + base0A = "#${palette.base0A}"; + base0B = "#${palette.base0B}"; + base0C = "#${palette.base0C}"; + base0D = "#${palette.base0D}"; + base0E = "#${palette.base0E}"; + base0F = "#${palette.base0F}"; }; }; }; diff --git a/inputs/home/modules/console/editor/nvim/settings.nix b/inputs/home/modules/console/editor/nvim/settings.nix index e248fa7..500b7fd 100644 --- a/inputs/home/modules/console/editor/nvim/settings.nix +++ b/inputs/home/modules/console/editor/nvim/settings.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; cfg = config.homeModules.console.editor.nvim; in @@ -37,22 +37,22 @@ in enable = true; colorscheme = config.colorscheme.slug; customColorScheme = { - base00 = "#${colors.base00}"; - base01 = "#${colors.base01}"; - base02 = "#${colors.base02}"; - base03 = "#${colors.base03}"; - base04 = "#${colors.base04}"; - base05 = "#${colors.base05}"; - base06 = "#${colors.base06}"; - base07 = "#${colors.base07}"; - base08 = "#${colors.base08}"; - base09 = "#${colors.base09}"; - base0A = "#${colors.base0A}"; - base0B = "#${colors.base0B}"; - base0C = "#${colors.base0C}"; - base0D = "#${colors.base0D}"; - base0E = "#${colors.base0E}"; - base0F = "#${colors.base0F}"; + base00 = "#${palette.base00}"; + base01 = "#${palette.base01}"; + base02 = "#${palette.base02}"; + base03 = "#${palette.base03}"; + base04 = "#${palette.base04}"; + base05 = "#${palette.base05}"; + base06 = "#${palette.base06}"; + base07 = "#${palette.base07}"; + base08 = "#${palette.base08}"; + base09 = "#${palette.base09}"; + base0A = "#${palette.base0A}"; + base0B = "#${palette.base0B}"; + base0C = "#${palette.base0C}"; + base0D = "#${palette.base0D}"; + base0E = "#${palette.base0E}"; + base0F = "#${palette.base0F}"; }; }; }; diff --git a/inputs/home/modules/console/multiplexer/tmux/default.nix b/inputs/home/modules/console/multiplexer/tmux/default.nix index 6af5ebe..1e7a6d7 100644 --- a/inputs/home/modules/console/multiplexer/tmux/default.nix +++ b/inputs/home/modules/console/multiplexer/tmux/default.nix @@ -2,7 +2,7 @@ let cfg = config.homeModules.console.multiplexer.tmux; - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; in { @@ -25,13 +25,13 @@ in set -g set-clipboard on #Appearance set -g status-position top - set -g status-style "fg=#${colors.base05} bg=#${colors.base00}" + set -g status-style "fg=#${palette.base05} bg=#${palette.base00}" #Windows set -g status-justify "centre" - setw -g window-status-current-format "#[bg=#${colors.base0B},fg=#${colors.base00},bold] #W " - setw -g window-status-format "#[bg=#${colors.base03},fg=#${colors.base05}] #W " + setw -g window-status-current-format "#[bg=#${palette.base0B},fg=#${palette.base00},bold] #W " + setw -g window-status-format "#[bg=#${palette.base03},fg=#${palette.base05}] #W " #Left - set -g status-left " #{tmux_mode_indicator} #[bg=#${colors.base0B},fg=#${colors.base00}] #S" + set -g status-left " #{tmux_mode_indicator} #[bg=#${palette.base0B},fg=#${palette.base00}] #S" set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}' #Move to Pane bind -n M-Left select-pane -L diff --git a/inputs/home/modules/console/multiplexer/zellij/default.nix b/inputs/home/modules/console/multiplexer/zellij/default.nix index 7df0136..6966e2d 100644 --- a/inputs/home/modules/console/multiplexer/zellij/default.nix +++ b/inputs/home/modules/console/multiplexer/zellij/default.nix @@ -1,7 +1,6 @@ { lib, config, pkgs, ... }: let - inherit (config) colorscheme; - inherit (colorscheme) colors; + inherit (config.colorscheme) palette; cfg = config.homeModules.console.multiplexer.zellij; in @@ -10,23 +9,23 @@ in programs.zellij = { enable = true; settings = { - theme = "${colorscheme.slug}"; + theme = "${config.colorscheme.slug}"; default_shell = "fish"; default_layout = "default"; pane_frames = false; themes = { - "${colorscheme.slug}" = { - fg = "#${colors.base05}"; - bg = "#${colors.base00}"; - black = "#${colors.base00}"; - red = "#${colors.base08}"; - green = "#${colors.base0B}"; - yellow = "#${colors.base0A}"; - blue = "#${colors.base0D}"; - magenta = "#${colors.base0E}"; - cyan = "#${colors.base0C}"; - white = "#${colors.base05}"; - orange = "#${colors.base09}"; + "${config.colorscheme.slug}" = { + fg = "#${palette.base05}"; + bg = "#${palette.base00}"; + black = "#${palette.base00}"; + red = "#${palette.base08}"; + green = "#${palette.base0B}"; + yellow = "#${palette.base0A}"; + blue = "#${palette.base0D}"; + magenta = "#${palette.base0E}"; + cyan = "#${palette.base0C}"; + white = "#${palette.base05}"; + orange = "#${palette.base09}"; }; }; }; diff --git a/inputs/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix b/inputs/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix index 1130895..03c8ac1 100644 --- a/inputs/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix +++ b/inputs/home/modules/console/multiplexer/zellij/layouts/defaultLayout.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: let - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; in { @@ -12,40 +12,40 @@ in plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { format_left "{mode}" format_right "{session} {command_git_branch} {datetime}" - format_center "#[fg=#${colors.base0D},bold] {tabs}" + format_center "#[fg=#${palette.base0D},bold] {tabs}" format_space "" border_enabled "true" border_char "─" - border_format "#[fg=#${colors.base05}]{char}" + border_format "#[fg=#${palette.base05}]{char}" border_position "bottom" hide_frame_for_single_pane "true" - mode_normal "#[fg=#${colors.base0D}] " - mode_tmux "#[fg=#${colors.base0E}] " - mode_pane "#[fg=#${colors.base08}] " - mode_tab "#[fg=#${colors.base08}] " - mode_rename_tab "#[fg=#${colors.base08}] " - mode_rename_pane "#[fg=#${colors.base08}] " - mode_session "#[fg=#${colors.base08}] " - mode_locked "#[fg=#${colors.base05}] " - mode_move "#[fg=#${colors.base0B}] " - mode_resize "#[fg=#${colors.base0B}] " - mode_prompt "#[fg=#${colors.base0A}] " - mode_search "#[fg=#${colors.base0A}] " - mode_enter_search "#[fg=#${colors.base0A}] " + mode_normal "#[fg=#${palette.base0D}] " + mode_tmux "#[fg=#${palette.base0E}] " + mode_pane "#[fg=#${palette.base08}] " + mode_tab "#[fg=#${palette.base08}] " + mode_rename_tab "#[fg=#${palette.base08}] " + mode_rename_pane "#[fg=#${palette.base08}] " + mode_session "#[fg=#${palette.base08}] " + mode_locked "#[fg=#${palette.base05}] " + mode_move "#[fg=#${palette.base0B}] " + mode_resize "#[fg=#${palette.base0B}] " + mode_prompt "#[fg=#${palette.base0A}] " + mode_search "#[fg=#${palette.base0A}] " + mode_enter_search "#[fg=#${palette.base0A}] " - tab_normal "#[bg=#${colors.base01}] {name} " - tab_active "#[bg=#${colors.base02}] {name} " + tab_normal "#[bg=#${palette.base01}] {name} " + tab_active "#[bg=#${palette.base02}] {name} " tab_separator " " command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=#${colors.base0C}] {stdout} " + command_git_branch_format "#[fg=#${palette.base0C}] {stdout} " command_git_branch_interval "10" command_git_branch_rendermode "static" - datetime "#[fg=#${colors.base05},bold] {format} " + datetime "#[fg=#${palette.base05},bold] {format} " datetime_format "%I:%M %p" datetime_timezone "${config.home.sessionVariables.TZ}" } diff --git a/inputs/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix b/inputs/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix index cdfc3ba..d456bf7 100644 --- a/inputs/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix +++ b/inputs/home/modules/console/multiplexer/zellij/layouts/flakeLayout.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: let - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; in { @@ -12,40 +12,40 @@ in plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { format_left "{mode}" format_right "{session} {command_git_branch} {datetime}" - format_center "#[fg=#${colors.base0D},bold] {tabs}" + format_center "#[fg=#${palette.base0D},bold] {tabs}" format_space "" border_enabled "true" border_char "─" - border_format "#[fg=#${colors.base05}]{char}" + border_format "#[fg=#${palette.base05}]{char}" border_position "bottom" hide_frame_for_single_pane "true" - mode_normal "#[fg=#${colors.base0D}] " - mode_tmux "#[fg=#${colors.base0E}] " - mode_pane "#[fg=#${colors.base08}] " - mode_tab "#[fg=#${colors.base08}] " - mode_rename_tab "#[fg=#${colors.base08}] " - mode_rename_pane "#[fg=#${colors.base08}] " - mode_session "#[fg=#${colors.base08}] " - mode_locked "#[fg=#${colors.base05}] " - mode_move "#[fg=#${colors.base0B}] " - mode_resize "#[fg=#${colors.base0B}] " - mode_prompt "#[fg=#${colors.base0A}] " - mode_search "#[fg=#${colors.base0A}] " - mode_enter_search "#[fg=#${colors.base0A}] " + mode_normal "#[fg=#${palette.base0D}] " + mode_tmux "#[fg=#${palette.base0E}] " + mode_pane "#[fg=#${palette.base08}] " + mode_tab "#[fg=#${palette.base08}] " + mode_rename_tab "#[fg=#${palette.base08}] " + mode_rename_pane "#[fg=#${palette.base08}] " + mode_session "#[fg=#${palette.base08}] " + mode_locked "#[fg=#${palette.base05}] " + mode_move "#[fg=#${palette.base0B}] " + mode_resize "#[fg=#${palette.base0B}] " + mode_prompt "#[fg=#${palette.base0A}] " + mode_search "#[fg=#${palette.base0A}] " + mode_enter_search "#[fg=#${palette.base0A}] " - tab_normal "#[bg=#${colors.base01}] {name} " - tab_active "#[bg=#${colors.base02}] {name} " + tab_normal "#[bg=#${palette.base01}] {name} " + tab_active "#[bg=#${palette.base02}] {name} " tab_separator " " command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=#${colors.base0C}] {stdout} " + command_git_branch_format "#[fg=#${palette.base0C}] {stdout} " command_git_branch_interval "10" command_git_branch_rendermode "static" - datetime "#[fg=#${colors.base05},bold] {format} " + datetime "#[fg=#${palette.base05},bold] {format} " datetime_format "%I:%M %p" datetime_timezone "${config.home.sessionVariables.TZ}" } diff --git a/inputs/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix b/inputs/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix index e6f2991..288bc00 100644 --- a/inputs/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix +++ b/inputs/home/modules/console/multiplexer/zellij/layouts/scriptLayout.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: let - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; in { @@ -12,40 +12,40 @@ text = /* kdl */ '' plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { format_left "{mode}" format_right "{session} {command_git_branch} {datetime}" - format_center "#[fg=#${colors.base0D},bold] {tabs}" + format_center "#[fg=#${palette.base0D},bold] {tabs}" format_space "" border_enabled "true" border_char "─" - border_format "#[fg=#${colors.base05}]{char}" + border_format "#[fg=#${palette.base05}]{char}" border_position "bottom" hide_frame_for_single_pane "true" - mode_normal "#[fg=#${colors.base0D}] " - mode_tmux "#[fg=#${colors.base0E}] " - mode_pane "#[fg=#${colors.base08}] " - mode_tab "#[fg=#${colors.base08}] " - mode_rename_tab "#[fg=#${colors.base08}] " - mode_rename_pane "#[fg=#${colors.base08}] " - mode_session "#[fg=#${colors.base08}] " - mode_locked "#[fg=#${colors.base05}] " - mode_move "#[fg=#${colors.base0B}] " - mode_resize "#[fg=#${colors.base0B}] " - mode_prompt "#[fg=#${colors.base0A}] " - mode_search "#[fg=#${colors.base0A}] " - mode_enter_search "#[fg=#${colors.base0A}] " + mode_normal "#[fg=#${palette.base0D}] " + mode_tmux "#[fg=#${palette.base0E}] " + mode_pane "#[fg=#${palette.base08}] " + mode_tab "#[fg=#${palette.base08}] " + mode_rename_tab "#[fg=#${palette.base08}] " + mode_rename_pane "#[fg=#${palette.base08}] " + mode_session "#[fg=#${palette.base08}] " + mode_locked "#[fg=#${palette.base05}] " + mode_move "#[fg=#${palette.base0B}] " + mode_resize "#[fg=#${palette.base0B}] " + mode_prompt "#[fg=#${palette.base0A}] " + mode_search "#[fg=#${palette.base0A}] " + mode_enter_search "#[fg=#${palette.base0A}] " - tab_normal "#[bg=#${colors.base01}] {name} " - tab_active "#[bg=#${colors.base02}] {name} " + tab_normal "#[bg=#${palette.base01}] {name} " + tab_active "#[bg=#${palette.base02}] {name} " tab_separator " " command_git_branch_command "git rev-parse --abbrev-ref HEAD" - command_git_branch_format "#[fg=#${colors.base0C}] {stdout} " + command_git_branch_format "#[fg=#${palette.base0C}] {stdout} " command_git_branch_interval "10" command_git_branch_rendermode "static" - datetime "#[fg=#${colors.base05},bold] {format} " + datetime "#[fg=#${palette.base05},bold] {format} " datetime_format "%I:%M %p" datetime_timezone "${config.home.sessionVariables.TZ}" } diff --git a/inputs/home/modules/console/shell/zsh/default.nix b/inputs/home/modules/console/shell/zsh/default.nix index 79d6ccb..4f421c6 100644 --- a/inputs/home/modules/console/shell/zsh/default.nix +++ b/inputs/home/modules/console/shell/zsh/default.nix @@ -6,7 +6,7 @@ let in { - options.homeModules.console.zsh.enable = mkEnableOption ""; + options.homeModules.console.shell.zsh.enable = mkEnableOption ""; config = mkIf cfg.enable { programs.zsh = { diff --git a/inputs/home/modules/desktop/browser/schizofox/default.nix b/inputs/home/modules/desktop/browser/schizofox/default.nix index 8f893a2..80eed31 100644 --- a/inputs/home/modules/desktop/browser/schizofox/default.nix +++ b/inputs/home/modules/desktop/browser/schizofox/default.nix @@ -3,7 +3,7 @@ let cfg = config.homeModules.desktop.browser.schizofox; fonts = config.homeModules.theme.fonts; - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; in { @@ -16,9 +16,9 @@ in theme = { font = "${fonts.regular.family}"; colors = { - background-darker = "${colors.base00}"; - background = "${colors.base01}"; - foreground = "${colors.base07}"; + background-darker = "${palette.base00}"; + background = "${palette.base01}"; + foreground = "${palette.base07}"; }; }; diff --git a/inputs/home/modules/desktop/communication/discord/default.nix b/inputs/home/modules/desktop/communication/discord/default.nix index e003631..b119f8b 100644 --- a/inputs/home/modules/desktop/communication/discord/default.nix +++ b/inputs/home/modules/desktop/communication/discord/default.nix @@ -3,7 +3,7 @@ let cfg = config.homeModules.desktop.communication.discord; fonts = config.homeModules.theme.fonts; - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; inherit (lib) mkIf mkEnableOption; in @@ -20,17 +20,17 @@ in */ :root { - --nix-bg1: #${colors.base00}; - --nix-bg2: #${colors.base01}; - --nix-bg3: #${colors.base02}; + --nix-bg1: #${palette.base00}; + --nix-bg2: #${palette.base01}; + --nix-bg3: #${palette.base02}; - --nix-fg1: #${colors.base05}; - --nix-fg2: #${colors.base07}; - --nix-fg3: #${colors.base03}; - --nix-link: #${colors.base0D}; + --nix-fg1: #${palette.base05}; + --nix-fg2: #${palette.base07}; + --nix-fg3: #${palette.base03}; + --nix-link: #${palette.base0D}; - --nix-accent: #${colors.base08}; - --nix-hi: #${colors.base0B}; + --nix-accent: #${palette.base08}; + --nix-hi: #${palette.base0B}; --font-mono: ${fonts.monospace.family}, monospace; --font-regular: ${fonts.regular.family}, sans serif; diff --git a/inputs/home/modules/desktop/media/music/tui/default.nix b/inputs/home/modules/desktop/media/music/tui/default.nix index 7a8a24b..29d7237 100644 --- a/inputs/home/modules/desktop/media/music/tui/default.nix +++ b/inputs/home/modules/desktop/media/music/tui/default.nix @@ -1,7 +1,7 @@ { pkgs, config, lib, ... }: let - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; cfg = config.homeModules.desktop.media.music.tui; zellij = config.homeModules.console.multiplexer.zellij; spotify-cli = pkgs.spotify-player.override { @@ -27,11 +27,11 @@ in color = { gradient = 1; gradient_count = 5; - gradient_color_1 = "'#${colors.base0A}'"; - gradient_color_2 = "'#${colors.base0B}'"; - gradient_color_3 = "'#${colors.base0C}'"; - gradient_color_4 = "'#${colors.base0D}'"; - gradient_color_5 = "'#${colors.base0E}'"; + gradient_color_1 = "'#${palette.base0A}'"; + gradient_color_2 = "'#${palette.base0B}'"; + gradient_color_3 = "'#${palette.base0C}'"; + gradient_color_4 = "'#${palette.base0D}'"; + gradient_color_5 = "'#${palette.base0E}'"; }; }; }; @@ -80,18 +80,18 @@ in border_enabled "true" border_char "─" - border_format "#[fg=#${colors.base0D}]{char}" + border_format "#[fg=#${palette.base0D}]{char}" border_position "bottom" hide_frame_for_single_pane "true" - mode_normal "#[fg=${colors.base0D}]󰝚" + mode_normal "#[fg=${palette.base0D}]󰝚" - tab_normal "#[bg=#${colors.base01}] {name} " - tab_active "#[bg=#${colors.base02}] {name} " + tab_normal "#[bg=#${palette.base01}] {name} " + tab_active "#[bg=#${palette.base02}] {name} " tab_separator " " - datetime "#[fg=#${colors.base05},bold] {format} " + datetime "#[fg=#${palette.base05},bold] {format} " datetime_format "%I:%M %p" datetime_timezone "${config.home.sessionVariables.TZ}" } diff --git a/inputs/home/modules/desktop/productivity/zathura/default.nix b/inputs/home/modules/desktop/productivity/zathura/default.nix index 2254075..d96e77f 100644 --- a/inputs/home/modules/desktop/productivity/zathura/default.nix +++ b/inputs/home/modules/desktop/productivity/zathura/default.nix @@ -2,7 +2,7 @@ let cfg = config.homeModules.desktop.productivity.zathura; - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; fonts = config.homeModules.theme.fonts; in @@ -14,26 +14,26 @@ in font = "${fonts.regular.family} 14"; recolor = true; selection-clipboard = "clipboard"; - default-bg = "#${colors.base00}"; - default-fg = "#${colors.base01}"; - statusbar-bg = "#${colors.base02}"; - statusbar-fg = "#${colors.base04}"; - inputbar-bg = "#${colors.base00}"; - inputbar-fg = "#${colors.base07}"; - notification-bg = "#${colors.base00}"; - notification-fg = "#${colors.base07}"; - notification-error-bg = "#${colors.base00}"; - notification-error-fg = "#${colors.base08}"; - notification-warning-bg = "#${colors.base00}"; - notification-warning-fg = "#${colors.base08}"; - highlight-color = "#${colors.base0A}"; - highlight-active-color = "#${colors.base0D}"; - completion-bg = "#${colors.base01}"; - completion-fg = "#${colors.base05}"; - completions-highlight-bg = "#${colors.base0D}"; - completions-highlight-fg = "#${colors.base07}"; - recolor-lightcolor = "#${colors.base00}"; - recolor-darkcolor = "#${colors.base06}"; + default-bg = "#${palette.base00}"; + default-fg = "#${palette.base01}"; + statusbar-bg = "#${palette.base02}"; + statusbar-fg = "#${palette.base04}"; + inputbar-bg = "#${palette.base00}"; + inputbar-fg = "#${palette.base07}"; + notification-bg = "#${palette.base00}"; + notification-fg = "#${palette.base07}"; + notification-error-bg = "#${palette.base00}"; + notification-error-fg = "#${palette.base08}"; + notification-warning-bg = "#${palette.base00}"; + notification-warning-fg = "#${palette.base08}"; + highlight-color = "#${palette.base0A}"; + highlight-active-color = "#${palette.base0D}"; + completion-bg = "#${palette.base01}"; + completion-fg = "#${palette.base05}"; + completions-highlight-bg = "#${palette.base0D}"; + completions-highlight-fg = "#${palette.base07}"; + recolor-lightcolor = "#${palette.base00}"; + recolor-darkcolor = "#${palette.base06}"; }; }; }; diff --git a/inputs/home/modules/desktop/terminal/foot/default.nix b/inputs/home/modules/desktop/terminal/foot/default.nix index 90b673a..eaf1565 100644 --- a/inputs/home/modules/desktop/terminal/foot/default.nix +++ b/inputs/home/modules/desktop/terminal/foot/default.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; fonts = config.homeModules.theme.fonts; cfg = config.homeModules.desktop.terminal.foot; in @@ -40,30 +40,30 @@ in }; colors = { alpha = 1.0; - foreground = "${colors.base05}"; - background = "${colors.base00}"; - regular0 = "${colors.base00}"; # black - regular1 = "${colors.base08}"; # red - regular2 = "${colors.base0B}"; # green - regular3 = "${colors.base0A}"; # yellow - regular4 = "${colors.base0D}"; # blue - regular5 = "${colors.base0E}"; # magenta - regular6 = "${colors.base0C}"; # cyan - regular7 = "${colors.base05}"; # white - bright0 = "${colors.base03}"; # bright black - bright1 = "${colors.base08}"; # bright red - bright2 = "${colors.base0B}"; # bright green - bright3 = "${colors.base0A}"; # bright yellow - bright4 = "${colors.base0D}"; # bright blue - bright5 = "${colors.base0E}"; # bright magenta - bright6 = "${colors.base0C}"; # bright cyan - bright7 = "${colors.base07}"; # bright white - "16" = "${colors.base09}"; - "17" = "${colors.base0F}"; - "18" = "${colors.base01}"; - "19" = "${colors.base02}"; - "20" = "${colors.base04}"; - "21" = "${colors.base06}"; + 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 + 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 + bright7 = "${palette.base07}"; # bright white + "16" = "${palette.base09}"; + "17" = "${palette.base0F}"; + "18" = "${palette.base01}"; + "19" = "${palette.base02}"; + "20" = "${palette.base04}"; + "21" = "${palette.base06}"; }; }; }; diff --git a/inputs/home/modules/desktop/terminal/kitty/default.nix b/inputs/home/modules/desktop/terminal/kitty/default.nix index 0efb0cf..c250c4d 100644 --- a/inputs/home/modules/desktop/terminal/kitty/default.nix +++ b/inputs/home/modules/desktop/terminal/kitty/default.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; fonts = config.homeModules.theme.font; cfg = config.homeModules.desktop.terminal.kitty; fish = config.homeModules.console.shell.fish; @@ -24,42 +24,42 @@ in scrollback_lines = 4000; scrollback_pager_history_size = 2048; window_padding_width = 1; - foreground = "#${colors.base05}"; - background = "#${colors.base00}"; + foreground = "#${palette.base05}"; + background = "#${palette.base00}"; background_opacity = "1.0"; - selection_background = "#${colors.base05}"; - selection_foreground = "#${colors.base00}"; - url_color = "#${colors.base04}"; - cursor = "#${colors.base05}"; - active_border_color = "#${colors.base03}"; - inactive_border_color = "#${colors.base01}"; - active_tab_background = "#${colors.base00}"; - active_tab_foreground = "#${colors.base05}"; - inactive_tab_background = "#${colors.base01}"; - inactive_tab_foreground = "#${colors.base04}"; - tab_bar_background = "#${colors.base01}"; - color0 = "#${colors.base00}"; - color1 = "#${colors.base08}"; - color2 = "#${colors.base0B}"; - color3 = "#${colors.base0A}"; - color4 = "#${colors.base0D}"; - color5 = "#${colors.base0E}"; - color6 = "#${colors.base0C}"; - color7 = "#${colors.base05}"; - color8 = "#${colors.base03}"; - color9 = "#${colors.base08}"; - color10 = "#${colors.base0B}"; - color11 = "#${colors.base0A}"; - color12 = "#${colors.base0D}"; - color13 = "#${colors.base0E}"; - color14 = "#${colors.base0C}"; - color15 = "#${colors.base07}"; - color16 = "#${colors.base09}"; - color17 = "#${colors.base0F}"; - color18 = "#${colors.base01}"; - color19 = "#${colors.base02}"; - color20 = "#${colors.base04}"; - color21 = "#${colors.base06}"; + selection_background = "#${palette.base05}"; + selection_foreground = "#${palette.base00}"; + url_color = "#${palette.base04}"; + cursor = "#${palette.base05}"; + active_border_color = "#${palette.base03}"; + inactive_border_color = "#${palette.base01}"; + active_tab_background = "#${palette.base00}"; + active_tab_foreground = "#${palette.base05}"; + inactive_tab_background = "#${palette.base01}"; + inactive_tab_foreground = "#${palette.base04}"; + tab_bar_background = "#${palette.base01}"; + color0 = "#${palette.base00}"; + color1 = "#${palette.base08}"; + color2 = "#${palette.base0B}"; + color3 = "#${palette.base0A}"; + color4 = "#${palette.base0D}"; + color5 = "#${palette.base0E}"; + color6 = "#${palette.base0C}"; + color7 = "#${palette.base05}"; + color8 = "#${palette.base03}"; + color9 = "#${palette.base08}"; + color10 = "#${palette.base0B}"; + color11 = "#${palette.base0A}"; + color12 = "#${palette.base0D}"; + color13 = "#${palette.base0E}"; + color14 = "#${palette.base0C}"; + color15 = "#${palette.base07}"; + color16 = "#${palette.base09}"; + color17 = "#${palette.base0F}"; + color18 = "#${palette.base01}"; + color19 = "#${palette.base02}"; + color20 = "#${palette.base04}"; + color21 = "#${palette.base06}"; }; }; }; diff --git a/inputs/home/modules/desktop/wayland/bar/waybar/default.nix b/inputs/home/modules/desktop/wayland/bar/waybar/default.nix index 6c7a2c3..e037f7c 100644 --- a/inputs/home/modules/desktop/wayland/bar/waybar/default.nix +++ b/inputs/home/modules/desktop/wayland/bar/waybar/default.nix @@ -1,10 +1,10 @@ -{ config, lib, pkgs, inputs, ... }: +{ config, lib, pkgs, ... }: let fonts = config.homeModules.theme.fonts; cfg = config.homeModules.desktop.wayland.bar.waybar; monitorWidth = (lib.head config.monitors).width - 20; - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; in { @@ -81,7 +81,7 @@ in * { font-family: "${fonts.monospace.family}"; font-size: 19px; - border: solid #${colors.base05}; + border: solid #${palette.base05}; } window#waybar { @@ -92,32 +92,32 @@ in #clock, #battery, #workspaces { - background-color: #${colors.base00}; + background-color: #${palette.base00}; padding-right: 10px; } #clock { padding-left: 10px; - border: 2px solid #${colors.base05}; + border: 2px solid #${palette.base05}; border-right: 0px; border-top-left-radius: 10px; } #battery { padding-left: 10px; - border-top: 2px solid #${colors.base05}; - border-bottom: 2px solid #${colors.base05}; + border-top: 2px solid #${palette.base05}; + border-bottom: 2px solid #${palette.base05}; border-left: 0px; } #battery.good { - color: #${colors.base0B}; + color: #${palette.base0B}; } #battery.warning { - color: #${colors.base0A}; + color: #${palette.base0A}; } #battery.critical { - color: #${colors.base08}; + color: #${palette.base08}; } #tray { @@ -128,7 +128,7 @@ in } #workspaces { - border: 2px solid #${colors.base05}; + border: 2px solid #${palette.base05}; border-left: 0; border-top-right-radius: 10px; } @@ -136,15 +136,15 @@ in #workspace button, #workspaces button.active, #workspaces button.visible { - color: #${colors.base0B}; + color: #${palette.base0B}; } #workspaces button.urgent { - color: #${colors.base08}; + color: #${palette.base08}; } #custom-hyprrecord { - color: #${colors.base08}; + color: #${palette.base08}; padding-right: 20px; } ''; diff --git a/inputs/home/modules/desktop/wayland/launcher/rofi/default.nix b/inputs/home/modules/desktop/wayland/launcher/rofi/default.nix index 7b491d8..957e26e 100644 --- a/inputs/home/modules/desktop/wayland/launcher/rofi/default.nix +++ b/inputs/home/modules/desktop/wayland/launcher/rofi/default.nix @@ -13,14 +13,14 @@ in package = pkgs.rofi-wayland; terminal = "${config.home.sessionVariables.TERMINAL}"; theme = let - inherit (config.colorscheme ) colors; + inherit (config.colorscheme ) palette; inherit (config.lib.formats.rasi) mkLiteral; in { "*" = { - background = mkLiteral "#${colors.base00}"; - foreground = mkLiteral "#${colors.base05}"; - selected = mkLiteral "#${colors.base0B}"; - message = mkLiteral "#${colors.base0D}"; + background = mkLiteral "#${palette.base00}"; + foreground = mkLiteral "#${palette.base05}"; + selected = mkLiteral "#${palette.base0B}"; + message = mkLiteral "#${palette.base0D}"; background-color = mkLiteral "@background"; border-color = mkLiteral "@foreground"; diff --git a/inputs/home/modules/desktop/wayland/launcher/tofi/default.nix b/inputs/home/modules/desktop/wayland/launcher/tofi/default.nix index 8afdb51..d066abe 100644 --- a/inputs/home/modules/desktop/wayland/launcher/tofi/default.nix +++ b/inputs/home/modules/desktop/wayland/launcher/tofi/default.nix @@ -3,7 +3,7 @@ let cfg = config.homeModules.desktop.wayland.launcher.tofi; fonts = config.homeModules.theme.fonts; - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; in { @@ -30,11 +30,11 @@ in prompt-text = "  " background-color = #0000 prompt-background = #0000 - prompt-color = ${colors.base0B} - input-color = ${colors.base05} - placeholder-color = ${colors.base03} - default-result-color = ${colors.base03} - selection-color = ${colors.base04} + prompt-color = ${palette.base0B} + input-color = ${palette.base05} + placeholder-color = ${palette.base03} + default-result-color = ${palette.base03} + selection-color = ${palette.base04} ''; }; diff --git a/inputs/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix b/inputs/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix index ea60131..88876d1 100644 --- a/inputs/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix +++ b/inputs/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix @@ -3,7 +3,7 @@ let cfg = config.homeModules.desktop.wayland.lockscreen.hyprlock; fonts = config.homeModules.theme.fonts; - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; in { @@ -25,7 +25,7 @@ in { monitor = ""; path = ""; - color = "0xff${colors.base01}"; + color = "0xff${palette.base01}"; } ]; input-fields = [ @@ -42,9 +42,9 @@ in dots_spacing = 0.2; fade_on_empty = false; placeholder_text = ""; - outer_color = "0xff${colors.base02}"; - inner_color = "0xff${colors.base00}"; - font_color = "0xff${colors.base05}"; + outer_color = "0xff${palette.base02}"; + inner_color = "0xff${palette.base00}"; + font_color = "0xff${palette.base05}"; } ]; labels = [ @@ -55,7 +55,7 @@ in x = 0; y = 80; }; - color = "0xff${colors.base08}"; + color = "0xff${palette.base08}"; font_size = 30; font_family = "${fonts.monospace.family}"; } @@ -66,7 +66,7 @@ in x = 0; y = -80; }; - color = "0xff${colors.base0B}"; + color = "0xff${palette.base0B}"; font_size = 20; font_family = "${fonts.monospace.family}"; } diff --git a/inputs/home/modules/desktop/wayland/lockscreen/swaylock/default.nix b/inputs/home/modules/desktop/wayland/lockscreen/swaylock/default.nix index a0e7aa7..3249e09 100644 --- a/inputs/home/modules/desktop/wayland/lockscreen/swaylock/default.nix +++ b/inputs/home/modules/desktop/wayland/lockscreen/swaylock/default.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let - inherit (config.colorscheme) colors; + inherit (config.colorscheme) palette; fonts = config.homeModules.theme.fonts; wallpaperPath = config.homeModules.theme.wallpaper.path; cfg = config.homeModules.desktop.wayland.lockscreen.swaylock; @@ -14,25 +14,25 @@ in settings = { image = "${wallpaperPath}"; font = fonts.monospace.family; - color = "#${colors.base01}"; - ring-color = "#${colors.base02}"; - inside-wrong-color = "#${colors.base08}"; - ring-wrong-color = "#${colors.base08}"; - key-hl-color = "#${colors.base0B}"; - bs-hl-color = "#${colors.base08}"; - ring-ver-color = "#${colors.base09}"; - inside-ver-color = "#${colors.base09}"; - inside-color = "#${colors.base01}"; - text-color = "#${colors.base07}"; - text-clear-color = "#${colors.base01}"; - text-ver-color = "#${colors.base01}"; - text-wrong-color = "#${colors.base01}"; - text-caps-lock-color = "#${colors.base07}"; - inside-clear-color = "#${colors.base0C}"; - ring-clear-color = "#${colors.base0C}"; - inside-caps-lock-color = "#${colors.base09}"; - ring-caps-lock-color = "#${colors.base02}"; - separator-color = "#${colors.base02}"; + color = "#${palette.base01}"; + ring-color = "#${palette.base02}"; + inside-wrong-color = "#${palette.base08}"; + ring-wrong-color = "#${palette.base08}"; + key-hl-color = "#${palette.base0B}"; + bs-hl-color = "#${palette.base08}"; + ring-ver-color = "#${palette.base09}"; + inside-ver-color = "#${palette.base09}"; + inside-color = "#${palette.base01}"; + text-color = "#${palette.base07}"; + text-clear-color = "#${palette.base01}"; + text-ver-color = "#${palette.base01}"; + text-wrong-color = "#${palette.base01}"; + text-caps-lock-color = "#${palette.base07}"; + inside-clear-color = "#${palette.base0C}"; + ring-clear-color = "#${palette.base0C}"; + inside-caps-lock-color = "#${palette.base09}"; + ring-caps-lock-color = "#${palette.base02}"; + separator-color = "#${palette.base02}"; }; }; }; diff --git a/inputs/home/modules/desktop/wayland/notification/mako/default.nix b/inputs/home/modules/desktop/wayland/notification/mako/default.nix index 45d49cf..e1da750 100644 --- a/inputs/home/modules/desktop/wayland/notification/mako/default.nix +++ b/inputs/home/modules/desktop/wayland/notification/mako/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: let - inherit (config.colorscheme) colors kind; + inherit (config.colorscheme) palette variant; fonts = config.homeModules.theme.fonts; cfg = config.homeModules.desktop.wayland.notification.mako; in { @@ -8,7 +8,7 @@ in { services.mako = { enable = true; iconPath = - if kind == "dark" then + if variant == "dark" then "${config.gtk.iconTheme.package}/share/icons/Papirus-Dark" else "${config.gtk.iconTheme.package}/share/icons/Papirus-Light"; @@ -19,9 +19,9 @@ in { height = 100; borderSize = 2; defaultTimeout = 3000; - backgroundColor = "#${colors.base00}dd"; - borderColor = "#${colors.base05}dd"; - textColor = "#${colors.base05}dd"; + backgroundColor = "#${palette.base00}dd"; + borderColor = "#${palette.base05}dd"; + textColor = "#${palette.base05}dd"; extraConfig = '' [app-name="system-notify"] padding=3,3 @@ -32,7 +32,7 @@ in { width=100 height=100 anchor=top-center - border-color=#${colors.base08}dd + border-color=#${palette.base08}dd ''; }; }; diff --git a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix index fec2cc4..d477121 100644 --- a/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix +++ b/inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix @@ -3,6 +3,7 @@ let cfg = config.homeModules.desktop.wayland.windowManager.hyprland; pointer = config.home.pointerCursor; + inherit (config.colorscheme) palette; in { @@ -16,8 +17,8 @@ in gaps_in = 10; gaps_out = 10; border_size = 2; - "col.active_border" = "0xff${config.colorscheme.colors.base05}"; - "col.inactive_border" = "0xff${config.colorscheme.colors.base02}"; + "col.active_border" = "0xff${palette.base05}"; + "col.inactive_border" = "0xff${palette.base02}"; }; exec-once = [