From b92b9b963ada5002372ca66db5de0e7c1dfba86d Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Fri, 12 Jul 2024 22:14:20 +0200 Subject: [PATCH] some changes --- hosts/fw.cloonar.com/modules/wol.nix | 9 ++++++--- hosts/nb-new.cloonar.com/modules/sway/sway.nix | 2 +- hosts/nb-new.cloonar.com/users/dominik.nix | 8 ++++---- utils/modules/netdata.nix | 18 +++++++++--------- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/hosts/fw.cloonar.com/modules/wol.nix b/hosts/fw.cloonar.com/modules/wol.nix index 365b635..cfb3733 100644 --- a/hosts/fw.cloonar.com/modules/wol.nix +++ b/hosts/fw.cloonar.com/modules/wol.nix @@ -1,9 +1,12 @@ { pkgs, ... }: let wolScript = pkgs.writeScriptBin "wol-script" '' - IP=$(cat /var/lib/kea/dhcp4.leases | grep $1 | awk -F, '{print $1}' | awk -F. 'OFS="." {print $1,$2,$3,255}' | tail -n 1); - MAC=$(cat /var/lib/kea/dhcp4.leases | grep $1 | awk -F, '{print $2}' | tail -n 1); - ${pkgs.wol}/bin/wol -i $IP $MAC + case $1 in + "gaming") + ${pkgs.wol}/bin/wol -i 10.42.96.255 78:8c:b5:fe:41:62 + }; + "") echo "Usage: $0 "; exit 1;; + esac ''; in { diff --git a/hosts/nb-new.cloonar.com/modules/sway/sway.nix b/hosts/nb-new.cloonar.com/modules/sway/sway.nix index 0f3ecb4..b5424e9 100644 --- a/hosts/nb-new.cloonar.com/modules/sway/sway.nix +++ b/hosts/nb-new.cloonar.com/modules/sway/sway.nix @@ -69,7 +69,7 @@ in { firefox vivaldi - unstable.cura + # unstable.cura freecad openscad diff --git a/hosts/nb-new.cloonar.com/users/dominik.nix b/hosts/nb-new.cloonar.com/users/dominik.nix index f9911e3..fdc326f 100644 --- a/hosts/nb-new.cloonar.com/users/dominik.nix +++ b/hosts/nb-new.cloonar.com/users/dominik.nix @@ -373,22 +373,22 @@ in }; "tools.epicenter.works" = { user = "root"; - identityFile = "epicenter.id_rsa"; + identityFile = "~/.ssh/epicenter.id_rsa"; }; "*.epicenter.works !tools.epicenter.works" = { user = "dominik"; - identityFile = "epicenter.id_rsa"; + identityFile = "~/.ssh/epicenter.id_rsa"; }; "*.dearmep.eu" = { user = "root"; - identityFile = "epicenter.id_rsa"; + identityFile = "~/.ssh/epicenter.id_rsa"; }; "*.akvorrat.at" = { user = "dominik"; setEnv = { TERM = "xterm-256color"; }; - identityFile = "epicenter.id_rsa"; + identityFile = "~/.ssh/epicenter.id_rsa"; }; "*.cloonar.com" = { user = "root"; diff --git a/utils/modules/netdata.nix b/utils/modules/netdata.nix index 1038b24..1aab534 100644 --- a/utils/modules/netdata.nix +++ b/utils/modules/netdata.nix @@ -9,28 +9,28 @@ in postfix: yes ''; - sops.secrets.netdata-claim-token = { }; - services.netdata = { enable = true; - - package = unstable.netdata; - # claimTokenFile = config.sops.secrets.netdata-claim-token.path; - python.enable = true; + package = pkgs.netdata.override { + withCloud = true; + }; + config = { global = { - # uncomment to reduce memory to 32 MB + "memory mode" = "none"; "page cache size" = 32; - - # update interval "update every" = 15; }; ml = { # enable machine learning "enabled" = "yes"; }; + # web = { + # mode = "none"; + # "accept a streaming request every seconds" = 0; + # }; }; }; }