From e6f67aa910f78ecf75f3a47a0794497148c60c2b Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 7 Jun 2022 15:43:30 +0200 Subject: l drbd module: init --- lass/3modules/default.nix | 1 + lass/3modules/drbd.nix | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 lass/3modules/drbd.nix diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix index 570bb45b..3a0b1306 100644 --- a/lass/3modules/default.nix +++ b/lass/3modules/default.nix @@ -2,6 +2,7 @@ _: { imports = [ ./dnsmasq.nix + ./drbd.nix ./folderPerms.nix ./hosts.nix ./klem.nix diff --git a/lass/3modules/drbd.nix b/lass/3modules/drbd.nix new file mode 100644 index 00000000..816e58f0 --- /dev/null +++ b/lass/3modules/drbd.nix @@ -0,0 +1,118 @@ +{ config, lib, pkgs, ... }: let + cfg = config.lass.drbd; + slib = import ; +in { + options = { + lass.drbd = lib.mkOption { + default = {}; + type = lib.types.attrsOf (lib.types.submodule ({ config, ... }: { + options = { + name = lib.mkOption { + type = lib.types.str; + default = config._module.args.name; + }; + blockMinor = lib.mkOption { + type = lib.types.int; + default = lib.mod (slib.genid config.name) 16000; # TODO get max_id fron drbd + }; + port = lib.mkOption { + type = lib.types.int; + default = 20000 + config.blockMinor; + }; + peers = lib.mkOption { + type = lib.types.listOf slib.types.host; + }; + disk = lib.mkOption { + type = lib.types.str; + default = "/dev/loop${toString config.blockMinor}"; + }; + drbdConfig = lib.mkOption { + type = lib.types.path; + internal = true; + default = pkgs.writeText "drbd-${config.name}.conf" '' + resource ${config.name} { + net { + protocol a; + ping-int 10; + } + device minor ${toString config.blockMinor}; + disk ${config.disk}; + meta-disk internal; + ${slib.indent (lib.concatStrings (lib.imap1 (i: peer: /* shell */ '' + on ${peer.name} { + address ${peer.nets.retiolum.ip4.addr}:${toString config.port}; + node-id ${toString i}; + } + '') config.peers))} + connection-mesh { + hosts ${lib.concatMapStringsSep " " (peer: peer.name) config.peers}; + } + } + ''; + }; + }; + })); + }; + }; + config = lib.mkIf (cfg != {}) { + boot.extraModulePackages = [ + (pkgs.linuxPackages.callPackage ../5pkgs/drbd9/default.nix {}) + ]; + boot.extraModprobeConfig = '' + options drbd usermode_helper=/run/current-system/sw/bin/drbdadm + ''; + services.udev.packages = [ pkgs.drbd ]; + boot.kernelModules = [ "drbd" ]; + + environment.systemPackages = [ pkgs.drbd ]; + + + networking.firewall.allowedTCPPorts = map (device: device.port) (lib.attrValues cfg); + systemd.services = lib.mapAttrs' (_: device: + lib.nameValuePair "drbd-${device.name}" { + after = [ "systemd-udev.settle.service" "network.target" ]; + wants = [ "systemd-udev.settle.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + RemainAfterExit = true; + ExecStart = pkgs.writers.writeDash "start-drbd-${device.name}" '' + set -efux + mkdir -p /var/lib/sync-containers2 + ${lib.optionalString (device.disk == "/dev/loop${toString device.blockMinor}") '' + if ! test -e /var/lib/sync-containers2/${device.name}.disk; then + truncate -s 10G /var/lib/sync-containers2/${device.name}.disk + fi + if ! ${pkgs.util-linux}/bin/losetup /dev/loop${toString device.blockMinor}; then + ${pkgs.util-linux}/bin/losetup /dev/loop${toString device.blockMinor} /var/lib/sync-containers2/${device.name}.disk + fi + ''} + if ! ${pkgs.drbd}/bin/drbdadm adjust ${device.name}; then + ${pkgs.drbd}/bin/drbdadm down ${device.name} + ${pkgs.drbd}/bin/drbdadm create-md ${device.name} + ${pkgs.drbd}/bin/drbdadm up ${device.name} + fi + ''; + ExecStop = pkgs.writers.writeDash "stop-drbd-${device.name}" '' + set -efux + ${pkgs.drbd}/bin/drbdadm -c ${device.drbdConfig} down ${device.name} + ${lib.optionalString (device.disk == "/dev/loop${toString device.blockMinor}") '' + ${pkgs.util-linux}/bin/losetup -d /dev/loop${toString device.blockMinor} + ''} + ''; + }; + } + ) cfg; + + + environment.etc."drbd.conf".text = '' + global { + usage-count yes; + } + + ${lib.concatMapStrings (device: /* shell */ '' + include ${device.drbdConfig}; + '') (lib.attrValues cfg)} + ''; + }; +} + -- cgit v1.2.3 From 188cc08462241c4e4e24d8a2fa6b36d7042ae940 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 8 Jun 2022 10:39:48 +0200 Subject: exim-smarthost: eloop2019 -> eloop2022 --- krebs/2configs/exim-smarthost.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix index 224a38ac..5b1d9551 100644 --- a/krebs/2configs/exim-smarthost.nix +++ b/krebs/2configs/exim-smarthost.nix @@ -25,7 +25,7 @@ in { "anmeldung@eloop.org" = eloop-ml; "brain@krebsco.de" = brain-ml; "cfp2019@eloop.org" = eloop-ml; - "eloop2019@krebsco.de" = eloop-ml; + "eloop2022@krebsco.de" = eloop-ml; "kontakt@eloop.org" = eloop-ml; "root@eloop.org" = eloop-ml; "youtube@eloop.org" = eloop-ml; -- cgit v1.2.3 From 35b3d5058059cdadb71db8cac362fc19952ac0b6 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 8 Jun 2022 11:09:55 +0200 Subject: exim-smarthost: remove unused eloop addresses --- krebs/2configs/exim-smarthost.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix index 5b1d9551..06ef690b 100644 --- a/krebs/2configs/exim-smarthost.nix +++ b/krebs/2configs/exim-smarthost.nix @@ -22,11 +22,8 @@ in { tv ]; in { - "anmeldung@eloop.org" = eloop-ml; "brain@krebsco.de" = brain-ml; - "cfp2019@eloop.org" = eloop-ml; "eloop2022@krebsco.de" = eloop-ml; - "kontakt@eloop.org" = eloop-ml; "root@eloop.org" = eloop-ml; "youtube@eloop.org" = eloop-ml; "postmaster@krebsco.de" = spam-ml; # RFC 822 -- cgit v1.2.3 From 4ea0e508f22fedb8cfc658ef771a486b2330016b Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 8 Jun 2022 11:10:13 +0200 Subject: exim-smarthost: add spam@eloop.org --- krebs/2configs/exim-smarthost.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix index 06ef690b..82f8ec94 100644 --- a/krebs/2configs/exim-smarthost.nix +++ b/krebs/2configs/exim-smarthost.nix @@ -24,8 +24,9 @@ in { in { "brain@krebsco.de" = brain-ml; "eloop2022@krebsco.de" = eloop-ml; - "root@eloop.org" = eloop-ml; - "youtube@eloop.org" = eloop-ml; + "root@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead + "spam@eloop.org" = eloop-ml; + "youtube@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead "postmaster@krebsco.de" = spam-ml; # RFC 822 "lass@krebsco.de" = lass; "makefu@krebsco.de" = makefu; -- cgit v1.2.3 From afaf5c354badf42ba004f21cf9f7888e5a585c6f Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 8 Jun 2022 20:27:53 +0200 Subject: bier balance: make : in nick optional --- krebs/2configs/reaktor2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index 205cc96f..74c21fd2 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -76,7 +76,7 @@ let }; } { - pattern = ''^([\H-]*):?\s+([+-][1-9][0-9]*)\s+(\S+)$''; + pattern = ''^([\H-]*?):?\s+([+-][1-9][0-9]*)\s+(\S+)$''; activate = "match"; arguments = [1 2 3]; command = { -- cgit v1.2.3 From d8013fd7ed2710b45d5d5a766841360123aaad71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 30 May 2022 09:42:53 +0200 Subject: mic92: drop jarvis --- krebs/3modules/external/mic92.nix | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/krebs/3modules/external/mic92.nix b/krebs/3modules/external/mic92.nix index d63a6b30..3bd2c1b7 100644 --- a/krebs/3modules/external/mic92.nix +++ b/krebs/3modules/external/mic92.nix @@ -681,27 +681,6 @@ in { }; }; }; - jarvis = { - owner = config.krebs.users.mic92; - nets = rec { - internet.addrs = [ "jarvis.thalheim.io" ]; - retiolum = { - via = internet; - aliases = [ "jarvis.r" ]; - tinc.pubkey = '' - -----BEGIN RSA PUBLIC KEY----- - MIIBCgKCAQEA7PtJlYBpBr2TK5CAvAukkGvj+esC+sMPKd3mO9iDwdViBrqKdf+D - yEy8SI80Y02dpkL97NjvnzepKpyGQWpG1ZQflJLhCTj7oFyVpWd4XsbIuzYp5ES6 - r8qKWs2xcItc1pbW0ZmrCBzdWsC1B0VAHlYkiz+7vM6pCTvg6hNQugP4c1TRCtJC - Sr+n+EjTXN/NTaKl+f7eoHJGnT5liDO3/xZVxm8AuLnron1xPPDghXClVHfDj5mt - f66f+CLwZhq3BrZuptwXp7TerMfrNtPyTx96b+EyuLPjrYxKeKL/+Nbr3VmmiDIV - tsraNc+0a8OBpVsYh4MQLp55NYwqxAoetQIDAQAB - -----END RSA PUBLIC KEY----- - ''; - tinc.pubkey_ed25519 = "RRkMnGSg+nMkz4L2iqmdFf2fIf4wIfcTM0TlTWLLNCE"; - }; - }; - }; bernie = { owner = config.krebs.users.mic92; nets = rec { -- cgit v1.2.3 From 18ea4967c1a708a70c0c807c4ba2f602bc72570c Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 10 Jun 2022 11:46:39 +0200 Subject: l domsen nextcloud: 23 -> 24 --- lass/2configs/websites/domsen.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index fe4d78a3..90a0a5a7 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -104,7 +104,7 @@ in { services.nextcloud = { enable = true; hostName = "o.xanf.org"; - package = pkgs.nextcloud23; + package = pkgs.nextcloud24; config = { adminpassFile = "/run/nextcloud.pw"; overwriteProtocol = "https"; -- cgit v1.2.3 From 342cb369bb6a78dbb6e2f03d7ea8873b1a3d32ab Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 19 Jun 2022 19:17:53 +0200 Subject: l radio: amplify newsspeaker by 1.4 --- lass/2configs/radio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/2configs/radio/default.nix b/lass/2configs/radio/default.nix index b8d95886..2f503eae 100644 --- a/lass/2configs/radio/default.nix +++ b/lass/2configs/radio/default.nix @@ -168,7 +168,7 @@ in { output.icecast(mount = '/music.mp3', password = 'hackme', %mp3.vbr(), source) output.icecast(mount = '/music.opus', password = 'hackme', %opus(bitrate = 96), source) - extra_input = audio_to_stereo(input.harbor("live", port=1338)) + extra_input = amplify(1.4, audio_to_stereo(input.harbor("live", port=1338))) o = smooth_add(normal = source, special = extra_input) output.icecast(mount = '/radio.ogg', password = 'hackme', %vorbis(quality = 1), o) -- cgit v1.2.3 From b887b8e277705f8a8a84d91bd61f9be37f54840f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 19 Jun 2022 19:18:14 +0200 Subject: l radio weather_report: less precision for floats --- lass/2configs/radio/weather_for_ips.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lass/2configs/radio/weather_for_ips.py b/lass/2configs/radio/weather_for_ips.py index f7cc2dac..587cc1f2 100644 --- a/lass/2configs/radio/weather_for_ips.py +++ b/lass/2configs/radio/weather_for_ips.py @@ -25,9 +25,9 @@ for ip in fileinput.input(): output.append( f'Weather report for {location.city.name}, {location.country.name}. ' f'Currently it is {weather["current"]["weather"][0]["description"]} outside ' - f'with a temperature of {weather["current"]["temp"]} degrees, ' - f'and a wind speed of {weather["current"]["wind_speed"]} meters per second. ' - f'The probability of precipitation is {weather["hourly"][0]["pop"] * 100} percent. ' + f'with a temperature of {weather["current"]["temp"]:.1f} degrees, ' + f'and a wind speed of {weather["current"]["wind_speed"]:.1f} meters per second. ' + f'The probability of precipitation is {weather["hourly"][0]["pop"] * 100:.0f} percent. ' ) print('\n'.join(output)) -- cgit v1.2.3 From 500aa05de7e34f6a60639a74017583268f9a829d Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 21 Jun 2022 20:44:59 +0200 Subject: flameshot: pin 0.10.2 --- krebs/5pkgs/override/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/krebs/5pkgs/override/default.nix b/krebs/5pkgs/override/default.nix index fe13b430..1dd694b7 100644 --- a/krebs/5pkgs/override/default.nix +++ b/krebs/5pkgs/override/default.nix @@ -10,6 +10,14 @@ self: super: { }); flameshot = super.flameshot.overrideAttrs (old: rec { + name = "flameshot-${version}"; + version = "0.10.2"; + src = self.fetchFromGitHub { + owner = "flameshot-org"; + repo = "flameshot"; + rev = "v${version}"; + sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4="; + }; patches = old.patches or [] ++ { "0.6.0" = [ ./flameshot/flameshot_imgur_0.6.0.patch -- cgit v1.2.3 From 1328a34e51e0a14aae8dbfe6469cc580ee739bce Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 21 Jun 2022 22:56:52 +0200 Subject: flameshot: make imgur great again --- krebs/5pkgs/override/default.nix | 19 +++--------- .../flameshot/flameshot_imgur_0.10.2.patch | 35 ++++++++++++++++++++++ .../override/flameshot/flameshot_imgur_0.6.0.patch | 34 --------------------- .../override/flameshot/flameshot_imgur_0.9.0.patch | 35 ---------------------- 4 files changed, 39 insertions(+), 84 deletions(-) create mode 100644 krebs/5pkgs/override/flameshot/flameshot_imgur_0.10.2.patch delete mode 100644 krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch delete mode 100644 krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch diff --git a/krebs/5pkgs/override/default.nix b/krebs/5pkgs/override/default.nix index 1dd694b7..ae42bc1a 100644 --- a/krebs/5pkgs/override/default.nix +++ b/krebs/5pkgs/override/default.nix @@ -17,21 +17,10 @@ self: super: { repo = "flameshot"; rev = "v${version}"; sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4="; - }; - patches = old.patches or [] ++ { - "0.6.0" = [ - ./flameshot/flameshot_imgur_0.6.0.patch - ]; - "0.9.0" = [ - ./flameshot/flameshot_imgur_0.9.0.patch - ]; - "0.10.1" = [ - ./flameshot/flameshot_imgur_0.9.0.patch - ]; - "0.10.2" = [ - ./flameshot/flameshot_imgur_0.9.0.patch - ]; - }.${old.version} or []; + }; + patches = old.patches or [] ++ [ + ./flameshot/flameshot_imgur_0.10.2.patch + ]; }); # https://github.com/proot-me/PRoot/issues/106 diff --git a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.10.2.patch b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.10.2.patch new file mode 100644 index 00000000..c4c0bf38 --- /dev/null +++ b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.10.2.patch @@ -0,0 +1,35 @@ +--- a/src/tools/imgur/imguruploader.cpp ++++ b/src/tools/imgur/imguruploader.cpp +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent) + : QWidget(parent) +@@ -79,8 +80,11 @@ void ImgurUploader::handleReply(QNetworkReply* reply) + m_imageURL.setUrl(data[QStringLiteral("link")].toString()); + + auto deleteToken = data[QStringLiteral("deletehash")].toString(); ++ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL"); ++ if (deleteImageURLPattern == NULL) ++ deleteImageURLPattern = "https://imgur.com/delete/%1"; + m_deleteImageURL.setUrl( +- QStringLiteral("https://imgur.com/delete/%1").arg(deleteToken)); ++ QString::fromUtf8(deleteImageURLPattern).arg(deleteToken)); + + // save history + QString imageName = m_imageURL.toString(); +@@ -133,7 +137,10 @@ void ImgurUploader::upload() + QString description = FileNameHandler().parsedPattern(); + urlQuery.addQueryItem(QStringLiteral("description"), description); + +- QUrl url(QStringLiteral("https://api.imgur.com/3/image")); ++ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL"); ++ if (createImageURLPattern == NULL) ++ createImageURLPattern = "https://api.imgur.com/3/image"; ++ QUrl url(QString::fromUtf8(createImageURLPattern)); + url.setQuery(urlQuery); + QNetworkRequest request(url); + request.setHeader(QNetworkRequest::ContentTypeHeader, diff --git a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch deleted file mode 100644 index 92023554..00000000 --- a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/src/tools/imgur/imguruploader.cpp -+++ b/src/tools/imgur/imguruploader.cpp -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) : - QWidget(parent), m_pixmap(capture) -@@ -74,7 +75,10 @@ void ImgurUploader::handleReply(QNetworkReply *reply) { - QJsonObject json = response.object(); - QJsonObject data = json["data"].toObject(); - m_imageURL.setUrl(data["link"].toString()); -- m_deleteImageURL.setUrl(QString("https://imgur.com/delete/%1").arg( -+ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL"); -+ if (deleteImageURLPattern == NULL) -+ deleteImageURLPattern = "https://imgur.com/delete/%1"; -+ m_deleteImageURL.setUrl(QString(deleteImageURLPattern).arg( - data["deletehash"].toString())); - onUploadOk(); - } else { -@@ -105,7 +109,10 @@ void ImgurUploader::upload() { - QString description = FileNameHandler().parsedPattern(); - urlQuery.addQueryItem("description", description); - -- QUrl url("https://api.imgur.com/3/image"); -+ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL"); -+ if (createImageURLPattern == NULL) -+ createImageURLPattern = "https://api.imgur.com/3/image"; -+ QUrl url(createImageURLPattern); - url.setQuery(urlQuery); - QNetworkRequest request(url); - request.setHeader(QNetworkRequest::ContentTypeHeader, diff --git a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch deleted file mode 100644 index c4c0bf38..00000000 --- a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/src/tools/imgur/imguruploader.cpp -+++ b/src/tools/imgur/imguruploader.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent) - : QWidget(parent) -@@ -79,8 +80,11 @@ void ImgurUploader::handleReply(QNetworkReply* reply) - m_imageURL.setUrl(data[QStringLiteral("link")].toString()); - - auto deleteToken = data[QStringLiteral("deletehash")].toString(); -+ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL"); -+ if (deleteImageURLPattern == NULL) -+ deleteImageURLPattern = "https://imgur.com/delete/%1"; - m_deleteImageURL.setUrl( -- QStringLiteral("https://imgur.com/delete/%1").arg(deleteToken)); -+ QString::fromUtf8(deleteImageURLPattern).arg(deleteToken)); - - // save history - QString imageName = m_imageURL.toString(); -@@ -133,7 +137,10 @@ void ImgurUploader::upload() - QString description = FileNameHandler().parsedPattern(); - urlQuery.addQueryItem(QStringLiteral("description"), description); - -- QUrl url(QStringLiteral("https://api.imgur.com/3/image")); -+ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL"); -+ if (createImageURLPattern == NULL) -+ createImageURLPattern = "https://api.imgur.com/3/image"; -+ QUrl url(QString::fromUtf8(createImageURLPattern)); - url.setQuery(urlQuery); - QNetworkRequest request(url); - request.setHeader(QNetworkRequest::ContentTypeHeader, -- cgit v1.2.3 From 4ef26cd0f67d77dbb1a35b5b43ed2272c17e64b8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 21 Jun 2022 23:39:33 +0200 Subject: l krops: use nom for build --- lass/krops.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lass/krops.nix b/lass/krops.nix index ace37888..c8a5b94b 100644 --- a/lass/krops.nix +++ b/lass/krops.nix @@ -37,18 +37,22 @@ in { - deploy = { target ? "root@${name}/var/src" }: pkgs.krops.writeCommand "deploy" { + deploy = { target ? "root@${name}/var/src", offline ? false }: pkgs.krops.writeCommand "deploy" { command = targetPath: '' - set -fu + set -xfu outDir=$(mktemp -d) trap "rm -rf $outDir;" INT TERM EXIT - nix build \ + build=$(command -v nom-build || echo "nix-build") + + $build \ -I "${targetPath}" \ - -f '' config.system.build.toplevel \ - -o "$outDir/out" + '' -A config.system.build.toplevel \ + -o "$outDir/out" \ + ${lib.optionalString offline "--option substitute false"} \ + # -vvvvv --show-trace nix-env -p /nix/var/nix/profiles/system --set "$outDir/out" -- cgit v1.2.3 From b33003606363dfa6a6445f4d008774ce8602e76b Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 27 Jun 2022 08:32:59 +0200 Subject: nixpkgs: d108690 -> cd90e77 --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 3e20b2a8..c9e1cd5e 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "d1086907f56c5a6c33c0c2e8dc9f42ef6988294f", - "date": "2022-05-28T12:29:49+02:00", - "path": "/nix/store/56gsa390lyiik6jdapnj98a2ww8af8ig-nixpkgs", - "sha256": "009dc0njvdn5pzcyd8bp4sc9byf70w4msdkv6q2zfdlnh36im1jl", + "rev": "cd90e773eae83ba7733d2377b6cdf84d45558780", + "date": "2022-06-26T19:49:46+02:00", + "path": "/nix/store/bmaf6x4yxcsvs5wp4rayvai4lw7g6snr-nixpkgs", + "sha256": "1b2wn1ncx9x4651vfcgyqrm93pd7ghnrgqjbkf6ckkpidah69m03", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- cgit v1.2.3 From c776acea38436cef932dfb18d5ab8f92b43f5305 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 27 Jun 2022 08:34:04 +0200 Subject: nixpkgs-unstable: 5ce6597 -> f2537a5 --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index 49d65160..b5f64ae2 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "5ce6597eca7d7b518c03ecda57d45f9404b5e060", - "date": "2022-05-24T17:55:48+02:00", - "path": "/nix/store/glvcj0zmqq9z5wf6bppnppbpf8w85iwf-nixpkgs", - "sha256": "1hs1lnnbp1dky3nfp7xlricpp5c63sr46jyrnvykci8bl8jnxnl3", + "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5", + "date": "2022-06-26T12:26:21+02:00", + "path": "/nix/store/d7wgj3chybniji4l6z73a0gh67hxym3b-nixpkgs", + "sha256": "1z28a3gqbv62sxahlssc5a722kh46f26f5ss3arbxpv7a1272vf1", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- cgit v1.2.3 From 0dddf50167525ab40f3bd68109e28d2242975201 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 27 Jun 2022 10:39:48 +0200 Subject: fysiirc: escape, post raw json link --- lass/2configs/fysiirc.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lass/2configs/fysiirc.nix b/lass/2configs/fysiirc.nix index e12eda42..809298df 100644 --- a/lass/2configs/fysiirc.nix +++ b/lass/2configs/fysiirc.nix @@ -10,8 +10,7 @@ ${write_to_irc} "$(echo "$INPUT" | jq -r ' "\(.action): " + "[\(.issue.title // .pull_request.title)] " + - "\(.comment.html_url // .issue.html_url // .pull_request.html_url) " + - "by \(.comment.user.login // .issue.user.login // .pull_request.user.login)" + "\(.comment.html_url // .issue.html_url // .pull_request.html_url) " ')" fi ''; @@ -58,16 +57,16 @@ in { case "$Method $Request_URI" in "POST /") payload=$(head -c "$req_content_length") - echo "$payload" >&2 + raw=$(printf '%s' "$payload" | ${pkgs.curl}/bin/curl --data-binary @- http://p.krebsco.de | tail -1) payload2=$payload - payload2=$(echo "$payload" | tr '\n' ' ' | tr -d '\r') + payload2=$(printf '%s' "$payload" | tr '\n' ' ' | tr -d '\r') if [ "$payload" != "$payload2" ]; then echo "payload has been mangled" >&2 else echo "payload not mangled" >&2 fi - echo "$payload2" > /tmp/last_fysi_payload echo "$payload2" | ${format-github-message}/bin/format-github-message + ${write_to_irc} "$raw" printf 'HTTP/1.1 200 OK\r\n' printf 'Connection: close\r\n' printf '\r\n' -- cgit v1.2.3 From ecf4c704f1d0d00d6a8408968ab820fbc422213a Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 28 Jun 2022 09:50:47 +0200 Subject: cidr2glob: python -> python3 --- krebs/5pkgs/simple/cidr2glob.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/cidr2glob.nix b/krebs/5pkgs/simple/cidr2glob.nix index 9b0b3f86..47a75ea4 100644 --- a/krebs/5pkgs/simple/cidr2glob.nix +++ b/krebs/5pkgs/simple/cidr2glob.nix @@ -1,6 +1,7 @@ -{ python, writeScriptBin, ... }: +{ python3, writeScriptBin, ... }: let + python = python3; pythonEnv = python.withPackages (ps: [ ps.netaddr ]); in writeScriptBin "cidr2glob" '' @@ -25,6 +26,6 @@ in if __name__ == "__main__": for cidr in sys.stdin: for glob in cidr2glob(cidr): - print glob + print(glob) '' -- cgit v1.2.3 From a68f4b0c8677406618afcf16e83dfe20224c6941 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 28 Jun 2022 09:51:24 +0200 Subject: github-known-hosts: update list --- krebs/3modules/github-known-hosts.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/krebs/3modules/github-known-hosts.nix b/krebs/3modules/github-known-hosts.nix index 7bdf5bb7..eec719f2 100644 --- a/krebs/3modules/github-known-hosts.nix +++ b/krebs/3modules/github-known-hosts.nix @@ -57,6 +57,7 @@ "20.201.28.151" "20.205.243.166" "102.133.202.242" + "20.248.137.48" "18.181.13.223" "54.238.117.237" "54.168.17.15" @@ -70,6 +71,7 @@ "20.201.28.152" "20.205.243.160" "102.133.202.246" + "20.248.137.50" ]; publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="; }; -- cgit v1.2.3 From bce11dce189b4132d7a2f19f473590dea7508e85 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 28 Jun 2022 11:22:21 +0200 Subject: veroroute: init at 2.28 --- krebs/5pkgs/simple/veroroute.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 krebs/5pkgs/simple/veroroute.nix diff --git a/krebs/5pkgs/simple/veroroute.nix b/krebs/5pkgs/simple/veroroute.nix new file mode 100644 index 00000000..e40c98e7 --- /dev/null +++ b/krebs/5pkgs/simple/veroroute.nix @@ -0,0 +1,28 @@ +{ pkgs }: + +pkgs.stdenv.mkDerivation rec { + pname = "veroroute"; + version = "2.28"; + + src = pkgs.fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "04dig0g4v1rz50mjj1k6jk99rqbg24hdx8kzrlwv0dlxm567lvc7"; + }; + + buildInputs = [ + pkgs.qt5.qtbase + ]; + nativeBuildInputs = [ + pkgs.qt5.wrapQtAppsHook + ]; + + buildPhase = '' + qmake Src/veroroute.pro + make + ''; + + installPhase = '' + sed -i 's;/usr;;g' veroroute-install.sh + pkgdir=$out bash ./veroroute-install.sh + ''; +} -- cgit v1.2.3 From 64dbf31d70497d6a66f89fdd86ac1884e28f7bc8 Mon Sep 17 00:00:00 2001 From: Dhananjay Balan Date: Tue, 28 Jun 2022 22:16:08 +0200 Subject: external: Add v60.dbalan.in to hosts. --- krebs/3modules/default.nix | 1 + krebs/3modules/external/dbalan.nix | 50 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 krebs/3modules/external/dbalan.nix diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 2d73da88..8ea727dc 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -102,6 +102,7 @@ let imp = lib.mkMerge [ { krebs = import ./external { inherit config; }; } + { krebs = import ./external/dbalan.nix { inherit config; }; } { krebs = import ./external/kmein.nix { inherit config; }; } { krebs = import ./external/mic92.nix { inherit config; }; } { krebs = import ./external/palo.nix { inherit config; }; } diff --git a/krebs/3modules/external/dbalan.nix b/krebs/3modules/external/dbalan.nix new file mode 100644 index 00000000..301f010d --- /dev/null +++ b/krebs/3modules/external/dbalan.nix @@ -0,0 +1,50 @@ +with import ; +{ config, ... }: +let + hostDefaults = hostName: host: flip recursiveUpdate host ({ + ci = false; + external = true; + monitoring = false; + owner = config.krebs.users.dbalan; + } // optionalAttrs (host.nets?retiolum) { + nets.retiolum = { + ip6.addr = (krebs.genipv6 "retiolum" "external" { inherit hostName; }).address; + }; + } // optionalAttrs (host.nets?wiregrill) { + nets.wiregrill = { + ip6.addr = (krebs.genipv6 "wiregrill" "external" { inherit hostName; }).address; + }; + }); +in +{ + users = rec { + dbalan = { + mail = "dbalan@thaum.space"; + pubkey = "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIAiWF+U3VHNfp1IPU0/TWhMioxJvmoyG1AMZMvnQjy5QAAAABHNzaDo= dj@v60"; + }; + }; + hosts = mapAttrs hostDefaults { + v60 = { + nets.retiolum = { + aliases = [ "v60.dbalan.r" ]; + ip4.addr = "10.243.42.12"; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIICCgKCAgEAxVRxcCWfjLu9cNo5ELfXyuwhpJBSfod5f9JkclSpydVHaQBfeVC6 + RKfdknQVL6RXiCMFsSAvCvmnIohmpUCbiQWu29P/g0jzQZZ7zNx5L7JHy18x9qAr + 1scu7FRdVErVuWKXXNt0+j45dA+u5HE6RLsjAHGYtQbAr21VLyLF3qq11IWNrFYU + uqSnM/ZPbOPPHLS8XtsQRdJ2cOkccSCO4W6xBar92aPFuDImH60VuxMFEKYWY2bz + p6q0K0rtRqW1qANTV62SUDeA1wMPlSmvnMFY7qesSLk6tJjJ02HwwiOvK2ov1/Rm + bpwcrqrrbUxbCaZC6t7pBBxUOZlGfnO3woZQm63+4TEw/YDHhxD0HbhH88Wc+eHy + I73tuL1oc01JxL131bJV6jcHG7LrG7wTsTdDaZpjbH54adJP47QpTMb0ggsx2WkD + mpxFFSnTZL7ghZO5NGPvidTBp+wJiSOv5igAjA72CvjR3tOF4d5Lsq4JsQeCStjA + OPrIrN0AnJRg2IFDXZEGwTS9AbLWX147O9VrNimLzezOylH4Eihn7GUJ5KLIPjLy + AvsgIYljoJuhGbM8QoWlakwqOndMeoqhz52ORZ5CDgfybJJEbyrYF8gYFVNJOzds + 9gy/F+27TwfjMgcheN2+ogJp+lD754aCF0EJMwaK8ElzQLqAzbBRGAsCAwEAAQ== + -----END RSA PUBLIC KEY----- + ''; + tinc.pubkey_ed25519 = "dcPFpCG94cq1KHD4TH9WgOl9fpc1589YvWkmnkEZcSC"; + }; + }; + }; +} -- cgit v1.2.3 From 65a7b6bf03c6976060d897c78fcd391d6b689e2f Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:14:09 +0200 Subject: tv: pass-otp -> pass.withExtensions --- tv/1systems/xu/config.nix | 4 +++- tv/5pkgs/simple/fzmenu/default.nix | 47 +++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 05c5c11b..8a86e209 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -45,7 +45,9 @@ with import ; netcup nmap p7zip - pass-otp + (pkgs.pass.withExtensions (ext: [ + ext.pass-otp + ])) q qrencode texlive.combined.scheme-full diff --git a/tv/5pkgs/simple/fzmenu/default.nix b/tv/5pkgs/simple/fzmenu/default.nix index 1f1b8284..634d8338 100644 --- a/tv/5pkgs/simple/fzmenu/default.nix +++ b/tv/5pkgs/simple/fzmenu/default.nix @@ -1,37 +1,38 @@ -{ lib, stdenv -, runCommand -, coreutils, dash, gnused, fzf, pass-otp, rxvt_unicode, utillinux, xdotool -}: +{ lib, pkgs, stdenv }: -runCommand "fzmenu" { +pkgs.runCommand "fzmenu" { } /* sh */ '' mkdir $out cp -r ${./bin} $out/bin substituteInPlace $out/bin/otpmenu \ - --replace '#! /bin/sh' '#! ${dash}/bin/dash' \ + --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \ --replace '#PATH=' PATH=${lib.makeBinPath [ - coreutils - dash - fzf - gnused - pass-otp - rxvt_unicode - utillinux - xdotool + pkgs.coreutils + pkgs.dash + pkgs.fzf + pkgs.gnused + (pkgs.pass.withExtensions (ext: [ + ext.pass-otp + ])) + pkgs.rxvt_unicode + pkgs.utillinux + pkgs.xdotool ]} substituteInPlace $out/bin/passmenu \ - --replace '#! /bin/sh' '#! ${dash}/bin/dash' \ + --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \ --replace '#PATH=' PATH=${lib.makeBinPath [ - coreutils - dash - fzf - gnused - pass-otp - rxvt_unicode - utillinux - xdotool + pkgs.coreutils + pkgs.dash + pkgs.fzf + pkgs.gnused + (pkgs.pass.withExtensions (ext: [ + ext.pass-otp + ])) + pkgs.rxvt_unicode + pkgs.utillinux + pkgs.xdotool ]} '' -- cgit v1.2.3 From c378ef4a1d7173dd9a0841242bb553e07959279f Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:28:17 +0200 Subject: tv: manpages -> man-pages --- tv/1systems/mu/config.nix | 2 +- tv/2configs/man.nix | 8 ++++---- tv/2configs/xserver/default.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 7c3f8cfd..00b17796 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -97,7 +97,7 @@ with import ; ]; fonts.fonts = [ - pkgs.xlibs.fontschumachermisc + pkgs.xorg.fontschumachermisc ]; services.xserver.enable = true; diff --git a/tv/2configs/man.nix b/tv/2configs/man.nix index 0a72dce2..c723138f 100644 --- a/tv/2configs/man.nix +++ b/tv/2configs/man.nix @@ -5,9 +5,9 @@ # s:^NROFF\t.*:& -Wbreak: # ' #''; - environment.systemPackages = with pkgs; [ - manpages - posix_man_pages - xorg.xorgdocs + environment.systemPackages = [ + pkgs.man-pages + pkgs.posix_man_pages + pkgs.xorg.xorgdocs ]; } diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index be155af5..5019d800 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -38,7 +38,7 @@ in { ]; fonts.fonts = [ - pkgs.xlibs.fontschumachermisc + pkgs.xorg.fontschumachermisc ]; services.xserver = { -- cgit v1.2.3 From 5374e8447da3191f3bbeca0007d1442578c77dac Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:30:58 +0200 Subject: tv: iana_etc -> iana-etc --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 8add07ff..62566c38 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -46,7 +46,7 @@ with import ; { # TODO check if both are required: - nix.sandboxPaths = [ "/etc/protocols" pkgs.iana_etc.outPath ]; + nix.sandboxPaths = [ "/etc/protocols" pkgs.iana-etc.outPath ]; nix.requireSignedBinaryCaches = true; -- cgit v1.2.3 From dd7ef4034f228ebab4a05d7b622a0c231af13ada Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:32:22 +0200 Subject: krebs: iana_etc -> iana-etc --- krebs/3modules/iana-etc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/iana-etc.nix b/krebs/3modules/iana-etc.nix index e8037128..9ed5f29c 100644 --- a/krebs/3modules/iana-etc.nix +++ b/krebs/3modules/iana-etc.nix @@ -34,7 +34,7 @@ with import ; '') (filter (proto: entry.${proto} != null) ["tcp" "udp"])} '') (attrValues config.krebs.iana-etc.services)} - cat ${pkgs.iana_etc}/etc/services + cat ${pkgs.iana-etc}/etc/services } | sort -b -k 2,2 -u > $out ''); -- cgit v1.2.3 From d389189efd7efe36df6a285efdc6a9caea29b1fe Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 20:12:06 +0200 Subject: tv: firefoxWrapper -> firefox --- tv/1systems/alnus/config.nix | 6 +++--- tv/1systems/mu/config.nix | 34 +++++++++++++++++----------------- tv/1systems/querel/config.nix | 20 ++++++++++---------- tv/5pkgs/simple/ff.nix | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index 54f845ec..c09e7f9b 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -15,9 +15,9 @@ with import ; }; }; - environment.systemPackages = with pkgs; [ - firefoxWrapper - networkmanagerapplet + environment.systemPackages = [ + pkgs.firefox + pkgs.networkmanagerapplet (pkgs.pidgin-with-plugins.override { plugins = [ pkgs.pidginotr ]; }) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 00b17796..21be2576 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -56,26 +56,26 @@ with import ; ${pkgs.kmod}/bin/modprobe -v iwlwifi ''; - environment.systemPackages = with pkgs; [ - chromium - firefoxWrapper - gimp - iptables - libreoffice - plasma-pa + environment.systemPackages = [ + pkgs.chromium + pkgs.firefox + pkgs.gimp + pkgs.iptables + pkgs.libreoffice + pkgs.plasma-pa (pkgs.pidgin-with-plugins.override { plugins = [ pkgs.pidginotr ]; }) - skype - slock - tinc_pre - vim - xsane - - #foomatic_filters - #gutenprint - #cups_pdf_filter - #ghostscript + pkgs.skypeforlinux + pkgs.slock + pkgs.tinc_pre + pkgs.vim + pkgs.xsane + + #pkgs.foomatic_filters + #pkgs.gutenprint + #pkgs.cups_pdf_filter + #pkgs.ghostscript ]; diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index 41253cfb..ad82915f 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -21,19 +21,19 @@ with import ; systemd-boot.enable = true; }; - environment.systemPackages = with pkgs; [ - firefoxWrapper - gimp - kate - libreoffice + environment.systemPackages = [ + pkgs.firefox + pkgs.gimp + pkgs.kate + pkgs.libreoffice (pkgs.pidgin-with-plugins.override { plugins = [ pkgs.pidginotr ]; }) - sxiv - texlive.combined.scheme-full - vim - xsane - zathura + pkgs.sxiv + pkgs.texlive.combined.scheme-full + pkgs.vim + pkgs.xsane + pkgs.zathura ]; fileSystems = { diff --git a/tv/5pkgs/simple/ff.nix b/tv/5pkgs/simple/ff.nix index ec20c4a2..4ce9c3c7 100644 --- a/tv/5pkgs/simple/ff.nix +++ b/tv/5pkgs/simple/ff.nix @@ -1,5 +1,5 @@ { pkgs }: pkgs.writeDashBin "ff" '' - exec ${pkgs.firefoxWrapper}/bin/firefox "$@" + exec ${pkgs.firefox}/bin/firefox "$@" '' -- cgit v1.2.3 From f5eefc5cadd503b4dff96e184f53d202e026c16c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 20:13:11 +0200 Subject: tv: pulseaudioLight -> pulseaudio --- tv/2configs/pulse.nix | 2 +- tv/2configs/xserver/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix index f720ad47..513a0eb1 100644 --- a/tv/2configs/pulse.nix +++ b/tv/2configs/pulse.nix @@ -2,7 +2,7 @@ with import ; let - pkg = pkgs.pulseaudioLight; + pkg = pkgs.pulseaudio; runDir = "/run/pulse"; pkgs_i686 = pkgs.pkgsi686Linux; diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 5019d800..8bedb0e8 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -128,7 +128,7 @@ in { config.imgur.xdg-open.browser = "/etc/profiles/per-user/tv/bin/cr"; config.timeout = 200; }) - pkgs.pulseaudioLight.out + pkgs.pulseaudio.out pkgs.rxvt_unicode pkgs.xcalib "/run/wrappers" # for su -- cgit v1.2.3 From 88a2a5fc9d6003722203e234096e1306bc9b01e6 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 19 Jun 2022 12:34:14 +0200 Subject: tv xmonad: add 22.05 compatibility --- tv/5pkgs/haskell/xmonad-tv/src/main.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs index cf0c0f53..81373f41 100644 --- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs +++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs @@ -7,7 +7,7 @@ module Main (main) where import System.Exit (exitFailure) import Control.Exception -import Control.Monad.Extra (ifM, whenJustM) +import Control.Monad.Extra (whenJustM) import qualified Data.List import Graphics.X11.ExtraTypes.XF86 import Text.Read (readEither) @@ -68,7 +68,9 @@ mainNoArgs :: IO () mainNoArgs = do workspaces0 <- getWorkspaces0 handleShutdownEvent <- newShutdownEventHandler - launch + let + config = + id $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ") $ def { terminal = {-pkg:rxvt_unicode-}"urxvtc" @@ -100,6 +102,8 @@ mainNoArgs = do , focusedBorderColor = "#f000b0" , handleEventHook = handleShutdownEvent } + directories <- getDirectories + launch config directories getWorkspaces0 :: IO [String] -- cgit v1.2.3 From 9f7875c1db21355608d7ee46d3a1d08e38c72cbf Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 21 Jun 2022 21:25:33 +0200 Subject: tv networkd: disable systemd-networkd-wait-online --- tv/2configs/default.nix | 1 + tv/2configs/networkd.nix | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 tv/2configs/networkd.nix diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 62566c38..f3ce2da4 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -15,6 +15,7 @@ with import ; ./bash ./htop.nix ./nets/hkw.nix + ./networkd.nix ./nginx ./pki ./ssh.nix diff --git a/tv/2configs/networkd.nix b/tv/2configs/networkd.nix new file mode 100644 index 00000000..da0d9ce4 --- /dev/null +++ b/tv/2configs/networkd.nix @@ -0,0 +1,4 @@ +{ + # often hangs + systemd.services.systemd-networkd-wait-online.enable = false; +} -- cgit v1.2.3 From a501cefc19cac105921612f9544f6d0cd137d9b7 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Jul 2022 15:38:17 +0200 Subject: tv pkgs pushBack: fix typo --- tv/5pkgs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 2b9bdeeb..4f6643c7 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -4,7 +4,7 @@ let if elem x xs then remove x xs ++ [ x ] else - names; + xs; in self: super: -- cgit v1.2.3 From 9170f1618efed14db081d1d3c3daa14bf3aabd8f Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Jul 2022 15:41:59 +0200 Subject: tv dhcpcd: RIP --- tv/5pkgs/override/dhcpcd.nix | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 tv/5pkgs/override/dhcpcd.nix diff --git a/tv/5pkgs/override/dhcpcd.nix b/tv/5pkgs/override/dhcpcd.nix deleted file mode 100644 index 202b8e5d..00000000 --- a/tv/5pkgs/override/dhcpcd.nix +++ /dev/null @@ -1,7 +0,0 @@ -self: super: - -self.lib.overrideDerivation super.dhcpcd (old: { - configureFlags = old.configureFlags ++ [ - "--dbdir=/var/lib/dhcpcd" - ]; -}) -- cgit v1.2.3 From 1d5f010bf8878fab02619161e3a41c96e116a475 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 19 Jul 2022 20:34:59 +0200 Subject: nixpkgs: cd90e77 -> e732e1f --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index c9e1cd5e..799399ea 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "cd90e773eae83ba7733d2377b6cdf84d45558780", - "date": "2022-06-26T19:49:46+02:00", - "path": "/nix/store/bmaf6x4yxcsvs5wp4rayvai4lw7g6snr-nixpkgs", - "sha256": "1b2wn1ncx9x4651vfcgyqrm93pd7ghnrgqjbkf6ckkpidah69m03", + "rev": "e732e1fdbf79bec59f7ade4a3675b091b4a9f6d6", + "date": "2022-07-19T15:32:15+02:00", + "path": "/nix/store/4dcxnk4xplx79xrwxg2m6pqh8b5k6ya0-nixpkgs", + "sha256": "1j73j17g852zfc75b7ll4avp30pnyvm37pgm66cz844phkv5ywfg", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- cgit v1.2.3 From 9ca99b86a535afda9810cfe9148b19f019dfda8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Wed, 20 Jul 2022 11:08:14 +0200 Subject: reaktor2: bier ledger nicer nicknames --- krebs/2configs/reaktor2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index 74c21fd2..2ed0b08f 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -71,7 +71,7 @@ let ${pkgs.hledger}/bin/hledger -f $state_file bal -N -O csv \ | ${pkgs.coreutils}/bin/tail +2 \ | ${pkgs.miller}/bin/mlr --icsv --opprint cat \ - | ${pkgs.gnused}/bin/sed 's/^/the_/' + | ${pkgs.gnused}/bin/sed 's/^\(.\)/\1‍/' ''; }; } -- cgit v1.2.3 From 3853645a5e3891802d6b3d5bb015e85aaf4e5bfe Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 20 Jul 2022 15:46:58 +0200 Subject: nixpkgs-unstable: f2537a5 -> e4d49de --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index b5f64ae2..9c50f970 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5", - "date": "2022-06-26T12:26:21+02:00", - "path": "/nix/store/d7wgj3chybniji4l6z73a0gh67hxym3b-nixpkgs", - "sha256": "1z28a3gqbv62sxahlssc5a722kh46f26f5ss3arbxpv7a1272vf1", + "rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", + "date": "2022-07-18T18:21:45+02:00", + "path": "/nix/store/665hb1ysmaadwh4axp7f9inhczq08xay-nixpkgs", + "sha256": "0y0c9ybkcfmjgrl93wzzlk7ii95kh2fb4v5ac5w6rmcsq2ff3yaz", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, -- cgit v1.2.3 From c24030bdc0ea5e01431303e577323b09bb3dd311 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 26 Jul 2022 20:46:01 +0200 Subject: reaktor2: 0.4.0a -> 0.4.2 --- krebs/5pkgs/haskell/reaktor2/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/krebs/5pkgs/haskell/reaktor2/default.nix b/krebs/5pkgs/haskell/reaktor2/default.nix index 9ff2bd88..7f89c0b1 100644 --- a/krebs/5pkgs/haskell/reaktor2/default.nix +++ b/krebs/5pkgs/haskell/reaktor2/default.nix @@ -1,18 +1,18 @@ { mkDerivation, aeson, async, attoparsec, base, blessings -, bytestring, containers, data-default, fetchgit, filepath -, hashable, lens, lens-aeson, network, network-simple -, network-simple-tls, network-uri, pcre-light, process, random -, servant-server, lib, string-conversions, stringsearch, text -, time, transformers, unagi-chan, unix, unordered-containers -, vector, wai, warp +, bytestring, containers, data-default, filepath, hashable, lens +, lens-aeson, lib, network, network-simple, network-simple-tls +, network-uri, pcre-light, process, random, servant-server +, string-conversions, stringsearch, text, time, transformers +, unagi-chan, unix, unordered-containers, vector, wai, warp +, fetchgit }: -mkDerivation rec { +mkDerivation { pname = "reaktor2"; - version = "0.4.0a"; + version = "0.4.2"; src = fetchgit { - url = "https://cgit.lassul.us/reaktor2"; - sha256 = "sha256-x1i2TWcycYVFij6832xaBiQa1RQ1VmSfu5Qt1QrUtds="; - rev = "6d3eb6de5e770ee26874bb7449934f0c55bd1efa"; + url = "https://cgit.krebsco.de/reaktor2"; + hash = "sha256-JPQyy0hDSH5JqQGjwoO5BNsD4qk+GKP1VH+j4/2cqes"; + rev = "53a11f421fb18e8687fa06e5511cea8bd9defc36"; fetchSubmodules = true; }; isLibrary = false; -- cgit v1.2.3 From 3e138aabba75e578916040234703ac5541060026 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 26 Jul 2022 21:08:28 +0200 Subject: krops: 1.26.3 -> 1.27.0 --- submodules/krops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/krops b/submodules/krops index 89e5e676..3aa04be9 160000 --- a/submodules/krops +++ b/submodules/krops @@ -1 +1 @@ -Subproject commit 89e5e67659bbbf0da53cc2cc5dea644b9a2301f6 +Subproject commit 3aa04be96f19cc5f4866b2b36a351f88f6667bd2 -- cgit v1.2.3 From b501b81041ab80fe8c4dedfc603ee09bf0428ae5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 2 Aug 2022 13:19:32 +0200 Subject: l 5: get rid of --- lass/5pkgs/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index e4208f1c..f090932e 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -1,24 +1,24 @@ -with import ; self: super: let + lib = super.lib; # This callPackage will try to detect obsolete overrides. callPackage = path: args: let override = super.callPackage path args; - upstream = optionalAttrs (override ? "name") - (super.${(parseDrvName override.name).name} or {}); + upstream = lib.optionalAttrs (override ? "name") + (super.${(builtins.parseDrvName override.name).name} or {}); in if upstream ? "name" && override ? "name" && - compareVersions upstream.name override.name != -1 + lib.compareVersions upstream.name override.name != -1 then - trace + builtins.trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." override else override; subdirsOf = path: - mapAttrs (name: _: path + "/${name}") - (filterAttrs (_: eq "directory") (readDir path)); + lib.mapAttrs (name: _: path + "/${name}") + (lib.filterAttrs (_: x: x == "directory") (builtins.readDir path)); -in mapAttrs (_: flip callPackage {}) - (filterAttrs (_: dir: pathExists (dir + "/default.nix")) +in lib.mapAttrs (_: lib.flip callPackage {}) + (lib.filterAttrs (_: dir: lib.pathExists (dir + "/default.nix")) (subdirsOf ./.)) -- cgit v1.2.3 From 1c0078af9685997e5adcbc765148e2efd956803c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 2 Aug 2022 13:33:55 +0200 Subject: tv: -> ../..{,/..}/lib --- tv/5pkgs/default.nix | 2 +- tv/5pkgs/override/default.nix | 2 +- tv/5pkgs/simple/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 4f6643c7..5a018a16 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -1,4 +1,4 @@ -with import ; +with import ../../lib; let pushBack = x: xs: if elem x xs then diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix index 4cc4749d..f719a9f6 100644 --- a/tv/5pkgs/override/default.nix +++ b/tv/5pkgs/override/default.nix @@ -1,4 +1,4 @@ -with import ; +with import ../../../lib; self: super: mapNixDir (path: import path self super) ./. diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix index 6ba4fec8..9fb45dd1 100644 --- a/tv/5pkgs/simple/default.nix +++ b/tv/5pkgs/simple/default.nix @@ -1,4 +1,4 @@ -with import ; +with import ../../../lib; self: super: -- cgit v1.2.3 From 20ff460cb3626e4dce81c9a4aa8ae2fb4b61d869 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 2 Aug 2022 13:43:30 +0200 Subject: tv: pidgin-with-plugins -> pidgin --- tv/1systems/alnus/config.nix | 4 ++-- tv/1systems/mu/config.nix | 4 ++-- tv/1systems/querel/config.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index c09e7f9b..bddd69ef 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -18,8 +18,8 @@ with import ; environment.systemPackages = [ pkgs.firefox pkgs.networkmanagerapplet - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) ]; diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 21be2576..00bd5da1 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -63,8 +63,8 @@ with import ; pkgs.iptables pkgs.libreoffice pkgs.plasma-pa - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) pkgs.skypeforlinux pkgs.slock diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index ad82915f..44c7685e 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -26,8 +26,8 @@ with import ; pkgs.gimp pkgs.kate pkgs.libreoffice - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) pkgs.sxiv pkgs.texlive.combined.scheme-full -- cgit v1.2.3 From b3694198eaac7ffd13640c64bc3e3af27e40389b Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 2 Aug 2022 13:56:14 +0200 Subject: l 5: compareVersions is builtin --- lass/5pkgs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index f090932e..6fa93e14 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -8,7 +8,7 @@ self: super: let (super.${(builtins.parseDrvName override.name).name} or {}); in if upstream ? "name" && override ? "name" && - lib.compareVersions upstream.name override.name != -1 + builtins.compareVersions upstream.name override.name != -1 then builtins.trace "Upstream `${upstream.name}' gets overridden by `${override.name}'." -- cgit v1.2.3