Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

themes: opacity + blur revamp #77

Merged
merged 4 commits into from
Aug 9, 2024
Merged

themes: opacity + blur revamp #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
053aaee
migrate to new transparency settings
alyraffauf Aug 8, 2024
b03a34b
sway: set default border and floating border to 2
alyraffauf Aug 8, 2024
3cc9943
nix fmt
alyraffauf Aug 8, 2024
958e2f4
hyprland: don't dimaround rofi
alyraffauf Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion homeManagerModules/apps/alacritty/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ in {
blur = true;
decorations = "Full";
dynamic_padding = true;
opacity = 0.8;
opacity = 0.6;
};
};
};
Expand Down
2 changes: 1 addition & 1 deletion homeManagerModules/apps/kitty/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
30 changes: 15 additions & 15 deletions homeManagerModules/apps/rofi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion homeManagerModules/apps/wlogout/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ in {
}

window {
background-color: rgba(35, 38, 52, 0.8);
background-color: rgba(35, 38, 52, 0.6);
}

button {
Expand Down
7 changes: 3 additions & 4 deletions homeManagerModules/desktop/hyprland/settings.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ in {
decoration = {
blur = {
enabled = true;
passes = 1;
passes = 2;
size = 8;
};

Expand All @@ -109,7 +109,6 @@ in {
"blur,rofi"
"blur,swayosd"
"blur,waybar"
"dimaround,rofi"
"ignorezero,gtk-layer-shell"
"ignorezero,notifications"
"ignorezero,swayosd"
Expand Down Expand Up @@ -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;
Expand Down
31 changes: 17 additions & 14 deletions homeManagerModules/desktop/sway/settings.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}";
};
};
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions homeManagerModules/services/mako/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions homeManagerModules/services/waybar/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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);
}
'';

Expand Down