Compare commits

..

2 commits

Author SHA1 Message Date
Fiscal Velvet Poet bfb7c0e63d
date: update to 2024 2024-01-08 17:20:26 +10:00
Fiscal Velvet Poet 74be547bb9
migration: initial commit 2024-01-08 17:18:12 +10:00
15 changed files with 50 additions and 49 deletions

View file

@ -1,7 +1,7 @@
ANARCHIST LICENSE ANARCHIST LICENSE
Version 1.0, 1 May, 2021 Version 1.0, 1 May, 2021
Copyright © 2023 JFDI Collective Copyright © 2024 JFDI Collective
This is Anarchist software, released for free use by individuals and This is Anarchist software, released for free use by individuals and
organizations that do not operate by capitalist principles. organizations that do not operate by capitalist principles.

View file

@ -1,10 +1,10 @@
JFDIC Web Reciproka Web
========= =============
Website configuration for the `JFDI Collective`_. Website configuration for the `Reciproka Kolectiva`_.
The canonical home for this repo is The canonical home for this repo is
https://source.jfdic.org/jfdic/jfdic-web https://reciproka.dev/reciproka/reciproka-web
.. _NixOps: https://nixos.org/nixops .. _NixOps: https://nixos.org/nixops
.. _JFDI Collective: https://jfdic.org/ .. _Reciproka Kolectiva: https://reciproka.co/

View file

