Run.Parsers -> Config.Template

2 files changed, 19 insertions, 17 deletions

diff --git a/src/Xmobar/Text/Output.hs b/src/Xmobar/Text/Output.hs
index 783a5bb..6e5b0f1 100644
--- a/src/Xmobar/Text/Output.hs
+++ b/src/Xmobar/Text/Output.hs
@@ -15,13 +15,15 @@
 
 module Xmobar.Text.Output (initLoop, format) where
 
-import Xmobar.Config.Types (Config(textOutputFormat, additionalFonts, font)
-                           , TextOutputFormat(..))
-import Xmobar.Run.Parsers ( Segment
-                          , Widget(..)
-                          , parseString
-                          , tColorsString
-                          , colorComponents)
+import Xmobar.Config.Types ( Config (..)
+                           , TextOutputFormat (..)
+                           , Segment
+                           , Widget (..)
+                           , tColorsString)
+
+
+import Xmobar.Config.Parse (colorComponents)
+import Xmobar.Config.Template (parseString)
 
 import Xmobar.Text.Ansi (withAnsiColor)
 import Xmobar.Text.Pango (withPangoMarkup)
diff --git a/src/Xmobar/Text/Swaybar.hs b/src/Xmobar/Text/Swaybar.hs
index a2fc585..355de06 100644
--- a/src/Xmobar/Text/Swaybar.hs
+++ b/src/Xmobar/Text/Swaybar.hs
@@ -24,16 +24,16 @@ import Data.ByteString.Lazy.UTF8 (toString)
 
 import GHC.Generics
 
-import Xmobar.Config.Types (Config (additionalFonts))
-
-import Xmobar.Run.Parsers ( Segment
-                          , Widget(..)
-                          , Box(..)
-                          , BoxBorder(..)
-                          , FontIndex
-                          , tBoxes
-                          , tColorsString
-                          , colorComponents)
+import Xmobar.Config.Types ( Config (additionalFonts)
+                           , Segment
+                           , Widget(..)
+                           , Box(..)
+                           , BoxBorder(..)
+                           , FontIndex
+                           , tBoxes
+                           , tColorsString)
+
+import Xmobar.Config.Parse (colorComponents)
 
 import Xmobar.Text.SwaybarClicks (startHandler)
 import Xmobar.Text.Pango (withPangoFont)