From 64c41fa2c8853aefc8f62bf9492043a6c25b8c8f Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Sun, 7 Jan 2024 09:07:22 +0400
Subject: Move config into a separate crate

Get miette and knuffel deps contained within.
---
 src/layout/mod.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/layout/mod.rs')

diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index c7fce722..69d78676 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -33,6 +33,7 @@ use std::mem;
 use std::rc::Rc;
 use std::time::Duration;
 
+use niri_config::{self, Config, SizeChange, Struts};
 use smithay::backend::renderer::element::AsRenderElements;
 use smithay::backend::renderer::{ImportAll, Renderer};
 use smithay::desktop::space::SpaceElement;
@@ -51,7 +52,6 @@ use self::workspace::{
     compute_working_area, ColumnWidth, OutputId, Workspace, WorkspaceRenderElement,
 };
 use crate::animation::Animation;
-use crate::config::{self, Config, SizeChange, Struts};
 use crate::utils::output_size;
 
 mod focus_ring;
@@ -137,8 +137,8 @@ pub struct Options {
     gaps: i32,
     /// Extra padding around the working area in logical pixels.
     struts: Struts,
-    focus_ring: config::FocusRing,
-    border: config::FocusRing,
+    focus_ring: niri_config::FocusRing,
+    border: niri_config::FocusRing,
     /// Column widths that `toggle_width()` switches between.
     preset_widths: Vec<ColumnWidth>,
     /// Initial width for new columns.
@@ -151,7 +151,7 @@ impl Default for Options {
             gaps: 16,
             struts: Default::default(),
             focus_ring: Default::default(),
-            border: config::default_border(),
+            border: niri_config::default_border(),
             preset_widths: vec![
                 ColumnWidth::Proportion(1. / 3.),
                 ColumnWidth::Proportion(0.5),
-- 
cgit