From 82480242771b66f5eff9be4598f38e7ba6259f6a Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Fri, 26 Feb 2021 13:56:52 -0700 Subject: wedding --- Makefile | 3 +++ default.nix | 14 +++++++++----- src/_posts/2021-02-25-married.md | 18 ++++++++++++++++++ src/img/wedding/1.jpg | Bin 0 -> 10772620 bytes src/img/wedding/1000px/1.jpg | Bin 0 -> 1025105 bytes src/img/wedding/1000px/2.jpg | Bin 0 -> 1019847 bytes src/img/wedding/1000px/3.jpg | Bin 0 -> 837770 bytes src/img/wedding/1500px/1.jpg | Bin 0 -> 2148194 bytes src/img/wedding/1500px/2.jpg | Bin 0 -> 2248792 bytes src/img/wedding/1500px/3.jpg | Bin 0 -> 1917092 bytes src/img/wedding/2.jpg | Bin 0 -> 13722601 bytes src/img/wedding/2000px/1.jpg | Bin 0 -> 3717531 bytes src/img/wedding/2000px/2.jpg | Bin 0 -> 4068147 bytes src/img/wedding/2000px/3.jpg | Bin 0 -> 3457459 bytes src/img/wedding/2500px/1.jpg | Bin 0 -> 5706806 bytes src/img/wedding/2500px/2.jpg | Bin 0 -> 6478989 bytes src/img/wedding/2500px/3.jpg | Bin 0 -> 5407036 bytes src/img/wedding/3.jpg | Bin 0 -> 10359419 bytes src/img/wedding/3000px/1.jpg | Bin 0 -> 7987806 bytes src/img/wedding/3000px/2.jpg | Bin 0 -> 9363668 bytes src/img/wedding/3000px/3.jpg | Bin 0 -> 7592593 bytes src/img/wedding/500px/1.jpg | Bin 0 -> 324297 bytes src/img/wedding/500px/2.jpg | Bin 0 -> 305002 bytes src/img/wedding/500px/3.jpg | Bin 0 -> 223909 bytes 24 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 src/_posts/2021-02-25-married.md create mode 100644 src/img/wedding/1.jpg create mode 100644 src/img/wedding/1000px/1.jpg create mode 100644 src/img/wedding/1000px/2.jpg create mode 100644 src/img/wedding/1000px/3.jpg create mode 100644 src/img/wedding/1500px/1.jpg create mode 100644 src/img/wedding/1500px/2.jpg create mode 100644 src/img/wedding/1500px/3.jpg create mode 100644 src/img/wedding/2.jpg create mode 100644 src/img/wedding/2000px/1.jpg create mode 100644 src/img/wedding/2000px/2.jpg create mode 100644 src/img/wedding/2000px/3.jpg create mode 100644 src/img/wedding/2500px/1.jpg create mode 100644 src/img/wedding/2500px/2.jpg create mode 100644 src/img/wedding/2500px/3.jpg create mode 100644 src/img/wedding/3.jpg create mode 100644 src/img/wedding/3000px/1.jpg create mode 100644 src/img/wedding/3000px/2.jpg create mode 100644 src/img/wedding/3000px/3.jpg create mode 100644 src/img/wedding/500px/1.jpg create mode 100644 src/img/wedding/500px/2.jpg create mode 100644 src/img/wedding/500px/3.jpg diff --git a/Makefile b/Makefile index 150bf91..ae13463 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ clean: serve: nix-shell -A serve +shell: + nix-shell -A shell + lock: nix-shell -p bundler -p bundix --run 'bundler lock; bundix; rm -rf .bundle vendor' diff --git a/default.nix b/default.nix index 26368d6..ba2c738 100644 --- a/default.nix +++ b/default.nix @@ -9,10 +9,13 @@ ruby = pkgs.ruby; gemdir = ./.; }; + + shell_inputs = [ jekyll_env pkgs.imagemagick pkgs.exiftool ]; in { build = derivation { inherit jekyll_env system; + name = "mediocre-blog"; builder = "${pkgs.bash}/bin/bash"; args = [ ./build.sh ]; @@ -22,14 +25,15 @@ }; serve = pkgs.stdenv.mkDerivation { - name = "mediocre-blog-shell"; - buildInputs = [ jekyll_env ]; + name = "mediocre-blog-shell-serve"; + buildInputs = shell_inputs; shellHook = '' exec ${jekyll_env}/bin/jekyll serve -s ./src -d ./_site -w -I -D -H 0.0.0.0 ''; }; - env = jekyll_env; + shell = pkgs.stdenv.mkDerivation { + name = "mediocre-blog-shell"; + buildInputs = shell_inputs; + }; } - - diff --git a/src/_posts/2021-02-25-married.md b/src/_posts/2021-02-25-married.md new file mode 100644 index 0000000..a44e044 --- /dev/null +++ b/src/_posts/2021-02-25-married.md @@ -0,0 +1,18 @@ +--- +title: >- + Married! +description: >- + We did it! +--- + +Just us, an aspen grove, and a photographer to witness. Between weather and +foot-traffic on the trail everything went as well as we hoped it would; it was a +wonderful day. + +{% include image.html dir="wedding" file="1.jpg" width=4005 %} + +{% include image.html dir="wedding" file="2.jpg" width=4004 %} + +{% include image.html dir="wedding" file="3.jpg" width=4005 %} + +More pictures coming soon to a website near you! diff --git a/src/img/wedding/1.jpg b/src/img/wedding/1.jpg new file mode 100644 index 0000000..bc0e60a Binary files /dev/null and b/src/img/wedding/1.jpg differ diff --git a/src/img/wedding/1000px/1.jpg b/src/img/wedding/1000px/1.jpg new file mode 100644 index 0000000..c030709 Binary files /dev/null and b/src/img/wedding/1000px/1.jpg differ diff --git a/src/img/wedding/1000px/2.jpg b/src/img/wedding/1000px/2.jpg new file mode 100644 index 0000000..1f1f97f Binary files /dev/null and b/src/img/wedding/1000px/2.jpg differ diff --git a/src/img/wedding/1000px/3.jpg b/src/img/wedding/1000px/3.jpg new file mode 100644 index 0000000..0537487 Binary files /dev/null and b/src/img/wedding/1000px/3.jpg differ diff --git a/src/img/wedding/1500px/1.jpg b/src/img/wedding/1500px/1.jpg new file mode 100644 index 0000000..04b7ad1 Binary files /dev/null and b/src/img/wedding/1500px/1.jpg differ diff --git a/src/img/wedding/1500px/2.jpg b/src/img/wedding/1500px/2.jpg new file mode 100644 index 0000000..b5b8132 Binary files /dev/null and b/src/img/wedding/1500px/2.jpg differ diff --git a/src/img/wedding/1500px/3.jpg b/src/img/wedding/1500px/3.jpg new file mode 100644 index 0000000..3d98245 Binary files /dev/null and b/src/img/wedding/1500px/3.jpg differ diff --git a/src/img/wedding/2.jpg b/src/img/wedding/2.jpg new file mode 100644 index 0000000..8b39b08 Binary files /dev/null and b/src/img/wedding/2.jpg differ diff --git a/src/img/wedding/2000px/1.jpg b/src/img/wedding/2000px/1.jpg new file mode 100644 index 0000000..f0309dc Binary files /dev/null and b/src/img/wedding/2000px/1.jpg differ diff --git a/src/img/wedding/2000px/2.jpg b/src/img/wedding/2000px/2.jpg new file mode 100644 index 0000000..9d7ea08 Binary files /dev/null and b/src/img/wedding/2000px/2.jpg differ diff --git a/src/img/wedding/2000px/3.jpg b/src/img/wedding/2000px/3.jpg new file mode 100644 index 0000000..dfb9928 Binary files /dev/null and b/src/img/wedding/2000px/3.jpg differ diff --git a/src/img/wedding/2500px/1.jpg b/src/img/wedding/2500px/1.jpg new file mode 100644 index 0000000..4a15704 Binary files /dev/null and b/src/img/wedding/2500px/1.jpg differ diff --git a/src/img/wedding/2500px/2.jpg b/src/img/wedding/2500px/2.jpg new file mode 100644 index 0000000..5f04162 Binary files /dev/null and b/src/img/wedding/2500px/2.jpg differ diff --git a/src/img/wedding/2500px/3.jpg b/src/img/wedding/2500px/3.jpg new file mode 100644 index 0000000..89a46a6 Binary files /dev/null and b/src/img/wedding/2500px/3.jpg differ diff --git a/src/img/wedding/3.jpg b/src/img/wedding/3.jpg new file mode 100644 index 0000000..8eb9972 Binary files /dev/null and b/src/img/wedding/3.jpg differ diff --git a/src/img/wedding/3000px/1.jpg b/src/img/wedding/3000px/1.jpg new file mode 100644 index 0000000..2e0e813 Binary files /dev/null and b/src/img/wedding/3000px/1.jpg differ diff --git a/src/img/wedding/3000px/2.jpg b/src/img/wedding/3000px/2.jpg new file mode 100644 index 0000000..47730c0 Binary files /dev/null and b/src/img/wedding/3000px/2.jpg differ diff --git a/src/img/wedding/3000px/3.jpg b/src/img/wedding/3000px/3.jpg new file mode 100644 index 0000000..a8c4fdd Binary files /dev/null and b/src/img/wedding/3000px/3.jpg differ diff --git a/src/img/wedding/500px/1.jpg b/src/img/wedding/500px/1.jpg new file mode 100644 index 0000000..e5fc782 Binary files /dev/null and b/src/img/wedding/500px/1.jpg differ diff --git a/src/img/wedding/500px/2.jpg b/src/img/wedding/500px/2.jpg new file mode 100644 index 0000000..7d7c95b Binary files /dev/null and b/src/img/wedding/500px/2.jpg differ diff --git a/src/img/wedding/500px/3.jpg b/src/img/wedding/500px/3.jpg new file mode 100644 index 0000000..7867536 Binary files /dev/null and b/src/img/wedding/500px/3.jpg differ -- cgit v1.2.3