Adding seal-blog as cutesealfanpage.love submodule

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "nixos-apps/cutesealfanpage.love"]
+	path = nixos-apps/cutesealfanpage.love
+	url = gitea@git.ewanick.com:bill/seal-blog.git

nixos-apps/cutesealfanpage.love

@@ -0,0 +1 @@
+Subproject commit 1772b80ab30752713ecd8ce749f0c7a261839daf

nixos-apps/cutesealfanpage.love.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 let
-  PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps";
+  PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/cutesealfanpage.love";
 in
 {
   services.caddy = {
@@ -10,7 +10,7 @@ in
       "cutesealfanpage.love" = {
         serverAliases = [ "www.cutesealfanpage.love" ];
         extraConfig = ''
-          root * ${PROJECT_ROOT}/cutesealfanpage.love/_site
+          root * ${PROJECT_ROOT}/_site
           file_server
         '';
       };
@@ -26,7 +26,7 @@ in
         git
       ];
       script = ''
-        cd ${PROJECT_ROOT}/cutesealfanpage.love
+        cd ${PROJECT_ROOT}
         nix run .#hakyll-site -- watch --no-server
       '';
     };
@@ -40,7 +40,7 @@ in
         git
       ];
       script = ''
-        cd ${PROJECT_ROOT}/cutesealfanpage.love
+        cd ${PROJECT_ROOT}
         nix run .#generateSealPosts
       '';
     };
@@ -52,11 +52,4 @@ in
   security.acme.defaults.email = "admin@cutesealfanpage.love";
   # uncomment this to use the staging server
   # security.acme.server = "https://acme-staging-v02.api.letsencrypt.org/directory";
-
-  # services.cron = {
-  #   enable = true;
-  #   systemCronJobs = [
-  #     "12 12 * * *   alice   . /etc/profile; ${pkgs.newSealPost} > /home/alice/logs/backup.log 2>&1"
-  #   ];
-  # };
 }

nixos-apps/cutesealfanpage.love/.envrc

@@ -1 +0,0 @@
-use flake

nixos-apps/cutesealfanpage.love/.gitconfig

@@ -1,3 +0,0 @@
-[user]
-	email = admin@cutesealfanpage.love
-	name = Alice

nixos-apps/cutesealfanpage.love/.gitignore

@@ -1,15 +0,0 @@
-# Haykll site
-_cache
-_site
-result
-
-# Haskell stuff
-site
-dist
-*.dyn_hi
-*.dyn_o
-*.hi
-*.o
-
-# Direnv lorri stuff
-.direnv

nixos-apps/cutesealfanpage.love/.vscode/settings.json

@@ -1,21 +0,0 @@
-{
-    "git.ignoreLimitWarning": true,
-    "cSpell.words": [
-        "cutesealfanpage",
-        "Dhall",
-        "Fanpage",
-        "fmap",
-        "Hakyll",
-        "Lookie",
-        "mappend",
-        "Monoid",
-        "Namecheap",
-        "NOINLINE",
-        "pandoc",
-        "runghc",
-        "uncurry",
-        "unlines",
-        "utct"
-    ],
-    "nix.serverPath": "nil"
-}

nixos-apps/cutesealfanpage.love/README.md

