diff --git a/docs/guide/2024/index.md b/docs/guide/2024/index.md
index ca53912..af92804 100644
--- a/docs/guide/2024/index.md
+++ b/docs/guide/2024/index.md
@@ -2,6 +2,7 @@
 title: 赛事信息
 titleTemplate: ":title - NewStar CTF 2024"
 aside: false
+comments: false
 ---
 
 <script setup>
diff --git a/docs/guide/2024/promotion.md b/docs/guide/2024/promotion.md
index 28a1fbf..8d758d6 100644
--- a/docs/guide/2024/promotion.md
+++ b/docs/guide/2024/promotion.md
@@ -1,5 +1,6 @@
 ---
 titleTemplate: ":title | 参考文档 - NewStar CTF 2024"
+comments: false
 ---
 
 <script setup>
diff --git a/docs/learn/credits.md b/docs/learn/credits.md
index 0f92f9e..ecf02f5 100644
--- a/docs/learn/credits.md
+++ b/docs/learn/credits.md
@@ -1,5 +1,6 @@
 ---
 titleTemplate: ":title | 快速入门 - NewStar CTF"
+comments: false
 ---
 
 <script setup>
diff --git a/docs/wp/2024/index.md b/docs/wp/2024/index.md
index 97b4266..2a41b8d 100644
--- a/docs/wp/2024/index.md
+++ b/docs/wp/2024/index.md
@@ -1,6 +1,7 @@
 ---
 title: WriteUp
 titleTemplate: ":title - NewStar CTF 2024"
+comments: false
 ---
 
 <script setup>
diff --git a/docs/wp/2024/week1/index.md b/docs/wp/2024/week1/index.md
index 9c38213..29a13a8 100644
--- a/docs/wp/2024/week1/index.md
+++ b/docs/wp/2024/week1/index.md
@@ -1,6 +1,7 @@
 ---
 title: WriteUp
 titleTemplate: ":title - NewStar CTF 2024"
+comments: false
 ---
 
 # WriteUp - NewStar CTF 2024
diff --git a/docs/wp/2024/week2/index.md b/docs/wp/2024/week2/index.md
index 73953be..0e1f43e 100644
--- a/docs/wp/2024/week2/index.md
+++ b/docs/wp/2024/week2/index.md
@@ -1,6 +1,7 @@
 ---
 title: WriteUp
 titleTemplate: ":title - NewStar CTF 2024"
+comments: false
 ---
 
 # WriteUp - NewStar CTF 2024
diff --git a/docs/wp/2024/week3/index.md b/docs/wp/2024/week3/index.md
index 1b507aa..fce9346 100644
--- a/docs/wp/2024/week3/index.md
+++ b/docs/wp/2024/week3/index.md
@@ -1,6 +1,7 @@
 ---
 title: WriteUp
 titleTemplate: ":title - NewStar CTF 2024"
+comments: false
 ---
 
 # WriteUp - NewStar CTF 2024
diff --git a/docs/wp/2024/week4/index.md b/docs/wp/2024/week4/index.md
index d65cb52..4996472 100644
--- a/docs/wp/2024/week4/index.md
+++ b/docs/wp/2024/week4/index.md
@@ -1,6 +1,7 @@
 ---
 title: WriteUp
 titleTemplate: ":title - NewStar CTF 2024"
+comments: false
 ---
 
 # WriteUp - NewStar CTF 2024
diff --git a/docs/wp/2024/week5/index.md b/docs/wp/2024/week5/index.md
index b5856df..eda5898 100644
--- a/docs/wp/2024/week5/index.md
+++ b/docs/wp/2024/week5/index.md
@@ -1,6 +1,7 @@
 ---
 title: WriteUp
 titleTemplate: ":title - NewStar CTF 2024"
+comments: false
 ---
 
 # WriteUp - NewStar CTF 2024
diff --git a/package.json b/package.json
index 765a9ff..08bdb6a 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
+    "@giscus/vue": "^3.1.1",
     "@types/bun": "latest",
     "@types/node": "^22.1.0",
     "@vueuse/core": "^11.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 65a331e..73cee5d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -15,6 +15,9 @@ importers:
       '@biomejs/biome':
         specifier: ^1.9.4
         version: 1.9.4
