From 26aa7705082998614b9a00497ea80cb004cac2bf Mon Sep 17 00:00:00 2001 From: kat Date: Mon, 26 Sep 2022 14:00:52 -0700 Subject: [PATCH] feat(gensokyo.zone): fixes --- home/shell/lc.nix | 7 ++-- overlays/local/default.nix | 1 + overlays/local/gensokyoZone/default.nix | 39 ++------------------- overlays/local/gensokyoZone/kittywitch.nix | 23 +++++++++++++ overlays/local/gensokyoZone/main.css | 40 ++++++++++++++++++++++ services/vaultwarden.nix | 1 - services/website.nix | 2 +- tf | 2 +- 8 files changed, 72 insertions(+), 43 deletions(-) create mode 100644 overlays/local/gensokyoZone/kittywitch.nix create mode 100644 overlays/local/gensokyoZone/main.css diff --git a/home/shell/lc.nix b/home/shell/lc.nix index c0388253..e5c39fc8 100644 --- a/home/shell/lc.nix +++ b/home/shell/lc.nix @@ -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; diff --git a/overlays/local/default.nix b/overlays/local/default.nix index f418d1c3..09fbb70c 100644 --- a/overlays/local/default.nix +++ b/overlays/local/default.nix @@ -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; diff --git a/overlays/local/gensokyoZone/default.nix b/overlays/local/gensokyoZone/default.nix index 2075f704..8018479d 100644 --- a/overlays/local/gensokyoZone/default.nix +++ b/overlays/local/gensokyoZone/default.nix @@ -7,40 +7,7 @@ let Gensokyo - +

Gensokyo

@@ -62,9 +29,9 @@ let ''; }; - 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; } ] diff --git a/overlays/local/gensokyoZone/kittywitch.nix b/overlays/local/gensokyoZone/kittywitch.nix new file mode 100644 index 00000000..2e11b4d3 --- /dev/null +++ b/overlays/local/gensokyoZone/kittywitch.nix @@ -0,0 +1,23 @@ +{ writeTextFile, linkFarm }: + +let + mewp = writeTextFile { + name = "index.html"; + text = '' + + + Gensokyo + + + + + + + ''; + }; +in +linkFarm "index" [ + { name = "index.html"; path = mewp; } + { name = "main.css"; path = ./main.css; } + { name = "cute.png"; path = ./cute.png; } +] diff --git a/overlays/local/gensokyoZone/main.css b/overlays/local/gensokyoZone/main.css new file mode 100644 index 00000000..c9ee3d04 --- /dev/null +++ b/overlays/local/gensokyoZone/main.css @@ -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; +} diff --git a/services/vaultwarden.nix b/services/vaultwarden.nix index 6873b11d..b0058914 100644 --- a/services/vaultwarden.nix +++ b/services/vaultwarden.nix @@ -71,6 +71,5 @@ network = "internet"; type = "cname"; domain = "vault"; - zone = "kittywit.ch."; }; } diff --git a/services/website.nix b/services/website.nix index b677ab0a..1dcd8b30 100644 --- a/services/website.nix +++ b/services/website.nix @@ -3,7 +3,7 @@ { services.nginx.virtualHosts = { "kittywit.ch" = { - root = pkgs.gensokyoZone; + root = pkgs.kittywitCh; }; }; } diff --git a/tf b/tf index abf69668..19085b06 160000 --- a/tf +++ b/tf @@ -1 +1 @@ -Subproject commit abf696684d586e054efc3de9abb7829b8171e91e +Subproject commit 19085b061685d726090c2b5fdc3afe536ad43dd7