@@ -1,39 +0,0 @@
-# Cute Seal Fanpage
-
-> An experiment using [Nix](https://nixos.org/), [Hakyll](https://jaspervdj.be/hakyll/), [Haskell](https://www.haskell.org/), and [shell scripts](https://en.wikipedia.org/wiki/Bourne_shell) to automate a simple website deployment pipeline.
-
-## Why Seals?
-
-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
-
-  - 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.
-
-  - newSealPost.sh
-    - Script to be called daily by a cron job on the server. Generates the post for the day, builds and commits.
-
-- 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.
-
-## Work to be done
-
-- The blog post generation and the hosting of the website are currently intertwined when they should be separated
-  - Seal post generator just makes posts
-  - Hakyll blog imports or calls the post generator
-  - The deployed server/nix config file has a cron job for adding a new blog and committing every day
-- Need to move the blog and post generation inside nixos-apps on my beefier server
-  - The configuration file here is for it's own Linode, the current small one running, but I have a better setup for that now
-  - Pull out the useful parts for my deployed server, remove anything not necessary for a small config file
-  - Also switch to using caddy if not already
-- Experiment with `*` A records
-  - For the seal blog
-  - Instead of having `www` and `git` and `...` subdomains spelled out in Namecheap
-  - Just have a `*` record and have caddy do the filtering

nixos-apps/cutesealfanpage.love/about.rst

@@ -1,6 +0,0 @@
----
-title: About Me
----
-I collect the seal photos
-
-Haven't missed a day yet!

nixos-apps/cutesealfanpage.love/config.dhall

@@ -1,102 +0,0 @@
-{ sealImagesPath = "images"
-, postsOutputPath = "posts"
-, startDate = 2023-07-01
-, seed = +137
-, adjectives1 =
-  [ "absorbing"
-  , "adorable"
-  , "alluring"
-  , "ambrosial"
-  , "amiable"
-  , "appealing"
-  , "attractive"
-  , "beautiful"
-  , "bewitching"
-  , "captivating"
-  , "charismatic"
-  , "charming"
-  , "choice"
-  , "cute"
-  , "dainty"
-  , "darling"
-  , "dear"
-  , "delectable"
-  , "delicate"
-  , "delicious"
-  , "delightful"
-  , "desirable"
-  , "dishy"
-  , "dreamy"
-  , "electrifying"
-  , "elegant"
-  , "enamoring"
-  , "engaging"
-  , "engrossing"
-  , "enthralling"
-  , "entrancing"
-  , "eye-catching"
-  , "fascinating"
-  , "fetching"
-  , "glamorous"
-  , "graceful"
-  , "heavenly"
-  , "infatuating"
-  , "inviting"
-  , "irresistible"
-  , "likable"
-  , "lovable"
-  , "lovely"
-  , "magnetizing"
-  , "nice"
-  , "pleasant"
-  , "precious"
-  , "pretty"
-  , "provocative"
-  , "rapturous"
-  , "ravishing"
-  , "seducing"
-  , "seductive"
-  , "suave"
-  , "sweet"
-  , "tantalizing"
-  , "tempting"
-  , "titillating"
-  , "winning"
-  , "winsome"
-  ]
-, adjectives2 =
-  [ "ample"
-  , "bearish"
-  , "big"
-  , "butterball"
-  , "buxom"
-  , "chunky"
-  , "fatty"
-  , "flabby"
-  , "fleshy"
-  , "full-figured"
-  , "hefty"
-  , "husky"
-  , "pleasingly plump"
-  , "plump"
-  , "plumpish"
-  , "podgy"
-  , "portly"
-  , "pudgy"
-  , "roly-poly"
-  , "rotund"
-  , "round"
-  , "stout"
-  , "tubby"
-  , "zaftig"
-  ]
-, looks =
-  [ "Look at"
-  , "Gaze upon"
-  , "Check out"
-  , "Witness!"
-  , "Look upon and tremble at"
-  , "Lookie here at"
-  , "Whoa! See"
-  ]
-}

nixos-apps/cutesealfanpage.love/contact.markdown

@@ -1,6 +0,0 @@
----
-title: Contact
----
-If you have a seal or seal photos, I'd love to post them!
-
-Send yours to admin AT cutesealfanpage.love

nixos-apps/cutesealfanpage.love/css/default.css

@@ -1,141 +0,0 @@
-html {
-  font-size: 62.5%;
-}
-
-body {
-  font-size: 1.6rem;
-  color: #000;
-}
-
-header {
-  border-bottom: 0.2rem solid #000;
-}
-
-nav {
-  text-align: right;
-}
-
-nav a {
-  font-size: 1.8rem;
-  font-weight: bold;
-  color: black;
-  text-decoration: none;
-  text-transform: uppercase;
-}
-
-footer {
-  margin-top: 3rem;
-  padding: 1.2rem 0;
-  border-top: 0.2rem solid #000;
-  font-size: 1.2rem;
-  color: #555;
-}
-
-h1 {
-  font-size: 2.4rem;
-}
-
-h2 {
-  font-size: 2rem;
-}
-
-article .header {
-  font-size: 1.4rem;
-  font-style: italic;
-  color: #555;
-}
-
-.logo a {
-  font-weight: bold;
-  color: #000;
-  text-decoration: none;
-}
-
-@media (max-width: 319px) {
-  body {
-    width: 90%;
-    margin: 0;
-    padding: 0 5%;
-  }
-  header {
-    margin: 4.2rem 0;
-  }
-  nav {
-    margin: 0 auto 3rem;
-    text-align: center;
-  }
-  footer {
-    text-align: center;
-  }
-  .logo {
-    text-align: center;
-    margin: 1rem auto 3rem;
-  }
-  .logo a {
-    font-size: 2.4rem;
-  }
-  nav a {
-    display: block;
-    line-height: 1.6;
-  }
-}
-
-@media (min-width: 320px) {
-  body {
-    width: 90%;
-    margin: 0;
-    padding: 0 5%;
-  }
-  header {
-    margin: 4.2rem 0;
-  }
-  nav {
-    margin: 0 auto 3rem;
-    text-align: center;
-  }
-  footer {
-    text-align: center;
-  }
-  .logo {
-    text-align: center;
-    margin: 1rem auto 3rem;
-  }
-  .logo a {
-    font-size: 2.4rem;
-  }
-  nav a {
-    display: inline;
-    margin: 0 0.6rem;
-  }
-}
-
-@media (min-width: 640px) {
-  body {
-    width: 60rem;
-    margin: 0 auto;
-    padding: 0;
-  }
-  header {
-    margin: 0 0 3rem;
-    padding: 1.2rem 0;
-  }
-  nav {
-    margin: 0;
-    text-align: right;
-  }
-  nav a {
-    margin: 0 0 0 1.2rem;
-    display: inline;
-  }
-  footer {
-    text-align: right;
-  }
-  .logo {
-    margin: 0;
-    text-align: left;
-  }
-  .logo a {
-    float: left;
-    font-size: 1.8rem;
-  }
-}

nixos-apps/cutesealfanpage.love/flake.lock

@@ -1,85 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1691421349,
-        "narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "011567f35433879aae5024fc6ec53f2a0568a6c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs",
-        "spg": "spg",
-        "utils": "utils"
-      }
-    },
-    "spg": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": [
-          "utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1691530010,
-        "narHash": "sha256-4xtMxEstoQ0iM/BOgGhla08xL/DFjS0+Q8nLOl9Gmls=",
-        "ref": "refs/heads/main",
-        "rev": "f25dd9c99382fd4e945e4d0d034254fc552d9aca",
-        "revCount": 14,
-        "type": "git",
-        "url": "https://git.ewanick.com/bill/sealPostGenerator.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.ewanick.com/bill/sealPostGenerator.git"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

