Merge pull request #48 from jwillikers/update

Convert Bash script to Nushell
jwillikers · Nov 18, 2024 · cd5d5d0 · cd5d5d0
2 parents dc7c99e + 588632c
commit cd5d5d0
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 23 deletions.
diff --git a/.github/workflows/update-nix-direnv.yaml b/.github/workflows/update-nix-direnv.yaml
@@ -17,7 +17,7 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@v16
       - uses: DeterminateSystems/magic-nix-cache-action@v8
       - name: Update nix-direnv to the latest version
-        run: nix run '.#update-nix-direnv'
+        run: nix run .#update-nix-direnv
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
         with:

diff --git a/.github/workflows/update-nixos-release.yaml b/.github/workflows/update-nixos-release.yaml
@@ -2,7 +2,7 @@ name: Update NixOS Release
 
 "on":
   schedule:
-    - cron: "0 0 15 5,11 *"
+    - cron: "0 0 15 6,12 *"
   workflow_dispatch:
 
 permissions:

diff --git a/.justfile b/.justfile
@@ -11,6 +11,7 @@ check: build && format
     yamllint .
     asciidoctor {CODE_OF_CONDUCT,LICENSE,README}.adoc
     lychee --cache _site/ *.html
+    nix flake check
 
 alias f := format
 alias fmt := format
@@ -27,6 +28,8 @@ alias u := update
 alias up := update
 
 update:
+    nix run ".#update-nix-direnv"
+    nix run ".#update-nixos-release"
     nix flake update
     bundle update
     bundix

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -183,6 +183,7 @@
     "pacman",
     "passwd",
     "Phoronix",
+    "Piceiver",
     "Pinebook",
     "pinentry",
     "Pipenv",
@@ -285,6 +286,15 @@
   "files.associations": {
     "*.html": "liquid"
   },
+  "files.watcherExclude": {
+    "_site/**": true,
+    ".direnv/**": true,
+    ".jekyll-cache/**": true,
+    ".lycheecache": true,
+    ".pre-commit-config.yaml": true,
+    "result": true,
+    "result/**": true
+  },
   "nix.enableLanguageServer": true,
   "nix.serverPath": "nil"
 }
diff --git a/flake.nix b/flake.nix
@@ -50,23 +50,17 @@
       with pkgs;
       {
         apps = {
-          inherit (nix-update-scripts.apps.${system}) update-nix-direnv;
-          inherit (nix-update-scripts.apps.${system}) update-nixos-release;
-          default =
-            let
-              script = pkgs.writeShellApplication {
-                name = "serve";
-                text = ''
-                  ${gems}/bin/jekyll serve --destination ${
-                    self.packages.${system}.default
-                  }/srv --open-url --skip-initial-build
-                '';
-              };
-            in
-            {
-              type = "app";
-              program = "${script}/bin/serve";
-            };
+          inherit (nix-update-scripts.apps.${system}) update-nix-direnv update-nixos-release;
+          default = {
+            type = "app";
+            program = builtins.toString (
+              pkgs.writers.writeNu "serve" ''
+                ^${gems}/bin/jekyll serve --destination ${
+                  self.packages.${system}.default
+                }/srv --open-url --skip-initial-build
+              ''
+            );
+          };
         };
         devShells.default = mkShell {
           nativeBuildInputs =
@@ -80,7 +74,6 @@
               gems.wrappedRuby
               just
               lychee
-              nil
               nushell
               treefmtEval.config.build.wrapper
               (builtins.attrValues treefmtEval.config.build.programs)

diff --git a/package.nix b/package.nix
@@ -1,5 +1,5 @@
-{ stdenv, gems }:
-stdenv.mkDerivation {
+{ stdenvNoCC, gems }:
+stdenvNoCC.mkDerivation {
   pname = "jwillikers-blog";
   version = "0.1.0";
 
@@ -11,11 +11,15 @@ stdenv.mkDerivation {
   ];
 
   buildPhase = ''
+    runHook preBuild
     jekyll build
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
     mkdir --parents $out
     mv _site $out/srv
+    runHook postInstall
   '';
 }
diff --git a/pre-commit-hooks.nix b/pre-commit-hooks.nix
@@ -9,7 +9,7 @@
     # todo Not integrated with Nix?
     check-format = {
       enable = true;
-      entry = "${treefmtEval.config.build.wrapper}/bin/treefmt --fail-on-change";
+      entry = "${treefmtEval.config.build.wrapper}/bin/treefmt-nix --fail-on-change";
     };
 
     check-json.enable = true;