Refactor, try to limit dependencies

src/Dodge/Data/Equipment/Misc.hs

@@ -1,9 +1,11 @@
 {-# LANGUAGE StrictData #-}
-{-# LANGUAGE DeriveGeneric #-}
-module Dodge.Data.Equipment.Misc
-    where
-import GHC.Generics
+{-# LANGUAGE TemplateHaskell #-}
+
+module Dodge.Data.Equipment.Misc where
+
 import Data.Aeson
+import Data.Aeson.TH
+
 data EquipSite
     = GoesOnHead
     | GoesOnChest
@@ -11,10 +13,8 @@ data EquipSite
     | GoesOnWrist
     | GoesOnLegs
     | GoesOnSpecial
-    deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON EquipSite where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON EquipSite
+    deriving (Eq, Ord, Show, Read)
+
 data EquipPosition
     = OnHead
     | OnChest
@@ -23,9 +23,11 @@ data EquipPosition
     | OnRightWrist
     | OnLegs
     | OnSpecial
-    deriving (Eq,Ord,Show,Read,Generic)
-instance ToJSON EquipPosition where
-    toEncoding = genericToEncoding defaultOptions
-instance FromJSON EquipPosition
+    deriving (Eq, Ord, Show, Read)
+
 instance ToJSONKey EquipPosition
+
 instance FromJSONKey EquipPosition
+
+deriveJSON defaultOptions ''EquipSite
+deriveJSON defaultOptions ''EquipPosition