From dd0283e65ab2b292bf2f3a44aa99b278ee9fe78e Mon Sep 17 00:00:00 2001
From: materus <materus@podkos.pl>
Date: Mon, 9 Sep 2024 11:04:15 +0200
Subject: [PATCH] configurations: updates to script, moniotoring and dcbot

---
 configurations/host/valkyrie/services/dcbot.nix          | 4 ++--
 configurations/host/waffentrager/services/monitoring.nix | 4 +---
 extraFiles/scripts/convert_images.sh                     | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configurations/host/valkyrie/services/dcbot.nix b/configurations/host/valkyrie/services/dcbot.nix
index 670ce89..6c05ca3 100644
--- a/configurations/host/valkyrie/services/dcbot.nix
+++ b/configurations/host/valkyrie/services/dcbot.nix
@@ -28,9 +28,9 @@
         wantedBy = [ "multi-user.target" ];
         path = [ pkgs.jdk ];
         script = let 
-          musicbot = let version = "0.4.2"; in (pkgs.fetchurl {
+          musicbot = let version = "0.4.3"; in (pkgs.fetchurl {
               url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar";
-              sha256 = "sha256-Jg6/ju3ADBd7fc3njRzoEDVjIL4SzAzlTc02I4Q9hz4=";
+              sha256 = "sha256-7CHFc94Fe6ip7RY+XJR9gWpZPKM5JY7utHp8C3paU9s=";
             });
         
         in ''
diff --git a/configurations/host/waffentrager/services/monitoring.nix b/configurations/host/waffentrager/services/monitoring.nix
index d27aeff..2562811 100644
--- a/configurations/host/waffentrager/services/monitoring.nix
+++ b/configurations/host/waffentrager/services/monitoring.nix
@@ -11,11 +11,9 @@
         enable = true;
         settings = {
           server = {
-            # Listening Address
             http_addr = "127.0.0.1";
-            # and Port
             http_port = 3232;
-            # Grafana needs to know on which domain and URL it's running
+            
             domain = "watchman.materus.pl";
             serve_from_sub_path = true;
           };
diff --git a/extraFiles/scripts/convert_images.sh b/extraFiles/scripts/convert_images.sh
index c49cee2..45b5c27 100755
--- a/extraFiles/scripts/convert_images.sh
+++ b/extraFiles/scripts/convert_images.sh
@@ -1,7 +1,7 @@
 #/usr/bin/env bash
 IFS=$'\n'
 
-CONVERT="$(nix eval nixpkgs\#imagemagick.outPath | tr -d '"')/bin/convert"
+CONVERT="$(nix eval nixpkgs\#imagemagick.outPath | tr -d '"')/bin/magick"
 convert_cmd () {
 if  ! command -v magick &> /dev/null; then $CONVERT "$@"; else convert "$@"; fi
 }