From 2d39d815601236cfcbca57087cd2a74795bf5f56 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 18 Nov 2024 11:32:02 -0500
Subject: [PATCH] refactor(desktop): unify animations on both desktops

---
 devices/binto/config/hypr/main.conf           |  6 ---
 devices/wim/config/hypr/main.conf             | 44 -------------------
 .../config/widgets/corners/screen-corners.tsx |  2 +-
 nixosModules/ags/hyprland.nix                 | 30 +++++++++++++
 nixosModules/ags/packages.nix                 |  8 +++-
 nixosModules/desktop/theme/default.nix        | 37 +++++-----------
 6 files changed, 50 insertions(+), 77 deletions(-)
 delete mode 100644 devices/binto/config/hypr/main.conf
 delete mode 100644 devices/wim/config/hypr/main.conf

diff --git a/devices/binto/config/hypr/main.conf b/devices/binto/config/hypr/main.conf
deleted file mode 100644
index a14b8e95..00000000
--- a/devices/binto/config/hypr/main.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Cosmetic
-general {
-    gaps_in = 10
-    gaps_out = 20
-    border_size = 0
-}
diff --git a/devices/wim/config/hypr/main.conf b/devices/wim/config/hypr/main.conf
deleted file mode 100644
index 4aa6d0ae..00000000
--- a/devices/wim/config/hypr/main.conf
+++ /dev/null
@@ -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
-}
diff --git a/nixosModules/ags/config/widgets/corners/screen-corners.tsx b/nixosModules/ags/config/widgets/corners/screen-corners.tsx
index 69dc74a8..d1555b30 100644
--- a/nixosModules/ags/config/widgets/corners/screen-corners.tsx
+++ b/nixosModules/ags/config/widgets/corners/screen-corners.tsx
@@ -20,7 +20,7 @@ export default (
     >
         <drawingarea
             css={`
-                border-radius: 18px;
+                border-radius: 8px;
                 border-width: 0.068rem;
                 ${css}
             `}
diff --git a/nixosModules/ags/hyprland.nix b/nixosModules/ags/hyprland.nix
index dbcd1777..5552d545 100644
--- a/nixosModules/ags/hyprland.nix
+++ b/nixosModules/ags/hyprland.nix
@@ -1,13 +1,43 @@
 {...}: {
   wayland.windowManager.hyprland = {
     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 = {
+        enabled = true;
+
         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"
+
+          # Fade out
           "easeInExpo    , 0.95, 0.05, 0.795, 0.035"
         ];
 
         animation = [
+          "workspaces, 1, 6, easeOutQuart, slide"
+
+          "windows, 1, 4, easeOutQuart, slide"
+          "fadeIn , 0"
+          "fadeOut, 1, 3000, easeInExpo"
+
           "fadeLayersIn , 0"
           "fadeLayersOut, 1, 3000, easeInExpo"
           "layers       , 1, 4   , easeInOutQuart, slide left"
diff --git a/nixosModules/ags/packages.nix b/nixosModules/ags/packages.nix
index a8121052..ee8f7026 100644
--- a/nixosModules/ags/packages.nix
+++ b/nixosModules/ags/packages.nix
@@ -22,7 +22,13 @@ in {
       };
       astalLibs =
         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];
 
diff --git a/nixosModules/desktop/theme/default.nix b/nixosModules/desktop/theme/default.nix
index 11c9a5d1..125f75b8 100644
--- a/nixosModules/desktop/theme/default.nix
+++ b/nixosModules/desktop/theme/default.nix
@@ -1,10 +1,4 @@
-self: {
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) mkIf;
-in {
+self: {...}: {
   imports = [
     ./gtk
     ./xresources.nix
@@ -15,26 +9,19 @@ in {
   ];
 
   config.wayland.windowManager.hyprland = {
-    settings =
-      {
-        windowrule = [
-          "size 1231 950,title:^(Open Folder)$"
-          "float,title:^(Open Folder)$"
+    settings = {
+      windowrule = [
+        "size 1231 950,title:^(Open Folder)$"
+        "float,title:^(Open Folder)$"
 
-          "size 1231 950,title:^(Open File)$"
-          "float,title:^(Open File)$"
-        ];
+        "size 1231 950,title:^(Open File)$"
+        "float,title:^(Open File)$"
+      ];
 
-        layerrule = [
-          "noanim, selection"
-        ];
-      }
-      // (
-        mkIf (config.home.username != "greeter") {
-          # This file should only be used for theming
-          source = ["${config.vars.configDir}/hypr/main.conf"];
-        }
-      );
+      layerrule = [
+        "noanim, selection"
+      ];
+    };
   };
 
   # For accurate stack trace