diff --git a/.gitignore b/.gitignore index 6d4c0aa..e1f5aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ pnpm-debug.log* # macOS-specific files .DS_Store +src/pages/posts/.obsidian/ +.vscode +src/pages/posts/.trash diff --git a/.gitmodules b/.gitmodules index f7663f6..cfd2e76 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "src/styles/terminal-css"] - path = src/styles/terminal-css - url = git@github.com:ArgentumCation/terminal-css.git +path = src/styles/terminal-css +url = git@github.com:ArgentumCation/terminal-css.git +[submodule "littlelink"] + path = littlelink + url = git@github.com:ArgentumCation/littlelink.git diff --git a/astro.config.mjs b/astro.config.mjs index bbd3e06..3ab7246 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -3,7 +3,7 @@ import mdx from '@astrojs/mdx'; export default defineConfig({ markdown: { - syntaxHighlight: 'shiki', + syntaxHighlight: false, shikiConfig: { theme: 'css-variables' } diff --git a/littlelink b/littlelink new file mode 160000 index 0000000..0d65b55 --- /dev/null +++ b/littlelink @@ -0,0 +1 @@ +Subproject commit 0d65b55b253309e4571253cafb003698083da726 diff --git a/package.json b/package.json index 427688c..34c7fd9 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "@astrojs/mdx": "^0.18.1", "accessible-astro-components": "^1.6.5", "astro": "^2.0.18", + "highlight.js": "^11.7.0", + "highlightjs-line-numbers.js": "^2.8.0", "sass": "^1.59.3" } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e157859..bbe5970 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,12 +4,16 @@ specifiers: '@astrojs/mdx': ^0.18.1 accessible-astro-components: ^1.6.5 astro: ^2.0.18 + highlight.js: ^11.7.0 + highlightjs-line-numbers.js: ^2.8.0 sass: ^1.59.3 dependencies: '@astrojs/mdx': 0.18.1_astro@2.1.2 accessible-astro-components: 1.6.5 astro: 2.1.2_sass@1.59.3 + highlight.js: 11.7.0 + highlightjs-line-numbers.js: 2.8.0 sass: 1.59.3 packages: @@ -1625,6 +1629,15 @@ packages: space-separated-tokens: 2.0.2 dev: false + /highlight.js/11.7.0: + resolution: {integrity: sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ==} + engines: {node: '>=12.0.0'} + dev: false + + /highlightjs-line-numbers.js/2.8.0: + resolution: {integrity: sha512-TEf1gw0c8mb8nan0QwliqS7obT4cpUd9hzsGzsZLweteNnWea/VIqy5/aQqsa5wnz9lnvmtAkS1ZtDTjB/goYQ==} + dev: false + /html-escaper/3.0.3: resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==} dev: false diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index 481a767..2db14ce 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -2,7 +2,8 @@ // Import the global.css file here so that it is included on // all pages through the use of the component. import "../styles/global.css"; -import "../styles/terminal-css/css/lunar-witch.css"; +import "../styles/terminal-css/lunar-witch.css"; +//import "../styles/terminal-css/base16-lunar-witch.css"; const { title, description } = Astro.props; --- @@ -15,7 +16,27 @@ const { title, description } = Astro.props; {title} - + + diff --git a/src/components/Footer.astro b/src/components/Footer.astro index e183c3f..1151f41 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -3,5 +3,9 @@ const today = new Date(); --- diff --git a/src/components/Header.astro b/src/components/Header.astro index d50d90d..d8c11e0 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -1,7 +1,15 @@ - +
+ + +
diff --git a/src/layouts/BlogLayout.astro b/src/layouts/BlogLayout.astro index 5282bc0..0f9b260 100644 --- a/src/layouts/BlogLayout.astro +++ b/src/layouts/BlogLayout.astro @@ -1,5 +1,6 @@ --- import Header from "../components/Header.astro"; +import Footer from "../components/Footer.astro"; import BaseHead from "../components/BaseHead.astro"; const { title } = Astro.props; --- @@ -10,11 +11,12 @@ const { title } = Astro.props; title={title} description="I don't know what I'm doing here either" /> - +

{title}

+