+      '@giscus/vue':
+        specifier: ^3.1.1
+        version: 3.1.1(vue@3.4.35(typescript@5.5.4))
       '@types/bun':
         specifier: latest
         version: 1.2.1
@@ -377,9 +380,20 @@ packages:
   '@floating-ui/utils@0.2.7':
     resolution: {integrity: sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==}
 
+  '@giscus/vue@3.1.1':
+    resolution: {integrity: sha512-xgsc93MibRQ0d1glBxN1BrEREHTIf3BPYs/3R+UZHNqawFFoWBV6iJ7uVCXMqoEKZdE2c78B3aKt5gfGqo8I5A==}
+    peerDependencies:
+      vue: '>=3.2.0'
+
   '@jridgewell/sourcemap-codec@1.5.0':
     resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
 
+  '@lit-labs/ssr-dom-shim@1.3.0':
+    resolution: {integrity: sha512-nQIWonJ6eFAvUUrSlwyHDm/aE8PBDu5kRpL0vHMg6K8fK3Diq1xdPjTnsJSwxABhaZ+5eBi1btQB5ShUTKo4nQ==}
+
+  '@lit/reactive-element@2.0.4':
+    resolution: {integrity: sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==}
+
   '@rollup/pluginutils@5.1.0':
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
     engines: {node: '>=14.0.0'}
@@ -527,6 +541,9 @@ packages:
   '@types/node@22.1.0':
     resolution: {integrity: sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw==}
 
+  '@types/trusted-types@2.0.7':
+    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
+
   '@types/unist@3.0.2':
     resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
 
@@ -863,6 +880,9 @@ packages:
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
+  giscus@1.6.0:
+    resolution: {integrity: sha512-Zrsi8r4t1LVW950keaWcsURuZUQwUaMKjvJgTCY125vkW6OiEBkatE7ScJDbpqKHdZwb///7FVC21SE3iFK3PQ==}
+
   glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
@@ -915,6 +935,15 @@ packages:
     engines: {node: '>=10.0.0'}
     hasBin: true
 
+  lit-element@4.1.1:
+    resolution: {integrity: sha512-HO9Tkkh34QkTeUmEdNYhMT8hzLid7YlMlATSi1q4q17HE5d9mrrEHJ/o8O2D0cMi182zK1F3v7x0PWFjrhXFew==}
+
+  lit-html@3.2.1:
+    resolution: {integrity: sha512-qI/3lziaPMSKsrwlxH/xMgikhQ0EGOX2ICU73Bi/YHFvz2j/yMCIrw4+puF2IpQ4+upd3EWbvnHM9+PnJn48YA==}
+
+  lit@3.2.1:
+    resolution: {integrity: sha512-1BBa1E/z0O9ye5fZprPtdqnc0BFzxIxTTOO/tQFmyC/hj1O3jL4TfmLBw0WEwjAokdLwpclkvGgDJwTIh0/22w==}
+
   lodash-es@4.17.21:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
 
@@ -1526,8 +1555,19 @@ snapshots:
 
   '@floating-ui/utils@0.2.7': {}
 
+  '@giscus/vue@3.1.1(vue@3.4.35(typescript@5.5.4))':
+    dependencies:
+      giscus: 1.6.0
+      vue: 3.4.35(typescript@5.5.4)
+
   '@jridgewell/sourcemap-codec@1.5.0': {}
 
+  '@lit-labs/ssr-dom-shim@1.3.0': {}
+
+  '@lit/reactive-element@2.0.4':
+    dependencies:
+      '@lit-labs/ssr-dom-shim': 1.3.0
+
   '@rollup/pluginutils@5.1.0(rollup@4.32.1)':
     dependencies:
       '@types/estree': 1.0.5
@@ -1636,6 +1676,8 @@ snapshots:
     dependencies:
       undici-types: 6.13.0
 
+  '@types/trusted-types@2.0.7': {}
+
   '@types/unist@3.0.2': {}
 
   '@types/web-bluetooth@0.0.16': {}
@@ -2075,6 +2117,10 @@ snapshots:
   fsevents@2.3.3:
     optional: true
 
+  giscus@1.6.0:
+    dependencies:
+      lit: 3.2.1
+
   glob-parent@5.1.2:
     dependencies:
       is-glob: 4.0.3
@@ -2127,6 +2173,22 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
+  lit-element@4.1.1:
+    dependencies:
+      '@lit-labs/ssr-dom-shim': 1.3.0
+      '@lit/reactive-element': 2.0.4
+      lit-html: 3.2.1
+
+  lit-html@3.2.1:
+    dependencies:
+      '@types/trusted-types': 2.0.7
+
+  lit@3.2.1:
+    dependencies:
+      '@lit/reactive-element': 2.0.4
+      lit-element: 4.1.1
+      lit-html: 3.2.1
+
   lodash-es@4.17.21: {}
 
   lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21):
