Clean up imports.

[dead/halcyon.git] / src / OptionalConfiguration.hs

diff --git a/src/OptionalConfiguration.hs b/src/OptionalConfiguration.hs
index 77b3a06d2c42bef78908bdc09827cad73e91988d..607659ea811ce200577ed1a04a645b86ae2a602b 100644 (file)
--- a/src/OptionalConfiguration.hs
+++ b/src/OptionalConfiguration.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverloadedStrings #-}
 
--- | The program will parse ~/.twatrc for any available configuration
+-- | The program will parse ~/.halcyonrc for any available configuration
 --   directives, resulting in an OptionalCfg. The command-line
 --   arguments will be used to create another OptionalCfg, and the two
 --   will be merged. Finally, a default_config will be updated from
@@ -11,18 +11,20 @@
 
 module OptionalConfiguration (
   OptionalCfg(..),
-  from_rc
-  )
+  from_rc )
 where
 
-import qualified Data.Configurator as DC
+import qualified Data.Configurator as DC (
+  Worth (Optional),
+  load,
+  lookup )
 
-import Data.Data (Data)
-import Data.Maybe (fromMaybe)
-import Data.Monoid (Monoid(..))
-import Data.Typeable (Typeable)
+import Data.Data ( Data )
+import Data.Maybe ( fromMaybe )
+import Data.Monoid ( Monoid(..) )
+import Data.Typeable ( Typeable )
 
-import Usernames
+import Usernames ( Usernames(..) )
 
 
 -- | The same as Cfg, except everything is optional. It's easy to
@@ -89,7 +91,7 @@ instance Monoid OptionalCfg where
 
 from_rc :: IO OptionalCfg
 from_rc = do
-  cfg <- DC.load [ DC.Optional "$(HOME)/.twatrc" ]
+  cfg <- DC.load [ DC.Optional "$(HOME)/.halcyonrc" ]
   cfg_consumer_key <- DC.lookup cfg "consumer-key"
   cfg_consumer_secret <- DC.lookup cfg "consumer-secret"
   cfg_access_token <- DC.lookup cfg "access-token"