From d90842f276c92a2a28a6e8c584b5efd8ef4af1f2 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 11 May 2023 10:35:26 +0200
Subject: [PATCH] minor adjustments

---
 nixos/machines/chungus/rbackup.nix      |  6 +---
 nixos/machines/chungus/sync-torrent.nix |  4 +--
 nixos/machines/cream/configuration.nix  |  2 ++
 nixos/machines/cream/packages.nix       |  2 ++
 nixos/machines/robi/jellyfin.nix        |  5 ++++
 nixos/system/all/nginx-landingpage.nix  | 39 +++++++++++++++++++++----
 nixos/system/all/packages.nix           |  4 +++
 7 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/nixos/machines/chungus/rbackup.nix b/nixos/machines/chungus/rbackup.nix
index 9d3595c..8aaa691 100644
--- a/nixos/machines/chungus/rbackup.nix
+++ b/nixos/machines/chungus/rbackup.nix
@@ -23,15 +23,11 @@
       src = "root@robi:/var/lib/bitwarden_rs/";
       dst = "/services/bitwarden_rs";
     };
-    #media = {
-    #  sshKeyPath = config.sops.secrets.rsync_private_key.path;
-    #  src = "root@robi:/media/syncthing/media/";
-    #  dst = "/robi/media";
-    #};
     torrent = {
       sshKeyPath = config.sops.secrets.rsync_private_key.path;
       src = "root@robi:/media/torrent/downloads/";
       dst = "/robi/torrent";
+      startAt = "00/5:00"; # every 2 hours
     };
   };
 
diff --git a/nixos/machines/chungus/sync-torrent.nix b/nixos/machines/chungus/sync-torrent.nix
index 19e6503..77c8a12 100644
--- a/nixos/machines/chungus/sync-torrent.nix
+++ b/nixos/machines/chungus/sync-torrent.nix
@@ -46,9 +46,9 @@ in
 
           # "normal" speed limits
           speed-limit-down-enabled = false;
-          speed-limit-down = 1000;
+          speed-limit-down = 1000; # in Kib/s
           speed-limit-up-enabled = true;
-          speed-limit-up = 1000;
+          speed-limit-up = 1000; # in Kib/s
           upload-slots-per-torrent = 8;
           # Queuing
           # When true, Transmission will only download
diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix
index 6ee9ce2..9241fe1 100644
--- a/nixos/machines/cream/configuration.nix
+++ b/nixos/machines/cream/configuration.nix
@@ -32,6 +32,8 @@
 
   system.custom.wifi.interfaces = [ "wlp166s0" ];
 
+  services.flatpak.enable = true;
+
   security.wrappers = {
     pmount = {
       source = "${pkgs.pmount}/bin/pmount";
diff --git a/nixos/machines/cream/packages.nix b/nixos/machines/cream/packages.nix
index 1283bc4..c58800d 100644
--- a/nixos/machines/cream/packages.nix
+++ b/nixos/machines/cream/packages.nix
@@ -101,6 +101,8 @@ in
 
     sops
 
+    steam-run
+
     bitwarden
 
     sensu-go-cli
diff --git a/nixos/machines/robi/jellyfin.nix b/nixos/machines/robi/jellyfin.nix
index 574f916..7647c2f 100644
--- a/nixos/machines/robi/jellyfin.nix
+++ b/nixos/machines/robi/jellyfin.nix
@@ -2,7 +2,12 @@
 {
   services.jellyfin.enable = true;
   services.jellyfin.openFirewall = false;
+
+  #services.jellyfin.user = toString config.ids.gids.transmission;
+  #services.jellyfin.group = toString config.ids.gids.transmission;
+
   users.groups."syncthing".members = [ "jellyfin" ];
+
   hardware.opengl = {
     enable = true;
     driSupport = true;
diff --git a/nixos/system/all/nginx-landingpage.nix b/nixos/system/all/nginx-landingpage.nix
index 2be7cfc..ee8561a 100644
--- a/nixos/system/all/nginx-landingpage.nix
+++ b/nixos/system/all/nginx-landingpage.nix
@@ -49,23 +49,53 @@
             ];
           }
           {
-            text = "pepe";
+            text = "chungus";
             items = [
               {
                 label = "HomeAssistant";
-                href = "http://pepe.private:8123/";
+                href = "http://chungus.private:8123/";
                 image = "https://media.giphy.com/media/fyLi0OuWysotq/giphy.gif";
               }
               {
                 label = "Zigbee2Mqtt";
-                href = "http://pepe.private:9666/";
+                href = "http://chungus.private:9666/";
+                image = "https://media.giphy.com/media/fyLi0OuWysotq/giphy.gif";
+              }
+              {
+                label = "Tdarr";
+                href = "http://tdarr.chungus.private/";
                 image = "https://media.giphy.com/media/fyLi0OuWysotq/giphy.gif";
               }
               {
                 label = "Jellyfin";
-                href = "http://pepe:8096/";
+                href = "http://chungus:8096/";
                 image = "https://media.giphy.com/media/fyLi0OuWysotq/giphy.gif";
               }
+              {
+                label = "netdata";
+                href = "http://chungus.private:19999/";
+                image = "https://media.giphy.com/media/BkjdN6MQCDPaw/giphy.gif";
+              }
+              {
+                label = "logs";
+                href = "http://grafana.chungus.private/explore";
+                image = "https://raw.githubusercontent.com/cncf/landscape/master/hosted_logos/grafana-loki.svg";
+              }
+              {
+                label = "grafana";
+                href = "http://grafana.chungus.private/";
+                image = "https://www.vectorlogo.zone/logos/grafana/grafana-icon.svg";
+              }
+              {
+                label = "prometheus";
+                href = "http://prometheus.chungus.private/";
+                image = "https://www.vectorlogo.zone/logos/prometheusio/prometheusio-icon.svg";
+              }
+            ];
+          }
+          {
+            text = "pepe";
+            items = [
               {
                 label = "netdata";
                 href = "http://pepe.private:19999/";
@@ -86,7 +116,6 @@
                 href = "http://prometheus.pepe.private/";
                 image = "https://www.vectorlogo.zone/logos/prometheusio/prometheusio-icon.svg";
               }
-
             ];
           }
 
diff --git a/nixos/system/all/packages.nix b/nixos/system/all/packages.nix
index 46da8aa..7dd9afd 100644
--- a/nixos/system/all/packages.nix
+++ b/nixos/system/all/packages.nix
@@ -104,6 +104,10 @@ in
 
     pciutils
 
+    (pkgs.writers.writeDashBin "mc" ''
+      ${pkgs.mc}/bin/mc --nocolor "$@"
+    '')
+
     (pkgs.writers.writeBashBin "ssl-check-cert-of-domain" ''
       DOMAIN=$1
       echo | \