From 2d0c954a8201ed2738e9717e6705501181e8d926 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Mon, 17 Jul 2023 17:01:11 +0200 Subject: [PATCH] feat: Make prettier --- content/code.html | 45 +++++++++------- content/contact.html | 73 +++++++++++++------------ content/index.html | 22 ++++---- flake.lock | 8 +-- flake.nix | 10 +++- input.css | 7 +++ layout/page.html | 77 +++++++++++---------------- layout/templates/no_screenshot.html | 12 ++--- layout/templates/project.html | 20 +++---- layout/templates/project_website.html | 2 +- layout/templates/screenshot.html | 2 +- pkgs/website.nix | 16 ++++-- tailwind.config.js | 12 +++++ 13 files changed, 168 insertions(+), 138 deletions(-) create mode 100644 input.css create mode 100644 tailwind.config.js diff --git a/content/code.html b/content/code.html index 7b988b8..781c42c 100644 --- a/content/code.html +++ b/content/code.html @@ -2,24 +2,29 @@ -
+
+

+ I keep my code mostly on my private Gitea instance here. + For purposes of allowing other people to also contribute + I try to mirror my code on GitHub and codeberg. +

-

- I keep my code mostly on my private Gitea instance here. For purposes of allowing other people to also contribute - I try to mirror my code on GitHub and codeberg. -

- - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + +
GitHub{{ github_username }}
Codeberg{{ codeberg_username }} +
Gitea{{ gitea_username }}
+
+
\ No newline at end of file diff --git a/content/contact.html b/content/contact.html index 17f8c5d..3af94d6 100644 --- a/content/contact.html +++ b/content/contact.html @@ -1,38 +1,43 @@ -
+
+

+ If you have any questions about my projects or just want to talk, feel + free to reach out to me. +

-

- If you have any questions about my projects or just want to talk, feel - free to reach out to me. -

- - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Fediverse@{{ + fediverse_username }}@{{ + fediverse_instance }}
E-Mail{{ email_user }} [a with a circle] {{ email_domain }}
+ + Please use my GPG public key +
GitHub{{ github_username }}
Codeberg{{ codeberg_username }} +
Gitea{{ gitea_username }}
+
+
\ No newline at end of file diff --git a/content/index.html b/content/index.html index 905c59d..fbfd917 100644 --- a/content/index.html +++ b/content/index.html @@ -1,16 +1,18 @@ -
-

- Hello! My online pseudonym is PapaTutuWawa and I am - just some random person on the Internet who is passionate about - topics like XMPP, federated Internet services and privacy. Linux system - administration, Linux tinkering and programming are my favourite things to do. -

+
+

+ Hello! My online pseudonym is PapaTutuWawa and I am + just some random person on the Internet who is passionate about + topics like XMPP, federated Internet services and privacy. Linux system + administration, Linux tinkering and programming are my favourite things to do. +

-
-

Projects

-

This is a small selection of my projects. More are available here.

+

Projects

+

This is a small selection of my projects. More are available here.

