From 74be547bb9491ec87bd7d31eb88252d155cfec11 Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Thu, 24 Aug 2023 20:58:49 +1000 Subject: [PATCH] migration: initial commit --- README.rst | 10 ++++---- css/{jfdic.css => reciproka.css} | 2 +- default.nix | 6 ++--- images/{jfdic-logo.png => reciproka-logo.png} | Bin pages/Contact.rst | 2 +- ...1-11-03-welcome-to-reciproka-kolectiva.rst | 22 ++++++++++++++++++ ...1-11-03-welcome-to-the-jfdi-collective.rst | 21 ----------------- jfdic-web.cabal => reciproka-web.cabal | 2 +- jfdic-web.nix => reciproka-web.nix | 2 +- release.nix | 4 ++-- site.hs | 18 +++++++------- templates/default.html | 2 +- templates/head.html | 2 +- templates/sidebar.html | 2 +- 14 files changed, 48 insertions(+), 47 deletions(-) rename css/{jfdic.css => reciproka.css} (99%) rename images/{jfdic-logo.png => reciproka-logo.png} (100%) create mode 100644 posts/2021-11-03-welcome-to-reciproka-kolectiva.rst delete mode 100644 posts/2021-11-03-welcome-to-the-jfdi-collective.rst rename jfdic-web.cabal => reciproka-web.cabal (91%) rename jfdic-web.nix => reciproka-web.nix (90%) diff --git a/README.rst b/README.rst index 6841913..c6ed12f 100644 --- a/README.rst +++ b/README.rst @@ -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 -https://source.jfdic.org/jfdic/jfdic-web +https://reciproka.dev/reciproka/reciproka-web .. _NixOps: https://nixos.org/nixops -.. _JFDI Collective: https://jfdic.org/ +.. _Reciproka Kolectiva: https://reciproka.co/ diff --git a/css/jfdic.css b/css/reciproka.css similarity index 99% rename from css/jfdic.css rename to css/reciproka.css index bed50f5..2bc9d45 100644 --- a/css/jfdic.css +++ b/css/reciproka.css @@ -1,5 +1,5 @@ /* - * JFDIC theme + * Reciproka Kolectiva theme */ /* diff --git a/default.nix b/default.nix index 8ce04f5..0ce9a44 100644 --- a/default.nix +++ b/default.nix @@ -5,10 +5,10 @@ let pkgs.haskellPackages else pkgs.haskell.packages.${compiler}; - jfdic-org = haskellPackages.callPackage ./jfdic-web.nix { }; + reciproka-co = haskellPackages.callPackage ./reciproka-web.nix { }; in nixpkgs.stdenv.mkDerivation { - name = "jfdic-org-website"; - buildInputs = [ jfdic-org ]; + name = "reciproka-co-website"; + buildInputs = [ reciproka-co ]; src = ./.; buildPhase = '' echo "Setting LC_ALL to C.UTF-8 to avoid invalid byte sequence." diff --git a/images/jfdic-logo.png b/images/reciproka-logo.png similarity index 100% rename from images/jfdic-logo.png rename to images/reciproka-logo.png diff --git a/pages/Contact.rst b/pages/Contact.rst index b0edf07..6eaca5d 100644 --- a/pages/Contact.rst +++ b/pages/Contact.rst @@ -2,4 +2,4 @@ title: Contact --- -You can contact the JFDI collective via our Matrix room. +You can contact Reciproka Kolectiva via our Matrix room. diff --git a/posts/2021-11-03-welcome-to-reciproka-kolectiva.rst b/posts/2021-11-03-welcome-to-reciproka-kolectiva.rst new file mode 100644 index 0000000..5f8683d --- /dev/null +++ b/posts/2021-11-03-welcome-to-reciproka-kolectiva.rst @@ -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 :-) diff --git a/posts/2021-11-03-welcome-to-the-jfdi-collective.rst b/posts/2021-11-03-welcome-to-the-jfdi-collective.rst deleted file mode 100644 index 65d8996..0000000 --- a/posts/2021-11-03-welcome-to-the-jfdi-collective.rst +++ /dev/null @@ -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 :-) diff --git a/jfdic-web.cabal b/reciproka-web.cabal similarity index 91% rename from jfdic-web.cabal rename to reciproka-web.cabal index 4d91564..916b0ae 100644 --- a/jfdic-web.cabal +++ b/reciproka-web.cabal @@ -1,4 +1,4 @@ -name: jfdic-web +name: reciproka-web version: 0.1.0.0 build-type: Simple cabal-version: >= 1.10 diff --git a/jfdic-web.nix b/reciproka-web.nix similarity index 90% rename from jfdic-web.nix rename to reciproka-web.nix index ec5fd02..4491dcf 100644 --- a/jfdic-web.nix +++ b/reciproka-web.nix @@ -1,6 +1,6 @@ { mkDerivation, base, hakyll, stdenv }: mkDerivation { - pname = "jfdic-web"; + pname = "reciproka-web"; version = "0.1.0.0"; src = ./.; isLibrary = false; diff --git a/release.nix b/release.nix index db15894..4af0a05 100644 --- a/release.nix +++ b/release.nix @@ -12,13 +12,13 @@ let (flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ]) ]; - jfdic-web = hpNew.callCabal2nix "jfdic-web" ./. { }; + reciproka-web = hpNew.callCabal2nix "reciproka-web" ./. { }; niv = import sources.niv { }; }; }; - project = haskellPackages.jfdic-web; + project = haskellPackages.reciproka-web; in { project = project; diff --git a/site.hs b/site.hs index 5bf7f0a..79a79ec 100644 --- a/site.hs +++ b/site.hs @@ -118,11 +118,11 @@ postsPageId n = fromFilePath $ if (n == 1) then "index.html" else show n ++ "/in feedConfig :: FeedConfiguration feedConfig = FeedConfiguration - { feedTitle = "JFDI Collective" + { feedTitle = "Reciproka Kolectiva" , feedDescription = "liberation, autonomy, privacy" - , feedAuthorName = "JFDI Collective" - , feedAuthorEmail = "collective@jfdic.org" - , feedRoot = "https://jfdic.org" + , feedAuthorName = "Reciproka Kolectiva" + , feedAuthorEmail = "collective@reciproka.co" + , feedRoot = "https://reciproka.co" } -------------------------------------------------------------------------------- @@ -130,16 +130,16 @@ feedConfig = FeedConfiguration siteCtx :: Context String siteCtx = baseCtx `mappend` - constField "site_description" "JFDI Collective" `mappend` - constField "site-url" "https://jfdic.org" `mappend` + constField "site_description" "Reciproka Kolectiva" `mappend` + constField "site-url" "https://reciproka.co" `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 "github-repo" "https://source.jfdic.org/jfdic/jfdic-web" `mappend` + constField "github-repo" "https://reciproka.dev/reciproka/reciproka-web" `mappend` defaultContext baseCtx = - constField "baseurl" "https://jfdic.org" + constField "baseurl" "https://reciproka.co" -------------------------------------------------------------------------------- diff --git a/templates/default.html b/templates/default.html index 1a921c2..fb6cb14 100644 --- a/templates/default.html +++ b/templates/default.html @@ -13,7 +13,7 @@

- + $site-title$ $tagline$

diff --git a/templates/head.html b/templates/head.html index 0945e9a..a1361ae 100644 --- a/templates/head.html +++ b/templates/head.html @@ -22,7 +22,7 @@ - +