From 7394dc93396a00b37bbed5b726590d6b3fa12c58 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 8 Aug 2024 20:47:25 -0400 Subject: [PATCH] themes: opacity + blur revamp (#77) * migrate to new transparency settings * sway: set default border and floating border to 2 * nix fmt * hyprland: don't dimaround rofi --- homeManagerModules/apps/alacritty/default.nix | 2 +- homeManagerModules/apps/kitty/default.nix | 2 +- homeManagerModules/apps/rofi/default.nix | 30 +++++++++--------- homeManagerModules/apps/wlogout/default.nix | 2 +- .../desktop/hyprland/settings.nix | 7 ++--- homeManagerModules/desktop/sway/settings.nix | 31 ++++++++++--------- homeManagerModules/services/mako/default.nix | 4 +-- .../services/waybar/default.nix | 4 +-- 8 files changed, 42 insertions(+), 40 deletions(-) diff --git a/homeManagerModules/apps/alacritty/default.nix b/homeManagerModules/apps/alacritty/default.nix index 6c5475bb..e148d040 100644 --- a/homeManagerModules/apps/alacritty/default.nix +++ b/homeManagerModules/apps/alacritty/default.nix @@ -35,7 +35,7 @@ in { blur = true; decorations = "Full"; dynamic_padding = true; - opacity = 0.8; + opacity = 0.6; }; }; }; diff --git a/homeManagerModules/apps/kitty/default.nix b/homeManagerModules/apps/kitty/default.nix index f1aad0c0..631fc1a7 100644 --- a/homeManagerModules/apps/kitty/default.nix +++ b/homeManagerModules/apps/kitty/default.nix @@ -16,7 +16,7 @@ in { }; settings = { - background_opacity = "0.8"; + background_opacity = "0.6"; confirm_os_window_close = "0"; notify_on_cmd_finish = "unfocused 10.0 command ${lib.getExe pkgs.libnotify} -i ${pkgs.kitty}/share/icons/hicolor/256x256/apps/kitty.png \"Job Finished\""; tab_bar_style = "powerline"; diff --git a/homeManagerModules/apps/rofi/default.nix b/homeManagerModules/apps/rofi/default.nix index 5a40cda9..edfbb51c 100644 --- a/homeManagerModules/apps/rofi/default.nix +++ b/homeManagerModules/apps/rofi/default.nix @@ -74,34 +74,34 @@ in { foreground: ${cfg.theme.colors.text}; normal-foreground: @foreground; alternate-normal-background: transparent; - red: ${cfg.theme.colors.secondary}; - selected-urgent-foreground: ${cfg.theme.colors.secondary}; - blue: ${cfg.theme.colors.primary}; - urgent-foreground: ${cfg.theme.colors.primary}; + red: ${cfg.theme.colors.secondary}CC; + selected-urgent-foreground: ${cfg.theme.colors.secondary}CC; + blue: ${cfg.theme.colors.primary}CC; + urgent-foreground: ${cfg.theme.colors.primary}CC; alternate-urgent-background: transparent; - active-foreground: ${cfg.theme.colors.primary}; - lightbg: rgba ( 238, 232, 213, 100 % ); - selected-active-foreground: rgba ( 32, 81, 113, 100 % ); + active-foreground: ${cfg.theme.colors.primary}CC; + lightbg: rgba ( 238, 232, 213, 80 % ); + selected-active-foreground: ${cfg.theme.colors.text}; alternate-active-background: transparent; background: transparent; - bordercolor: ${cfg.theme.colors.background}CC; + bordercolor: ${cfg.theme.colors.background}99; alternate-normal-foreground: @foreground; normal-background: transparent; - lightfg: rgba ( 88, 104, 117, 100 % ); + lightfg: ${cfg.theme.colors.primary}CC; selected-normal-background: ${cfg.theme.colors.primary}; - border-color: ${cfg.theme.colors.primary}; + border-color: ${cfg.theme.colors.primary}CC; spacing: 2; - separatorcolor: ${cfg.theme.colors.primary}; + separatorcolor: ${cfg.theme.colors.primary}CC; urgent-background: transparent; - selected-urgent-background: ${cfg.theme.colors.primary}; + selected-urgent-background: ${cfg.theme.colors.primary}CC; alternate-urgent-foreground: @urgent-foreground; - background-color: rgba ( 0, 0, 0, 0 % ); + background-color: transparent; alternate-active-foreground: @active-foreground; - active-background: ${cfg.theme.colors.background}CC; + active-background: transparent; selected-active-background: ${cfg.theme.colors.primary}; } window { - background-color: ${cfg.theme.colors.background}CC; + background-color: ${cfg.theme.colors.background}99; border: 2; border-radius: 10px; padding: 0; diff --git a/homeManagerModules/apps/wlogout/default.nix b/homeManagerModules/apps/wlogout/default.nix index eddd1d93..24603e84 100644 --- a/homeManagerModules/apps/wlogout/default.nix +++ b/homeManagerModules/apps/wlogout/default.nix @@ -40,7 +40,7 @@ in { } window { - background-color: rgba(35, 38, 52, 0.8); + background-color: rgba(35, 38, 52, 0.6); } button { diff --git a/homeManagerModules/desktop/hyprland/settings.nix b/homeManagerModules/desktop/hyprland/settings.nix index 4151e8ef..bdaabc1e 100644 --- a/homeManagerModules/desktop/hyprland/settings.nix +++ b/homeManagerModules/desktop/hyprland/settings.nix @@ -93,7 +93,7 @@ in { decoration = { blur = { enabled = true; - passes = 1; + passes = 2; size = 8; }; @@ -109,7 +109,6 @@ in { "blur,rofi" "blur,swayosd" "blur,waybar" - "dimaround,rofi" "ignorezero,gtk-layer-shell" "ignorezero,notifications" "ignorezero,swayosd" @@ -146,8 +145,8 @@ in { }; general = { - "col.active_border" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.secondary}EE) rgba(${lib.strings.removePrefix "#" cfg.theme.colors.primary}EE) 45deg"; - "col.inactive_border" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.inactive}AA)"; + "col.active_border" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.secondary}CC) rgba(${lib.strings.removePrefix "#" cfg.theme.colors.primary}CC) 45deg"; + "col.inactive_border" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.inactive}99)"; allow_tearing = false; border_size = 2; gaps_in = 5; diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix index 90dba6f2..1bcc57c7 100644 --- a/homeManagerModules/desktop/sway/settings.nix +++ b/homeManagerModules/desktop/sway/settings.nix @@ -23,29 +23,29 @@ in { modifier = modifier; colors = { - background = "${cfg.theme.colors.primary}EE"; + background = "${cfg.theme.colors.primary}CC"; focused = { - background = "${cfg.theme.colors.primary}EE"; - border = "${cfg.theme.colors.primary}EE"; - childBorder = "${cfg.theme.colors.primary}EE"; - indicator = "${cfg.theme.colors.primary}EE"; + background = "${cfg.theme.colors.primary}CC"; + border = "${cfg.theme.colors.primary}CC"; + childBorder = "${cfg.theme.colors.primary}CC"; + indicator = "${cfg.theme.colors.primary}CC"; text = "${cfg.theme.colors.text}"; }; focusedInactive = { - background = "${cfg.theme.colors.inactive}AA"; - border = "${cfg.theme.colors.inactive}AA"; - childBorder = "${cfg.theme.colors.inactive}AA"; - indicator = "${cfg.theme.colors.inactive}AA"; + background = "${cfg.theme.colors.inactive}99"; + border = "${cfg.theme.colors.inactive}99"; + childBorder = "${cfg.theme.colors.inactive}99"; + indicator = "${cfg.theme.colors.inactive}99"; text = "${cfg.theme.colors.text}"; }; unfocused = { - background = "${cfg.theme.colors.inactive}AA"; - border = "${cfg.theme.colors.inactive}AA"; - childBorder = "${cfg.theme.colors.inactive}AA"; - indicator = "${cfg.theme.colors.inactive}AA"; + background = "${cfg.theme.colors.inactive}99"; + border = "${cfg.theme.colors.inactive}99"; + childBorder = "${cfg.theme.colors.inactive}99"; + indicator = "${cfg.theme.colors.inactive}99"; text = "${cfg.theme.colors.text}"; }; }; @@ -256,11 +256,14 @@ in { bindswitch --reload --locked lid:on output eDP-1 disable bindswitch --reload --locked lid:off output eDP-1 enable + + default_border pixel 2 + default_floating_border pixel 2 '' + lib.strings.optionalString (config.wayland.windowManager.sway.package == pkgs.swayfx) '' blur enable - blur_passes 1 + blur_passes 2 # corner_radius 10 shadows enable diff --git a/homeManagerModules/services/mako/default.nix b/homeManagerModules/services/mako/default.nix index 4c264f4e..3972fc98 100644 --- a/homeManagerModules/services/mako/default.nix +++ b/homeManagerModules/services/mako/default.nix @@ -10,8 +10,8 @@ in { services.mako = { actions = true; anchor = "top-center"; - backgroundColor = "${cfg.theme.colors.background}CC"; - borderColor = "${cfg.theme.colors.primary}EE"; + backgroundColor = "${cfg.theme.colors.background}99"; + borderColor = "${cfg.theme.colors.primary}CC"; borderRadius = 10; borderSize = 2; defaultTimeout = 10000; diff --git a/homeManagerModules/services/waybar/default.nix b/homeManagerModules/services/waybar/default.nix index 5f3b203b..c3a3c8b2 100644 --- a/homeManagerModules/services/waybar/default.nix +++ b/homeManagerModules/services/waybar/default.nix @@ -315,7 +315,7 @@ in { #tray, #workspaces { border-radius: 10px; - background: rgba (36, 36, 36, 0.8); + background: rgba (36, 36, 36, 0.6); margin: 5px 10px 0px 10px; padding: 0px 10px 0px 10px; } @@ -327,7 +327,7 @@ in { #submap, #mode { color: ${cfg.theme.colors.text}; - background: rgba(255, 123, 99, 0.8); + background: rgba(255, 123, 99, 0.6); } '';