Compare commits

..

No commits in common. "bfb7c0e63d31771cf0ba91b057cea28eb5a3f9d8" and "ada25c081f49e7e84dcf84079a059c9c357d14c5" have entirely different histories.

15 changed files with 49 additions and 50 deletions

View file

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

View file

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

View file

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

View file

@ -5,10 +5,10 @@ let
pkgs.haskellPackages
else
pkgs.haskell.packages.${compiler};
reciproka-co = haskellPackages.callPackage ./reciproka-web.nix { };
jfdic-org = haskellPackages.callPackage ./jfdic-web.nix { };
in nixpkgs.stdenv.mkDerivation {
name = "reciproka-co-website";
buildInputs = [ reciproka-co ];
name = "jfdic-org-website";
buildInputs = [ jfdic-org ];
src = ./.;
buildPhase = ''
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

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

View file

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

View file

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

View file

@ -1,22 +0,0 @@
---
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

@ -0,0 +1,21 @@
---
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

@ -12,13 +12,13 @@ let
(flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ])
];
reciproka-web = hpNew.callCabal2nix "reciproka-web" ./. { };
jfdic-web = hpNew.callCabal2nix "jfdic-web" ./. { };
niv = import sources.niv { };
};
};
project = haskellPackages.reciproka-web;
project = haskellPackages.jfdic-web;
in {
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
{ feedTitle = "Reciproka Kolectiva"
{ feedTitle = "JFDI Collective"
, feedDescription = "liberation, autonomy, privacy"
, feedAuthorName = "Reciproka Kolectiva"
, feedAuthorEmail = "collective@reciproka.co"
, feedRoot = "https://reciproka.co"
, feedAuthorName = "JFDI Collective"
, feedAuthorEmail = "collective@jfdic.org"
, feedRoot = "https://jfdic.org"
}
--------------------------------------------------------------------------------
@ -130,16 +130,16 @@ feedConfig = FeedConfiguration
siteCtx :: Context String
siteCtx =
baseCtx `mappend`
constField "site_description" "Reciproka Kolectiva" `mappend`
constField "site-url" "https://reciproka.co" `mappend`
constField "site_description" "JFDI Collective" `mappend`
constField "site-url" "https://jfdic.org" `mappend`
constField "tagline" "liberation, autonomy, privacy" `mappend`
constField "site-title" "Reciproka Kolectiva" `mappend`
constField "copy-year" "2024" `mappend`
constField "github-repo" "https://reciproka.dev/reciproka/reciproka-web" `mappend`
constField "site-title" "JFDI Collective" `mappend`
constField "copy-year" "2023" `mappend`
constField "github-repo" "https://source.jfdic.org/jfdic/jfdic-web" `mappend`
defaultContext
baseCtx =
constField "baseurl" "https://reciproka.co"
constField "baseurl" "https://jfdic.org"
--------------------------------------------------------------------------------

View file

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

View file

@ -22,7 +22,7 @@
<link rel="stylesheet" href="$baseurl$/css/base.css">
<link rel="stylesheet" href="$baseurl$/css/syntax.css">
<link rel="stylesheet" href="$baseurl$/css/reciproka.css">
<link rel="stylesheet" href="$baseurl$/css/jfdic.css">
<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.
</p>
<p>
<img src="$baseurl$/images/reciproka-logo.png" class=logo style="display: inline;"/>
<img src="$baseurl$/images/jfdic-logo.png" class=logo style="display: inline;"/>
Site created with
<a href="https://jaspervdj.be/hakyll">Hakyll</a>.
</p>