3 files changed, 15 insertions, 14 deletions

diff --git a/src/animation/mod.rs b/src/animation/mod.rs
index 044ddd46..a8de3275 100644
--- a/src/animation/mod.rs
+++ b/src/animation/mod.rs
@@ -77,7 +77,7 @@ impl Animation {
         let start_time = self.start_time;
 
         match config.kind {
-            niri_config::AnimationKind::Spring(p) => {
+            niri_config::animations::Kind::Spring(p) => {
                 let params = SpringParams::new(p.damping_ratio, f64::from(p.stiffness), p.epsilon);
 
                 let spring = Spring {
@@ -88,7 +88,7 @@ impl Animation {
                 };
                 *self = Self::spring(self.clock.clone(), spring);
             }
-            niri_config::AnimationKind::Easing(p) => {
+            niri_config::animations::Kind::Easing(p) => {
                 *self = Self::ease(
                     self.clock.clone(),
                     self.from,
@@ -346,13 +346,13 @@ impl Curve {
     }
 }
 
-impl From<niri_config::AnimationCurve> for Curve {
-    fn from(value: niri_config::AnimationCurve) -> Self {
+impl From<niri_config::animations::Curve> for Curve {
+    fn from(value: niri_config::animations::Curve) -> Self {
         match value {
-            niri_config::AnimationCurve::Linear => Curve::Linear,
-            niri_config::AnimationCurve::EaseOutQuad => Curve::EaseOutQuad,
-            niri_config::AnimationCurve::EaseOutCubic => Curve::EaseOutCubic,
-            niri_config::AnimationCurve::EaseOutExpo => Curve::EaseOutExpo,
+            niri_config::animations::Curve::Linear => Curve::Linear,
+            niri_config::animations::Curve::EaseOutQuad => Curve::EaseOutQuad,
+            niri_config::animations::Curve::EaseOutCubic => Curve::EaseOutCubic,
+            niri_config::animations::Curve::EaseOutExpo => Curve::EaseOutExpo,
         }
     }
 }
diff --git a/src/layout/tests/animations.rs b/src/layout/tests/animations.rs
index bae2d512..3f39e25a 100644
--- a/src/layout/tests/animations.rs
+++ b/src/layout/tests/animations.rs
@@ -1,7 +1,7 @@
 use std::fmt::Write as _;
 
 use insta::assert_snapshot;
-use niri_config::{AnimationCurve, AnimationKind, EasingParams};
+use niri_config::animations::{Curve, EasingParams, Kind};
 
 use super::*;
 
@@ -23,9 +23,9 @@ fn format_tiles(layout: &Layout<TestWindow>) -> String {
 }
 
 fn make_options() -> Options {
-    const LINEAR: AnimationKind = AnimationKind::Easing(EasingParams {
+    const LINEAR: Kind = Kind::Easing(EasingParams {
         duration_ms: 1000,
-        curve: AnimationCurve::Linear,
+        curve: Curve::Linear,
     });
 
     let mut options = Options {
diff --git a/src/tests/animations.rs b/src/tests/animations.rs
index d930d254..90d64dc8 100644
--- a/src/tests/animations.rs
+++ b/src/tests/animations.rs
@@ -2,7 +2,8 @@ use std::fmt::Write as _;
 use std::time::Duration;
 
 use insta::assert_snapshot;
-use niri_config::{AnimationCurve, AnimationKind, Config, EasingParams, FloatOrInt};
+use niri_config::animations::{Curve, EasingParams, Kind};
+use niri_config::{Config, FloatOrInt};
 use niri_ipc::SizeChange;
 use smithay::utils::{Point, Size};
 use wayland_client::protocol::wl_surface::WlSurface;
@@ -73,9 +74,9 @@ fn set_time(niri: &mut Niri, time: Duration) {
 
 // Sets up a fixture with linear animations, a renderer, and an output.
 fn set_up() -> Fixture {
-    const LINEAR: AnimationKind = AnimationKind::Easing(EasingParams {
+    const LINEAR: Kind = Kind::Easing(EasingParams {
         duration_ms: 1000,
-        curve: AnimationCurve::Linear,
+        curve: Curve::Linear,
     });
 
     let mut config = Config::default();