diff --git a/cyperpunk.de/src/components/Sidebar.astro b/cyperpunk.de/src/components/Sidebar.astro
index 1318af6..72321ae 100644
--- a/cyperpunk.de/src/components/Sidebar.astro
+++ b/cyperpunk.de/src/components/Sidebar.astro
@@ -16,10 +16,9 @@
   <div id="sidebar-topics">
     <span class="section-label">topics</span>
     <div id="tags">
-      <span class="tag">nixos</span>
-      <span class="tag">systems</span>
-      <span class="tag">web</span>
-      <span class="tag">talks</span>
+      <span class="tag">Blog</span>
+      <span class="tag">Git Projects</span>
+      <span class="tag">Matrix</span>
     </div>
   </div>
 </div>
diff --git a/cyperpunk.de/src/components/Topbar.astro b/cyperpunk.de/src/components/Topbar.astro
index 8cd2bb9..e7f1cfd 100644
--- a/cyperpunk.de/src/components/Topbar.astro
+++ b/cyperpunk.de/src/components/Topbar.astro
@@ -13,7 +13,7 @@ const currentPath = Astro.url.pathname;
   <span id="logo">cyper-site</span>
   <nav>
     {navItems.map((item) => (
-      
+	<a 
         href={item.href}
         class={currentPath === item.href ? "active" : ""}
       >
diff --git a/cyperpunk.de/src/pages/index.astro b/cyperpunk.de/src/pages/index.astro
index 561196b..5bb1968 100644
--- a/cyperpunk.de/src/pages/index.astro
+++ b/cyperpunk.de/src/pages/index.astro
@@ -1,17 +1,12 @@
 ---
+import Base from "../layouts/Base.astro";
+import Topbar from "../components/Topbar.astro";
+import Sidebar from "../components/Sidebar.astro";
+---
 
----
+<Base title="home">
+  <Topbar slot="topbar" />
+  <Sidebar slot="sidebar" />
 
-<html lang="en">
-	<head>
-		<meta charset="utf-8" />
-		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-		<link rel="icon" href="/favicon.ico" />
-		<meta name="viewport" content="width=device-width" />
-		<meta name="generator" content={Astro.generator} />
-		<title>Astro</title>
-	</head>
-	<body>
-		<h1>Astro</h1>
-	</body>
-</html>
+  <h1>hello world</h1>
+</Base>
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..083c58f
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1779560665,
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index 1df4db9..5ffc023 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,9 +20,14 @@
       {
         devShells.default = pkgs.mkShell {
           packages = with pkgs; [
-            nodejs_22
-            nodePackages.pnpm
+            nodejs_24
+            pnpm
+            fish
           ];
+
+          shellHook = ''
+            exec fish
+          '';
         };
       }
     );
