diff --git a/NixShebang.sh b/NixShebang.sh deleted file mode 100755 index b40f726..0000000 --- a/NixShebang.sh +++ /dev/null @@ -1,11 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -p "haskellPackages.ghcWithPackages (ps: with ps; [turtle])" -#! nix-shell -i runghc - -{-# LANGUAGE OverloadedStrings #-} - -import Turtle - -main :: IO () -main = do - echo "Hello, World!" \ No newline at end of file diff --git a/README.md b/README.md index b88439f..3857003 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ It's an in-joke. ## What's all this code? seal-blog/ + - devops/ - build.sh - Uses a [nix-shell](https://nixos.wiki/wiki/Development_environment_with_nix-shell) expression to build the Hakyll executable @@ -16,18 +17,11 @@ seal-blog/ - configuration.nix - The [configuration file for the NixOS](https://nixos.org/manual/nixos/stable/index.html#ch-configuration) production server. This takes care of installing all the necessary software, setup [Nginx](https://www.nginx.com/), and get [ACME certs](https://en.wikipedia.org/wiki/Automated_Certificate_Management_Environment) for verification. - - default.nix - - An broken experiment to package this repo as a Nix expression. - - - deploy.sh - - A simple rsync command to copy this repo to the server. - - newSealPost.sh - Script to be called daily by a cron job on the server. Generates the post for the day, builds and commits. - - dist/ - - Nothing checked in goes here. If you have to go in here you're probably doing something wrong. + - Place for the Haskell build artifacts to go. - generate/ - generateSealPosts.hs @@ -36,6 +30,6 @@ seal-blog/ - website/ - A basic Hakyll site, slightly modified to serve seals. Most of the site is generated from the `site.hs` file. Check the [Hakyll](https://jaspervdj.be/hakyll/) documentation for more info. -## These seals need more adjectives! +## These seals need more adjectives -In [generate/generateSealPosts.hs](https://gitlab.com/billewanick/seal-blog/-/blob/master/generate/generateSealPosts.hs#L117-221) you'll find two lists of adjectives. Submit a pull request to add more. Or email me at admin AT cutesealfanpage.love \ No newline at end of file +In [generate/generateSealPosts.hs](https://gitlab.com/billewanick/seal-blog/-/blob/master/generate/generateSealPosts.hs#L117-221) you'll find two lists of adjectives. Submit a pull request to add more. Or email me at admin AT cutesealfanpage.love diff --git a/seal-blog.cabal b/seal-blog.cabal deleted file mode 100644 index 0a9f456..0000000 --- a/seal-blog.cabal +++ /dev/null @@ -1,11 +0,0 @@ -name: seal-blog -version: 0.1.0.0 -build-type: Simple -cabal-version: >= 1.10 - -executable site - main-is: site.hs - build-depends: base == 4.* - , hakyll == 4.13.* - ghc-options: -threaded - default-language: Haskell2010 diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 94b35e0..0000000 --- a/shell.nix +++ /dev/null @@ -1,42 +0,0 @@ -# https://wizzup.github.io/posts/nix-shell-haskell-invocation/ -# shell.nix for nix-shell (haskell) - -{ pkgs ? import {} }: - -let - pkgs = import (builtins.fetchGit { - # Descriptive name to make the store path easier to identify - name = "hakyll-4.13.3.0"; - url = "https://github.com/nixos/nixpkgs-channels/"; - ref = "refs/heads/nixpkgs-unstable"; - rev = "fa54dd346fe5e73d877f2068addf6372608c820b"; - }) {}; - - myPkg = pkgs.haskellPackages.hakyll; - - ghc = pkgs.haskellPackages.ghcWithHoogle (self: with self; [ - # hspec - split - # myPkg # hakyll - random - neat-interpolation - ]); -in -pkgs.mkShell { - name = "haskell-shell"; - buildInputs = (with pkgs.haskellPackages; [ - ghc - hlint - -# stack -# ghcjs-dom -# cabal-install - ]) ++ (with pkgs; [ - nano - ]); - - shellHook = '' - eval "$(egrep ^export "$(type -p ghc)")" - export PS1="\[\033[1;32m\][ns-hs:\w]\n$ \[\033[0m\]" - ''; -}