nixos-apps/cutesealfanpage.love/flake.nix

@@ -1,59 +0,0 @@
-{
-  description = "A Nix flake for my long-running seal blog";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
-
-    utils.url = "github:numtide/flake-utils";
-
-    spg.url = "git+https://git.ewanick.com/bill/sealPostGenerator.git";
-    spg.inputs.nixpkgs.follows = "nixpkgs";
-    spg.inputs.utils.follows = "utils";
-  };
-
-  outputs = { self, nixpkgs, utils, ... }@inputs:
-    utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-
-        ghc' = pkgs.haskellPackages.ghcWithHoogle (self: with self; [
-          hakyll
-        ]);
-      in
-      rec {
-        apps.generateSealPosts = {
-          type = "app";
-          program = "${inputs.spg.packages.${system}.default}/bin/generateSealPosts";
-        };
-
-        apps.hakyll-site = {
-          type = "app";
-          program = "${packages.default}/bin/site";
-        };
-
-        apps.default = apps.hakyll-site;
-
-        packages.default = pkgs.stdenv.mkDerivation {
-          name = "site";
-          src = ./.; # using self here caused a bunch of problems!
-          buildPhase = ''
-            ${ghc'}/bin/ghc \
-              -O2           \
-              -static       \
-              -o site       \
-              site.hs
-          '';
-          installPhase = "mkdir -p $out/bin; install -t $out/bin site";
-        };
-
-        devShells.default = pkgs.mkShell {
-          name = "hakyll-shell";
-
-          buildInputs = with pkgs.haskellPackages; [
-            ghc'
-            hlint
-            haskell-language-server
-          ];
-        };
-      });
-}

