back to astro for hopefully the last time (#146)

1 files changed, 19 insertions, 76 deletions

diff --git a/flake.nix b/flake.nix
index 48e7350..f22841b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,16 +1,12 @@
 {
   description = "Getchoo's website";
 
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    nix-filter.url = "github:numtide/nix-filter";
-  };
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
   outputs =
     {
       self,
       nixpkgs,
-      nix-filter,
     }:
     let
       inherit (nixpkgs) lib;
@@ -20,95 +16,42 @@
       nixpkgsFor = forAllSystems (system: nixpkgs.legacyPackages.${system});
     in
     {
-      apps = forAllSystems (
-        system:
-        let
-          pkgs = nixpkgsFor.${system};
-        in
-        {
-          serve = {
-            type = "app";
-            program = toString (
-              pkgs.runCommand "serve-website" { nativeBuildInputs = [ pkgs.zola ]; } ''
-                tmpdir=$(mktemp -d)
-                cd ${self.packages.${system}.website.src}
-                zola serve --force --output-dir "$tmpdir"
-              ''
-            );
-          };
-        }
-      );
-
       devShells = forAllSystems (
         system:
         let
           pkgs = nixpkgsFor.${system};
+
+          baseNodeTools = [
+            pkgs.corepack
+            pkgs.nodejs
+            pkgs.nrr
+          ];
         in
         {
           default = pkgs.mkShellNoCC {
-            packages = [
-              pkgs.zola
+            packages = baseNodeTools ++ [
+              # Node tools
+              pkgs.astro-language-server
+              pkgs.oxlint
+              pkgs.typescript-language-server
 
+              # For CI
               pkgs.actionlint
+
+              # Nix tools
               pkgs.deadnix
               pkgs.nil
               pkgs.statix
               self.formatter.${system}
             ];
           };
+
+          ci = pkgs.mkShellNoCC {
+            packages = baseNodeTools;
+          };
         }
       );
 
       formatter = forAllSystems (system: nixpkgsFor.${system}.nixfmt-rfc-style);
-
-      packages = forAllSystems (
-        system:
-        let
-          pkgs = nixpkgsFor.${system};
-        in
-        {
-          website = pkgs.callPackage (
-            {
-              lib,
-              stdenvNoCC,
-              writeShellApplication,
-              zola,
-            }:
-
-            stdenvNoCC.mkDerivation {
-              pname = "getchoo-website";
-              version = self.shortRev or self.dirtyShortRev or "unknown";
-
-              src = nix-filter.lib.filter {
-                root = self;
-                include = [
-                  "config.toml"
-                  "content"
-                  "highlight_themes"
-                  "sass"
-                  "static"
-                  "templates"
-                ];
-              };
-
-              nativeBuildInputs = [ zola ];
-
-              postBuild = "zola build --output-dir $out";
-
-              dontConfigure = true;
-              dontInstall = true;
-              dontFixup = true;
-
-              meta = {
-                homepage = "https://github.com/getchoo/website";
-                license = lib.licenses.mit;
-                maintainers = with lib.maintainers; [ getchoo ];
-              };
-            }
-          ) { };
-
-          default = self.packages.${system}.website;
-        }
-      );
     };
 }