From d531fb9c59020623a7a131b74d531f46dfc96363 Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Sun, 1 Sep 2024 22:29:05 +0200 Subject: [PATCH] cleaned up and simplified theming --- hosts/chris-laptop/default.nix | 6 +- hosts/chris-pc/default.nix | 6 +- hosts/chris-server/default.nix | 6 +- hosts/mam-laptop/default.nix | 6 +- modules/desktop/editors/nvim.nix | 2 +- modules/desktop/terminal/alacritty.nix | 94 +++++----- modules/shell/toolset/btop.nix | 102 +++++------ modules/shell/toolset/starship.nix | 28 +-- modules/shell/zsh.nix | 144 +++++++-------- modules/themes/default.nix | 172 +++++------------- .../assets/wallpaper.jpg => everforest.jpg} | Bin modules/themes/everforest/default.nix | 135 -------------- 12 files changed, 249 insertions(+), 452 deletions(-) rename modules/themes/{everforest/assets/wallpaper.jpg => everforest.jpg} (100%) delete mode 100644 modules/themes/everforest/default.nix diff --git a/hosts/chris-laptop/default.nix b/hosts/chris-laptop/default.nix index 2735f4d..b578d19 100644 --- a/hosts/chris-laptop/default.nix +++ b/hosts/chris-laptop/default.nix @@ -3,7 +3,11 @@ imports = [ ./hardware-configuration.nix ]; modules = { - themes.active = "everforest"; + themes = { + enable = true; + theme = "everforest"; + polarity = "dark"; + }; system.audio = true; networking.enable = true; diff --git a/hosts/chris-pc/default.nix b/hosts/chris-pc/default.nix index 263a3bf..2e2fe6b 100644 --- a/hosts/chris-pc/default.nix +++ b/hosts/chris-pc/default.nix @@ -3,7 +3,11 @@ imports = [ ./hardware.nix ]; modules = { - themes.active = "everforest"; + themes = { + enable = true; + theme = "everforest"; + polarity = "dark"; + }; system.audio.enable = true; networking.enable = true; diff --git a/hosts/chris-server/default.nix b/hosts/chris-server/default.nix index e8d6c05..a820d65 100644 --- a/hosts/chris-server/default.nix +++ b/hosts/chris-server/default.nix @@ -3,7 +3,11 @@ imports = [ ./hardware.nix ]; modules = { - themes.active = "everforest"; + themes = { + enable = true; + theme = "everforest"; + polarity = "dark"; + }; networking.enable = true; diff --git a/hosts/mam-laptop/default.nix b/hosts/mam-laptop/default.nix index 2301843..73ab25a 100644 --- a/hosts/mam-laptop/default.nix +++ b/hosts/mam-laptop/default.nix @@ -3,7 +3,11 @@ imports = [ ./hardware-configuration.nix ]; modules = { - themes.active = "everforest"; + themes = { + enable = true; + theme = "everforest"; + polarity = "dark"; + }; system.audio = true; networking.enable = true; diff --git a/modules/desktop/editors/nvim.nix b/modules/desktop/editors/nvim.nix index 1c0235d..3f04423 100644 --- a/modules/desktop/editors/nvim.nix +++ b/modules/desktop/editors/nvim.nix @@ -19,7 +19,7 @@ in }; # colorschemes.base16 = "${pkgs.base16-schemes}/share/themes/everforest.yaml"; - colorschemes.everforest.enable = true; +# colorschemes.everforest.enable = true; plugins = { lualine.enable = true; diff --git a/modules/desktop/terminal/alacritty.nix b/modules/desktop/terminal/alacritty.nix index a61f2e7..d04dc9f 100644 --- a/modules/desktop/terminal/alacritty.nix +++ b/modules/desktop/terminal/alacritty.nix @@ -8,8 +8,6 @@ inherit (builtins) toString; inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - - active = config.modules.themes.active; in { options.modules.desktop.terminal.alacritty = let inherit (lib.options) mkEnableOption; @@ -48,54 +46,54 @@ in { }; } - (mkIf (active != null) { - import = ["~/.config/alacritty/config/${active}.toml"]; - }) +# (mkIf (active != null) { +# import = ["~/.config/alacritty/config/${active}.toml"]; +# }) ]; }; - create.configFile = mkIf (active != null) { - alacritty-conf = { - target = "alacritty/config/${active}.toml"; - source = let - inherit (config.modules.themes.font) mono sans; - tomlFormat = pkgs.formats.toml {}; - in tomlFormat.generate "alacritty-theme" { - font = { - builtin_box_drawing = true; - size = mono.size; - - normal = { - family = "${mono.family}"; - style = "${sans.weight}"; - }; - - italic = { - family = "${mono.family}"; - style = "${sans.weight} Italic"; - }; - - bold = { - family = "${mono.family}"; - style = "${mono.weight}"; - }; - - bold_italic = { - family = "${mono.family}"; - style = "${mono.weight} Italic"; - }; - - offset = { - x = 0; - y = 0; - }; - glyph_offset = { - x = 0; - y = 0; - }; - }; - }; - }; - }; +# create.configFile = mkIf (active != null) { +# alacritty-conf = { +# target = "alacritty/config/${active}.toml"; +# source = let +# inherit (config.modules.themes.font) mono sans; +# tomlFormat = pkgs.formats.toml {}; +# in tomlFormat.generate "alacritty-theme" { +# font = { +# builtin_box_drawing = true; +# size = mono.size; +# +# normal = { +# family = "${mono.family}"; +# style = "${sans.weight}"; +# }; +# +# italic = { +# family = "${mono.family}"; +# style = "${sans.weight} Italic"; +# }; +# +# bold = { +# family = "${mono.family}"; +# style = "${mono.weight}"; +# }; +# +# bold_italic = { +# family = "${mono.family}"; +# style = "${mono.weight} Italic"; +# }; +# +# offset = { +# x = 0; +# y = 0; +# }; +# glyph_offset = { +# x = 0; +# y = 0; +# }; +# }; +# }; +# }; +# }; }; } diff --git a/modules/shell/toolset/btop.nix b/modules/shell/toolset/btop.nix index 7ea44ae..b768fdc 100644 --- a/modules/shell/toolset/btop.nix +++ b/modules/shell/toolset/btop.nix @@ -25,7 +25,7 @@ in background_update = true; disks_filter = "exclude=/boot"; - color_theme = "${active}"; +# color_theme = "${active}"; rounded_corners = true; theme_background = false; truecolor = true; @@ -90,55 +90,55 @@ in }; }; - create.configFile.btop-theme = let - inherit (config.modules.themes) active; - in - mkIf (active != null) { - target = "btop/themes/${active}.theme"; - text = '' - theme[main_bg]="bg" - theme[main_fg]="fg" - theme[title]="fg" - theme[hi_fg]="highlight" - theme[selected_bg]="border" - theme[selected_fg]="bg" - theme[inactive_fg]="brightBlack" - theme[graph_text]="brightYellow" - theme[meter_bg]="brightblack" - theme[proc_misc]="brightYellow" - theme[cpu_box]="brightCyan" - theme[mem_box]="brightGreen" - theme[net_box]="brightMagenta" - theme[proc_box]="brightYellow" - theme[div_line]="brightblack" - theme[temp_start]="brightYellow" - theme[temp_mid]="panelbg" - theme[temp_end]="brightRed" - theme[cpu_start]="brightCyan" - theme[cpu_mid]="border" - theme[cpu_end]="brightGreen" - theme[free_start]="brightGreen" - theme[free_mid]="brightGreen" - theme[free_end]="brightGreen" - theme[cached_start]="brightYellow" - theme[cached_mid]="brightYellow" - theme[cached_end]="brightMagenta" - theme[available_start]="brightYellow" - theme[available_mid]="brightYellow" - theme[available_end]="brightYellow" - theme[used_start]="panelbg" - theme[used_mid]="panelbg" - theme[used_end]="brightRed" - theme[download_start]="brightBlue" - theme[download_mid]="brightBlue" - theme[download_end]="brightMagenta" - theme[upload_start]="brightBlue" - theme[upload_mid]="brightBlue" - theme[upload_end]="brightMagenta" - theme[process_start]="brightCyan" - theme[process_mid]="border" - theme[process_end]="brightGreen" - ''; - }; +# create.configFile.btop-theme = let +# inherit (config.modules.themes) active; +# in +# mkIf (active != null) { +# target = "btop/themes/${active}.theme"; +# text = '' +# theme[main_bg]="bg" +# theme[main_fg]="fg" +# theme[title]="fg" +# theme[hi_fg]="highlight" +# theme[selected_bg]="border" +# theme[selected_fg]="bg" +# theme[inactive_fg]="brightBlack" +# theme[graph_text]="brightYellow" +# theme[meter_bg]="brightblack" +# theme[proc_misc]="brightYellow" +# theme[cpu_box]="brightCyan" +# theme[mem_box]="brightGreen" +# theme[net_box]="brightMagenta" +# theme[proc_box]="brightYellow" +# theme[div_line]="brightblack" +# theme[temp_start]="brightYellow" +# theme[temp_mid]="panelbg" +# theme[temp_end]="brightRed" +# theme[cpu_start]="brightCyan" +# theme[cpu_mid]="border" +# theme[cpu_end]="brightGreen" +# theme[free_start]="brightGreen" +# theme[free_mid]="brightGreen" +# theme[free_end]="brightGreen" +# theme[cached_start]="brightYellow" +# theme[cached_mid]="brightYellow" +# theme[cached_end]="brightMagenta" +# theme[available_start]="brightYellow" +# theme[available_mid]="brightYellow" +# theme[available_end]="brightYellow" +# theme[used_start]="panelbg" +# theme[used_mid]="panelbg" +# theme[used_end]="brightRed" +# theme[download_start]="brightBlue" +# theme[download_mid]="brightBlue" +# theme[download_end]="brightMagenta" +# theme[upload_start]="brightBlue" +# theme[upload_mid]="brightBlue" +# theme[upload_end]="brightMagenta" +# theme[process_start]="brightCyan" +# theme[process_mid]="border" +# theme[process_end]="brightGreen" +# ''; +# }; }; } diff --git a/modules/shell/toolset/starship.nix b/modules/shell/toolset/starship.nix index 5f529f9..be9c11a 100644 --- a/modules/shell/toolset/starship.nix +++ b/modules/shell/toolset/starship.nix @@ -10,15 +10,17 @@ in config = mkIf config.modules.shell.toolset.starship.enable { hm.programs.starship = { enable = true; - settings = { + settings = let + inherit (config.lib.stylix.colors) cyan red magenta yellow green blue; + in { scan_timeout = 10; add_newline = true; line_break.disabled = true; format = "$username$hostname$nix_shell$git_branch$git_commit$git_state$git_status$directory$jobs$cmd_duration$character"; username = { - style_user = "blue bold"; - style_root = "red bold"; + style_user = "${cyan} bold"; + style_root = "${red} bold"; format = "[$user]($style) "; disabled = false; show_always = true; @@ -27,7 +29,7 @@ in hostname = { ssh_only = false; ssh_symbol = "🌐 "; - format = "on [$hostname](bold red) "; + format = "on [$hostname](bold ${red}) "; trim_at = ".local"; disabled = false; }; @@ -35,28 +37,28 @@ in nix_shell = { symbol = " "; format = "[$symbol$name]($style) "; - style = "magenta bold"; + style = "${magenta} bold"; }; git_branch = { only_attached = true; format = "[$symbol$branch]($style) "; symbol = "שׂ"; - style = "brightYellow bold"; + style = "${yellow} bold"; }; git_commit = { only_detached = true; format = "[ﰖ$hash]($style) "; - style = "brightYellow bold"; + style = "${yellow} bold"; }; git_state = { - style = "brightMagenta bold"; + style = "${magenta} bold"; }; git_status = { - style = "brightGreen bold"; + style = "${green} bold"; }; directory = { @@ -66,16 +68,16 @@ in cmd_duration = { format = "[$duration]($style) "; - style = "brightBlue"; + style = "${blue}"; }; jobs = { - style = "brightGreen bold"; + style = "${green} bold"; }; character = { - success_symbol = "[\\$](brightGreen} bold)"; - error_symbol = "[\\$](brightRed bold)"; + success_symbol = "[\\$](${green}} bold)"; + error_symbol = "[\\$](${red} bold)"; }; }; }; diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index 2c0b781..997e156 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -85,78 +85,78 @@ in } ]; - syntaxHighlighting = let - inherit (config.modules.themes) active; - in - mkIf (active != null) { - enable = true; - highlighters = ["main" "brackets" "pattern" "cursor" "regexp" "root" "line"]; - patterns = { - "sudo " = "fg=red,bold"; - "rm -rf *" = "fg=red,bold"; - }; - styles = { - # -------===[ Comments ]===------- # - comment = "fg=black"; - - # -------===[ Functions/Methods ]===------- # - alias = "fg=magenta"; - "suffix-alias" = "fg=magenta"; - "global-alias" = "fg=magenta"; - function = "fg=blue"; - command = "fg=green"; - precommand = "fg=green,italic"; - autodirectory = "fg=yellow,italic"; - "single-hyphen-option" = "fg=yellow"; - "double-hyphen-option" = "fg=yellow"; - "back-quoted-argument" = "fg=magenta"; - - # -------===[ Built-ins ]===------- # - builtin = "fg=blue"; - "reserved-word" = "fg=green"; - "hashed-command" = "fg=green"; - - # -------===[ Punctuation ]===------- # - commandseparator = "fg=brightRed"; - "command-substitution-delimiter" = "fg=border"; - "command-substitution-delimiter-unquoted" = "fg=border"; - "process-substitution-delimiter" = "fg=border"; - "back-quoted-argument-delimiter" = "fg=brightRed"; - "back-double-quoted-argument" = "fg=brightRed"; - "back-dollar-quoted-argument" = "fg=brightRed"; - - # -------===[ Strings ]===------- # - "command-substitution-quoted" = "fg=brightYellow"; - "command-substitution-delimiter-quoted" = "fg=brightYellow"; - "single-quoted-argument" = "fg=brightYellow"; - "single-quoted-argument-unclosed" = "fg=red"; - "double-quoted-argument" = "fg=brightYellow"; - "double-quoted-argument-unclosed" = "fg=red"; - "rc-quote" = "fg=brightYellow"; - - # -------===[ Variables ]===------- # - "dollar-quoted-argument" = "fg=highlight"; - "dollar-quoted-argument-unclosed" = "fg=brightRed"; - "dollar-double-quoted-argument" = "fg=highlight"; - assign = "fg=highlight"; - "named-fd" = "fg=highlight"; - "numeric-fd" = "fg=highlight"; - - # -------===[ Non-Exclusive ]===------- # - "unknown-token" = "fg=red"; - path = "fg=highlight,underline"; - path_pathseparator = "fg=brightRed,underline"; - path_prefix = "fg=highlight,underline"; - path_prefix_pathseparator = "fg=brightRed,underline"; - globbing = "fg=highlight"; - "history-expansion" = "fg=magenta"; - "back-quoted-argument-unclosed" = "fg=red"; - redirection = "fg=highlight"; - arg0 = "fg=highlight"; - default = "fg=highlight"; - cursor = "fg=highlight"; - }; - }; +# syntaxHighlighting = let +# inherit (config.modules.themes) active; +# in +# mkIf (active != null) { +# enable = true; +# highlighters = ["main" "brackets" "pattern" "cursor" "regexp" "root" "line"]; +# patterns = { +# "sudo " = "fg=red,bold"; +# "rm -rf *" = "fg=red,bold"; +# }; +# styles = { +# # -------===[ Comments ]===------- # +# comment = "fg=black"; +# +# # -------===[ Functions/Methods ]===------- # +# alias = "fg=magenta"; +# "suffix-alias" = "fg=magenta"; +# "global-alias" = "fg=magenta"; +# function = "fg=blue"; +# command = "fg=green"; +# precommand = "fg=green,italic"; +# autodirectory = "fg=yellow,italic"; +# "single-hyphen-option" = "fg=yellow"; +# "double-hyphen-option" = "fg=yellow"; +# "back-quoted-argument" = "fg=magenta"; +# +# # -------===[ Built-ins ]===------- # +# builtin = "fg=blue"; +# "reserved-word" = "fg=green"; +# "hashed-command" = "fg=green"; +# +# # -------===[ Punctuation ]===------- # +# commandseparator = "fg=brightRed"; +# "command-substitution-delimiter" = "fg=border"; +# "command-substitution-delimiter-unquoted" = "fg=border"; +# "process-substitution-delimiter" = "fg=border"; +# "back-quoted-argument-delimiter" = "fg=brightRed"; +# "back-double-quoted-argument" = "fg=brightRed"; +# "back-dollar-quoted-argument" = "fg=brightRed"; +# +# # -------===[ Strings ]===------- # +# "command-substitution-quoted" = "fg=brightYellow"; +# "command-substitution-delimiter-quoted" = "fg=brightYellow"; +# "single-quoted-argument" = "fg=brightYellow"; +# "single-quoted-argument-unclosed" = "fg=red"; +# "double-quoted-argument" = "fg=brightYellow"; +# "double-quoted-argument-unclosed" = "fg=red"; +# "rc-quote" = "fg=brightYellow"; +# +# # -------===[ Variables ]===------- # +# "dollar-quoted-argument" = "fg=highlight"; +# "dollar-quoted-argument-unclosed" = "fg=brightRed"; +# "dollar-double-quoted-argument" = "fg=highlight"; +# assign = "fg=highlight"; +# "named-fd" = "fg=highlight"; +# "numeric-fd" = "fg=highlight"; +# +# # -------===[ Non-Exclusive ]===------- # +# "unknown-token" = "fg=red"; +# path = "fg=highlight,underline"; +# path_pathseparator = "fg=brightRed,underline"; +# path_prefix = "fg=highlight,underline"; +# path_prefix_pathseparator = "fg=brightRed,underline"; +# globbing = "fg=highlight"; +# "history-expansion" = "fg=magenta"; +# "back-quoted-argument-unclosed" = "fg=red"; +# redirection = "fg=highlight"; +# arg0 = "fg=highlight"; +# default = "fg=highlight"; +# cursor = "fg=highlight"; +# }; +# }; }; create.configFile.zsh-abbreviations = { diff --git a/modules/themes/default.nix b/modules/themes/default.nix index 2ae6789..556af8e 100644 --- a/modules/themes/default.nix +++ b/modules/themes/default.nix @@ -10,138 +10,54 @@ let desktop = config.modules.desktop; in { options.modules.themes = let - inherit (lib.options) mkOption mkPackageOption; - inherit (lib.types) attrsOf int lines listOf nullOr path package str; - inherit (lib.my) mkOpt toFilteredImage; + inherit (lib.options) mkOption mkEnableOption; + inherit (lib.types) nullOr enum; in { - active = mkOption { - type = nullOr str; - default = null; - apply = v: let - theme = getEnv "THEME"; - in - if theme != "" - then theme - else v; - description = '' - Name of the theme which ought to be applied. - Can be overridden by the `THEME` environment variable. - ''; + enable = mkEnableOption "Theming (Stylix)"; + + theme = mkOption { + type = nullOr (enum [ "everforest" "catppuccin-latte" "chalk" ]); + default = "everforest"; + description = "The theme to set the system to"; + example = "everforest"; }; - wallpaper = mkOpt (nullOr path) null; - - loginWallpaper = mkOpt (nullOr path) ( - if cfg.wallpaper != null - then toFilteredImage cfg.wallpaper "-gaussian-blur 0x2 -modulate 70 -level 5%" - else null - ); - - gtk = { - name = mkOpt str ""; - package = mkPackageOption pkgs "gtk" {}; - }; - - iconTheme = { - name = mkOpt str ""; - package = mkPackageOption pkgs "icon" {}; - }; - - pointer = { - name = mkOpt str ""; - package = mkPackageOption pkgs "pointer" {}; - size = mkOpt int 0; - }; - - onReload = mkOpt (attrsOf lines) {}; - - fontConfig = { - packages = mkOpt (listOf package) []; - mono = mkOpt (listOf str) [""]; - sans = mkOpt (listOf str) [""]; - emoji = mkOpt (listOf str) [""]; - }; - - font = { - mono = { - family = mkOpt str ""; - weight = mkOpt str "Bold"; - weightAlt = mkOpt str "Bold"; - weightNum = mkOpt int 700; - size = mkOpt int 13; - }; - sans = { - family = mkOpt str ""; - weight = mkOpt str "SemiBold"; - weightAlt = mkOpt str "DemiBold"; - weightNum = mkOpt int 600; - size = mkOpt int 10; - }; - }; - - colors = { - main = { - normal = { - black = mkOpt str "#000000"; # 0 - red = mkOpt str "#FF0000"; # 1 - green = mkOpt str "#00FF00"; # 2 - yellow = mkOpt str "#FFFF00"; # 3 - blue = mkOpt str "#0000FF"; # 4 - magenta = mkOpt str "#FF00FF"; # 5 - cyan = mkOpt str "#00FFFF"; # 6 - white = mkOpt str "#BBBBBB"; # 7 - }; - bright = { - black = mkOpt str "#888888"; # 8 - red = mkOpt str "#FF8800"; # 9 - green = mkOpt str "#00FF80"; # 10 - yellow = mkOpt str "#FF8800"; # 11 - blue = mkOpt str "#0088FF"; # 12 - magenta = mkOpt str "#FF88FF"; # 13 - cyan = mkOpt str "#88FFFF"; # 14 - white = mkOpt str "#FFFFFF"; # 15 - }; - types = let - inherit (cfg.colors.main.normal) black red white yellow; - inherit (cfg.colors.main.types) bg fg; - in { - bg = mkOpt str black; - fg = mkOpt str white; - panelbg = mkOpt str bg; - panelfg = mkOpt str fg; - border = mkOpt str bg; - error = mkOpt str red; - warning = mkOpt str yellow; - highlight = mkOpt str white; - }; - }; - - rofi = { - bg = { - main = mkOpt str "#FFFFFF"; - alt = mkOpt str "#FFFFFF"; - bar = mkOpt str "#FFFFFF"; - }; - fg = mkOpt str "#FFFFFF"; - ribbon = { - outer = mkOpt str "#FFFFFF"; - inner = mkOpt str "#FFFFFF"; - }; - selected = mkOpt str "#FFFFFF"; - urgent = mkOpt str "#FFFFFF"; - transparent = mkOpt str "#FFFFFF"; - }; - }; - - editor = { - neovim = { - light = mkOpt str ""; - dark = mkOpt str ""; - }; + polarity = mkOption { + type = nullOr (enum [ "dark" "light" ]); + default = "dark"; + description = "determine if system is in dark or light mode"; }; }; - config = mkIf (cfg.active != null) (mkMerge [ - (mkIf (desktop.type == "wayland") (mkMerge [])) - ]); + config = mkIf (cfg.enable) { + stylix = { + enable = true; + + base16Scheme = "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml"; + image = ./${cfg.theme}.jpg; + polarity = cfg.polarity; + + fonts = { + serif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Serif"; + }; + + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + + monospace = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans Mono"; + }; + + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; + }; + }; } diff --git a/modules/themes/everforest/assets/wallpaper.jpg b/modules/themes/everforest.jpg similarity index 100% rename from modules/themes/everforest/assets/wallpaper.jpg rename to modules/themes/everforest.jpg diff --git a/modules/themes/everforest/default.nix b/modules/themes/everforest/default.nix deleted file mode 100644 index c3e2136..0000000 --- a/modules/themes/everforest/default.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ config, options, lib, pkgs, ... }: -let - inherit (builtins) toString readFile; - inherit (lib.attrsets) attrValues; - inherit (lib.modules) mkDefault mkIf mkMerge; - inherit (lib.strings) concatMapStringsSep; - - cfg = config.modules.themes; -in -{ - config = mkIf (cfg.active == "everforest") - { - stylix = { - base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml"; - image = ./assets/wallpaper.jpg; - polarity = "dark"; - - fonts = { - serif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Serif"; - }; - - sansSerif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans"; - }; - - monospace = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans Mono"; - }; - - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; - }; - }; - -# modules.themes = { -# wallpaper = mkDefault ./assets/wallpaper.jpg; -# -# gtk = { -# name = "Everforest-Dark-BL"; -# package = pkgs.my.everforest-gtk; -# }; -# -# iconTheme = { -# name = "everforest-dark"; -# package = pkgs.fluent-icon-theme.override { -# colorVariants = []; -# }; -# }; -# -# pointer = { -# name = "Bibata-Modern-Classic"; -# package = pkgs.bibata-cursors; -# size = 24; -# }; -# -# fontConfig = { -# packages = attrValues { -# inherit (pkgs) noto-fonts-emoji sarasa-gothic; -# google-fonts = pkgs.google-fonts.override {fonts = ["Cardo"];}; -# nerdfonts = -# pkgs.nerdfonts.override {fonts = ["CascadiaCode" "VictorMono"];}; -# }; -# mono = ["VictorMono Nerd Font" "Sarasa Mono SC"]; -# sans = ["Caskaydia Cove Nerd Font" "Sarasa Gothic SC"]; -# emoji = ["Noto Color Emoji"]; -# }; -# -# font = { -# mono.family = "VictorMono Nerd Font"; -# sans.family = "CaskaydiaCove Nerd Font"; -# }; -# -# colors = { -# main = { -# normal = { -# black = "#15161e"; -# red = "#f7768e"; -# green = "#9ece6a"; -# yellow = "#e0af68"; -# blue = "#7aa2f7"; -# magenta = "#bb9af7"; -# cyan = "#7dcfff"; -# white = "#a9b1d6"; -# }; -# bright = { -# black = "#414868"; -# red = "#f7768e"; -# green = "#9ece6a"; -# yellow = "#e0af68"; -# blue = "#7aa2f7"; -# magenta = "#bb9af7"; -# cyan = "#7dcfff"; -# white = "#c0caf5"; -# }; -# types = { -# fg = "#c0caf5"; -# bg = "#1a1b26"; -# panelbg = "#ff9e64"; -# border = "#1abc9c"; -# highlight = "#3d59a1"; -# }; -# }; -# -# rofi = { -# bg = { -# main = "hsla(235, 18%, 12%, 1)"; -# alt = "hsla(235, 18%, 12%, 0)"; -# bar = "hsla(229, 24%, 18%, 1)"; -# }; -# fg = "hsla(228, 72%, 85%, 1)"; -# ribbon = { -# outer = "hsla(188, 68%, 27%, 1)"; -# inner = "hsla(202, 76%, 24%, 1)"; -# }; -# selected = "hsla(220, 88%, 72%, 1)"; -# urgent = "hsl(349, 89%, 72%, 1)"; -# transparent = "hsla(0, 0%, 0%, 0)"; -# }; -# }; -# -# editor = { -# neovim = { -# dark = "everforest"; -# light = "everforest"; -# }; -# }; -# }; - }; -}