shell.nix: Lock down

Use standard format and adjust formatting on shell script

2 files changed, 12 insertions, 12 deletions

diff --git a/make b/make
index d35059c..3399f88 100644
--- a/make
+++ b/make
@@ -28,15 +28,15 @@ done
 }
 
 Hugo() {
-	sh "$0" Config
-	hugo --debug
-	rm --force .hugo_build.lock
+  sh "$0" Config
+  hugo --debug
+  rm --force .hugo_build.lock
 }
 
 Config() {
   set -x
-	yj -yj -i < config.yaml > config.json
-	yj -yt -i < config.yaml > config.toml
+  yj -yj -i < config.yaml > config.json
+  yj -yt -i < config.yaml > config.toml
 }
 
 Clean() {
diff --git a/shell.nix b/shell.nix
index c5238ff..08dcb1b 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,16 +1,16 @@
 let
 
-  pkgs = import <nixpkgs> { };
   name = "nix-shell.hugo-theme-base";
 
-  mkShellPure = pkgs.callPackage (builtins.fetchurl {
-    url = "https://raw.githubusercontent.com/tdro/dotfiles/b710281b132056105709c03dda1899a6afc68a93/.config/nixpkgs/helpers/mkShellPure.nix";
-    sha256 = "1ciwifsx2hrp0ymm077zfb5q8ravrk545bda1q249y2spw9np4ms";
-  }) { };
+  nixpkgs = import <nixpkgs> { };
 
-in mkShellPure {
+  pkgs = import (builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/ddc33509516c5e3b1a3e5099dfde07c94c032ba3.tar.gz";
+    sha256 = "0510g7g5vsn4j37xaww3szld00dcwm9bwl47yx4rgb1dwb7sy4fn"; }) { };
 
-  packages = [
+in pkgs.mkShell {
+
+  buildInputs = [
     pkgs.hugo
     pkgs.busybox
     pkgs.caddy