summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--default.nix14
-rw-r--r--src/_posts/2021-02-25-married.md18
-rw-r--r--src/img/wedding/1.jpgbin0 -> 10772620 bytes
-rw-r--r--src/img/wedding/1000px/1.jpgbin0 -> 1025105 bytes
-rw-r--r--src/img/wedding/1000px/2.jpgbin0 -> 1019847 bytes
-rw-r--r--src/img/wedding/1000px/3.jpgbin0 -> 837770 bytes
-rw-r--r--src/img/wedding/1500px/1.jpgbin0 -> 2148194 bytes
-rw-r--r--src/img/wedding/1500px/2.jpgbin0 -> 2248792 bytes
-rw-r--r--src/img/wedding/1500px/3.jpgbin0 -> 1917092 bytes
-rw-r--r--src/img/wedding/2.jpgbin0 -> 13722601 bytes
-rw-r--r--src/img/wedding/2000px/1.jpgbin0 -> 3717531 bytes
-rw-r--r--src/img/wedding/2000px/2.jpgbin0 -> 4068147 bytes
-rw-r--r--src/img/wedding/2000px/3.jpgbin0 -> 3457459 bytes
-rw-r--r--src/img/wedding/2500px/1.jpgbin0 -> 5706806 bytes
-rw-r--r--src/img/wedding/2500px/2.jpgbin0 -> 6478989 bytes
-rw-r--r--src/img/wedding/2500px/3.jpgbin0 -> 5407036 bytes
-rw-r--r--src/img/wedding/3.jpgbin0 -> 10359419 bytes
-rw-r--r--src/img/wedding/3000px/1.jpgbin0 -> 7987806 bytes
-rw-r--r--src/img/wedding/3000px/2.jpgbin0 -> 9363668 bytes
-rw-r--r--src/img/wedding/3000px/3.jpgbin0 -> 7592593 bytes
-rw-r--r--src/img/wedding/500px/1.jpgbin0 -> 324297 bytes
-rw-r--r--src/img/wedding/500px/2.jpgbin0 -> 305002 bytes
-rw-r--r--src/img/wedding/500px/3.jpgbin0 -> 223909 bytes
24 files changed, 30 insertions, 5 deletions
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
--- /dev/null
+++ b/src/img/wedding/1.jpg
Binary files differ
diff --git a/src/img/wedding/1000px/1.jpg b/src/img/wedding/1000px/1.jpg
new file mode 100644
index 0000000..c030709
--- /dev/null
+++ b/src/img/wedding/1000px/1.jpg
Binary files differ
diff --git a/src/img/wedding/1000px/2.jpg b/src/img/wedding/1000px/2.jpg
new file mode 100644
index 0000000..1f1f97f
--- /dev/null
+++ b/src/img/wedding/1000px/2.jpg
Binary files differ
diff --git a/src/img/wedding/1000px/3.jpg b/src/img/wedding/1000px/3.jpg
new file mode 100644
index 0000000..0537487
--- /dev/null
+++ b/src/img/wedding/1000px/3.jpg
Binary files differ
diff --git a/src/img/wedding/1500px/1.jpg b/src/img/wedding/1500px/1.jpg
new file mode 100644
index 0000000..04b7ad1
--- /dev/null
+++ b/src/img/wedding/1500px/1.jpg
Binary files differ
diff --git a/src/img/wedding/1500px/2.jpg b/src/img/wedding/1500px/2.jpg
new file mode 100644
index 0000000..b5b8132
--- /dev/null
+++ b/src/img/wedding/1500px/2.jpg
Binary files differ
diff --git a/src/img/wedding/1500px/3.jpg b/src/img/wedding/1500px/3.jpg
new file mode 100644
index 0000000..3d98245
--- /dev/null
+++ b/src/img/wedding/1500px/3.jpg
Binary files differ
diff --git a/src/img/wedding/2.jpg b/src/img/wedding/2.jpg
new file mode 100644
index 0000000..8b39b08
--- /dev/null
+++ b/src/img/wedding/2.jpg
Binary files differ
diff --git a/src/img/wedding/2000px/1.jpg b/src/img/wedding/2000px/1.jpg
new file mode 100644
index 0000000..f0309dc
--- /dev/null
+++ b/src/img/wedding/2000px/1.jpg
Binary files differ
diff --git a/src/img/wedding/2000px/2.jpg b/src/img/wedding/2000px/2.jpg
new file mode 100644
index 0000000..9d7ea08
--- /dev/null
+++ b/src/img/wedding/2000px/2.jpg
Binary files differ
diff --git a/src/img/wedding/2000px/3.jpg b/src/img/wedding/2000px/3.jpg
new file mode 100644
index 0000000..dfb9928
--- /dev/null
+++ b/src/img/wedding/2000px/3.jpg
Binary files differ
diff --git a/src/img/wedding/2500px/1.jpg b/src/img/wedding/2500px/1.jpg
new file mode 100644
index 0000000..4a15704
--- /dev/null
+++ b/src/img/wedding/2500px/1.jpg
Binary files differ
diff --git a/src/img/wedding/2500px/2.jpg b/src/img/wedding/2500px/2.jpg
new file mode 100644
index 0000000..5f04162
--- /dev/null
+++ b/src/img/wedding/2500px/2.jpg
Binary files differ
diff --git a/src/img/wedding/2500px/3.jpg b/src/img/wedding/2500px/3.jpg
new file mode 100644
index 0000000..89a46a6
--- /dev/null
+++ b/src/img/wedding/2500px/3.jpg
Binary files differ
diff --git a/src/img/wedding/3.jpg b/src/img/wedding/3.jpg
new file mode 100644
index 0000000..8eb9972
--- /dev/null
+++ b/src/img/wedding/3.jpg
Binary files differ
diff --git a/src/img/wedding/3000px/1.jpg b/src/img/wedding/3000px/1.jpg
new file mode 100644
index 0000000..2e0e813
--- /dev/null
+++ b/src/img/wedding/3000px/1.jpg
Binary files differ
diff --git a/src/img/wedding/3000px/2.jpg b/src/img/wedding/3000px/2.jpg
new file mode 100644
index 0000000..47730c0
--- /dev/null
+++ b/src/img/wedding/3000px/2.jpg
Binary files differ
diff --git a/src/img/wedding/3000px/3.jpg b/src/img/wedding/3000px/3.jpg
new file mode 100644
index 0000000..a8c4fdd
--- /dev/null
+++ b/src/img/wedding/3000px/3.jpg
Binary files differ
diff --git a/src/img/wedding/500px/1.jpg b/src/img/wedding/500px/1.jpg
new file mode 100644
index 0000000..e5fc782
--- /dev/null
+++ b/src/img/wedding/500px/1.jpg
Binary files differ
diff --git a/src/img/wedding/500px/2.jpg b/src/img/wedding/500px/2.jpg
new file mode 100644
index 0000000..7d7c95b
--- /dev/null
+++ b/src/img/wedding/500px/2.jpg
Binary files differ
diff --git a/src/img/wedding/500px/3.jpg b/src/img/wedding/500px/3.jpg
new file mode 100644
index 0000000..7867536
--- /dev/null
+++ b/src/img/wedding/500px/3.jpg
Binary files differ