home: coloscheme module -> hozen arg

This commit is contained in:
ooks-io 2024-11-18 17:47:27 +11:00
parent edc99e84ef
commit ecbb5c8700
13 changed files with 263 additions and 237 deletions

View file

@ -3,9 +3,10 @@
config, config,
lib, lib,
pkgs, pkgs,
hozen,
... ...
}: let }: let
inherit (osConfig.ooknet.appearance.colorscheme) slug palette; inherit (hozen) color;
inherit (osConfig.ooknet) console; inherit (osConfig.ooknet) console;
inherit (osConfig.ooknet.host) admin; inherit (osConfig.ooknet.host) admin;
inherit (lib) mkIf; inherit (lib) mkIf;
@ -16,24 +17,24 @@ in {
programs.zellij = { programs.zellij = {
enable = true; enable = true;
settings = { settings = {
theme = "${slug}"; theme = "${color.slug}";
default_shell = "${admin.shell}"; default_shell = "${admin.shell}";
default_layout = "default"; default_layout = "default";
pane_frames = false; pane_frames = false;
scrollback_editor = "${console.editor}"; scrollback_editor = "${console.editor}";
themes = { themes = {
"${slug}" = { "${color.slug}" = {
fg = "#${palette.base05}"; fg = "#${color.base05}";
bg = "#${palette.base00}"; bg = "#${color.base00}";
black = "#${palette.base00}"; black = "#${color.base00}";
red = "#${palette.base08}"; red = "#${color.base08}";
green = "#${palette.base0B}"; green = "#${color.base0B}";
yellow = "#${palette.base0A}"; yellow = "#${color.base0A}";
blue = "#${palette.base0D}"; blue = "#${color.base0D}";
magenta = "#${palette.base0E}"; magenta = "#${color.base0E}";
cyan = "#${palette.base0C}"; cyan = "#${color.base0C}";
white = "#${palette.base05}"; white = "#${color.base05}";
orange = "#${palette.base09}"; orange = "#${color.base09}";
}; };
}; };
}; };
@ -42,11 +43,11 @@ in {
# Layouts # Layouts
xdg.configFile = { xdg.configFile = {
# Default layout # Default layout
"zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix {inherit pkgs config osConfig;}; "zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix {inherit pkgs config osConfig hozen;};
# Layout for bash scripts # Layout for bash scripts
"zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix {inherit pkgs config osConfig;}; "zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix {inherit pkgs config osConfig hozen;};
# Layout for configuring my flake # Layout for configuring my flake
"zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix {inherit pkgs config osConfig;}; "zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix {inherit pkgs config osConfig hozen;};
# Additional keybinds # Additional keybinds
"zellij/config.kdl".text = "zellij/config.kdl".text =
# kdl # kdl

View file

@ -1,9 +1,10 @@
{ {
pkgs, pkgs,
osConfig, osConfig,
hozen,
... ...
}: let }: let
inherit (osConfig.ooknet.appearance.colorscheme) palette; inherit (hozen) color;
in { in {
text = text =
# kdl # kdl
@ -14,40 +15,40 @@ in {
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
format_left "{mode}" format_left "{mode}"
format_right "{session} {command_git_branch} {datetime}" format_right "{session} {command_git_branch} {datetime}"
format_center "#[fg=#${palette.base0D},bold] {tabs}" format_center "#[fg=#${color.base0D},bold] {tabs}"
format_space "" format_space ""
border_enabled "true" border_enabled "true"
border_char "" border_char ""
border_format "#[fg=#${palette.base05}]{char}" border_format "#[fg=#${color.base05}]{char}"
border_position "bottom" border_position "bottom"
hide_frame_for_single_pane "true" hide_frame_for_single_pane "true"
mode_normal "#[fg=#${palette.base0D}] " mode_normal "#[fg=#${color.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] " mode_tmux "#[fg=#${color.base0E}] "
mode_pane "#[fg=#${palette.base08}] " mode_pane "#[fg=#${color.base08}] "
mode_tab "#[fg=#${palette.base08}] " mode_tab "#[fg=#${color.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] " mode_rename_tab "#[fg=#${color.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] " mode_rename_pane "#[fg=#${color.base08}] "
mode_session "#[fg=#${palette.base08}] " mode_session "#[fg=#${color.base08}] "
mode_locked "#[fg=#${palette.base05}] " mode_locked "#[fg=#${color.base05}] "
mode_move "#[fg=#${palette.base0B}] " mode_move "#[fg=#${color.base0B}] "
mode_resize "#[fg=#${palette.base0B}] " mode_resize "#[fg=#${color.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] " mode_prompt "#[fg=#${color.base0A}] "
mode_search "#[fg=#${palette.base0A}] " mode_search "#[fg=#${color.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] " mode_enter_search "#[fg=#${color.base0A}] "
tab_normal "#[bg=#${palette.base01}] {name} " tab_normal "#[bg=#${color.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} " tab_active "#[bg=#${color.base02}] {name} "
tab_separator " " tab_separator " "
command_git_branch_command "git rev-parse --abbrev-ref HEAD" command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} " command_git_branch_format "#[fg=#${color.base0C}] {stdout} "
command_git_branch_interval "10" command_git_branch_interval "10"
command_git_branch_rendermode "static" command_git_branch_rendermode "static"
datetime "#[fg=#${palette.base05},bold] {format} " datetime "#[fg=#${color.base05},bold] {format} "
datetime_format "%I:%M %p" datetime_format "%I:%M %p"
datetime_timezone "${osConfig.time.timeZone}" datetime_timezone "${osConfig.time.timeZone}"
} }

View file

@ -1,9 +1,10 @@
{ {
pkgs, pkgs,
hozen,
osConfig, osConfig,
... ...
}: let }: let
inherit (osConfig.ooknet.appearance.colorscheme) palette; inherit (hozen) color;
in { in {
text = text =
/* /*
@ -16,40 +17,40 @@ in {
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
format_left "{mode}" format_left "{mode}"
format_right "{session} {command_git_branch} {datetime}" format_right "{session} {command_git_branch} {datetime}"
format_center "#[fg=#${palette.base0D},bold] {tabs}" format_center "#[fg=#${color.base0D},bold] {tabs}"
format_space "" format_space ""
border_enabled "true" border_enabled "true"
border_char "" border_char ""
border_format "#[fg=#${palette.base05}]{char}" border_format "#[fg=#${color.base05}]{char}"
border_position "bottom" border_position "bottom"
hide_frame_for_single_pane "true" hide_frame_for_single_pane "true"
mode_normal "#[fg=#${palette.base0D}] " mode_normal "#[fg=#${color.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] " mode_tmux "#[fg=#${color.base0E}] "
mode_pane "#[fg=#${palette.base08}] " mode_pane "#[fg=#${color.base08}] "
mode_tab "#[fg=#${palette.base08}] " mode_tab "#[fg=#${color.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] " mode_rename_tab "#[fg=#${color.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] " mode_rename_pane "#[fg=#${color.base08}] "
mode_session "#[fg=#${palette.base08}] " mode_session "#[fg=#${color.base08}] "
mode_locked "#[fg=#${palette.base05}] " mode_locked "#[fg=#${color.base05}] "
mode_move "#[fg=#${palette.base0B}] " mode_move "#[fg=#${color.base0B}] "
mode_resize "#[fg=#${palette.base0B}] " mode_resize "#[fg=#${color.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] " mode_prompt "#[fg=#${color.base0A}] "
mode_search "#[fg=#${palette.base0A}] " mode_search "#[fg=#${color.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] " mode_enter_search "#[fg=#${color.base0A}] "
tab_normal "#[bg=#${palette.base01}] {name} " tab_normal "#[bg=#${color.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} " tab_active "#[bg=#${color.base02}] {name} "
tab_separator " " tab_separator " "
command_git_branch_command "git rev-parse --abbrev-ref HEAD" command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} " command_git_branch_format "#[fg=#${color.base0C}] {stdout} "
command_git_branch_interval "10" command_git_branch_interval "10"
command_git_branch_rendermode "static" command_git_branch_rendermode "static"
datetime "#[fg=#${palette.base05},bold] {format} " datetime "#[fg=#${color.base05},bold] {format} "
datetime_format "%I:%M %p" datetime_format "%I:%M %p"
datetime_timezone "${osConfig.time.timeZone}" datetime_timezone "${osConfig.time.timeZone}"
} }

View file

@ -1,9 +1,10 @@
{ {
pkgs, pkgs,
hozen,
osConfig, osConfig,
... ...
}: let }: let
inherit (osConfig.ooknet.appearance.colorscheme) palette; inherit (hozen) color;
in { in {
text = text =
/* /*
@ -16,40 +17,40 @@ in {
plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
format_left "{mode}" format_left "{mode}"
format_right "{session} {command_git_branch} {datetime}" format_right "{session} {command_git_branch} {datetime}"
format_center "#[fg=#${palette.base0D},bold] {tabs}" format_center "#[fg=#${color.base0D},bold] {tabs}"
format_space "" format_space ""
border_enabled "true" border_enabled "true"
border_char "" border_char ""
border_format "#[fg=#${palette.base05}]{char}" border_format "#[fg=#${color.base05}]{char}"
border_position "bottom" border_position "bottom"
hide_frame_for_single_pane "true" hide_frame_for_single_pane "true"
mode_normal "#[fg=#${palette.base0D}] " mode_normal "#[fg=#${color.base0D}] "
mode_tmux "#[fg=#${palette.base0E}] " mode_tmux "#[fg=#${color.base0E}] "
mode_pane "#[fg=#${palette.base08}] " mode_pane "#[fg=#${color.base08}] "
mode_tab "#[fg=#${palette.base08}] " mode_tab "#[fg=#${color.base08}] "
mode_rename_tab "#[fg=#${palette.base08}] " mode_rename_tab "#[fg=#${color.base08}] "
mode_rename_pane "#[fg=#${palette.base08}] " mode_rename_pane "#[fg=#${color.base08}] "
mode_session "#[fg=#${palette.base08}] " mode_session "#[fg=#${color.base08}] "
mode_locked "#[fg=#${palette.base05}] " mode_locked "#[fg=#${color.base05}] "
mode_move "#[fg=#${palette.base0B}] " mode_move "#[fg=#${color.base0B}] "
mode_resize "#[fg=#${palette.base0B}] " mode_resize "#[fg=#${color.base0B}] "
mode_prompt "#[fg=#${palette.base0A}] " mode_prompt "#[fg=#${color.base0A}] "
mode_search "#[fg=#${palette.base0A}] " mode_search "#[fg=#${color.base0A}] "
mode_enter_search "#[fg=#${palette.base0A}] " mode_enter_search "#[fg=#${color.base0A}] "
tab_normal "#[bg=#${palette.base01}] {name} " tab_normal "#[bg=#${color.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} " tab_active "#[bg=#${color.base02}] {name} "
tab_separator " " tab_separator " "
command_git_branch_command "git rev-parse --abbrev-ref HEAD" command_git_branch_command "git rev-parse --abbrev-ref HEAD"
command_git_branch_format "#[fg=#${palette.base0C}] {stdout} " command_git_branch_format "#[fg=#${color.base0C}] {stdout} "
command_git_branch_interval "10" command_git_branch_interval "10"
command_git_branch_rendermode "static" command_git_branch_rendermode "static"
datetime "#[fg=#${palette.base05},bold] {format} " datetime "#[fg=#${color.base05},bold] {format} "
datetime_format "%I:%M %p" datetime_format "%I:%M %p"
datetime_timezone "${osConfig.time.timeZone}" datetime_timezone "${osConfig.time.timeZone}"
} }

View file

@ -1,11 +1,12 @@
{ {
osConfig, osConfig,
hozen,
pkgs, pkgs,
... ...
}: let }: let
inherit (osConfig.ooknet.appearance) fonts; inherit (osConfig.ooknet.appearance) fonts;
gtkCss = import ./gtkCss.nix {inherit osConfig;}; gtkCss = import ./gtkCss.nix {inherit hozen;};
in { in {
config = rec { config = rec {
gtk = { gtk = {
@ -30,7 +31,10 @@ in {
gtk4.extraConfig.gtk-application-prefer-dark-theme = true; gtk4.extraConfig.gtk-application-prefer-dark-theme = true;
}; };
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; dconf.settings = {
"org/gnome/desktop/interface".color-scheme = "prefer-dark";
"org/gtk/Settings/Debug".enable-inspector-keybinding = true;
};
#TODO: add gtk css configuration #TODO: add gtk css configuration

View file

@ -1,94 +1,106 @@
{osConfig}: let {hozen}: let
inherit (osConfig.ooknet.appearance.colorscheme) palette; inherit (hozen) color;
in in
with palette; /*
#css css
'' */
''
@define-color accent_color #${green}; @define-color accent_color #${color.primary.base};
@define-color accent_bg_color #${text}; @define-color accent_bg_color #${color.primary.soft1};
@define-color accent_fg_color #${mantle}; @define-color accent_fg_color #${color.layout.menu};
@define-color destructive_color #${blue};
@define-color destructive_bg_color #${dull-blue}; @define-color destructive_color #${color.blue.base};
@define-color destructive_fg_color #${text}; @define-color destructive_bg_color #${color.blue.soft2};
@define-color success_color #${cyan}; @define-color destructive_fg_color #${color.typography.text};
@define-color success_bg_color #${green};
@define-color success_fg_color #${text}; @define-color success_color #${color.success.base};
@define-color warning_color #${yellow}; @define-color success_bg_color #${color.success.bg};
@define-color warning_bg_color #${red}; @define-color success_fg_color #${color.success.fg};
@define-color warning_fg_color #${text};
@define-color error_color #${red}; @define-color warning_color #${color.warning.base};
@define-color error_bg_color #${dull-red}; @define-color warning_bg_color #${color.warning.bg};
@define-color error_fg_color #${text}; @define-color warning_fg_color #${color.warning.fg};
@define-color window_bg_color #${crust};
@define-color window_fg_color #${text}; @define-color error_color #${color.error.base};
@define-color view_bg_color #${mantle}; @define-color error_bg_color #${color.error.bg};
@define-color view_fg_color #${text}; @define-color error_fg_color #${color.error.fg};
@define-color sidebar_bg_color #${crust};
@define-color sidebar_fg_color #${text}; @define-color window_bg_color #${color.layout.menu};
@define-color sidebar_backdrop_color @window_bg_color; @define-color window_fg_color #${color.typography.text};
@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
@define-color secondary_sidebar_bg_color @sidebar_bg_color; @define-color view_bg_color #${color.layout.body};
@define-color secondary_sidebar_fg_color @sidebar_fg_color; @define-color view_fg_color #${color.typography.text};
@define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
@define-color secondary_sidebar_shade_color @sidebar_shade_color; @define-color sidebar_bg_color #${color.layout.menu};
@define-color headerbar_bg_color #${base}; @define-color sidebar_fg_color #${color.typography.text};
@define-color headerbar_fg_color #${text}; @define-color sidebar_backdrop_color @window_bg_color;
@define-color headerbar_border_color #${text}; @define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
@define-color headerbar_backdrop_color @window_bg_color; @define-color secondary_sidebar_bg_color @sidebar_bg_color;
@define-color headerbar_shade_color rgba(0, 0, 0, 0.36); @define-color secondary_sidebar_fg_color @sidebar_fg_color;
@define-color card_bg_color rgba(255, 255, 255, 0.08); @define-color secondary_sidebar_backdrop_color @sidebar_backdrop_color;
@define-color card_fg_color #${text}; @define-color secondary_sidebar_shade_color @sidebar_shade_color;
@define-color card_shade_color rgba(0, 0, 0, 0.36); @define-color headerbar_bg_color #${color.layout.header};
@define-color dialog_bg_color #${mantle}; @define-color headerbar_fg_color #${color.typography.text};
@define-color dialog_fg_color #${text}; @define-color headerbar_border_color #${color.border.base};
@define-color popover_bg_color #${mantle}; @define-color headerbar_backdrop_color @window_bg_color;
@define-color popover_fg_color #${text}; @define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
@define-color shade_color rgba(0,0,0,0.36); @define-color card_bg_color rgba(255, 255, 255, 0.08);
@define-color scrollbar_outline_color rgba(0,0,0,0.5); @define-color card_fg_color #${color.typography.text};
@define-color blue_1 #${blue}; @define-color card_shade_color rgba(0, 0, 0, 0.36);
@define-color blue_2 #${blue}; @define-color dialog_bg_color #${color.layout.body};
@define-color blue_3 #${blue}; @define-color dialog_fg_color #${color.typography.text};
@define-color blue_4 #${blue}; @define-color popover_bg_color #${color.layout.menu};
@define-color blue_5 #${blue}; @define-color popover_fg_color #${color.typography.text};
@define-color green_1 #b8bb26; @define-color shade_color rgba(0,0,0,0.36);
@define-color green_2 #b8bb26; @define-color scrollbar_outline_color rgba(0,0,0,0.5);
@define-color green_3 #b8bb26; @define-color blue_1 #${color.blue.base};
@define-color green_4 #b8bb26; @define-color blue_2 #${color.blue.base};
@define-color green_5 #b8bb26; @define-color blue_3 #${color.blue.base};
@define-color yellow_1 #fabd2f; @define-color blue_4 #${color.blue.base};
@define-color yellow_2 #fabd2f; @define-color blue_5 #${color.blue.base};
@define-color yellow_3 #fabd2f; @define-color green_1 #${color.green.base};
@define-color yellow_4 #fabd2f; @define-color green_2 #${color.green.base};
@define-color yellow_5 #fabd2f; @define-color green_3 #${color.green.base};
@define-color orange_1 #fe8019; @define-color green_4 #${color.green.base};
@define-color orange_2 #fe8019; @define-color green_5 #${color.green.base};
@define-color orange_3 #fe8019; @define-color yellow_1 #${color.yellow.base};
@define-color orange_4 #fe8019; @define-color yellow_2 #${color.yellow.base};
@define-color orange_5 #fe8019; @define-color yellow_3 #${color.yellow.base};
@define-color red_1 #fb4934; @define-color yellow_4 #${color.yellow.base};
@define-color red_2 #fb4934; @define-color yellow_5 #${color.yellow.base};
@define-color red_3 #fb4934; @define-color orange_1 #${color.orange.base};
@define-color red_4 #fb4934; @define-color orange_2 #${color.orange.base};
@define-color red_5 #fb4934; @define-color orange_3 #${color.orange.base};
@define-color purple_1 #d3869b; @define-color orange_4 #${color.orange.base};
@define-color purple_2 #d3869b; @define-color orange_5 #${color.orange.base};
@define-color purple_3 #d3869b; @define-color red_1 #${color.red.base};
@define-color purple_4 #d3869b; @define-color red_2 #${color.red.base};
@define-color purple_5 #d3869b; @define-color red_3 #${color.red.base};
@define-color brown_1 #d65d0e; @define-color red_4 #${color.red.base};
@define-color brown_2 #d65d0e; @define-color red_5 #${color.red.base};
@define-color brown_3 #d65d0e; @define-color purple_1 #${color.purple.base};
@define-color brown_4 #d65d0e; @define-color purple_2 #${color.purple.base};
@define-color brown_5 #d65d0e; @define-color purple_3 #${color.purple.base};
@define-color light_1 #${base05}; @define-color purple_4 #${color.purple.base};
@define-color light_2 #${base06}; @define-color purple_5 #${color.purple.base};
@define-color light_3 #${base07}; @define-color brown_1 #${color.brown.base};
@define-color light_4 #${base07}; @define-color brown_2 #${color.brown.base};
@define-color light_5 #${base07}; @define-color brown_3 #${color.brown.base};
@define-color dark_1 #${base00}; @define-color brown_4 #${color.brown.base};
@define-color dark_2 #${base01}; @define-color brown_5 #${color.brown.base};
@define-color dark_3 #${base02}; @define-color light_1 #${color.neutrals."250"};
@define-color dark_4 #${base03}; @define-color light_2 #${color.neutrals."200"};
@define-color dark_5 #${base04}; @define-color light_3 #${color.neutrals."150"};
'' @define-color light_4 #${color.neutrals."100"};
@define-color light_5 #${color.neutrals."50"};
@define-color dark_1 #${color.neutrals."700"};
@define-color dark_2 #${color.neutrals."750"};
@define-color dark_3 #${color.neutrals."800"};
@define-color dark_4 #${color.neutrals."850"};
@define-color dark_5 #${color.neutrals."900"};
* {
border-radius: 0;
}
''

View file

@ -8,8 +8,7 @@
}: let }: let
inherit (lib) mkIf mkMerge; inherit (lib) mkIf mkMerge;
inherit (osConfig.ooknet.host) admin; inherit (osConfig.ooknet.host) admin;
inherit (osConfig.ooknet.appearance) colorscheme fonts; inherit (osConfig.ooknet.appearance) fonts;
inherit (colorscheme) palette;
inherit (osConfig.ooknet.workstation) default; inherit (osConfig.ooknet.workstation) default;
addons = inputs'.firefox-addons.packages; addons = inputs'.firefox-addons.packages;

View file

@ -26,15 +26,19 @@ in
border-radius: 0 !important; border-radius: 0 !important;
font-family: ${fonts.monospace.family}; font-family: ${fonts.monospace.family};
} }
#nav-bar { #nav-bar {
border: var(--border) !important; border: var(--border) !important;
background-color: var(--clr-menu) !important; background-color: var(--clr-menu) !important;
margin-top: 0px !important;
} }
#urlbar { #urlbar {
text-align: center; text-align: center;
} }
.browser-toolbar {
padding-bottom: 1px !important;
}
#urlbar-background { #urlbar-background {
background-color: transparent !important; background-color: transparent !important;
border: unset !important; border: unset !important;
@ -102,13 +106,13 @@ in
} }
.tabbrowser-tab { .tabbrowser-tab {
padding: 5px !important; padding: 3px !important;
padding-left: 5px !important; padding-left: 3px !important;
--tab-label-mask-size: unset !important;
} }
.tabbrowser-tab[pinned] { .tabbrowser-tab[pinned] {
margin: 0px !important; padding: 3px !important;
padding: 5px !important;
} }
#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])[orient="horizontal"] > #tabbrowser-arrowscrollbox > .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) { #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])[orient="horizontal"] > #tabbrowser-arrowscrollbox > .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) {

