From 274b95ce28f94ef1c0a20957cbdc17ffae548f13 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Fri, 3 Dec 2021 12:40:12 +0100
Subject: upgrade to nixos 21.11

---
 hosts/chaski/configuration.nix |  6 ++----
 hosts/flora/configuration.nix  |  3 ++-
 nix/sources.json               | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/hosts/chaski/configuration.nix b/hosts/chaski/configuration.nix
index 38e9e0d..59ab774 100644
--- a/hosts/chaski/configuration.nix
+++ b/hosts/chaski/configuration.nix
@@ -8,12 +8,10 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      # ./services/grafana.nix
       # ./services/workadventure.nix
       #./services/exneuland.nix
-      ./services/jitsi.nix
-      ./services/uplcg.nix
-      #./services/kontraiaa.nix
+      # ./services/jitsi.nix
+      # ./services/uplcg.nix
       ./services/woitb.nix
       ./services/geolocation.nix
       ./services/gtfs.nix
diff --git a/hosts/flora/configuration.nix b/hosts/flora/configuration.nix
index e8e6345..5bdc18a 100644
--- a/hosts/flora/configuration.nix
+++ b/hosts/flora/configuration.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    #./services/hedgedoc.nix
+    # ./services/hedgedoc.nix
     #./services/daemoniones.nix
     ./services/nginx.nix
     ./services/pleroma.nix
@@ -50,6 +50,7 @@
     bantime-increment.enable = true;
     bantime-increment.overalljails = true;
     bantime-increment.maxtime = "1312m";
+    ignoreIP = [ "88.133.194.232" ];
   };
   
   services.logrotate = {
diff --git a/nix/sources.json b/nix/sources.json
index f17b50d..6dbaacf 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,22 +5,22 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e",
-        "sha256": "17mirpsx5wyw262fpsd6n6m47jcgw8k2bwcp1iwdnrlzy4dhcgqh",
+        "rev": "5830a4dd348d77e39a0f3c4c762ff2663b602d4c",
+        "sha256": "1d3lsrqvci4qz2hwjrcnd8h5vfkg8aypq3sjd4g3izbc8frwz5sm",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/5830a4dd348d77e39a0f3c4c762ff2663b602d4c.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "release-21.05",
+        "branch": "release-21.11",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ce48bcdde86eef5780a60bea55b9bc9dbd8248cd",
-        "sha256": "18r8hblb1x94v00y5d35cvnpszvk1mwy1cccdc6mzg5piglkk6yp",
+        "rev": "dc6b93f729ddd8cc1222279162ef05ec7eee80e7",
+        "sha256": "0fvdwgpsfghmdc1wx1wvqpapy7n9655jj6z1zcxfn97s93xqsxb9",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/ce48bcdde86eef5780a60bea55b9bc9dbd8248cd.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/dc6b93f729ddd8cc1222279162ef05ec7eee80e7.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-unstable": {
@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4789953e5c1ef6d10e3ff437e5b7ab8eed526942",
-        "sha256": "15nksgi9pncz59l8vrfg05g9dqw835wwdi9bmghffyg0k1yh2j8d",
+        "rev": "391f93a83c3a486475d60eb4a569bb6afbf306ad",
+        "sha256": "0s5f7j2akh3g0013880jfbigdaac1z76r9dv46yw6k254ba2r6nq",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/4789953e5c1ef6d10e3ff437e5b7ab8eed526942.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/391f93a83c3a486475d60eb4a569bb6afbf306ad.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "woitb": {
-- 
cgit v1.2.3