diff --git a/Makefile b/Makefile index 84ee695..998bdd4 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,10 @@ install: result clean: rm result + rm -rf _site serve: nix-shell -A serve update: - nix-shell -p bundler --run 'bundler update' - -lock: - nix-shell -p bundler -p bundix --run 'bundler lock; bundler package --no-install --path vendor; bundix; rm -rf .bundle vendor' + nix-shell -p bundler --run 'bundler update; bundler lock; bundix; rm -rf .bundle vendor' diff --git a/default.nix b/default.nix index 95bfc26..19de15d 100644 --- a/default.nix +++ b/default.nix @@ -12,18 +12,17 @@ in { build = derivation { - system = system; + inherit jekyll_env system; name = "mediocre-blog"; builder = "${pkgs.bash}/bin/bash"; args = [ ./build.sh ]; src = ./src; stdenv = pkgs.stdenv; - inherit jekyll_env; }; - serve = pkgs.stdenv.mkDerivation rec { - name = "jekyll_env"; + serve = pkgs.stdenv.mkDerivation { + name = "mediocre-blog-shell"; # glibcLocales is required so to fill in LC_ALL and other locale # related environment vars. Without those jekyll's scss compiler @@ -36,6 +35,8 @@ exec ${jekyll_env}/bin/jekyll serve -s ./src -d ./_site -w -I -D -H 0.0.0.0 ''; }; + + env = jekyll_env; } diff --git a/src/_config.yml b/src/_config.yml index c8b0980..acca4c8 100644 --- a/src/_config.yml +++ b/src/_config.yml @@ -5,7 +5,7 @@ description: >- A mix of tech, art, travel, and who knows what else. baseurl: "" # the subpath of your site, e.g. /blog url: https://blog.mediocregopher.com # the base hostname & protocol for your site, e.g. http://example.com -repository: mediocregopher/blog.mediocregopher.com +repository: https://github.com/mediocregopher/blog.mediocregopher.com twitter_username: mediocre_gopher github_username: mediocregopher rss: rss diff --git a/src/_includes/header.html b/src/_includes/header.html index 888a8dc..a6b9e30 100644 --- a/src/_includes/header.html +++ b/src/_includes/header.html @@ -1,6 +1,6 @@