View file

@ -1,11 +1,12 @@
{ {
lib, lib,
osConfig, osConfig,
hozen,
... ...
}: let }: let
inherit (lib) mkIf; inherit (lib) mkIf;
inherit (osConfig.ooknet.appearance) colorscheme fonts; inherit (osConfig.ooknet.appearance) fonts;
inherit (colorscheme) palette; inherit (hozen) color;
inherit (osConfig.ooknet.workstation) default; inherit (osConfig.ooknet.workstation) default;
cfg = osConfig.ooknet.workstation.programs.firefox; cfg = osConfig.ooknet.workstation.programs.firefox;
in { in {
@ -55,17 +56,17 @@ in {
'' ''
:root { :root {
--font: ${fonts.monospace.family}; --font: ${fonts.monospace.family};
--bg: #${palette.base00}; --bg: #${color.layout.menu};
--fg: #${palette.base05}; --fg: #${color.typography.text};
--red: #${palette.base08}; --red: #${color.red.base};
--green: #${palette.base0B}; --green: #${color.green.base};
--blue: #${palette.base0D}; --blue: #${color.blue.base};
--yellow: #${palette.base0A}; --yellow: #${color.yellow.base};
--purple: #${palette.base0E}; --purple: #${color.purple.base};
--orange: #${palette.base09}; --orange: #${color.orange.base};
--cyan: #${palette.base0C}; --cyan: #${color.teal.base};
--comment: #${palette.base04}; --comment: #${color.typography.subtext};
--selectedline: #${palette.base02}; --selectedline: #${color.secondary.base};
--tridactyl-fg: var(--fg); --tridactyl-fg: var(--fg);

View file

@ -1,13 +1,13 @@
{ {
config,
osConfig, osConfig,
hozen,
lib, lib,
pkgs, pkgs,
... ...
}: let }: let
inherit (lib) mkIf elem; inherit (lib) mkIf elem;
inherit (osConfig.ooknet.appearance) colorscheme fonts; inherit (hozen) color;
inherit (colorscheme) palette; inherit (osConfig.ooknet.appearance) fonts;
inherit (osConfig.ooknet.workstation) profiles; inherit (osConfig.ooknet.workstation) profiles;
vesktopMime = {"x-scheme-handler/discord" = ["vesktop.desktop"];}; vesktopMime = {"x-scheme-handler/discord" = ["vesktop.desktop"];};
@ -18,6 +18,7 @@ in {
(pkgs.vesktop.overrideAttrs (old: { (pkgs.vesktop.overrideAttrs (old: {
patches = (old.patches or []) ++ [./vesktop-patch.patch]; patches = (old.patches or []) ++ [./vesktop-patch.patch];
})) }))
pkgs.equibop
]; ];
xdg.configFile."vesktop/themes/nix.css".text = xdg.configFile."vesktop/themes/nix.css".text =
@ -32,17 +33,17 @@ in {
*/ */
:root { :root {
--nix-bg1: #${palette.base00}; --nix-bg1: #${color.base00};
--nix-bg2: #${palette.base01}; --nix-bg2: #${color.base01};
--nix-bg3: #${palette.base02}; --nix-bg3: #${color.base02};
--nix-fg1: #${palette.base05}; --nix-fg1: #${color.base05};
--nix-fg2: #${palette.base07}; --nix-fg2: #${color.base07};
--nix-fg3: #${palette.base03}; --nix-fg3: #${color.base03};
--nix-link: #${palette.base0D}; --nix-link: #${color.base0D};
--nix-accent: #${palette.base08}; --nix-accent: #${color.base08};
--nix-hi: #${palette.base0B}; --nix-hi: #${color.base0B};
--font-mono: ${fonts.monospace.family}, monospace; --font-mono: ${fonts.monospace.family}, monospace;
--font-regular: ${fonts.regular.family}, sans serif; --font-regular: ${fonts.regular.family}, sans serif;

View file

@ -3,17 +3,18 @@
pkgs, pkgs,
config, config,
lib, lib,
hozen,
... ...
}: let }: let
inherit (lib) mkIf getExe elem; inherit (lib) mkIf getExe elem;
inherit (builtins) attrValues; inherit (builtins) attrValues;
inherit (osConfig.ooknet.appearance.colorscheme) palette;
inherit (osConfig.networking) hostName; inherit (osConfig.networking) hostName;
inherit (osConfig.ooknet.console.tools) zellij; inherit (osConfig.ooknet.console.tools) zellij;
inherit (osConfig.ooknet.console) multiplexer; inherit (osConfig.ooknet.console) multiplexer;
inherit (osConfig.ooknet.workstation) profiles; inherit (osConfig.ooknet.workstation) profiles;
inherit (osConfig.age.secrets) spotify_key; inherit (osConfig.age.secrets) spotify_key;
inherit (config.ooknet) binds; inherit (config.ooknet) binds;
inherit (hozen) color;
in { in {
config = mkIf (elem "media" profiles) { config = mkIf (elem "media" profiles) {
home.packages = attrValues { home.packages = attrValues {
@ -78,11 +79,11 @@ in {
color = { color = {
gradient = 1; gradient = 1;
gradient_count = 5; gradient_count = 5;
gradient_color_1 = "'#${palette.base0A}'"; gradient_color_1 = "'#${color.primary.base}'";
gradient_color_2 = "'#${palette.base0B}'"; gradient_color_2 = "'#${color.primary.hard1}'";
gradient_color_3 = "'#${palette.base0C}'"; gradient_color_3 = "'#${color.primary.hard2}'";
gradient_color_4 = "'#${palette.base0D}'"; gradient_color_4 = "'#${color.primary.hard3}'";
gradient_color_5 = "'#${palette.base0E}'"; gradient_color_5 = "'#${color.primary.hard4}'";
}; };
}; };
}; };
@ -105,18 +106,18 @@ in {
border_enabled "true" border_enabled "true"
border_char "" border_char ""
border_format "#[fg=#${palette.base0D}]{char}" border_format "#[fg=#${color.base0D}]{char}"
border_position "bottom" border_position "bottom"
hide_frame_for_single_pane "true" hide_frame_for_single_pane "true"
mode_normal "#[fg=${palette.base0D}]󰝚" mode_normal "#[fg=${color.base0D}]󰝚"
tab_normal "#[bg=#${palette.base01}] {name} " tab_normal "#[bg=#${color.base01}] {name} "
tab_active "#[bg=#${palette.base02}] {name} " tab_active "#[bg=#${color.base02}] {name} "
tab_separator " " tab_separator " "
datetime "#[fg=#${palette.base05},bold] {format} " datetime "#[fg=#${color.base05},bold] {format} "
datetime_format "%I:%M %p" datetime_format "%I:%M %p"
datetime_timezone "${osConfig.time.timeZone}" datetime_timezone "${osConfig.time.timeZone}"
} }

View file

@ -1,12 +1,13 @@
{ {
lib, lib,
osConfig, osConfig,
hozen,
... ...
}: let }: let
inherit (lib) mkIf elem; inherit (lib) mkIf elem;
inherit (osConfig.ooknet.appearance.colorscheme) palette;
inherit (osConfig.ooknet.appearance) fonts; inherit (osConfig.ooknet.appearance) fonts;
inherit (osConfig.ooknet.workstation) profiles; inherit (osConfig.ooknet.workstation) profiles;
inherit (hozen) color;
zathuraMime = {"application/pdf" = ["org.pwmt.zathura.desktop"];}; zathuraMime = {"application/pdf" = ["org.pwmt.zathura.desktop"];};
in { in {
@ -17,26 +18,26 @@ in {
font = "${fonts.regular.family} 14"; font = "${fonts.regular.family} 14";
recolor = true; recolor = true;
selection-clipboard = "clipboard"; selection-clipboard = "clipboard";
default-bg = "#${palette.base00}"; default-bg = "#${color.layout.body}";
default-fg = "#${palette.base01}"; default-fg = "#${color.typography.text}";
statusbar-bg = "#${palette.base02}"; statusbar-bg = "#${color.layout.header}";
statusbar-fg = "#${palette.base04}"; statusbar-fg = "#${color.typography.text}";
inputbar-bg = "#${palette.base00}"; inputbar-bg = "#${color.layout.menu}";
inputbar-fg = "#${palette.base07}"; inputbar-fg = "#${color.typography.text-bright}";
notification-bg = "#${palette.base00}"; notification-bg = "#${color.layout.menu}";
notification-fg = "#${palette.base07}"; notification-fg = "#${color.typography.text}";
notification-error-bg = "#${palette.base00}"; notification-error-bg = "#${color.layout.menu}";
notification-error-fg = "#${palette.base08}"; notification-error-fg = "#${color.error.base}";
notification-warning-bg = "#${palette.base00}"; notification-warning-bg = "#${color.layout.menu}";
notification-warning-fg = "#${palette.base08}"; notification-warning-fg = "#${color.warning.base}";
highlight-color = "#${palette.base0A}"; highlight-color = "#${color.primary.base}";
highlight-active-color = "#${palette.base0D}"; highlight-active-color = "#${color.primary.hard1}";
completion-bg = "#${palette.base01}"; completion-bg = "#${color.layout.menu}";
completion-fg = "#${palette.base05}"; completion-fg = "#${color.typography.text}";
completions-highlight-bg = "#${palette.base0D}"; completion-highlight-bg = "#${color.primary.base}";
completions-highlight-fg = "#${palette.base07}"; completion-highlight-fg = "#${color.typography.contrast-text}";
recolor-lightcolor = "#${palette.base00}"; recolor-lightcolor = "#${color.typography.text}";
recolor-darkcolor = "#${palette.base06}"; recolor-darkcolor = "#${color.layout.body}";
}; };
}; };
xdg.mimeApps = { xdg.mimeApps = {

View file

@ -4,8 +4,7 @@
hozen, hozen,
... ...
}: let }: let
inherit (osConfig.ooknet.appearance) colorscheme fonts; inherit (osConfig.ooknet.appearance) fonts;
inherit (colorscheme) palette;
inherit (hozen) color; inherit (hozen) color;
inherit (lib) mkMerge mkIf; inherit (lib) mkMerge mkIf;
inherit (osConfig.ooknet.workstation) default; inherit (osConfig.ooknet.workstation) default;