{{ for_each projects layout/templates/project.html }} + +
\ No newline at end of file diff --git a/flake.lock b/flake.lock index e123ff7..a029760 100644 --- a/flake.lock +++ b/flake.lock @@ -36,16 +36,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1638239011, - "narHash": "sha256-AjhmbT4UBlJWqxY0ea8a6GU2C2HdKUREkG43oRr3TZg=", + "lastModified": 1689449371, + "narHash": "sha256-sK3Oi8uEFrFPL83wKPV6w0+96NrmwqIpw9YFffMifVg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7ecde854aee5c4c7cd6177f54a99d2c1ff28a31", + "rev": "29bcead8405cfe4c00085843eb372cc43837bb9d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "21.11", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9514b4d..07d25bd 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "The website hosted at https://polynom.me"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/21.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; assets.url = "git+https://git.polynom.me/polynom.me/shared-assets.git"; }; @@ -16,9 +16,17 @@ in { packages = forAllSystems (system: let pkgs = import nixpkgs { inherit system; }; + + tailwindWithTypography = pkgs.nodePackages.tailwindcss.overrideAttrs (old: { + plugins = [ + pkgs.nodePackages."@tailwindcss/typography" + ]; + }); in { default = pkgs.callPackage ./pkgs/website.nix { shared-assets = assets.packages.${system}.default; + + inherit tailwindWithTypography; }; }); diff --git a/input.css b/input.css new file mode 100644 index 0000000..7767981 --- /dev/null +++ b/input.css @@ -0,0 +1,7 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +html { + background-color: #212121; +} \ No newline at end of file diff --git a/layout/page.html b/layout/page.html index e5e371f..d4cf512 100644 --- a/layout/page.html +++ b/layout/page.html @@ -1,53 +1,38 @@ - - - - {{ title }} + + + + + {{ title }} + + + - - - + + + - - - - - - - -
-
- + {{ content }}
- - + + + \ No newline at end of file diff --git a/layout/templates/no_screenshot.html b/layout/templates/no_screenshot.html index 23b957f..250a075 100644 --- a/layout/templates/no_screenshot.html +++ b/layout/templates/no_screenshot.html @@ -1,9 +1,7 @@ -
- -
-
- # -
+
+ +
+ #
-
+
\ No newline at end of file diff --git a/layout/templates/project.html b/layout/templates/project.html index f4cfc4c..a977420 100644 --- a/layout/templates/project.html +++ b/layout/templates/project.html @@ -1,12 +1,14 @@ -
+
{{ template_if_empty item.screenshot layout/templates/no_screenshot.html layout/templates/screenshot.html }} -
-

{{ item.title }}

-

{{ item.description }}

+
+

{{ item.title }}

+

{{ item.description }}

-
    - {{ template_if_empty item.website layout/templates/empty.html layout/templates/project_website.html }} -
  • Code
    • -
+
+
    + {{ template_if_empty item.website layout/templates/empty.html layout/templates/project_website.html }} +
  • Code
    • +
+
-
+
\ No newline at end of file diff --git a/layout/templates/project_website.html b/layout/templates/project_website.html index 4486660..5504509 100644 --- a/layout/templates/project_website.html +++ b/layout/templates/project_website.html @@ -1 +1 @@ -
  • Website
    • +
  • Website
    • diff --git a/layout/templates/screenshot.html b/layout/templates/screenshot.html index 8c1cc19..290b4a2 100644 --- a/layout/templates/screenshot.html +++ b/layout/templates/screenshot.html @@ -1,5 +1,5 @@ diff --git a/pkgs/website.nix b/pkgs/website.nix index 5fddd85..5fc81b3 100644 --- a/pkgs/website.nix +++ b/pkgs/website.nix @@ -2,23 +2,29 @@ lib, stdenv , python3 , shared-assets -}: - -stdenv.mkDerivation { +, tailwindWithTypography +}: let + pythonEnv = python3.withPackages (ps: with ps; [ + markdown pygments + ]); +in stdenv.mkDerivation { pname = "website"; - version = "202205120-01"; + version = "20230716"; src = ../.; buildInputs = [ shared-assets python3 ]; buildPhase = '' - ${python3}/bin/python ${shared-assets}/bin/makesite.py \ + ${pythonEnv}/bin/python ${shared-assets}/bin/makesite.py \ -v page_assets=https://cdn.polynom.me \ --assets ./assets \ --copy-assets \ --include robots.txt \ -p params.json + + # Build Tailwind CSS data + ${tailwindWithTypography}/bin/tailwindcss --input ./input.css --output _site/assets/css/index.css ''; installPhase = '' diff --git a/tailwind.config.js b/tailwind.config.js new file mode 100644 index 0000000..d8af9a4 --- /dev/null +++ b/tailwind.config.js @@ -0,0 +1,12 @@ +module.exports = { + content: [ + "./content/*.html", + "./layout/*.html", + "./layout/templates/*.html", + ], + theme: { + }, + plugins: [ + require('@tailwindcss/typography'), + ], +} \ No newline at end of file