diff --git a/home/modules/gui/sway.nix b/home/modules/gui/sway.nix index 5465d68..987d05c 100644 --- a/home/modules/gui/sway.nix +++ b/home/modules/gui/sway.nix @@ -97,7 +97,7 @@ in { colors = { background = "#141414"; focused = { - border = "#1c1c1c"; + border = "#444444"; background = "#000000"; text = "#eaeaea"; indicator = "#000000"; diff --git a/homepage/posixlycorrect/config.toml b/homepage/posixlycorrect/config.toml index 109b3df..0ace7f1 100644 --- a/homepage/posixlycorrect/config.toml +++ b/homepage/posixlycorrect/config.toml @@ -21,12 +21,12 @@ favicon_mimetype = "image/png" menu_items = [ {name = "about", url = "$BASE_URL/about"}, {name = "lib", url = "$BASE_URL/lib"}, - {name = "boardgame night highscores", url = "$BASE_URL/leaderboard"} + {name = "blog", url = "$BASE_URL/blog"}, + {name = "boardgame night highscores", url = "$BASE_URL/leaderboard"}, {name = "wiki↗", url = "https://wiki.posixlycorrect.com", newtab = true}, {name = "git↗", url = "https://git.posixlycorrect.com", newtab = true}, {name = "notes↗", url = "https://notes.posixlycorrect.com", newtab = true}, {name = "ebooks↗", url = "https://calibre.posixlycorrect.com", newtab = true}, {name = "photos↗", url = "https://photos.posixlycorrect.com", newtab = true}, {name = "recipes↗", url = "https://food.posixlycorrect.com", newtab = true}, - {name = "bookmarks↗", url = "https://bookmarks.posixlycorrect.com", newtab = true}, ] diff --git a/homepage/posixlycorrect/content/blog.md b/homepage/posixlycorrect/content/blog.md deleted file mode 100644 index 9b8d5bf..0000000 --- a/homepage/posixlycorrect/content/blog.md +++ /dev/null @@ -1,6 +0,0 @@ -+++ -title = "blog posts" -+++ -## [2023-06-02: building a site with zola and sourcehut](@/blog/building_a_site_with_zola_and_sourcehut.md) -## [2023-09-19: introduction to gpg key usage](@/blog/introduction_to_gpg_key_usage.md) -## [2024-05-22: Stellaris virtual rush build](@/blog/stellaris_tall_virtual_build.md) \ No newline at end of file diff --git a/homepage/posixlycorrect/content/blog/_index.md b/homepage/posixlycorrect/content/blog/_index.md new file mode 100644 index 0000000..1db40b0 --- /dev/null +++ b/homepage/posixlycorrect/content/blog/_index.md @@ -0,0 +1,5 @@ ++++ +title = "blog posts" +template = "blog_index.html" +paginate_by = 10 ++++ \ No newline at end of file diff --git a/homepage/posixlycorrect/themes/terminimal/templates/blog_index.html b/homepage/posixlycorrect/themes/terminimal/templates/blog_index.html new file mode 100644 index 0000000..272db3d --- /dev/null +++ b/homepage/posixlycorrect/themes/terminimal/templates/blog_index.html @@ -0,0 +1,128 @@ +{% import "macros/date.html" as date_macros -%} +{% import "macros/head.html" as head_macros -%} +{% import "macros/menu.html" as menu_macros -%} +{% import "macros/post.html" as post_macros -%} +{% import "macros/title.html" as title_macros -%} + + + + + {% block title -%}{{ section.title | default(value=config.title) }}{%- endblock title %} + {{ head_macros::head(config=config) }} + + {%- if config.generate_feed %} + + {% endif -%} + + {%- if config.extra.favicon %} + + {% endif -%} + + {%- block extra_head %} + + {% endblock extra_head -%} + + + +
+ {% block header %} +
+
+ +
+ + {% block header_menu %} + {{ menu_macros::menu(config=config, current_path=current_path) }} + {% endblock header_menu %} +
+ {% endblock header %} + +
+ {% block content %} +
+
+

{{ section.title | default(value="Blog") }}

+ {% if section.description %}

{{ section.description }}

{% endif %} +
+ + {% if paginator %} + {% set items = paginator.pages %} + {% else %} + {% set items = section.pages | sort(attribute="date") | reverse %} + {% endif %} + +
    + {% for p in items %} + {% if not p.draft %} +
  • + {{ p.title }} + {% if p.date %} + · + + {% endif %} +
    • + {% endif %} + {% endfor %} +
+ + {% if paginator %} + + {% endif %} +
+ {% endblock content %} +
+ + {% block footer %} + + {% endblock footer %} +
+ +{%- block extra_body %}{% endblock extra_body -%} + + diff --git a/homepage/posixlycorrect/themes/terminimal/templates/index.html b/homepage/posixlycorrect/themes/terminimal/templates/index.html index ee0aa6e..82c3958 100644 --- a/homepage/posixlycorrect/themes/terminimal/templates/index.html +++ b/homepage/posixlycorrect/themes/terminimal/templates/index.html @@ -59,14 +59,6 @@
Hi! :) You have reached the root endpoint of the posixlycorrect server, my home server. - -
-
- - index: - - {% set page = get_page(path="lib.md") %} - {{ post_macros::content(page=page, summary=false) }}
{% endblock content %} @@ -85,12 +77,14 @@ {% endif -%} - :: - Theme adapted from Terminimal by pawroman + {% endif -%} + Powered by NixOS and vpsfree.org. Backed up by rsync.net. +
+ Theme adapted from Terminimal by pawroman. {% endblock footer %} diff --git a/sys/platforms/vps/srv/default.nix b/sys/platforms/vps/srv/default.nix index 7d9cb6e..8c6abcf 100644 --- a/sys/platforms/vps/srv/default.nix +++ b/sys/platforms/vps/srv/default.nix @@ -15,7 +15,6 @@ with lib; { ./paperless.nix ./trilium.nix ./syncthing.nix - ./shiori.nix ./calibre-web.nix ./immich.nix ./wiki-js.nix diff --git a/sys/platforms/vps/srv/shiori.nix b/sys/platforms/vps/srv/shiori.nix deleted file mode 100644 index 309200d..0000000 --- a/sys/platforms/vps/srv/shiori.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - pkgs, - ... -}: -with lib; { - services = { - nginx = { - virtualHosts."bookmarks.posixlycorrect.com" = { - enableACME = true; - forceSSL = true; - extraConfig = '' - proxy_headers_hash_max_size 512; - proxy_headers_hash_bucket_size 128; - ''; - locations."/" = { - proxyPass = "http://127.0.0.1:8089"; - }; - }; - }; - - shiori = { - enable = true; - address = "127.0.0.1"; - port = 8089; - environmentFile = "/var/trust/shiori/env"; - }; - }; -}