fix: add default dev shell and remote extra packages

Lehmanator · Aug 21, 2024 · 26ae0c1 · 26ae0c1
1 parent 114dbf8
commit 26ae0c1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 41 deletions.
diff --git a/flake.nix b/flake.nix
@@ -154,9 +154,6 @@
           // jsonresume-formats
           // {
             inherit (pkgs) resumed puppeteer-cli;
-            #wkhtmltopdf pnmp-lock-export corepack_latest;
-            inherit (pkgs.python3Packages) weasyprint;
-            inherit (pkgs.nodePackages_latest) pnpm;
             # default = config.packages.resume;
             jsonresume-builder-pdf = pkgs.writeShellScript "resumed-render-pdf" ''
               ${lib.getExe pkgs.puppeteer-cli} print ${config.packages.jsonresume-format-html}/index.html ./jsonresume.pdf

diff --git a/shell/jsonresume.nix b/shell/jsonresume.nix
@@ -1,41 +1,38 @@
-{inputs, ...}: {
-  # imports = [ ];
-  perSystem = {
-    config,
-    lib,
-    pkgs,
-    ...
-  }: {
-    devshells.jsonresume = {
-      packages = [
-        pkgs.resumed
-        #pkgs.resume-cli
-        pkgs.puppeteer-cli
-        pkgs.python311Packages.weasyprint
-        pkgs.nodePackages_latest.pnpm
-      ];
-      commands = [
-        {
-          name = "build-all";
-          command = "nix build .#jsonresume";
-        }
-        {
-          name = "build-data";
-          command = "nix build .#jsonresume-json";
-        }
-        {
-          name = "build-html";
-          command = "nix build .#jsonresume-html";
-        }
-        {
-          name = "build-pdf";
-          command = "nix build .#jsonresume-pdf";
-        }
-        # { name = "validate";       command = "${lib.getExe pkgs.resume-cli} validate";             }
-        # { name = "export-pdf";     command = "${lib.getExe pkgs.resume-cli} export --format pdf";  }
-        # { name = "export-html";    command = "${lib.getExe pkgs.resume-cli} export --format html"; }
-        # { name = "server";         command = "${lib.getExe pkgs.resume-cli} serve";                }
-      ];
+{ inputs, ... }: {
+  perSystem = { config, lib, pkgs, ... }: {
+    devshells = rec {
+      default = jsonresume;
+      jsonresume = {
+        packages = [
+          pkgs.resumed
+          #pkgs.resume-cli
+          pkgs.puppeteer-cli
+          pkgs.python311Packages.weasyprint
+          pkgs.nodePackages_latest.pnpm
+        ];
+        commands = [
+          {
+            name = "build-all";
+            command = "nix build .#jsonresume";
+          }
+          {
+            name = "build-data";
+            command = "nix build .#jsonresume-json";
+          }
+          {
+            name = "build-html";
+            command = "nix build .#jsonresume-html";
+          }
+          {
+            name = "build-pdf";
+            command = "nix build .#jsonresume-pdf";
+          }
+          # { name = "validate";       command = "${lib.getExe pkgs.resume-cli} validate";             }
+          # { name = "export-pdf";     command = "${lib.getExe pkgs.resume-cli} export --format pdf";  }
+          # { name = "export-html";    command = "${lib.getExe pkgs.resume-cli} export --format html"; }
+          # { name = "server";         command = "${lib.getExe pkgs.resume-cli} serve";                }
+        ];
+      };
     };
   };
 }