summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--krebs/3modules/airdcpp.nix1
-rw-r--r--makefu/1systems/gum/config.nix3
-rw-r--r--makefu/2configs/bgt/download.binaergewitter.de.nix1
-rw-r--r--makefu/2configs/dcpp/hub.nix3
-rw-r--r--makefu/2configs/default.nix1
-rw-r--r--makefu/2configs/home/ham/automation/fenster_auf.nix2
-rw-r--r--makefu/2configs/home/ham/automation/pflanzen_giessen_erinnerung.nix7
-rw-r--r--makefu/2configs/nsupdate-data.nix1
-rw-r--r--makefu/2configs/tools/media.nix2
-rw-r--r--makefu/5pkgs/chitubox/default.nix3
-rw-r--r--makefu/5pkgs/tt-rss/default.nix25
11 files changed, 18 insertions, 31 deletions
diff --git a/krebs/3modules/airdcpp.nix b/krebs/3modules/airdcpp.nix
index 56fb31795..0ac9d3350 100644
--- a/krebs/3modules/airdcpp.nix
+++ b/krebs/3modules/airdcpp.nix
@@ -268,6 +268,7 @@ let
uid = genid "airdcpp";
home = cfg.stateDir;
createHome = true;
+ isSystemUser = true;
inherit (cfg) extraGroups;
};
groups.airdcpp.gid = genid "airdcpp";
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 763d36841..1cfa8e4a4 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -126,6 +126,9 @@ in {
<stockholm/makefu/2configs/wireguard/server.nix>
<stockholm/makefu/2configs/wireguard/wiregrill.nix>
+ { # recent changes mediawiki bot
+ networking.firewall.allowedUDPPorts = [ 5005 5006 ];
+ }
# Removed until move: no extra mails
# <stockholm/makefu/2configs/urlwatch>
# Removed until move: avoid letsencrypt ban
diff --git a/makefu/2configs/bgt/download.binaergewitter.de.nix b/makefu/2configs/bgt/download.binaergewitter.de.nix
index 4abc7d345..6ce0606a8 100644
--- a/makefu/2configs/bgt/download.binaergewitter.de.nix
+++ b/makefu/2configs/bgt/download.binaergewitter.de.nix
@@ -22,6 +22,7 @@ in {
uid = genid "auphonic";
group = "nginx";
useDefaultShell = true;
+ isSystemUser = true;
openssh.authorizedKeys.keys = [ ident config.krebs.users.makefu.pubkey ];
};
diff --git a/makefu/2configs/dcpp/hub.nix b/makefu/2configs/dcpp/hub.nix
index fbbce1f09..d9a2869cc 100644
--- a/makefu/2configs/dcpp/hub.nix
+++ b/makefu/2configs/dcpp/hub.nix
@@ -33,10 +33,11 @@ let
uhubDir = "/var/lib/uhub";
in {
- users.extraUsers."${ddclientUser}" = {
+ users.users."${ddclientUser}" = {
uid = genid "ddclient";
description = "ddclient daemon user";
home = stateDir;
+ isSystemUser = true;
createHome = true;
};
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index be64e402e..52206c380 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -23,6 +23,7 @@ with import <stockholm/lib>;
group = "users";
home = "/home/makefu";
createHome = true;
+ isNormalUser = true;
useDefaultShell = true;
extraGroups = [ "wheel" ];
openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
diff --git a/makefu/2configs/home/ham/automation/fenster_auf.nix b/makefu/2configs/home/ham/automation/fenster_auf.nix
index 0c57fc760..4fc0da485 100644
--- a/makefu/2configs/home/ham/automation/fenster_auf.nix
+++ b/makefu/2configs/home/ham/automation/fenster_auf.nix
@@ -20,7 +20,7 @@ let
{
service = "notify.signal_home";
data = {
- message= "${name} seit ${toString min} Minuten offen\nBitte einmal checken ob das ok ist :)";
+ message_template = "${name} seit ${toString min} Minuten offen und draussen ist es gerade {{states.sensor.dark_sky_temperature.state}}°C bei {{states.sensor.dark_sky_humidity.state}}% Luftfeuchte";
};
}
{
diff --git a/makefu/2configs/home/ham/automation/pflanzen_giessen_erinnerung.nix b/makefu/2configs/home/ham/automation/pflanzen_giessen_erinnerung.nix
index 3aaa57bd6..68604659e 100644
--- a/makefu/2configs/home/ham/automation/pflanzen_giessen_erinnerung.nix
+++ b/makefu/2configs/home/ham/automation/pflanzen_giessen_erinnerung.nix
@@ -5,7 +5,7 @@ let
};
notify_home = message: {
service = "notify.signal_home";
- data.message = message;
+ data.message_template = message;
};
in
{
@@ -32,7 +32,10 @@ in
weekday = [ "sat" ];
};
action = [
- (notify_home "Es ist Wochenende und die Pflanzen würden sich über ein bisschen Wasser freuen.")
+ (notify_home
+ ''Es ist Wochenende und die Pflanzen würden sich über ein bisschen Wasser freuen.
+ Die Wettervorhersage: {{sensor.dark_sky_summary}} mit einer Regenwahrscheinlichkeit von {{states.sensor.dark_sky_precip_probability.state}}%.
+ Aktuell sind es {{states.sensor.dark_sky_temperature.state}}°C bei {{states.sensor.dark_sky_humidity.state}}% Luftfeuchte'')
];
}
];
diff --git a/makefu/2configs/nsupdate-data.nix b/makefu/2configs/nsupdate-data.nix
index cfa6193c6..2f8f4acc4 100644
--- a/makefu/2configs/nsupdate-data.nix
+++ b/makefu/2configs/nsupdate-data.nix
@@ -34,6 +34,7 @@ in {
description = "ddclient daemon user";
home = stateDir;
createHome = true;
+ isSystemUser = true;
};
systemd.services = {
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index d66ea7760..14e782e3f 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -15,6 +15,6 @@
streamripper
youtube-dl
- pulseeffects
+ pulseeffects-legacy # for pulse
];
}
diff --git a/makefu/5pkgs/chitubox/default.nix b/makefu/5pkgs/chitubox/default.nix
index 2e01949bb..bea33e64f 100644
--- a/makefu/5pkgs/chitubox/default.nix
+++ b/makefu/5pkgs/chitubox/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
version = "1.8.1";
src = builtins.fetchTarball {
- url = "https://sac.chitubox.com/software/download.do?softwareId=17839&softwareVersionId=v${version}&fileName=CHITUBOX_V${version}.tar.gz";
+ #url = "https://sac.chitubox.com/software/download.do?softwareId=17839&softwareVersionId=v${version}&fileName=CHITUBOX_V${version}.tar.gz";
+ url = "https://archive.org/download/chitubox-v-1.8.1.tar/CHITUBOX_V${version}.tar.gz";
sha256 = "08fh8w7s5qvlx6bhdg24g81a7zprq7n8m27w2vdv0cd8j0wixbsx";
};
nativeBuildInputs = [ autoPatchelfHook ];
diff --git a/makefu/5pkgs/tt-rss/default.nix b/makefu/5pkgs/tt-rss/default.nix
deleted file mode 100644
index 4907a73a5..000000000
--- a/makefu/5pkgs/tt-rss/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "tt-rss";
- version = "2020-09-23";
- rev = "d0ed7890df";
-
- src = fetchurl {
- url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz";
- sha256 = "1b2fczd41bqg9bq37r99svrqswr9qrp35m6gn3nz032yqcwc22ij";
- };
-
- installPhase = ''
- mkdir $out
- cp -ra * $out/
- '';
-
- meta = with stdenv.lib; {
- description = "Web-based news feed (RSS/Atom) aggregator";
- license = licenses.gpl2Plus;
- homepage = "https://tt-rss.org";
- maintainers = with maintainers; [ globin zohl ];
- platforms = platforms.all;
- };
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 08:29:00 +0000