feat(gensokyo.zone): fixes

This commit is contained in:
Kat Inskip 2022-09-26 14:00:52 -07:00
parent 58992ff283
commit 26aa770508
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
8 changed files with 72 additions and 43 deletions

View file

@ -1,18 +1,17 @@
{ config, ... }: {
home.language = let
ca = "en_CA.UTF-8";
gb = "en_GB.UTF-8";
dk = "en_DK.UTF-8";
in {
base = ca;
ctype = ca;
time = dk;
time = ca;
numeric = ca;
collate = ca;
monetary = ca;
messages = ca;
paper = gb;
name = gb;
paper = ca;
name = ca;
address = ca;
telephone = ca;
measurement = ca;

View file

@ -10,6 +10,7 @@ final: prev: {
waybar-konawall = final.callPackage ./waybar-konawall { };
hedgedoc-cli = final.callPackage ./hedgedoc-cli.nix { };
gensokyoZone = final.callPackage ./gensokyoZone { };
kittywitCh = final.callPackage ./gensokyoZone/kittywitch.nix { };
oomox = final.callPackage ./oomox.nix { };
wezterm = final.callPackage ./wezterm {
inherit (final.darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation UserNotifications;

View file

@ -7,40 +7,7 @@ let
<html>
<head>
<title>Gensokyo</title>
<style>
html {
margin: 0;
width: 100%;
min-height: 100%;
padding: 0;
}
body {
margin: 2em auto;
width: 50%;
}
img {
max-height: 33vh;
min-height: 500px;
margin: 1em auto;
display: block;
}
h1 {
text-align: center;
}
nav ul {
list-style-type: none;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
margin: 0;
padding: 0;
}
nav ul li {
text-align: center;
margin: 0;
padding: 0;
}
</style>
<link rel="stylesheet" type="text/css" href="main.css">
</head>
<body>
<h1>Gensokyo</h1>
@ -62,9 +29,9 @@ let
</html>
'';
};
mewy = "${./cute.png}";
in
linkFarm "index" [
{ name = "index.html"; path = mewp; }
{ name = "cute.png"; path = mewy; }
{ name = "main.css"; path = ./main.css; }
{ name = "cute.png"; path = ./cute.png; }
]

View file

@ -0,0 +1,23 @@
{ writeTextFile, linkFarm }:
let
mewp = writeTextFile {
name = "index.html";
text = ''
<html>
<head>
<title>Gensokyo</title>
<link rel="stylesheet" type="text/css" href="main.css">
</head>
<body>
<img src="cute.png"/>
</body>
</html>
'';
};
in
linkFarm "index" [
{ name = "index.html"; path = mewp; }
{ name = "main.css"; path = ./main.css; }
{ name = "cute.png"; path = ./cute.png; }
]

View file

@ -0,0 +1,40 @@
html {
max-width: 70ch;
padding: 3em 1em;
margin: auto;
line-height: 1.75;
font-size: 1.25em;
min-height: 100%;
padding: 0;
}
h1,h2,h3,h4,h5,h6 {
margin: 3em 0 1em;
}
p,ul,ol {
margin-bottom: 2em;
color: #1d1d1d;
font-family: sans-serif;
}
img {
max-height: 33vh;
min-height: 500px;
margin: 1em auto;
display: block;
}
h1 {
text-align: center;
}
nav ul {
list-style-type: none;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
margin: 0;
padding: 0;
}
nav ul li {
text-align: center;
margin: 0;
padding: 0;
}

View file

@ -71,6 +71,5 @@
network = "internet";
type = "cname";
domain = "vault";
zone = "kittywit.ch.";
};
}

View file

@ -3,7 +3,7 @@
{
services.nginx.virtualHosts = {
"kittywit.ch" = {
root = pkgs.gensokyoZone;
root = pkgs.kittywitCh;
};
};
}

2
tf

@ -1 +1 @@
Subproject commit abf696684d586e054efc3de9abb7829b8171e91e
Subproject commit 19085b061685d726090c2b5fdc3afe536ad43dd7