feat(nixos:appearance): move appearance options to nixos

This commit is contained in:
ooks-io 2024-08-05 17:29:53 +12:00
parent cedeb52103
commit ceb66c03cf
51 changed files with 393 additions and 377 deletions

View file

@ -1,14 +1,15 @@
{
inputs,
config,
osConfig,
pkgs,
lib,
...
}: let
inherit (config) colorscheme;
inherit (osConfig.ooknet.appearance) colorscheme;
inherit (config.ooknet) console;
inherit (lib) mkIf;
cfg = config.ooknet.editor.helix;
console = config.ooknet.console;
in {
imports = [
./languages.nix
@ -37,7 +38,7 @@ in {
];
});
settings = {
theme = colorscheme.slug;
theme = "base16_transparent";
editor = {
color-modes = true;
middle-click-paste = false;
@ -66,7 +67,6 @@ in {
W = ":set whitespace.render none";
};
};
themes = import ./theme.nix {inherit colorscheme;};
};
};
}

View file

@ -1,140 +0,0 @@
{colorscheme}: {
"${colorscheme.slug}" = {
palette = builtins.mapAttrs (_name: value: "#${value}") colorscheme.colors; # Add leading '#'
"attributes" = "base09";
"comment" = {
fg = "base03";
modifiers = ["italic"];
};
"constant" = "base09";
"constant.character.escape" = "base0C";
"constant.numeric" = "base09";
"constructor" = "base0D";
"debug" = "base03";
"diagnostic" = {modifiers = ["underlined"];};
"diagnostic.error" = {underline = {style = "curl";};};
"diagnostic.hint" = {underline = {style = "curl";};};
"diagnostic.info" = {underline = {style = "curl";};};
"diagnostic.warning" = {underline = {style = "curl";};};
"diff.delta" = "base09";
"diff.minus" = "base08";
"diff.plus" = "base0B";
"error" = "base08";
"function" = "base0D";
"hint" = "base03";
"info" = "base0D";
"keyword" = "base0E";
"label" = "base0E";
"markup.bold" = {
fg = "base0A";
modifiers = ["bold"];
};
"markup.heading" = "base0D";
"markup.italic" = {
fg = "base0E";
modifiers = ["italic"];
};
"markup.link.text" = "base08";
"markup.link.url" = {
fg = "base09";
modifiers = ["underlined"];
};
"markup.list" = "base08";
"markup.quote" = "base0C";
"markup.raw" = "base0B";
"markup.strikethrough" = {modifiers = ["crossed_out"];};
"namespace" = "base0E";
"operator" = "base05";
"special" = "base0D";
"string" = "base0B";
"type" = "base0A";
"ui.background" = {bg = "base00";};
"ui.bufferline" = {
fg = "base04";
bg = "base00";
};
"ui.bufferline.active" = {
fg = "base00";
bg = "base03";
modifiers = ["bold"];
};
"ui.cursor" = {
fg = "base04";
modifiers = ["reversed"];
};
"ui.cursor.insert" = {
fg = "base0A";
modifiers = ["underlined"];
};
"ui.cursor.match" = {
fg = "base0A";
modifiers = ["underlined"];
};
"ui.cursor.select" = {
fg = "base0A";
modifiers = ["underlined"];
};
"ui.cursorline.primary" = {
fg = "base05";
bg = "base01";
};
"ui.gutter" = {bg = "base00";};
"ui.help" = {
fg = "base06";
bg = "base01";
};
"ui.linenr" = {
fg = "base03";
bg = "base00";
};
"ui.linenr.selected" = {
fg = "base04";
bg = "base01";
modifiers = ["bold"];
};
"ui.menu" = {
fg = "base05";
bg = "base01";
};
"ui.menu.scroll" = {
fg = "base03";
bg = "base01";
};
"ui.menu.selected" = {
fg = "base01";
bg = "base04";
};
"ui.popup" = {bg = "base01";};
"ui.selection" = {bg = "base02";};
"ui.selection.primary" = {bg = "base02";};
"ui.statusline" = {
fg = "base0B";
bg = "base02";
};
"ui.statusline.inactive" = {
bg = "base01";
fg = "base02";
};
"ui.statusline.insert" = {
fg = "base00";
bg = "base0B";
};
"ui.statusline.normal" = {
fg = "base00";
bg = "base04";
};
"ui.statusline.select" = {
fg = "base00";
bg = "base0E";
};
"ui.text" = "base05";
"ui.text.focus" = "base05";
"ui.virtual.indent-guide" = {fg = "base03";};
"ui.virtual.ruler" = {bg = "base01";};
"ui.virtual.whitespace" = {fg = "base01";};
"ui.window" = {bg = "base01";};
"variable" = "base08";
"variable.other.member" = "base08";
"warning" = "base09";
};
}

