Format all files using ormolu

7 files changed, 33 insertions, 19 deletions

diff --git a/src/Zettel.hs b/src/Zettel.hs
index 6846263..63b4910 100644
--- a/src/Zettel.hs
+++ b/src/Zettel.hs
@@ -9,8 +9,8 @@ module Zettel
 where
 
 import Zettel.Links
+import Zettel.Math
 import Zettel.Parse
 import Zettel.Render
 import Zettel.Transclusion
 import Zettel.Types
-import Zettel.Math
diff --git a/src/Zettel/Common.hs b/src/Zettel/Common.hs
index f471321..c2fe81b 100644
--- a/src/Zettel/Common.hs
+++ b/src/Zettel/Common.hs
@@ -38,8 +38,10 @@ refreshPandocMetaZettel zid z =
   z {zettelBody = refreshPandocMetaZettel' zid z . clearPandocAttr $ zettelBody z}
 
 refreshPandocMeta :: ZettelGraph -> ZettelGraph
-refreshPandocMeta zg = ZettelGraph (Map.mapWithKey refreshPandocMetaZettel zg.unZettelGraph)
-  zg.zettelGraphBib
+refreshPandocMeta zg =
+  ZettelGraph
+    (Map.mapWithKey refreshPandocMetaZettel zg.unZettelGraph)
+    zg.zettelGraphBib
 
 parseIds :: Text -> Text
 parseIds t
diff --git a/src/Zettel/Links.hs b/src/Zettel/Links.hs
index 39a6f5a..bf5cc2d 100644
--- a/src/Zettel/Links.hs
+++ b/src/Zettel/Links.hs
@@ -41,8 +41,10 @@ forwardLinkNode zg ident zn =
     }
 
 forwardLink :: ZettelGraph -> ZettelGraph
-forwardLink zg = ZettelGraph (Map.mapWithKey (forwardLinkNode zg) $ unZettelGraph zg)
-  zg.zettelGraphBib
+forwardLink zg =
+  ZettelGraph
+    (Map.mapWithKey (forwardLinkNode zg) $ unZettelGraph zg)
+    zg.zettelGraphBib
 
 backwardLinkNode :: ZettelGraph -> ZettelId -> Zettel -> Zettel
 backwardLinkNode graph ident node = Map.foldlWithKey' f node (unZettelGraph graph)
@@ -54,8 +56,10 @@ backwardLinkNode graph ident node = Map.foldlWithKey' f node (unZettelGraph grap
       | otherwise = l
 
 backwardLink :: ZettelGraph -> ZettelGraph
-backwardLink zg = ZettelGraph (Map.mapWithKey (backwardLinkNode zg) $ unZettelGraph zg)
-  zg.zettelGraphBib
+backwardLink zg =
+  ZettelGraph
+    (Map.mapWithKey (backwardLinkNode zg) $ unZettelGraph zg)
+    zg.zettelGraphBib
 
 updatePandocLinksInline :: Inline -> Inline
 updatePandocLinksInline l@(Link a i (_, t))
diff --git a/src/Zettel/Parse.hs b/src/Zettel/Parse.hs
index 3fbb37b..bb08291 100644
--- a/src/Zettel/Parse.hs
+++ b/src/Zettel/Parse.hs
@@ -3,6 +3,7 @@ module Zettel.Parse where
 import Data.Default (def)
 import qualified Data.Map.Strict as Map
 import qualified Data.Text as T
+import System.FilePath (takeBaseName)
 import Text.Pandoc.Builder (toMetaValue)
 import Text.Pandoc.Chunks (Chunk (..), ChunkedDoc (..), splitIntoChunks)
 import Text.Pandoc.Class (runIOorExplode)
@@ -11,7 +12,6 @@ import Text.Pandoc.Options (ReaderOptions (..), getDefaultExtensions)
 import Text.Pandoc.Readers (readOrg)
 import Text.Pandoc.Shared (stringify)
 import Text.Pandoc.Walk (query, walk)
-import System.FilePath (takeBaseName)
 import Zettel.Common
 import Zettel.Types
 
