From b77a1696b392b67a7eaa28bbac368551b2ec6d3c Mon Sep 17 00:00:00 2001 From: matt1432 Date: Mon, 21 Oct 2024 04:04:41 -0400 Subject: [PATCH] feat(desktop): change bezier curve --- devices/wim/config/hypr/main.conf | 28 +++++++++---------- .../config/scss/wim-widgets/workspaces.scss | 2 +- nixosModules/ags/default.nix | 9 +++--- nixosModules/ags/v2/lib.ts | 2 +- nixosModules/ags/v2/widgets/bar/style.scss | 6 ++-- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/devices/wim/config/hypr/main.conf b/devices/wim/config/hypr/main.conf index 680ad837..9b2d69ce 100644 --- a/devices/wim/config/hypr/main.conf +++ b/devices/wim/config/hypr/main.conf @@ -22,23 +22,21 @@ decoration { animations { enabled = yes - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + # 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 = easeInBack, 0.36, 0, 0.66, -0.56 - bezier = easeOutBack, 0.34, 1.56, 0.64, 1 - bezier = softEaseOutBack, 0.34, 1.26, 0.64, 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 = windows, 1, 7, myBezier - animation = windowsIn, 1, 7, easeOutBack, slide - animation = windowsOut, 1, 7, easeInBack, slide - animation = windowsMove, 1, 7, easeOutBack, slide + animation = windowsIn , 1, 4, easeOutQuart, slide + animation = windowsOut , 1, 4, easeInQuart , slide + animation = windowsMove, 1, 4, easeOutQuart, slide - animation = workspaces, 1, 6, softEaseOutBack, slide + animation = workspaces, 1, 6, easeOutQuart, slide - animation = fade, 1, 7, default - animation = fadeIn, 1, 7, easeOutBack - animation = fadeOut, 1, 7, easeInBack - - animation = border, 1, 10, default - animation = borderangle, 1, 8, default + animation = fadeIn , 1, 10, easeOutExpo + animation = fadeOut, 1, 10, easeInExpo } diff --git a/nixosModules/ags/config/scss/wim-widgets/workspaces.scss b/nixosModules/ags/config/scss/wim-widgets/workspaces.scss index f897c8b6..3615bb6a 100644 --- a/nixosModules/ags/config/scss/wim-widgets/workspaces.scss +++ b/nixosModules/ags/config/scss/wim-widgets/workspaces.scss @@ -29,6 +29,6 @@ .active { border: 2px solid #50fa7b; - transition: margin-left 0.5s cubic-bezier(0.34, 1.56, 0.64, 1); + transition: margin-left 0.5s cubic-bezier(0.165, 0.84, 0.44, 1); } } diff --git a/nixosModules/ags/default.nix b/nixosModules/ags/default.nix index 62824af8..952c88b2 100644 --- a/nixosModules/ags/default.nix +++ b/nixosModules/ags/default.nix @@ -145,13 +145,14 @@ in { settings = { animations = { bezier = [ - "easeInOutBack, 0.68, -0.6, 0.32, 1.6" + "easeInOutQuart, 0.77, 0 , 0.175, 1" + "easeInExpo , 0.95, 0.05, 0.795, 0.035" ]; animation = [ - "fadeLayersIn, 0" - "fadeLayersOut, 1, 3000, default" - "layers, 1, 8, easeInOutBack, slide left" + "fadeLayersIn , 0" + "fadeLayersOut, 1, 3000, easeInExpo" + "layers , 1, 4 , easeInOutQuart, slide left" ]; }; diff --git a/nixosModules/ags/v2/lib.ts b/nixosModules/ags/v2/lib.ts index 145c22d0..b4124dfe 100644 --- a/nixosModules/ags/v2/lib.ts +++ b/nixosModules/ags/v2/lib.ts @@ -1,6 +1,6 @@ import { Gdk } from 'astal/gtk3'; -import AstalHyprland from 'gi://AstalHyprland?version=0.1'; +import AstalHyprland from 'gi://AstalHyprland?version=0.1'; const Hyprland = AstalHyprland.get_default(); /* Types */ diff --git a/nixosModules/ags/v2/widgets/bar/style.scss b/nixosModules/ags/v2/widgets/bar/style.scss index f160d594..d9029bb1 100644 --- a/nixosModules/ags/v2/widgets/bar/style.scss +++ b/nixosModules/ags/v2/widgets/bar/style.scss @@ -36,18 +36,18 @@ .occupied { border: 2px solid $window_bg_color; background: $accent_color; - transition: background-color 0.6s ease-in-out; + transition: background-color 0.3s ease-in-out; } .urgent { border: 2px solid $window_bg_color; background: red; - transition: background-color 0.6s ease-in-out; + transition: background-color 0.3s ease-in-out; } .active { border: 2px solid #50fa7b; - transition: margin-left 0.5s cubic-bezier(0.34, 1.56, 0.64, 1); + transition: margin-left 0.3s cubic-bezier(0.165, 0.84, 0.44, 1); } }