@ -1,5 +1,5 @@
/* /*
* JFDIC theme * Reciproka Kolectiva theme
*/ */
/* /*

View file

@ -5,10 +5,10 @@ let
pkgs.haskellPackages pkgs.haskellPackages
else else
pkgs.haskell.packages.${compiler}; pkgs.haskell.packages.${compiler};
jfdic-org = haskellPackages.callPackage ./jfdic-web.nix { }; reciproka-co = haskellPackages.callPackage ./reciproka-web.nix { };
in nixpkgs.stdenv.mkDerivation { in nixpkgs.stdenv.mkDerivation {
name = "jfdic-org-website"; name = "reciproka-co-website";
buildInputs = [ jfdic-org ]; buildInputs = [ reciproka-co ];
src = ./.; src = ./.;
buildPhase = '' buildPhase = ''
echo "Setting LC_ALL to C.UTF-8 to avoid invalid byte sequence." echo "Setting LC_ALL to C.UTF-8 to avoid invalid byte sequence."

View file

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

View file

@ -2,4 +2,4 @@
title: Contact title: Contact
--- ---
You can contact the JFDI collective via our Matrix room. You can contact Reciproka Kolectiva via our Matrix room.

View file

@ -0,0 +1,22 @@
---
title: Welcome to Reciproka Kolectiva
author: la kolektivo
tags:
---
Reciproka Kolectiva is a non-hierarchical non-profit venture aimed at
delivering net access to anarchists, indigenous, greens, gays, feminists,
activists and other interested persons or groups.
Established with visions of freedom, independence and privacy in mind, the
Reciproka Kolectiva acknowledges that issues of privacy, access and equity to
technology are crucial for those who feel they need and want to connect with
the world.
A strong individual or group presence on the net can be used as an effective
means of communication, debate and solidarity. The Reciproka Kolectiva aims to
encourage all who wish to learn and develop skills in information technology
and new media and to understand their processes.
Our hosting services are ramping up and we look forward to offering a complete
suit of privacy respecting services for you fairly soon :-)

View file

@ -1,21 +0,0 @@
---
title: Welcome to the JFDI Collective
author: the collective
tags: jfdi
---
JFDIC is a non-hierarchical non-profit venture aimed at delivering net access to
anarchists, indigenous, greens, gays, feminists, activists and other interested
persons or groups.
Established with visions of freedom, independence and privacy in mind, the JFDIC
acknowledges that issues of privacy, access and equity to technology are crucial
for those who feel they need and want to connect with the world.
A strong individual or group presence on the net can be used as an effective
means of communication, debate and solidarity. The JFDIC aims to encourage all
who wish to learn and develop skills in information technology and new media and
to understand their processes.
Our hosting services are ramping up and we look forward to offering a complete
suit of privacy respecting services for you fairly soon :-)

View file

@ -1,4 +1,4 @@
name: jfdic-web name: reciproka-web
version: 0.1.0.0 version: 0.1.0.0
build-type: Simple build-type: Simple
cabal-version: >= 1.10 cabal-version: >= 1.10

View file

@ -1,6 +1,6 @@
{ mkDerivation, base, hakyll, stdenv }: { mkDerivation, base, hakyll, stdenv }:
mkDerivation { mkDerivation {
pname = "jfdic-web"; pname = "reciproka-web";
version = "0.1.0.0"; version = "0.1.0.0";
src = ./.; src = ./.;
isLibrary = false; isLibrary = false;

View file

@ -12,13 +12,13 @@ let
(flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ]) (flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ])
]; ];
jfdic-web = hpNew.callCabal2nix "jfdic-web" ./. { }; reciproka-web = hpNew.callCabal2nix "reciproka-web" ./. { };
niv = import sources.niv { }; niv = import sources.niv { };
}; };
}; };
project = haskellPackages.jfdic-web; project = haskellPackages.reciproka-web;
in { in {
project = project; project = project;

20
site.hs
View file

@ -118,11 +118,11 @@ postsPageId n = fromFilePath $ if (n == 1) then "index.html" else show n ++ "/in
feedConfig :: FeedConfiguration feedConfig :: FeedConfiguration
feedConfig = FeedConfiguration feedConfig = FeedConfiguration
{ feedTitle = "JFDI Collective" { feedTitle = "Reciproka Kolectiva"
, feedDescription = "liberation, autonomy, privacy" , feedDescription = "liberation, autonomy, privacy"
, feedAuthorName = "JFDI Collective" , feedAuthorName = "Reciproka Kolectiva"
, feedAuthorEmail = "collective@jfdic.org" , feedAuthorEmail = "collective@reciproka.co"
, feedRoot = "https://jfdic.org" , feedRoot = "https://reciproka.co"
} }
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
@ -130,16 +130,16 @@ feedConfig = FeedConfiguration
siteCtx :: Context String siteCtx :: Context String
siteCtx = siteCtx =
baseCtx `mappend` baseCtx `mappend`
constField "site_description" "JFDI Collective" `mappend` constField "site_description" "Reciproka Kolectiva" `mappend`
constField "site-url" "https://jfdic.org" `mappend` constField "site-url" "https://reciproka.co" `mappend`
constField "tagline" "liberation, autonomy, privacy" `mappend` constField "tagline" "liberation, autonomy, privacy" `mappend`
constField "site-title" "JFDI Collective" `mappend` constField "site-title" "Reciproka Kolectiva" `mappend`
constField "copy-year" "2023" `mappend` constField "copy-year" "2024" `mappend`
constField "github-repo" "https://source.jfdic.org/jfdic/jfdic-web" `mappend` constField "github-repo" "https://reciproka.dev/reciproka/reciproka-web" `mappend`
defaultContext defaultContext
baseCtx = baseCtx =
constField "baseurl" "https://jfdic.org" constField "baseurl" "https://reciproka.co"
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

View file

@ -13,7 +13,7 @@
<div class="masthead"> <div class="masthead">
<div class="container"> <div class="container">
<h3 class="masthead-title"> <h3 class="masthead-title">
<img src="$baseurl$/images/jfdic-logo.png" class=logo style="display: inline;"/> <img src="$baseurl$/images/reciproka-logo.png" class=logo style="display: inline;"/>
<a href="$baseurl$" title="Home">$site-title$</a> <a href="$baseurl$" title="Home">$site-title$</a>
<small>$tagline$</small> <small>$tagline$</small>
</h3> </h3>

View file

@ -22,7 +22,7 @@
<link rel="stylesheet" href="$baseurl$/css/base.css"> <link rel="stylesheet" href="$baseurl$/css/base.css">
<link rel="stylesheet" href="$baseurl$/css/syntax.css"> <link rel="stylesheet" href="$baseurl$/css/syntax.css">
<link rel="stylesheet" href="$baseurl$/css/jfdic.css"> <link rel="stylesheet" href="$baseurl$/css/reciproka.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700%7CPT+Sans:400">
<!--- <!---

View file

@ -30,7 +30,7 @@
&copy; $copy-year$. All rights reserved. &copy; $copy-year$. All rights reserved.
</p> </p>
<p> <p>
<img src="$baseurl$/images/jfdic-logo.png" class=logo style="display: inline;"/> <img src="$baseurl$/images/reciproka-logo.png" class=logo style="display: inline;"/>
Site created with Site created with
<a href="https://jaspervdj.be/hakyll">Hakyll</a>. <a href="https://jaspervdj.be/hakyll">Hakyll</a>.
</p> </p>