diff --git a/modules/config/theming/catppuccin.nix b/modules/config/theming/catppuccin.nix index 99ecea9..bca09bc 100644 --- a/modules/config/theming/catppuccin.nix +++ b/modules/config/theming/catppuccin.nix @@ -36,6 +36,20 @@ in { home-manager.users.moritz = { programs = { + fzf.colors = { + "bg+" = "#${surface0}"; + "fg+" = "#${text}"; + "hl+" = "#${red}"; + bg = "#${base}"; + fg = "#${text}"; + header = "#${red}"; + hl = "#${red}"; + info = "#${mauve}"; + marker = "#${rosewater}"; + pointer = "#${rosewater}"; + prompt = "#${mauve}"; + spinner = "#${rosewater}"; + }; kitty.extraConfig = '' # vim:ft=kitty diff --git a/modules/config/theming/dracula.nix b/modules/config/theming/dracula.nix index 22ef8e6..76fa25a 100644 --- a/modules/config/theming/dracula.nix +++ b/modules/config/theming/dracula.nix @@ -4,22 +4,36 @@ with lib; let cfg = config.my.theming; - background = "#282a36"; - currentLine = "#44475a"; - foreground = "#f8f8f2"; - comment = "#6272a4"; - cyan = "#8be9fd"; - green = "#50fa7b"; - orange = "#ffb86c"; - pink = "#ff79c6"; - purple = "#bd93f9"; - red = "#ff5555"; - yellow = "#f1fa8c"; + background = "282a36"; + currentLine = "44475a"; + foreground = "f8f8f2"; + comment = "6272a4"; + cyan = "8be9fd"; + green = "50fa7b"; + orange = "ffb86c"; + pink = "ff79c6"; + purple = "bd93f9"; + red = "ff5555"; + yellow = "f1fa8c"; in { config = mkIf (cfg.enable && cfg.scheme == "dracula") { home-manager.users.moritz = { programs = { + fzf.colors = { + "bg+" = "#${currentLine}"; + "fg+" = "#${foreground}"; + "hl+" = "#${purple}"; + bg = "#${background}"; + fg = "#${foreground}"; + header = "#${comment}"; + hl = "#${purple}"; + info = "#${orange}"; + marker = "#${pink}"; + pointer = "#${pink}"; + prompt = "#${green}"; + spinner = "#${orange}"; + }; kitty.extraConfig = '' # https://draculatheme.com/kitty @@ -142,9 +156,9 @@ in }; xsession.windowManager.bspwm = { settings = { - focused_border_color = purple; - normal_border_color = background; - active_border_color = background; + focused_border_color = "#${purple}"; + normal_border_color = "#${background}"; + active_border_color = "#${background}"; }; }; services = { @@ -181,42 +195,43 @@ in polybar = { config = { "bar/bottom" = { - inherit background foreground; - border-color = background; + background = "#${background}"; + foreground = "#${foreground}"; + border-color = "#${background}"; }; "module/bspwm" = { - label-focused-foreground = pink; - label-occupied-foreground = comment; - label-urgent-foreground = red; - label-empty-foreground = currentLine; - label-separator-foreground = background; + label-focused-foreground = "#${pink}"; + label-occupied-foreground = "#${comment}"; + label-urgent-foreground = "#${red}"; + label-empty-foreground = "#${currentLine}"; + label-separator-foreground = "#${background}"; }; "module/cpu" = { - format-foreground = background; - format-background = green; + format-foreground = "#${background}"; + format-background = "#${green}"; }; "module/time" = { - format-foreground = background; - format-background = cyan; + format-foreground = "#${background}"; + format-background = "#${cyan}"; }; "module/date" = { - format-foreground = background; - format-background = yellow; + format-foreground = "#${background}"; + format-background = "#${yellow}"; }; "module/memory" = { - format-foreground = background; - format-background = cyan; + format-foreground = "#${background}"; + format-background = "#${cyan}"; }; "module/pulseaudio" = { - format-volume-foreground = background; - format-volume-background = purple; - label-muted = "%{F${red}}婢 %{F${background}}muted"; - format-muted-foreground = background; - format-muted-background = red; + format-volume-foreground = "#${background}"; + format-volume-background = "#${purple}"; + label-muted = "%{F#${red}}婢 %{F#${background}}muted"; + format-muted-foreground = "#${background}"; + format-muted-background = "#${red}"; }; "module/network" = { - format-connected-foreground = background; - format-connected-background = purple; + format-connected-foreground = "#${background}"; + format-connected-background = "#${purple}"; }; }; };