refactor(desktop): unify animations on both desktops
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-11-18 11:32:02 -05:00
parent 6eb0921ec8
commit 2d39d81560
6 changed files with 50 additions and 77 deletions

View file

@ -1,6 +0,0 @@
# Cosmetic
general {
gaps_in = 10
gaps_out = 20
border_size = 0
}

View file

@ -1,44 +0,0 @@
# Cosmetic
general {
gaps_in = 5
gaps_out = 5
border_size = 2
col.active_border = rgb(411C6C)
col.inactive_border = rgba(595959aa)
}
decoration {
rounding = 20
blur {
enabled = true
size = 3
passes = 1
}
shadow {
enabled = false
}
}
animations {
enabled = yes
# Fade out bezier
bezier = easeInExpo , 0.95 , 0.05, 0.795, 0.035
# Fade in bezier
bezier = easeOutExpo , 0.19 , 1 , 0.22 , 1
bezier = easeInOutQuart, 0.77 , 0 , 0.175, 1
bezier = easeOutQuart , 0.165, 0.84, 0.44 , 1
bezier = easeInQuart , 0.895, 0.03, 0.685, 0.22
animation = windowsIn , 1, 4, easeOutQuart, slide
animation = windowsOut , 1, 4, easeInQuart , slide
animation = windowsMove, 1, 4, easeOutQuart, slide
animation = workspaces, 1, 6, easeOutQuart, slide
animation = fadeIn , 1, 10, easeOutExpo
animation = fadeOut, 1, 10, easeInExpo
}

View file

@ -20,7 +20,7 @@ export default (
> >
<drawingarea <drawingarea
css={` css={`
border-radius: 18px; border-radius: 8px;
border-width: 0.068rem; border-width: 0.068rem;
${css} ${css}
`} `}

View file

@ -1,13 +1,43 @@
{...}: { {...}: {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = { settings = {
general = {
gaps_in = 5;
gaps_out = 5;
border_size = 0;
};
decoration = {
rounding = 12;
blur = {
enabled = true;
size = 3;
passes = 1;
};
shadow.enabled = false;
};
animations = { animations = {
enabled = true;
bezier = [ bezier = [
"easeInQuart , 0.895, 0.03, 0.685, 0.22"
"easeOutQuart , 0.165, 0.84, 0.44 , 1"
"easeInOutQuart, 0.77, 0 , 0.175, 1" "easeInOutQuart, 0.77, 0 , 0.175, 1"
# Fade out
"easeInExpo , 0.95, 0.05, 0.795, 0.035" "easeInExpo , 0.95, 0.05, 0.795, 0.035"
]; ];
animation = [ animation = [
"workspaces, 1, 6, easeOutQuart, slide"
"windows, 1, 4, easeOutQuart, slide"
"fadeIn , 0"
"fadeOut, 1, 3000, easeInExpo"
"fadeLayersIn , 0" "fadeLayersIn , 0"
"fadeLayersOut, 1, 3000, easeInExpo" "fadeLayersOut, 1, 3000, easeInExpo"
"layers , 1, 4 , easeInOutQuart, slide left" "layers , 1, 4 , easeInOutQuart, slide left"

View file

@ -22,7 +22,13 @@ in {
}; };
astalLibs = astalLibs =
attrValues ( attrValues (
removeAttrs ags.inputs.astal.packages.${pkgs.system} ["docs" "gjs" "cava"] removeAttrs ags.inputs.astal.packages.${pkgs.system} [
"cava"
"powerprofiles"
"river"
"docs" # not a lib
"gjs" # not a lib
]
) )
++ [gtk-session-lock.packages.${pkgs.system}.default]; ++ [gtk-session-lock.packages.${pkgs.system}.default];

View file

@ -1,10 +1,4 @@
self: { self: {...}: {
config,
lib,
...
}: let
inherit (lib) mkIf;
in {
imports = [ imports = [
./gtk ./gtk
./xresources.nix ./xresources.nix
@ -15,8 +9,7 @@ in {
]; ];
config.wayland.windowManager.hyprland = { config.wayland.windowManager.hyprland = {
settings = settings = {
{
windowrule = [ windowrule = [
"size 1231 950,title:^(Open Folder)$" "size 1231 950,title:^(Open Folder)$"
"float,title:^(Open Folder)$" "float,title:^(Open Folder)$"
@ -28,13 +21,7 @@ in {
layerrule = [ layerrule = [
"noanim, selection" "noanim, selection"
]; ];
} };
// (
mkIf (config.home.username != "greeter") {
# This file should only be used for theming
source = ["${config.vars.configDir}/hypr/main.conf"];
}
);
}; };
# For accurate stack trace # For accurate stack trace