1 files changed, 46 insertions, 48 deletions
diff --git a/shell.nix b/shell.nix
index 7b54486..0954bb4 100644
--- a/shell.nix
+++ b/shell.nix
@@ -2,72 +2,70 @@ let
 
   name = "nix-shell.canory";
 
-  pkgs = import (builtins.fetchTarball {
-    url = "https://releases.nixos.org/nixos/22.05/nixos-22.05.998.d17a56d90ec/nixexprs.tar.xz";
-    sha256 = "084dzb7fmchfhhflrgprjjv7qz3j7vxw3d01f82q8p4g1x7hzn36";
-  }) { };
-
-  validatornu = pkgs.callPackage (pkgs.fetchurl {
-    url = "https://raw.githubusercontent.com/tdro/dotfiles/032efcf7f4b1c7304ce5f3f64f64c175ba59eb6d/.config/nixpkgs/packages/validatornu/default.nix";
-    sha256 = "1ify40x9547z04hcibk76m45d02xg3dlvwc57n8vxcbax82yb9pj";
-  }) { };
+  system = builtins.currentSystem;
 
-  mkShellPure = pkgs.callPackage (pkgs.fetchurl {
-    url = "https://raw.githubusercontent.com/tdro/dotfiles/b710281b132056105709c03dda1899a6afc68a93/.config/nixpkgs/helpers/mkShellPure.nix";
-    sha256 = "1ciwifsx2hrp0ymm077zfb5q8ravrk545bda1q249y2spw9np4ms";
-  }) { };
-
-  hugo = pkgs.callPackage ({ lib, buildGo118Module, fetchgit, installShellFiles }:
+  pkgs = import (builtins.fetchTarball {
+    url = "https://releases.nixos.org/nixos/unstable/nixos-23.11pre516114.d680ded26da5/nixexprs.tar.xz";
+    sha256 = "13cnlhpp3v7jay4jxyyy2d4kxw4ngpz3m00rhj3vlhvf7jl7hr48";
+  }) { inherit system; };
 
-    buildGo118Module rec {
+  hugo = pkgs.callPackage ({ lib, buildGoModule, fetchgit }:
+    buildGoModule rec {
       pname = "hugo";
-      version = "0.101.0";
-
+      version = "0.122.0";
       src = fetchgit {
         rev = "v${version}";
         url = "https://github.com/gohugoio/hugo.git";
-        sha256 = "sha256-Fodcefp8xdSV2tt6ZYaKdcLqVe2upEngQr6M+wV5wnw=";
+        sha256 = "sha256-pnsQo+nSuIlQ6KKTP1z/BZ74zEu9HjYP66hGStPc0pc=";
       };
-
       doCheck = false;
       proxyVendor = true;
-      vendorSha256 = "sha256-rReqDOhBKZO1qa3C4jmewGgmhLvvOYyxwWqsdm+6DzM=";
-
+      vendorSha256 = "sha256-aYy0TOfNIqx44UBXJhewvxi+oSAWjmi/32WvI3HJ3MM=";
       tags = [ "extended" ];
       subPackages = [ "." ];
-      nativeBuildInputs = [ installShellFiles ];
-
-      postInstall = ''
-        $out/bin/hugo gen man
-        installManPage man/*
-      '';
-
       meta = {
         license = lib.licenses.asl20;
         homepage = "https://gohugo.io";
         description = "A fast and modern static website engine";
-        maintainers = with lib.maintainers; [ schneefux Br1ght0ne Frostman ];
       };
   }) { };
 
-in mkShellPure {
+  shell = pkgs.writeShellApplication {
+    inherit name;
+    text = ''
+      /usr/bin/env --ignore-environment /bin/sh -c ${
+        pkgs.writeScript name ''
+          export PS1='\h (${name}) \W \$ '
+          export HOME=$PWD
+          export HISTFILE=
+          export DENO_DIR=vendor
+          export DENO_NO_UPDATE_CHECK=1
+          export PATH=${pkgs.lib.strings.makeBinPath [
+            hugo
+            pkgs.busybox
+            pkgs.caddy
+            pkgs.check-jsonschema
+            pkgs.curl
+            pkgs.deno
+            pkgs.entr
+            pkgs.git
+            pkgs.gnumake
+            pkgs.inotify-tools
+            pkgs.jing
+            pkgs.libxml2
+            pkgs.libxslt
+            pkgs.unixtools.column
+            pkgs.validator-nu
+            pkgs.xmlstarlet
+            pkgs.yj
+          ]}
+          /bin/sh
+        ''
+      };
+    '';
+  };
 
+in pkgs.mkShell {
   inherit hugo;
-
-  packages = [
-    hugo
-    validatornu
-    pkgs.busybox
-    pkgs.deno
-    pkgs.entr
-    pkgs.git
-    pkgs.gnumake
-    pkgs.php
-    pkgs.subversion
-    pkgs.yj
-  ];
-
-  shellHook = ''
-    export PS1='\h (${name}) \W \$ '
-  '';
+  shellHook = "exec ${shell}/bin/${shell.name}";
 }