From a807b12dbead89431ee2dce18c0e4c3a402c89a6 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 25 Mar 2024 22:32:57 -0400 Subject: [PATCH] overhauled theming to make hyprland, waybar, mako, tmux, fuzzel, lightdm, and alacritty more consistent --- home/alacritty/default.nix | 2 +- home/fuzzel/default.nix | 4 ++-- home/hypr/default.nix | 18 +++++++++--------- home/hypr/hyprland.conf | 6 +++--- home/mako/default.nix | 4 ++-- home/shell/default.nix | 4 ++-- home/waybar/waybar.css | 10 +++++----- modules/hyprland.nix | 18 +++++++++--------- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/home/alacritty/default.nix b/home/alacritty/default.nix index fa060ffa..7925142d 100644 --- a/home/alacritty/default.nix +++ b/home/alacritty/default.nix @@ -7,7 +7,7 @@ colors = { primary = { foreground = "#fafafa"; - background = "#000000"; + background = "#232634"; }; draw_bold_text_with_bright_colors = true; }; diff --git a/home/fuzzel/default.nix b/home/fuzzel/default.nix index 1a7fbdc3..6cd3c817 100644 --- a/home/fuzzel/default.nix +++ b/home/fuzzel/default.nix @@ -15,8 +15,8 @@ background = "#23263499"; selection = "#232634FF"; selection-match = "#e78284FF"; - selection-text = "#babbf1FF"; - text = "#FFFFFFFF"; + selection-text = "#f4b8e4FF"; + text = "#fafafaFF"; }; }; }; diff --git a/home/hypr/default.nix b/home/hypr/default.nix index e76e3a68..e5d2c708 100644 --- a/home/hypr/default.nix +++ b/home/hypr/default.nix @@ -34,34 +34,34 @@ home.pointerCursor = { gtk.enable = true; # x11.enable = true; - package = pkgs.catppuccin-cursors.latteDark; - name = "Catppuccin-Latte-Dark-Cursors"; + package = pkgs.catppuccin-cursors.frappeDark; + name = "Catppuccin-Frappe-Dark-Cursors"; size = 24; }; qt = { enable = true; platformTheme = "gtk"; - style.name = "Catppuccin-Latte-Compact-Green-Light"; + style.name = "Catppuccin-Frappe-Compact-Mauve-Dark"; }; gtk = { enable = true; theme = { package = pkgs.catppuccin-gtk.override { - accents = [ "green" ]; + accents = [ "mauve" ]; size = "compact"; - variant = "latte"; + variant = "frappe"; tweaks = [ "normal" ]; }; - name = "Catppuccin-Latte-Compact-Green-Light"; + name = "Catppuccin-Frappe-Compact-Mauve-Dark"; }; iconTheme = { package = pkgs.catppuccin-papirus-folders.override { - flavor = "latte"; - accent = "green"; + flavor = "frappe"; + accent = "mauve"; }; - name = "Papirus-Light"; + name = "Papirus-Dark"; }; font = { name = "NotoSans Nerd Font Regular"; diff --git a/home/hypr/hyprland.conf b/home/hypr/hyprland.conf index bc5f8881..ee3f0dc4 100644 --- a/home/hypr/hyprland.conf +++ b/home/hypr/hyprland.conf @@ -72,10 +72,10 @@ general { # See https://wiki.hyprland.org/Configuring/Variables/ for more gaps_in = 5 - gaps_out = 15 + gaps_out = 10 border_size = 2 - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) + col.active_border = rgba(99d1dbee) rgba(ca9ee6ee) 45deg + col.inactive_border = rgba(303446aa) layout = dwindle diff --git a/home/mako/default.nix b/home/mako/default.nix index 34d5fcad..7e22d3a1 100644 --- a/home/mako/default.nix +++ b/home/mako/default.nix @@ -4,8 +4,8 @@ services.mako = { enable = true; font = "NotoSans Nerd Font Regular 10"; - backgroundColor = "#00000099"; - textColor = "#FFFFFF"; + backgroundColor = "#30344699"; + textColor = "#FAFAFA"; borderRadius = 10; defaultTimeout = 10000; padding = "15"; diff --git a/home/shell/default.nix b/home/shell/default.nix index 4b3e9649..dc0dcf92 100644 --- a/home/shell/default.nix +++ b/home/shell/default.nix @@ -84,8 +84,8 @@ ]; terminal = "tmux-256color"; extraConfig = '' - set-option -g status-bg blue - set-option -g pane-active-border-style fg=blue + set-option -g status-bg plum4 + set-option -g pane-active-border-style fg=plum4 set-option -g @tmux-weather-format "%x+%t" set-option -g @tmux-weather-units "u" set -g status-right '#{cpu_percentage} CPU | #{battery_percentage} BAT | %I:%M %p | #{weather}' diff --git a/home/waybar/waybar.css b/home/waybar/waybar.css index fec8c666..695db516 100644 --- a/home/waybar/waybar.css +++ b/home/waybar/waybar.css @@ -6,20 +6,20 @@ } window#waybar { background: rgba (0, 0, 0, 0.5); - color: #FFFFFF; + color: #FAFAFA; } #workspaces button { padding: 5px 10px; - color: #FFFFFF; + color: #FAFAFA; } #workspaces button.active { - color: #a6d189; + color: #ca9ee6; } #clock, #battery, #pulseaudio, #bluetooth, #network, #tray, #power-profiles-daemon { padding: 0 10px; margin: 0 5px; } #battery.critical { color: #e78284; } -#battery.full { color: #a6d189; } -#battery.normal { color: #FFFFFF; } +#battery.full { color: #ca9ee6; } +#battery.normal { color: #FAFAFA; } diff --git a/modules/hyprland.nix b/modules/hyprland.nix index b826b86f..6d8ed294 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -9,26 +9,26 @@ enable = true; greeters.slick = { enable = true; - theme.name = "Catppuccin-Latte-Compact-Green-Light"; + theme.name = "Catppuccin-Frappe-Compact-Mauve-Dark"; theme.package = pkgs.catppuccin-gtk.override { - accents = [ "green" ]; + accents = [ "mauve" ]; size = "compact"; - variant = "latte"; + variant = "frappe"; tweaks = [ "normal" ]; }; - iconTheme.name = "Papirus-Light"; + iconTheme.name = "Papirus-Dark"; iconTheme.package = pkgs.catppuccin-papirus-folders.override { - flavor = "latte"; - accent = "green"; + flavor = "frappe"; + accent = "mauve"; }; - font.name = "NotoSansM Nerd Font Mono"; + font.name = "NotoSans Nerd Font Regular"; cursorTheme.package = pkgs.catppuccin-cursors.latteDark; - cursorTheme.name = "Catppuccin-Latte-Dark-Cursors"; + cursorTheme.name = "Catppuccin-Frappe-Dark-Cursors"; cursorTheme.size = 32; extraConfig = '' - background=#fdfdff + background=#ca9ee6 enable-hidpi=on ''; };