From b03d3a72ce1dc96e53cec43ab6521532f3d203b3 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Fri, 15 Sep 2023 11:48:58 +0200
Subject: [PATCH] Clanup

---
 instances/loki/configuration.nix        | 63 +++++--------------------
 instances/odin/common_configuration.nix |  2 +-
 2 files changed, 12 insertions(+), 53 deletions(-)

diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix
index 9ea0a78..7580371 100644
--- a/instances/loki/configuration.nix
+++ b/instances/loki/configuration.nix
@@ -103,36 +103,16 @@ with lib; {
     };
     gnome.gnome-keyring.enable = true;
     gvfs.enable = true;
-    jackett = {
-      enable = true;
-      # package = pkgs.unstable_pkgs.jackett;
-      openFirewall = true;
-      group = "users";
-    };
-    jellyfin = {
-      enable = true;
-      # package = pkgs.unstable_pkgs.jellyfin;
-      openFirewall = true;
-      group = "users";
-    };
+    jackett = { enable = true; openFirewall = true; group = "users"; };
+    jellyfin = { enable = true; openFirewall = true; group = "users"; };
     logind.lidSwitch = "ignore";
     # node-red = { enable = true; openFirewall = true; withNpmAndGcc = true; };
-    openssh = {
-      enable = true;
-      openFirewall = true;
-    };
+    openssh = { enable = true; openFirewall = true; };
     # plex = { enable = true; openFirewall = true; group = "users"; };
     power-profiles-daemon.enable = true;
     prowlarr = { enable = true; openFirewall = true; };
-    radarr = {
-      enable = true;
-      openFirewall = true;
-      group = "users";
-    };
-    samba-wsdd = {
-      enable = true;
-      discovery = true;
-    };
+    radarr = { enable = true; openFirewall = true; group = "users"; };
+    samba-wsdd = { enable = true; discovery = true; };
     samba = {
       enable = true;
       enableNmbd = true;
@@ -181,11 +161,7 @@ with lib; {
         };
     };
     smartd.enable = true;
-    sonarr = {
-      enable = true;
-      openFirewall = true;
-      group = "users";
-    };
+    sonarr = { enable = true; openFirewall = true; group = "users"; };
     thermald.enable = true;
     transmission = {
       enable = true;
@@ -260,18 +236,9 @@ with lib; {
         };
       in
       {
-        bertof = recursiveUpdate common {
-          SUBVOLUME = "/home/bertof/";
-          ALLOW_USERS = [ "bertof" ];
-        };
-        tiziano = recursiveUpdate common {
-          SUBVOLUME = "/home/tiziano/";
-          ALLOW_USERS = [ "tiziano" ];
-        };
-        condiviso = recursiveUpdate common {
-          SUBVOLUME = "/mnt/condiviso";
-          ALLOW_USERS = [ "bertof" "tiziano" ];
-        };
+        bertof = recursiveUpdate common { SUBVOLUME = "/home/bertof/"; ALLOW_USERS = [ "bertof" ]; };
+        tiziano = recursiveUpdate common { SUBVOLUME = "/home/tiziano/"; ALLOW_USERS = [ "tiziano" ]; };
+        condiviso = recursiveUpdate common { SUBVOLUME = "/mnt/condiviso"; ALLOW_USERS = [ "bertof" "tiziano" ]; };
       };
   };
 
@@ -412,16 +379,8 @@ with lib; {
       "map" = { };
       mobile_app = { };
       notify = [
-        {
-          platform = "telegram";
-          name = "t_filippo";
-          chat_id = "!secret filippo_t_chat_id";
-        }
-        {
-          platform = "telegram";
-          name = "t_famiglia";
-          chat_id = "!secret famiglia_t_chat_id";
-        }
+        { platform = "telegram"; name = "t_filippo"; chat_id = "!secret filippo_t_chat_id"; }
+        { platform = "telegram"; name = "t_famiglia"; chat_id = "!secret famiglia_t_chat_id"; }
       ];
       recorder.purge_keep_days = 30;
       script = "!include scripts.yaml";
diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix
index b52aeaa..22aaa99 100644
--- a/instances/odin/common_configuration.nix
+++ b/instances/odin/common_configuration.nix
@@ -128,7 +128,7 @@ with lib; {
     drivers = [
       pkgs.gutenprint
       # pkgs.cups-kyocera
-      pkgs.unstable_pkgs.cups-kyodialog
+      pkgs.cups-kyodialog
     ];
   };