diff --git a/README.md b/README.md deleted file mode 100644 index 2cf4324..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -`jekyll serve` diff --git a/flake.nix b/flake.nix index 9d80f56..b14246e 100644 --- a/flake.nix +++ b/flake.nix @@ -16,9 +16,52 @@ forEachSystem = nixpkgs.lib.genAttrs (import systems); in { - packages = forEachSystem (system: { - devenv-up = self.devShells.${system}.default.config.procfileScript; - }); + packages = forEachSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + images.hello = pkgs.dockerTools.buildImage { + name = "hello-docker"; + config = { + Cmd = [ "${pkgs.hello}/bin/hello" ]; + }; + }; + + website = pkgs.stdenv.mkDerivation + ( + let + # TODO: DRY + gems = pkgs.bundlerEnv { + name = "static"; + gemdir = ./src; + }; + in + { + version = "0.0.1"; + name = "website"; + + src = ./src; + + buildInputs = [ + gems + gems.wrappedRuby + ]; + + sourceRoot = "src"; + + buildPhase = '' + bundle exec jekyll build + ''; + + installPhase = '' + mkdir -p $out + cp -r _site/* $out/ + ''; + } + ); + } + ); devShells = forEachSystem (system: @@ -26,7 +69,7 @@ pkgs = nixpkgs.legacyPackages.${system}; gems = pkgs.bundlerEnv { name = "static"; - gemdir = ./.; + gemdir = ./src; }; in { diff --git a/result b/result new file mode 120000 index 0000000..8f90ca9 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/7nwlgm56gharaymrwn8k4b2pld89098g-website \ No newline at end of file diff --git a/404.md b/src/404.md similarity index 100% rename from 404.md rename to src/404.md diff --git a/Gemfile b/src/Gemfile similarity index 100% rename from Gemfile rename to src/Gemfile diff --git a/Gemfile.lock b/src/Gemfile.lock similarity index 100% rename from Gemfile.lock rename to src/Gemfile.lock diff --git a/_config.yml b/src/_config.yml similarity index 98% rename from _config.yml rename to src/_config.yml index 0aaecd7..beb0ab3 100644 --- a/_config.yml +++ b/src/_config.yml @@ -64,6 +64,7 @@ exclude: - lighthouse.png - klise-*.gem - klise.gemspec + - gemset.nix plugins: - jekyll-feed diff --git a/_data/menus.yml b/src/_data/menus.yml similarity index 100% rename from _data/menus.yml rename to src/_data/menus.yml diff --git a/_includes/anchor_headings.html b/src/_includes/anchor_headings.html similarity index 100% rename from _includes/anchor_headings.html rename to src/_includes/anchor_headings.html diff --git a/_includes/author.html b/src/_includes/author.html similarity index 100% rename from _includes/author.html rename to src/_includes/author.html diff --git a/_includes/comments.html b/src/_includes/comments.html similarity index 100% rename from _includes/comments.html rename to src/_includes/comments.html diff --git a/_includes/footer.html b/src/_includes/footer.html similarity index 100% rename from _includes/footer.html rename to src/_includes/footer.html diff --git a/_includes/header.html b/src/_includes/header.html similarity index 100% rename from _includes/header.html rename to src/_includes/header.html diff --git a/_includes/navbar.html b/src/_includes/navbar.html similarity index 100% rename from _includes/navbar.html rename to src/_includes/navbar.html diff --git a/_includes/navigation.html b/src/_includes/navigation.html similarity index 100% rename from _includes/navigation.html rename to src/_includes/navigation.html diff --git a/_includes/pagination.html b/src/_includes/pagination.html similarity index 100% rename from _includes/pagination.html rename to src/_includes/pagination.html diff --git a/_layouts/404.html b/src/_layouts/404.html similarity index 100% rename from _layouts/404.html rename to src/_layouts/404.html diff --git a/_layouts/compress.html b/src/_layouts/compress.html similarity index 100% rename from _layouts/compress.html rename to src/_layouts/compress.html diff --git a/_layouts/default.html b/src/_layouts/default.html similarity index 100% rename from _layouts/default.html rename to src/_layouts/default.html diff --git a/_layouts/home.html b/src/_layouts/home.html similarity index 100% rename from _layouts/home.html rename to src/_layouts/home.html diff --git a/_layouts/page.html b/src/_layouts/page.html similarity index 100% rename from _layouts/page.html rename to src/_layouts/page.html diff --git a/_layouts/post.html b/src/_layouts/post.html similarity index 100% rename from _layouts/post.html rename to src/_layouts/post.html diff --git a/_posts/ansible-edit-kernel-params/2023-06-19-ansible-edit-grub.md b/src/_posts/ansible-edit-kernel-params/2023-06-19-ansible-edit-grub.md similarity index 100% rename from _posts/ansible-edit-kernel-params/2023-06-19-ansible-edit-grub.md rename to src/_posts/ansible-edit-kernel-params/2023-06-19-ansible-edit-grub.md diff --git a/_posts/backup-failure/2023-08-08-backup-failure.md b/src/_posts/backup-failure/2023-08-08-backup-failure.md similarity index 100% rename from _posts/backup-failure/2023-08-08-backup-failure.md rename to src/_posts/backup-failure/2023-08-08-backup-failure.md diff --git a/_posts/concourse-apprise-notifier/2023-06-14-concourse-apprise-notifier.md b/src/_posts/concourse-apprise-notifier/2023-06-14-concourse-apprise-notifier.md similarity index 100% rename from _posts/concourse-apprise-notifier/2023-06-14-concourse-apprise-notifier.md rename to src/_posts/concourse-apprise-notifier/2023-06-14-concourse-apprise-notifier.md diff --git a/_posts/concourse-apprise-notifier/ntfy.png b/src/_posts/concourse-apprise-notifier/ntfy.png similarity index 100% rename from _posts/concourse-apprise-notifier/ntfy.png rename to src/_posts/concourse-apprise-notifier/ntfy.png diff --git a/_posts/concourse-apprise-notifier/pipeline.png b/src/_posts/concourse-apprise-notifier/pipeline.png similarity index 100% rename from _posts/concourse-apprise-notifier/pipeline.png rename to src/_posts/concourse-apprise-notifier/pipeline.png diff --git a/_posts/fluent-bit-memory/2023-08-09-fluent-bit-memory.md b/src/_posts/fluent-bit-memory/2023-08-09-fluent-bit-memory.md similarity index 100% rename from _posts/fluent-bit-memory/2023-08-09-fluent-bit-memory.md rename to src/_posts/fluent-bit-memory/2023-08-09-fluent-bit-memory.md diff --git a/_posts/hashicorp-license-change/2023-08-17-hashicorp-license-change.md b/src/_posts/hashicorp-license-change/2023-08-17-hashicorp-license-change.md similarity index 100% rename from _posts/hashicorp-license-change/2023-08-17-hashicorp-license-change.md rename to src/_posts/hashicorp-license-change/2023-08-17-hashicorp-license-change.md diff --git a/_posts/homebrew-ssh-ca/2023-05-23-homebrew-ssh-ca.md b/src/_posts/homebrew-ssh-ca/2023-05-23-homebrew-ssh-ca.md similarity index 100% rename from _posts/homebrew-ssh-ca/2023-05-23-homebrew-ssh-ca.md rename to src/_posts/homebrew-ssh-ca/2023-05-23-homebrew-ssh-ca.md diff --git a/_posts/infrastructure-snapshot/2023-08-13-infrastructure-snapshot.md b/src/_posts/infrastructure-snapshot/2023-08-13-infrastructure-snapshot.md similarity index 100% rename from _posts/infrastructure-snapshot/2023-08-13-infrastructure-snapshot.md rename to src/_posts/infrastructure-snapshot/2023-08-13-infrastructure-snapshot.md diff --git a/_posts/infrastructure-snapshot/nat.png b/src/_posts/infrastructure-snapshot/nat.png similarity index 100% rename from _posts/infrastructure-snapshot/nat.png rename to src/_posts/infrastructure-snapshot/nat.png diff --git a/_posts/infrastructure-snapshot/servers.jpeg b/src/_posts/infrastructure-snapshot/servers.jpeg similarity index 100% rename from _posts/infrastructure-snapshot/servers.jpeg rename to src/_posts/infrastructure-snapshot/servers.jpeg diff --git a/_posts/infrastructure-snapshot/unbound_overrides.png b/src/_posts/infrastructure-snapshot/unbound_overrides.png similarity index 100% rename from _posts/infrastructure-snapshot/unbound_overrides.png rename to src/_posts/infrastructure-snapshot/unbound_overrides.png diff --git a/_posts/infrastructure-snapshot/vlans.png b/src/_posts/infrastructure-snapshot/vlans.png similarity index 100% rename from _posts/infrastructure-snapshot/vlans.png rename to src/_posts/infrastructure-snapshot/vlans.png diff --git a/_posts/its-alive/2024-04-21-its-alive.md b/src/_posts/its-alive/2024-04-21-its-alive.md similarity index 100% rename from _posts/its-alive/2024-04-21-its-alive.md rename to src/_posts/its-alive/2024-04-21-its-alive.md diff --git a/_posts/virtio-9p-experiences/2023-05-31-virtio-9p-experiences.md b/src/_posts/virtio-9p-experiences/2023-05-31-virtio-9p-experiences.md similarity index 100% rename from _posts/virtio-9p-experiences/2023-05-31-virtio-9p-experiences.md rename to src/_posts/virtio-9p-experiences/2023-05-31-virtio-9p-experiences.md diff --git a/_posts/virtio-9p-experiences/virt-manager.png b/src/_posts/virtio-9p-experiences/virt-manager.png similarity index 100% rename from _posts/virtio-9p-experiences/virt-manager.png rename to src/_posts/virtio-9p-experiences/virt-manager.png diff --git a/_sass/klise/_base.scss b/src/_sass/klise/_base.scss similarity index 100% rename from _sass/klise/_base.scss rename to src/_sass/klise/_base.scss diff --git a/_sass/klise/_dark.scss b/src/_sass/klise/_dark.scss similarity index 100% rename from _sass/klise/_dark.scss rename to src/_sass/klise/_dark.scss diff --git a/_sass/klise/_fonts.scss b/src/_sass/klise/_fonts.scss similarity index 100% rename from _sass/klise/_fonts.scss rename to src/_sass/klise/_fonts.scss diff --git a/_sass/klise/_layout.scss b/src/_sass/klise/_layout.scss similarity index 100% rename from _sass/klise/_layout.scss rename to src/_sass/klise/_layout.scss diff --git a/_sass/klise/_miscellaneous.scss b/src/_sass/klise/_miscellaneous.scss similarity index 100% rename from _sass/klise/_miscellaneous.scss rename to src/_sass/klise/_miscellaneous.scss diff --git a/_sass/klise/_post.scss b/src/_sass/klise/_post.scss similarity index 100% rename from _sass/klise/_post.scss rename to src/_sass/klise/_post.scss diff --git a/_sass/klise/_syntax.scss b/src/_sass/klise/_syntax.scss similarity index 100% rename from _sass/klise/_syntax.scss rename to src/_sass/klise/_syntax.scss diff --git a/_sass/main.scss b/src/_sass/main.scss similarity index 100% rename from _sass/main.scss rename to src/_sass/main.scss diff --git a/about.md b/src/about.md similarity index 100% rename from about.md rename to src/about.md diff --git a/archive.html b/src/archive.html similarity index 100% rename from archive.html rename to src/archive.html diff --git a/assets/css/fontawesome.all.min.css b/src/assets/css/fontawesome.all.min.css similarity index 100% rename from assets/css/fontawesome.all.min.css rename to src/assets/css/fontawesome.all.min.css diff --git a/assets/css/style.scss b/src/assets/css/style.scss similarity index 100% rename from assets/css/style.scss rename to src/assets/css/style.scss diff --git a/assets/favicons/android-chrome-192x192.png b/src/assets/favicons/android-chrome-192x192.png similarity index 100% rename from assets/favicons/android-chrome-192x192.png rename to src/assets/favicons/android-chrome-192x192.png diff --git a/assets/favicons/android-chrome-384x384.png b/src/assets/favicons/android-chrome-384x384.png similarity index 100% rename from assets/favicons/android-chrome-384x384.png rename to src/assets/favicons/android-chrome-384x384.png diff --git a/assets/favicons/android-chrome-512x512.png b/src/assets/favicons/android-chrome-512x512.png similarity index 100% rename from assets/favicons/android-chrome-512x512.png rename to src/assets/favicons/android-chrome-512x512.png diff --git a/assets/favicons/apple-touch-icon.png b/src/assets/favicons/apple-touch-icon.png similarity index 100% rename from assets/favicons/apple-touch-icon.png rename to src/assets/favicons/apple-touch-icon.png diff --git a/assets/favicons/browserconfig.xml b/src/assets/favicons/browserconfig.xml similarity index 100% rename from assets/favicons/browserconfig.xml rename to src/assets/favicons/browserconfig.xml diff --git a/assets/favicons/favicon-16x16.png b/src/assets/favicons/favicon-16x16.png similarity index 100% rename from assets/favicons/favicon-16x16.png rename to src/assets/favicons/favicon-16x16.png diff --git a/assets/favicons/favicon-32x32.png b/src/assets/favicons/favicon-32x32.png similarity index 100% rename from assets/favicons/favicon-32x32.png rename to src/assets/favicons/favicon-32x32.png diff --git a/assets/favicons/favicon.ico b/src/assets/favicons/favicon.ico similarity index 100% rename from assets/favicons/favicon.ico rename to src/assets/favicons/favicon.ico diff --git a/assets/favicons/mstile-150x150.png b/src/assets/favicons/mstile-150x150.png similarity index 100% rename from assets/favicons/mstile-150x150.png rename to src/assets/favicons/mstile-150x150.png diff --git a/assets/favicons/safari-pinned-tab.svg b/src/assets/favicons/safari-pinned-tab.svg similarity index 100% rename from assets/favicons/safari-pinned-tab.svg rename to src/assets/favicons/safari-pinned-tab.svg diff --git a/assets/favicons/site.webmanifest b/src/assets/favicons/site.webmanifest similarity index 100% rename from assets/favicons/site.webmanifest rename to src/assets/favicons/site.webmanifest diff --git a/assets/img/avatar.jpg b/src/assets/img/avatar.jpg similarity index 100% rename from assets/img/avatar.jpg rename to src/assets/img/avatar.jpg diff --git a/assets/js/disqus.js b/src/assets/js/disqus.js similarity index 100% rename from assets/js/disqus.js rename to src/assets/js/disqus.js diff --git a/assets/js/main.js b/src/assets/js/main.js similarity index 100% rename from assets/js/main.js rename to src/assets/js/main.js diff --git a/assets/js/search.min.js b/src/assets/js/search.min.js similarity index 100% rename from assets/js/search.min.js rename to src/assets/js/search.min.js diff --git a/assets/search.json b/src/assets/search.json similarity index 100% rename from assets/search.json rename to src/assets/search.json diff --git a/assets/webfonts/fa-brands-400.ttf b/src/assets/webfonts/fa-brands-400.ttf similarity index 100% rename from assets/webfonts/fa-brands-400.ttf rename to src/assets/webfonts/fa-brands-400.ttf diff --git a/assets/webfonts/fa-brands-400.woff2 b/src/assets/webfonts/fa-brands-400.woff2 similarity index 100% rename from assets/webfonts/fa-brands-400.woff2 rename to src/assets/webfonts/fa-brands-400.woff2 diff --git a/assets/webfonts/fa-regular-400.ttf b/src/assets/webfonts/fa-regular-400.ttf similarity index 100% rename from assets/webfonts/fa-regular-400.ttf rename to src/assets/webfonts/fa-regular-400.ttf diff --git a/assets/webfonts/fa-regular-400.woff2 b/src/assets/webfonts/fa-regular-400.woff2 similarity index 100% rename from assets/webfonts/fa-regular-400.woff2 rename to src/assets/webfonts/fa-regular-400.woff2 diff --git a/assets/webfonts/fa-solid-900.ttf b/src/assets/webfonts/fa-solid-900.ttf similarity index 100% rename from assets/webfonts/fa-solid-900.ttf rename to src/assets/webfonts/fa-solid-900.ttf diff --git a/assets/webfonts/fa-solid-900.woff2 b/src/assets/webfonts/fa-solid-900.woff2 similarity index 100% rename from assets/webfonts/fa-solid-900.woff2 rename to src/assets/webfonts/fa-solid-900.woff2 diff --git a/assets/webfonts/fa-v4compatibility.ttf b/src/assets/webfonts/fa-v4compatibility.ttf similarity index 100% rename from assets/webfonts/fa-v4compatibility.ttf rename to src/assets/webfonts/fa-v4compatibility.ttf diff --git a/assets/webfonts/fa-v4compatibility.woff2 b/src/assets/webfonts/fa-v4compatibility.woff2 similarity index 100% rename from assets/webfonts/fa-v4compatibility.woff2 rename to src/assets/webfonts/fa-v4compatibility.woff2 diff --git a/browserconfig.xml b/src/browserconfig.xml similarity index 100% rename from browserconfig.xml rename to src/browserconfig.xml diff --git a/gemset.nix b/src/gemset.nix similarity index 100% rename from gemset.nix rename to src/gemset.nix diff --git a/index.md b/src/index.md similarity index 100% rename from index.md rename to src/index.md diff --git a/klise.gemspec b/src/klise.gemspec similarity index 100% rename from klise.gemspec rename to src/klise.gemspec diff --git a/now.json b/src/now.json similarity index 100% rename from now.json rename to src/now.json diff --git a/tags.html b/src/tags.html similarity index 100% rename from tags.html rename to src/tags.html