@@ -103,9 +103,14 @@ pandocFromChunk (_, t, c) =
     . walk removeDiv
     . walk removeHeadings
     . Pandoc
-      (Meta (fromList (("categories", toMetaValue [t])
-                       : ("zettelid", MetaString (chunkId c))
-                       : headingMeta)))
+      ( Meta
+          ( fromList
+              ( ("categories", toMetaValue [t])
+                  : ("zettelid", MetaString (chunkId c))
+                  : headingMeta
+              )
+          )
+      )
     $ chunkContents c
   where
     headingMeta = queryHeaderMetaData $ chunkContents c
@@ -155,4 +160,4 @@ parseZettelKasten fl = do
   let pandocList = map (updatePandocAttr . pandocFromChunk) chunks
   return . refreshPandocMeta $ ZettelGraph (fromList $ map zettelFromPandoc pandocList) Nothing
 
---parseBibliography :: FilePath -> IO [Pandoc]
+-- parseBibliography :: FilePath -> IO [Pandoc]
diff --git a/src/Zettel/Render.hs b/src/Zettel/Render.hs
index 0a052f1..2451163 100644
--- a/src/Zettel/Render.hs
+++ b/src/Zettel/Render.hs
@@ -6,6 +6,7 @@ import Data.Default (def)
 import qualified Data.Map.Strict as Map
 import qualified Data.Text as T
 import Paths_org_zk (getDataFileName)
+import System.FilePath ((<.>), (</>))
 import Text.Pandoc.App (applyFilters)
 import Text.Pandoc.Builder (HasMeta (..))
 import Text.Pandoc.Class (runIOorExplode)
@@ -17,7 +18,6 @@ import Text.Pandoc.Scripting (noEngine)
 import Text.Pandoc.Templates (WithDefaultPartials (..), compileTemplate)
 import Text.Pandoc.Walk (query)
 import Text.Pandoc.Writers (writeMarkdown)
-import System.FilePath ((</>), (<.>))
 import Zettel.Types
 
 zettelIdToLink :: ZettelId -> Inline
diff --git a/src/Zettel/Transclusion.hs b/src/Zettel/Transclusion.hs
index c9f41cb..27d4429 100644
--- a/src/Zettel/Transclusion.hs
+++ b/src/Zettel/Transclusion.hs
@@ -5,7 +5,7 @@ module Zettel.Transclusion where
 import Data.Map.Strict ((!?))
 import qualified Data.Text as T
 import Text.Pandoc.Definition (Block (..), Inline (..), Pandoc (..))
-import Text.Pandoc.Walk (walk, query)
+import Text.Pandoc.Walk (query, walk)
 import Zettel.Common
 import Zettel.Types
 
@@ -80,8 +80,9 @@ transcludeMd zg depth p = walk (transcludeRawBlockWith f) p
   where
     f ident level =
       concatMap
-        ( (\(Pandoc _ b) ->
-             wrapTransclude (maybe depth (subtract $ floorLvl - 1) level) ident b)
+        ( ( \(Pandoc _ b) ->
+              wrapTransclude (maybe depth (subtract $ floorLvl - 1) level) ident b
+          )
             . transcludeMd zg (depth + 1)
             . zettelBody
         )
diff --git a/src/Zettel/Types.hs b/src/Zettel/Types.hs
index 580052b..3b68ca9 100644
--- a/src/Zettel/Types.hs
+++ b/src/Zettel/Types.hs
@@ -154,9 +154,11 @@ walkMZettelGraph f b = do
   newBib <- traverse (walkM f) (zettelGraphBib b)
   return $ ZettelGraph res newBib
 
-queryZettelGraph
-  :: (Monoid a1, Walkable a2 Zettel, Walkable a2 Pandoc) =>
-     (a2 -> a1) -> ZettelGraph -> a1
+queryZettelGraph ::
+  (Monoid a1, Walkable a2 Zettel, Walkable a2 Pandoc) =>
+  (a2 -> a1) ->
+  ZettelGraph ->
+  a1
 queryZettelGraph f g = query f (unZettelGraph g) <> maybe mempty (query f) (zettelGraphBib g)
 
 instance Walkable Block ZettelGraph where