View file

@ -1,13 +1,14 @@
{
config,
osConfig,
lib,
pkgs,
...
}: let
inherit (config.colorscheme) palette;
inherit (osConfig.ooknet.appearance.colorscheme) palette;
inherit (config.ooknet) console;
inherit (lib) mkIf;
cfg = config.ooknet.multiplexer.tmux;
console = config.ooknet.console;
in {
config = mkIf (cfg.enable || console.multiplexer == "tmux") {
programs.tmux = {

View file

@ -5,23 +5,23 @@
pkgs,
...
}: let
inherit (config.colorscheme) palette;
inherit (lib) mkIf;
inherit (osConfig.ooknet.appearance.colorscheme) slug palette;
inherit (config.ooknet) console;
inherit (osConfig.ooknet.host) admin;
inherit (lib) mkIf;
cfg = config.ooknet.multiplexer.zellij;
in {
config = mkIf (cfg.enable || console.multiplexer == "zellij") {
programs.zellij = {
enable = true;
settings = {
theme = "${config.colorscheme.slug}";
theme = "${slug}";
default_shell = "${admin.shell}";
default_layout = "default";
pane_frames = false;
scrollback_editor = "${console.editor}";
themes = {
"${config.colorscheme.slug}" = {
"${slug}" = {
fg = "#${palette.base05}";
bg = "#${palette.base00}";
black = "#${palette.base00}";
@ -41,11 +41,11 @@ in {
# Layouts
xdg.configFile = {
# Default layout
"zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix {inherit pkgs config;};
"zellij/layouts/default.kdl" = import ./layouts/defaultLayout.nix {inherit pkgs config osConfig;};
# Layout for bash scripts
"zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix {inherit pkgs config;};
"zellij/layouts/script.kdl" = import ./layouts/scriptLayout.nix {inherit pkgs config osConfig;};
# Layout for configuring my flake
"zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix {inherit pkgs config;};
"zellij/layouts/flake.kdl" = import ./layouts/flakeLayout.nix {inherit pkgs config osConfig;};
# Additional keybinds
"zellij/config.kdl".text =
# kdl

View file

@ -1,14 +1,13 @@
{
pkgs,
osConfig,
config,
...
}: let
inherit (config.colorscheme) palette;
inherit (osConfig.ooknet.appearance.colorscheme) palette;
in {
text =
/*
kdl
*/
# kdl
''
layout {
default_tab_template {
@ -51,7 +50,7 @@ in {
datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
datetime_timezone "${osConfig.time.timeZone}"
}
}
children

View file

@ -1,9 +1,9 @@
{
pkgs,
config,
osConfig,
...
}: let
inherit (config.colorscheme) palette;
inherit (osConfig.ooknet.appearance.colorscheme) palette;
in {
text =
/*
@ -51,7 +51,7 @@ in {
datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
datetime_timezone "${osConfig.time.timeZone}"
}
}
children

View file

@ -1,9 +1,9 @@
{
pkgs,
config,
osConfig,
...
}: let
inherit (config.colorscheme) palette;
inherit (osConfig.ooknet.appearance.colorscheme) palette;
in {
text =
/*
@ -51,7 +51,7 @@ in {
datetime "#[fg=#${palette.base05},bold] {format} "
datetime_format "%I:%M %p"
datetime_timezone "${config.home.sessionVariables.TZ}"
datetime_timezone "${osConfig.time.timeZone}"
}
}
children