fix(nix-colors): config.colorscheme.colors -> config.colorscheme.palette
This commit is contained in:
parent
58447dcf84
commit
5f3c9de7e7
21 changed files with 282 additions and 282 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue