adjust wording

default.nix

@@ -0,0 +1,7 @@
+{ pkgs ? import <nixpkgs> {}
+, self ? ./., packageName ? "chaoszone"
+}:
+let
+  gitignore = dir: pkgs.nix-gitignore.gitignoreSource [] dir;
+in
+  pkgs.haskellPackages.callCabal2nix packageName (gitignore self) {}

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700883623,
-        "narHash": "sha256-L0VAwMUuJctNW94qLsF9nMDQ2CjM1evo9sLJm0p6N/g=",
+        "lastModified": 1702216395,
+        "narHash": "sha256-RgbHAGU2YaSjtkmfsYk+TCoXnAOku+eYxpEOCqZ5Cz0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc584735fc80a6fb657cc260136d85a9d6f61121",
+        "rev": "7089845da9775aa1c6f176795aff726734a88317",
         "type": "github"
       },
       "original": {

flake.nix

@@ -18,36 +18,11 @@
 
           packageName = "chaoszone";
       in rec {
-        packages.${packageName} = # (ref:haskell-package-def)
-          haskellPackages.callCabal2nix packageName self rec {
-          };
+        packages.${packageName} = import ./default.nix {inherit pkgs self;};
 
         defaultPackage = self.packages.${system}.${packageName};
 
-        devShell = haskellPackages.shellFor {
-          packages = p: [ defaultPackage ];
-          withHoogle = true;
-          buildInputs = with haskellPackages; [
-            haskell-language-server
-            ghcid
-            cabal-install
-          ];
-        };
-        #devShell = pkgs.mkShell {
-        #  buildInputs = with haskellPackages; [
-        #    haskell-language-server
-        #    ghcid
-        #    cabal-install
-        #  ];
-        #  nativeBuildInputs = with pkgs; [
-        #    pkg-config
-        #    glib
-        #    freetype
-        #    glew
-        #    SDL2
-        #  ];
-        #  inputsFrom = builtins.attrValues self.packages.${system};
-        #};
+        devShell = import ./shell.nix {inherit pkgs; chaoszone = defaultPackage;};
       });
 }
 

shell.nix

@@ -1,8 +1,14 @@
-{ pkgs ? import <nixpkgs> {}}:
+{ pkgs ? import <nixpkgs> {}
+, chaoszone ? import ./default.nix { inherit pkgs; packageName = "chaoszone"; }
+}:
 
-let
-  chaoszone_cz =
-    pkgs.haskellPackages.callCabal2nix "chaoszone" (gitignore ./.) {};
-  gitignore = dir: pkgs.nix-gitignore.gitignoreSource [] dir;
-in
-  chaoszone_cz.env
+pkgs.haskellPackages.shellFor {
+  packages = p: [ chaoszone ];
+  withHoogle = true;
+  buildInputs = with pkgs.haskellPackages; with pkgs; [
+    haskell-language-server
+    ghcid
+    cabal-install
+    vim
+  ];
+}

site/about.md

@@ -2,11 +2,11 @@
 title: About
 ---
 
-ChaosZone is the project to setting up an collaborative Assembly at the 35th
+ChaosZone is the project to setting up an collaborative Assembly at the 37th
 Chaos Communication Congress.
 
-ChaosZone wants to become a place - a platform - to unite hackspaces around
-C3D2, the Erfa of the Chaos Computer Club from Dresden in the former GDR.
+ChaosZone wants to become a place - a platform - to unite hackspaces from
+eastern germany and farther east
 
 We are  focused on hacking (software, hardware and other stuff). We are
 providing a friendly environment for learning from each other.

site/contact.md

@@ -2,7 +2,4 @@
 title: Contact
 ---
 
-If you wish to contact the people behind the planned assembly, you may write to
-<mail@c3d2.de>.
-
 To contact the administrator of this site, write to <nek0@chaoszone.cz>.

site/css/default.css

@@ -185,6 +185,15 @@ div.info {
 }
 
 @media screen and (max-width: 750px){
+  body {
+    grid-template-columns: [maincol] auto;
+    grid-template-rows: [logorow] 20rem [headerrow] 6rem [mainrow] auto [footerrow] 2rem;
+    grid-template-areas:
+      "logo"
+      "header"
+      "main"
+      "footer";
+  }
   #logo {
     position: initial;
   }
@@ -192,8 +201,4 @@ div.info {
   #logo img {
     max-width: 100%;
   }
-
-  article, header {
-    margin: 0;
-  }
 }

site/index.md

@@ -1,16 +1,12 @@
 ---
-title: Under Construction
+title: ChaosZone
 ---
 
-## /!\\ Codeworks ahead /!\\
-
 Hello there!
 
-As the 37th Chaos Communication Congress draws nearer a greater overhaul of this page is in order.
+Here you will find more information on ChaosZone and its member hackerspaces.
 
-Come back soon for more Information on ChaosZone and its member hackerspaces.
-
-Posts from previous years:
+Our recent Posts:
 
 $partial("templates/post-list.html")$
 

site/posts/2023-12-19-ChaosZone-goes-37c3-~-Kombinate-aller-Länder-vereinigt-euch!-~.md

