themes: opacity + blur revamp (#77)
Some checks are pending
git-mirror / gitlab-sync (push) Waiting to run
nix-build / default-build (push) Waiting to run
nix-build / fallarbor-build (push) Waiting to run
nix-build / lavaridge-build (push) Waiting to run
nix-build / mauville-build (push) Waiting to run
nix-build / petalburg-build (push) Waiting to run
nix-build / rustboro-build (push) Waiting to run
nix-check / fmt-check (push) Waiting to run
nix-check / eval-check (push) Waiting to run

* migrate to new transparency settings

* sway: set default border and floating border to 2

* nix fmt

* hyprland: don't dimaround rofi
This commit is contained in:
Aly Raffauf 2024-08-08 20:47:25 -04:00 committed by GitHub
parent e82d9087f4
commit 7394dc9339
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 42 additions and 40 deletions

View file

@ -35,7 +35,7 @@ in {
blur = true; blur = true;
decorations = "Full"; decorations = "Full";
dynamic_padding = true; dynamic_padding = true;
opacity = 0.8; opacity = 0.6;
}; };
}; };
}; };

View file

@ -16,7 +16,7 @@ in {
}; };
settings = { settings = {
background_opacity = "0.8"; background_opacity = "0.6";
confirm_os_window_close = "0"; 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\""; 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"; tab_bar_style = "powerline";

View file

@ -74,34 +74,34 @@ in {
foreground: ${cfg.theme.colors.text}; foreground: ${cfg.theme.colors.text};
normal-foreground: @foreground; normal-foreground: @foreground;
alternate-normal-background: transparent; alternate-normal-background: transparent;
red: ${cfg.theme.colors.secondary}; red: ${cfg.theme.colors.secondary}CC;
selected-urgent-foreground: ${cfg.theme.colors.secondary}; selected-urgent-foreground: ${cfg.theme.colors.secondary}CC;
blue: ${cfg.theme.colors.primary}; blue: ${cfg.theme.colors.primary}CC;
urgent-foreground: ${cfg.theme.colors.primary}; urgent-foreground: ${cfg.theme.colors.primary}CC;
alternate-urgent-background: transparent; alternate-urgent-background: transparent;
active-foreground: ${cfg.theme.colors.primary}; active-foreground: ${cfg.theme.colors.primary}CC;
lightbg: rgba ( 238, 232, 213, 100 % ); lightbg: rgba ( 238, 232, 213, 80 % );
selected-active-foreground: rgba ( 32, 81, 113, 100 % ); selected-active-foreground: ${cfg.theme.colors.text};
alternate-active-background: transparent; alternate-active-background: transparent;
background: transparent; background: transparent;
bordercolor: ${cfg.theme.colors.background}CC; bordercolor: ${cfg.theme.colors.background}99;
alternate-normal-foreground: @foreground; alternate-normal-foreground: @foreground;
normal-background: transparent; normal-background: transparent;
lightfg: rgba ( 88, 104, 117, 100 % ); lightfg: ${cfg.theme.colors.primary}CC;
selected-normal-background: ${cfg.theme.colors.primary}; selected-normal-background: ${cfg.theme.colors.primary};
border-color: ${cfg.theme.colors.primary}; border-color: ${cfg.theme.colors.primary}CC;
spacing: 2; spacing: 2;
separatorcolor: ${cfg.theme.colors.primary}; separatorcolor: ${cfg.theme.colors.primary}CC;
urgent-background: transparent; urgent-background: transparent;
selected-urgent-background: ${cfg.theme.colors.primary}; selected-urgent-background: ${cfg.theme.colors.primary}CC;
alternate-urgent-foreground: @urgent-foreground; alternate-urgent-foreground: @urgent-foreground;
background-color: rgba ( 0, 0, 0, 0 % ); background-color: transparent;
alternate-active-foreground: @active-foreground; alternate-active-foreground: @active-foreground;
active-background: ${cfg.theme.colors.background}CC; active-background: transparent;
selected-active-background: ${cfg.theme.colors.primary}; selected-active-background: ${cfg.theme.colors.primary};
} }
window { window {
background-color: ${cfg.theme.colors.background}CC; background-color: ${cfg.theme.colors.background}99;
border: 2; border: 2;
border-radius: 10px; border-radius: 10px;
padding: 0; padding: 0;

View file

@ -40,7 +40,7 @@ in {
} }
window { window {
background-color: rgba(35, 38, 52, 0.8); background-color: rgba(35, 38, 52, 0.6);
} }
button { button {

View file

@ -93,7 +93,7 @@ in {
decoration = { decoration = {
blur = { blur = {
enabled = true; enabled = true;
passes = 1; passes = 2;
size = 8; size = 8;
}; };
@ -109,7 +109,6 @@ in {
"blur,rofi" "blur,rofi"
"blur,swayosd" "blur,swayosd"
"blur,waybar" "blur,waybar"
"dimaround,rofi"
"ignorezero,gtk-layer-shell" "ignorezero,gtk-layer-shell"
"ignorezero,notifications" "ignorezero,notifications"
"ignorezero,swayosd" "ignorezero,swayosd"
@ -146,8 +145,8 @@ in {
}; };
general = { general = {
"col.active_border" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.secondary}EE) rgba(${lib.strings.removePrefix "#" cfg.theme.colors.primary}EE) 45deg"; "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}AA)"; "col.inactive_border" = "rgba(${lib.strings.removePrefix "#" cfg.theme.colors.inactive}99)";
allow_tearing = false; allow_tearing = false;
border_size = 2; border_size = 2;
gaps_in = 5; gaps_in = 5;

View file

@ -23,29 +23,29 @@ in {
modifier = modifier; modifier = modifier;
colors = { colors = {
background = "${cfg.theme.colors.primary}EE"; background = "${cfg.theme.colors.primary}CC";
focused = { focused = {
background = "${cfg.theme.colors.primary}EE"; background = "${cfg.theme.colors.primary}CC";
border = "${cfg.theme.colors.primary}EE"; border = "${cfg.theme.colors.primary}CC";
childBorder = "${cfg.theme.colors.primary}EE"; childBorder = "${cfg.theme.colors.primary}CC";
indicator = "${cfg.theme.colors.primary}EE"; indicator = "${cfg.theme.colors.primary}CC";
text = "${cfg.theme.colors.text}"; text = "${cfg.theme.colors.text}";
}; };
focusedInactive = { focusedInactive = {
background = "${cfg.theme.colors.inactive}AA"; background = "${cfg.theme.colors.inactive}99";
border = "${cfg.theme.colors.inactive}AA"; border = "${cfg.theme.colors.inactive}99";
childBorder = "${cfg.theme.colors.inactive}AA"; childBorder = "${cfg.theme.colors.inactive}99";
indicator = "${cfg.theme.colors.inactive}AA"; indicator = "${cfg.theme.colors.inactive}99";
text = "${cfg.theme.colors.text}"; text = "${cfg.theme.colors.text}";
}; };
unfocused = { unfocused = {
background = "${cfg.theme.colors.inactive}AA"; background = "${cfg.theme.colors.inactive}99";
border = "${cfg.theme.colors.inactive}AA"; border = "${cfg.theme.colors.inactive}99";
childBorder = "${cfg.theme.colors.inactive}AA"; childBorder = "${cfg.theme.colors.inactive}99";
indicator = "${cfg.theme.colors.inactive}AA"; indicator = "${cfg.theme.colors.inactive}99";
text = "${cfg.theme.colors.text}"; text = "${cfg.theme.colors.text}";
}; };
}; };
@ -256,11 +256,14 @@ in {
bindswitch --reload --locked lid:on output eDP-1 disable bindswitch --reload --locked lid:on output eDP-1 disable
bindswitch --reload --locked lid:off output eDP-1 enable 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 + lib.strings.optionalString (config.wayland.windowManager.sway.package
== pkgs.swayfx) '' == pkgs.swayfx) ''
blur enable blur enable
blur_passes 1 blur_passes 2
# corner_radius 10 # corner_radius 10
shadows enable shadows enable

View file

@ -10,8 +10,8 @@ in {
services.mako = { services.mako = {
actions = true; actions = true;
anchor = "top-center"; anchor = "top-center";
backgroundColor = "${cfg.theme.colors.background}CC"; backgroundColor = "${cfg.theme.colors.background}99";
borderColor = "${cfg.theme.colors.primary}EE"; borderColor = "${cfg.theme.colors.primary}CC";
borderRadius = 10; borderRadius = 10;
borderSize = 2; borderSize = 2;
defaultTimeout = 10000; defaultTimeout = 10000;

View file

@ -315,7 +315,7 @@ in {
#tray, #tray,
#workspaces { #workspaces {
border-radius: 10px; border-radius: 10px;
background: rgba (36, 36, 36, 0.8); background: rgba (36, 36, 36, 0.6);
margin: 5px 10px 0px 10px; margin: 5px 10px 0px 10px;
padding: 0px 10px 0px 10px; padding: 0px 10px 0px 10px;
} }
@ -327,7 +327,7 @@ in {
#submap, #submap,
#mode { #mode {
color: ${cfg.theme.colors.text}; color: ${cfg.theme.colors.text};
background: rgba(255, 123, 99, 0.8); background: rgba(255, 123, 99, 0.6);
} }
''; '';