nixos-apps/cutesealfanpage.love/index.html

@@ -1,16 +0,0 @@
----
-title: Seal Blog!
----
-
-<h2>Welcome</h2>
-
-<img src="/images/seal1.jpg" style="float: right; margin: 10px;" width="200px"/>
-
-<p>Welcome to my seal blog!</p>
-
-<p>Here's a list of recent posts for your reading pleasure:</p>
-
-<h2>Seal Posts</h2>
-$partial("templates/post-list.html")$
-
-<p>…or you can find more in the <a href="/archive.html">archives</a>.</p>

nixos-apps/cutesealfanpage.love/posts/2023-07-01-seal-post-1.markdown

@@ -1,10 +0,0 @@
----
-title: Seal Post Number 1
----
-
-Gaze upon this alluring, tubby seal!
-<img
-  src="/images/seal23.jpg"
-  alt="A picture of a alluring, tubby seal! <3"
-  width="400"
-/>

nixos-apps/cutesealfanpage.love/posts/2023-07-02-seal-post-2.markdown

@@ -1,10 +0,0 @@
----
-title: Seal Post Number 2
----
-
-Lookie here at this attractive, bearish seal!
-<img
-  src="/images/seal4.jpg"
-  alt="A picture of a attractive, bearish seal! <3"
-  width="400"
-/>

nixos-apps/cutesealfanpage.love/posts/2023-07-03-seal-post-3.markdown

@@ -1,10 +0,0 @@
----
-title: Seal Post Number 3
----
-
-Witness! this engrossing, portly seal!
-<img
-  src="/images/seal8.jpg"
-  alt="A picture of a engrossing, portly seal! <3"
-  width="400"
-/>

nixos-apps/cutesealfanpage.love/posts/2023-07-04-seal-post-4.markdown

@@ -1,10 +0,0 @@
----
-title: Seal Post Number 4
----
-
-Gaze upon this engaging, plumpish seal!
-<img
-  src="/images/seal25.jpg"
-  alt="A picture of a engaging, plumpish seal! <3"
-  width="400"
-/>

nixos-apps/cutesealfanpage.love/posts/2023-07-05-seal-post-5.markdown

@@ -1,10 +0,0 @@
----
-title: Seal Post Number 5
----
-
-Look upon and tremble at this enthralling, chunky seal!
-<img
-  src="/images/seal39.jpg"
-  alt="A picture of a enthralling, chunky seal! <3"
-  width="400"
-/>

nixos-apps/cutesealfanpage.love/posts/2023-07-06-seal-post-6.markdown

@@ -1,10 +0,0 @@
----
-title: Seal Post Number 6
----
-
-Gaze upon this delightful, pleasingly plump seal!
-<img
-  src="/images/seal18.jpg"
-  alt="A picture of a delightful, pleasingly plump seal! <3"
-  width="400"
-/>