diff --git a/theme/Layout.vue b/theme/Layout.vue
index 547d33d..b6b4790 100644
--- a/theme/Layout.vue
+++ b/theme/Layout.vue
@@ -7,9 +7,11 @@ import { nextTick, provide } from "vue";
 import LayoutIndex from "@/layouts/LayoutIndex.vue";
 import "element-plus/theme-chalk/dark/css-vars.css";
 
+import Comments from "./components/Comments.vue";
+
 const { isDark, frontmatter } = useData();
 
-const DefaultLayoutList = ["home", "page", "docs", false, undefined];
+// const DefaultLayoutList = ["home", "page", "docs", false, undefined];
 
 // Theme transition
 
@@ -44,11 +46,15 @@ provide("toggle-appearance", async ({ clientX: x, clientY: y }: MouseEvent) => {
 </script>
 
 <template>
-  <template v-if="DefaultLayoutList.includes(frontmatter.layout)">
-    <DefaultTheme.Layout />
+  <template v-if="frontmatter.layout === 'index'">
+    <LayoutIndex />
   </template>
   <template v-else>
-    <LayoutIndex v-if="frontmatter.layout === 'index'" />
+    <DefaultTheme.Layout>
+      <template #doc-after>
+        <Comments />
+      </template>
+    </DefaultTheme.Layout>
   </template>
 </template>
 
diff --git a/theme/components/Comments.vue b/theme/components/Comments.vue
new file mode 100644
index 0000000..e93162c
--- /dev/null
+++ b/theme/components/Comments.vue
@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import { useData } from "vitepress";
+import Giscus from "@giscus/vue";
+
+// const { frontmatter, title } = useData();
+const { site, frontmatter, page } = useData();
+
+const PREFIX = "comments+";
+
+const p2k = (str: string) => {
+  const type = typeof frontmatter.value.comments;
+  if (type === "string" || type === "number") {
+    return PREFIX + frontmatter.value.comments.toString().replace(/\s/g, "-");
+  }
+  return PREFIX + str.replace(/\.\w+$/, "");
+};
+</script>
+
+<template>
+  <div
+    class="giscus comments-box"
+    :key="p2k(page.filePath)"
+    :data-key="p2k(page.filePath)"
+    v-if="frontmatter.comments !== false"
+  >
+    <Giscus
+      repo="lumishell/newstar-docs"
+      repoId="R_kgDOMqjJaA"
+      category="Comments"
+      categoryId="DIC_kwDOMqjJaM4CnZZo"
+      mapping="specific"
+      :term="p2k(page.filePath)"
+      strict="1"
+      reactionsEnabled="1"
+      emitMetadata="0"
+      inputPosition="top"
+      theme="preferred_color_scheme"
+      :lang="site.lang"
+      loading="lazy"
+      crossorigin="anonymous"
+    />
+  </div>
+</template>
+
+<style lang="scss">
+.comments-box {
+  border-top: 1px solid var(--vp-c-divider);
+  margin-top: 24px;
+  padding-top: 2rem;
+}
+</style>