diff --git a/lib/Data/Config/Suckless/KeyValue.hs b/lib/Data/Config/Suckless/KeyValue.hs index 033d002..63e5012 100644 --- a/lib/Data/Config/Suckless/KeyValue.hs +++ b/lib/Data/Config/Suckless/KeyValue.hs @@ -39,7 +39,7 @@ instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Maybe Integer) m) => HasC cfgValue = lastMay . val <$> getConf where val syn = [ e - | ListVal @C (Key s [LitIntVal e]) <- syn, s == key @a @(Maybe Integer) @m + | ListVal (Key s [LitIntVal e]) <- syn, s == key @a @(Maybe Integer) @m ] @@ -54,28 +54,28 @@ instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Maybe Scientific) m) => H cfgValue = lastMay . val <$> getConf where val syn = [ e - | ListVal @C (Key s [LitScientificVal e]) <- syn, s == key @a @(Maybe Scientific) @m + | ListVal (Key s [LitScientificVal e]) <- syn, s == key @a @(Maybe Scientific) @m ] instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Maybe Bool) m) => HasCfgValue a (Maybe Bool) m where cfgValue = lastMay . val <$> getConf where val syn = [ e - | ListVal @C (Key s [LitBoolVal e]) <- syn, s == key @a @(Maybe Bool) @m + | ListVal (Key s [LitBoolVal e]) <- syn, s == key @a @(Maybe Bool) @m ] instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Maybe Value) m) => HasCfgValue a (Maybe Value) m where cfgValue = lastMay . val <$> getConf where val syn = [ toJSON v - | ListVal @C (Key s [v@ListVal{}]) <- syn, s == key @a @(Maybe Value) @m + | ListVal (Key s [v@ListVal{}]) <- syn, s == key @a @(Maybe Value) @m ] instance {-# OVERLAPPABLE #-} (HasConf m, Ord b, IsString b, HasCfgKey a (Maybe b) m) => HasCfgValue a (Maybe b) m where cfgValue = lastMay . val <$> getConf where val syn = [ fromString (show $ pretty e) - | ListVal @C (Key s [LitStrVal e]) <- syn, s == key @a @(Maybe b) @m + | ListVal (Key s [LitStrVal e]) <- syn, s == key @a @(Maybe b) @m ] @@ -83,14 +83,14 @@ instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Set Integer) m) => HasCfg cfgValue = Set.fromList . val <$> getConf where val syn = [ e - | ListVal @C (Key s [LitIntVal e]) <- syn, s == key @a @(Set Integer) @m + | ListVal (Key s [LitIntVal e]) <- syn, s == key @a @(Set Integer) @m ] instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Set Scientific) m) => HasCfgValue a (Set Scientific) m where cfgValue = Set.fromList . val <$> getConf where val syn = [ e - | ListVal @C (Key s [LitScientificVal e]) <- syn, s == key @a @(Set Scientific) @m + | ListVal (Key s [LitScientificVal e]) <- syn, s == key @a @(Set Scientific) @m ] @@ -98,7 +98,7 @@ instance {-# OVERLAPPABLE #-} (HasConf m, HasCfgKey a (Set Value) m) => HasCfgVa cfgValue = Set.fromList . val <$> getConf where val syn = [ toJSON v - | ListVal @C (Key s [v@ListVal{}]) <- syn, s == key @a @(Set Value) @m + | ListVal (Key s [v@ListVal{}]) <- syn, s == key @a @(Set Value) @m ] @@ -106,7 +106,7 @@ instance {-# OVERLAPPABLE #-} (HasConf m, Ord b, IsString b, HasCfgKey a (Set b) cfgValue = Set.fromList . val <$> getConf where val syn = [ fromString (show $ pretty e) - | ListVal @C (Key s [LitStrVal e]) <- syn, s == key @a @(Set b) @m + | ListVal (Key s [LitStrVal e]) <- syn, s == key @a @(Set b) @m ]