@@ -0,0 +1,36 @@
+---
+title: ChaosZone goes 37c3 ~ Kombinate aller Länder vereinigt euch! ~
+author: chaoszone
+description: KOmmt uns auf dem Kongress besuchen!
+---
+
+![](/images/teaser.jpg)
+
+## ostdeutsch
+Genossinnen und Genossen! 
+Wir machen uns auf ins kapitalistische Ausland, um dort an der diesjährigen [Messe](https://events.ccc.de/category/37c3/) für Rechentechnik und Signalverarbeitung teilzunehmen.
+Unsere Schwestern und Brüder im elektronischen Geiste aus Hamburg heißen uns Willkommen. Uns soll Platz zugewießen werden, so sagt man, mit Tischen und Stühlen bestückt. Eine Ecke zum Werken und Wirken soll es auch geben.
+Desweiteren werden, mit etwas Glück, Eisbowlen gereicht und neumodische Anstecknadeln produziert. 
+Kommen Sie, schauen Sie und sprechen Sie uns an! Wir werden Sie gerne in die sozialistische Arbeit einführen.
+Nach Ankunft werden wir ein Signal über [Sputnik42](https://chaos.social/@chaoszone) absenden, somit Sie uns finden können.
+Solidarische Grüße,
+Nerdschaft!
+
+## deutsch
+Einige Wesen der Chaoszone werden am diesjährigen [Congress](https://events.ccc.de/category/37c3/) des Chaos Computer Clubs in Hamburg teilnehmen.
+Wir werden dort eine Assemblyfläche mit ein paar Tischen, Stühlen und einer kleinen Workshopecke haben! :)
+Wenn alles klappt werden wir auch eine Slushimaschine und eine Buttonmaschine dahaben und Live Slushis und Buttons machen. ^^
+Komm gerne vorbei! Eine genauere Ortsangabe wird später via [Mastodon](https://chaos.social/@chaoszone) bekannt gegeben.
+
+
+## english
+Some Chaoszone creatures will be attending this year's Chaos Computer Club [Congress](https://events.ccc.de/category/37c3/) in Hamburg.
+We will have an assembly area with a few tables, chairs and a small workshop corner! :)
+If everything works out well we will also have a slushi machine and a button machine there and make live slushis and buttons. ^^
+Feel free to come by! A more exact location will be announced later via [Mastodon](https://chaos.social/@chaoszone).
+
+## česky
+Některé z bytostí Chaoszone se zúčastní letošního [kongresu](https://events.ccc.de/category/37c3/) Chaos Computer Clubu v Hamburgu.
+Budeme tam mít prostor s několika stoly, židlemi a malým workshopovým koutkem! :)
+Pokud vše vyjde, budeme tam mít také stroj na slushie, stroj na placky a budeme vyrábět živě slushie a placky. ^^
+Neváhejte a přijďte! Přesnější místo oznámíme později prostřednictvím [Mastodonu](https://chaos.social/@chaoszone).

src/Main.hs

@@ -110,6 +110,20 @@ main = do
               defaultCtx full
                 >>= relativizeUrls
 
+    create ["atom.xml"] $ do
+      route idRoute
+      compile $ do
+        loadAllSnapshots "site/posts/*.md" "content"
+          >>= recentFirst
+          >>= renderAtom feedConf feedCtx
+
+    create ["rss.xml"] $ do
+      route idRoute
+      compile $ do
+        loadAllSnapshots "site/posts/*.md" "content"
+          >>= recentFirst
+          >>= renderRss feedConf feedCtx
+
 --------------------------------------------------------------------------------
 
 myRoute :: Routes
@@ -135,6 +149,25 @@ config = defaultConfiguration
 
 --------------------------------------------------------------------------------
 
+feedCtx :: Context String
+feedCtx = mconcat
+  [ bodyField "description"
+  , defaultContext
+  ]
+
+--------------------------------------------------------------------------------
+
+feedConf :: FeedConfiguration
+feedConf = FeedConfiguration
+  { feedTitle = "Chaosone news"
+  , feedDescription = "News from eastern european hackerspaces"
+  , feedAuthorName = "Chaoszone members"
+  , feedAuthorEmail = "nek0@chaoszone.cz"
+  , feedRoot = "https://chaoszone.cz"
+  }
+
+--------------------------------------------------------------------------------
+
 sortIdentifiersByDate :: [Identifier] -> [Identifier]
 sortIdentifiersByDate =
     sortBy byDate

templates/default.html

@@ -10,6 +10,13 @@
     <link rel="stylesheet" href="/css/default.css" />
     <link rel="stylesheet" href="/css/font.css" />
     <link rel="icon" type="image/svg+xml" href="/images/Chaoszone.svg">
+
+    <!-- RSS -->
+    <link rel="alternate" type="application/rss+xml" title="Chaoszone news" href="/rss.xml">
+
+    <!-- ATOM -->
+    <link rel="alternate" type="application/atom+xml" title="Chaoszone news" href="/atom.xml">
+
   </head>
   <body>
     <div id="logo">
@@ -22,11 +29,9 @@
       <nav class="menu">
         <ul>
           <li><a href="/">Home</a></li>
-          <!--
           <li><a href="/about.html">About</a></li>
           <li><a href="/contact.html">Contact</a></li>
           <li><a href="/archive.html">Archive</a></li>
-          -->
         </ul>
       </nav>
     </header>