Refactor, try to limit dependencies

src/Dodge/Data/GenParams.hs

@@ -1,24 +1,23 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
-module Dodge.Data.GenParams
-    where
-import GHC.Generics
-import Data.Aeson
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.GenParams where
+
 import Color
-import Dodge.Data.Damage.Type
 import Control.Lens
+import Data.Aeson
+import Data.Aeson.TH
 import qualified Data.Map.Strict as M
+import Dodge.Data.Damage.Type
+
 newtype GenParams = GenParams
-    { _sensorCoding :: M.Map DamageType (PaletteColor,DecorationShape)
+    { _sensorCoding :: M.Map DamageType (PaletteColor, DecorationShape)
     }
-  deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON GenParams where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON GenParams 
+    deriving (Eq, Ord, Show, Read)
+
 data DecorationShape = PLUS | SQUARE | CIRCLE | THREELINES
-  deriving (Eq,Ord,Enum,Show,Read,Generic)
-instance ToJSON DecorationShape where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON DecorationShape 
+    deriving (Eq, Ord, Enum, Show, Read)
+
 makeLenses ''GenParams
+deriveJSON defaultOptions ''GenParams
+deriveJSON defaultOptions ''DecorationShape