make layouts simpler to think about

quartz.config.ts

@@ -1,83 +1,46 @@
-import { GlobalConfiguration, PageLayout, QuartzConfig } from "./quartz/cfg"
-import * as Component from "./quartz/components"
+import { QuartzConfig } from "./quartz/cfg"
 import * as Plugin from "./quartz/plugins"
 
-const generalConfiguration: GlobalConfiguration = {
-  pageTitle: "🪴 Quartz 4.0",
-  enableSPA: true,
-  enablePopovers: true,
-  analytics: {
-    provider: "plausible",
-  },
-  baseUrl: "quartz.jzhao.xyz",
-  ignorePatterns: ["private", "templates"],
-  theme: {
-    typography: {
-      header: "Schibsted Grotesk",
-      body: "Source Sans Pro",
-      code: "IBM Plex Mono",
-    },
-    colors: {
-      lightMode: {
-        light: "#faf8f8",
-        lightgray: "#e5e5e5",
-        gray: "#b8b8b8",
-        darkgray: "#4e4e4e",
-        dark: "#2b2b2b",
-        secondary: "#284b63",
-        tertiary: "#84a59d",
-        highlight: "rgba(143, 159, 169, 0.15)",
-      },
-      darkMode: {
-        light: "#161618",
-        lightgray: "#393639",
-        gray: "#646464",
-        darkgray: "#d4d4d4",
-        dark: "#ebebec",
-        secondary: "#7b97aa",
-        tertiary: "#84a59d",
-        highlight: "rgba(143, 159, 169, 0.15)",
-      },
-    },
-  },
-}
-
-const sharedPageComponents = {
-  head: Component.Head(),
-  header: [],
-  footer: Component.Footer({
-    links: {
-      GitHub: "https://github.com/jackyzha0/quartz",
-      "Discord Community": "https://discord.gg/cRFFHYye7t",
-    },
-  }),
-}
-
-const contentPageLayout: PageLayout = {
-  beforeBody: [Component.ArticleTitle(), Component.ReadingTime(), Component.TagList()],
-  left: [
-    Component.PageTitle(),
-    Component.MobileOnly(Component.Spacer()),
-    Component.Search(),
-    Component.Darkmode(),
-    Component.DesktopOnly(Component.TableOfContents()),
-  ],
-  right: [Component.Graph(), Component.Backlinks()],
-}
-
-const listPageLayout: PageLayout = {
-  beforeBody: [Component.ArticleTitle()],
-  left: [
-    Component.PageTitle(),
-    Component.MobileOnly(Component.Spacer()),
-    Component.Search(),
-    Component.Darkmode(),
-  ],
-  right: [],
-}
-
 const config: QuartzConfig = {
-  configuration: generalConfiguration,
+  configuration: {
+    pageTitle: "🪴 Quartz 4.0",
+    enableSPA: true,
+    enablePopovers: true,
+    analytics: {
+      provider: "plausible",
+    },
+    baseUrl: "quartz.jzhao.xyz",
+    ignorePatterns: ["private", "templates"],
+    theme: {
+      typography: {
+        header: "Schibsted Grotesk",
+        body: "Source Sans Pro",
+        code: "IBM Plex Mono",
+      },
+      colors: {
+        lightMode: {
+          light: "#faf8f8",
+          lightgray: "#e5e5e5",
+          gray: "#b8b8b8",
+          darkgray: "#4e4e4e",
+          dark: "#2b2b2b",
+          secondary: "#284b63",
+          tertiary: "#84a59d",
+          highlight: "rgba(143, 159, 169, 0.15)",
+        },
+        darkMode: {
+          light: "#161618",
+          lightgray: "#393639",
+          gray: "#646464",
+          darkgray: "#d4d4d4",
+          dark: "#ebebec",
+          secondary: "#7b97aa",
+          tertiary: "#84a59d",
+          highlight: "rgba(143, 159, 169, 0.15)",
+        },
+      },
+    },
+  },
   plugins: {
     transformers: [
       Plugin.FrontMatter(),
@@ -96,21 +59,9 @@ const config: QuartzConfig = {
     emitters: [
       Plugin.AliasRedirects(),
       Plugin.ComponentResources({ fontOrigin: "googleFonts" }),
-      Plugin.ContentPage({
-        ...sharedPageComponents,
-        ...contentPageLayout,
-        pageBody: Component.Content(),
-      }),
-      Plugin.FolderPage({
-        ...sharedPageComponents,
-        ...listPageLayout,
-        pageBody: Component.FolderContent(),
-      }),
-      Plugin.TagPage({
-        ...sharedPageComponents,
-        ...listPageLayout,
-        pageBody: Component.TagContent(),
-      }),
+      Plugin.ContentPage(),
+      Plugin.FolderPage(),
+      Plugin.TagPage(),
       Plugin.ContentIndex({
         enableSiteMap: true,
         enableRSS: true,