From 948343e45996a2d6d107012de83bc54ba2e3e348 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 19 Dec 2022 14:15:40 +0100 Subject: tv alacritty: don't expect $HOME/ref to exists --- tv/5pkgs/simple/alacritty-tv.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tv/5pkgs/simple/alacritty-tv.nix b/tv/5pkgs/simple/alacritty-tv.nix index 466ff27..d80c46c 100644 --- a/tv/5pkgs/simple/alacritty-tv.nix +++ b/tv/5pkgs/simple/alacritty-tv.nix @@ -70,8 +70,7 @@ pkgs.symlinkJoin { # Install stored configuration if it has changed. # This allows for both declarative updates and runtime modifications. ${pkgs.coreutils}/bin/mkdir -p "$HOME" - ref=$(${pkgs.coreutils}/bin/cat "$HOME"/ref) - if test "$ref" != ${config-file}; then + if test "$(${pkgs.coreutils}/bin/cat "$HOME"/ref)" != ${config-file}; then echo ${config-file} > "$HOME"/ref ${pkgs.coreutils}/bin/cp ${config-file} "$HOME"/.alacritty.yml fi -- cgit v1.2.3 From 19701a1ed870ea1846fdb931b2a52f8b6f0ea24c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 20 Dec 2022 19:07:51 +0100 Subject: lib: add on --- lib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/default.nix b/lib/default.nix index 149b97a..1a57df2 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -39,6 +39,8 @@ let ne = x: y: x != y; mod = x: y: x - y * (x / y); + on = b: u: x: y: b (u x) (u y); + genid = lib.genid_uint32; # TODO remove genid_uint31 = x: ((lib.genid_uint32 x) + 16777216) / 2; genid_uint32 = import ./genid.nix { inherit lib; }; -- cgit v1.2.3 From 6c4e84fe87aace5daf6915f26ea930a99b149555 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 20 Dec 2022 19:08:42 +0100 Subject: lib: add uniq and uniqBy --- lib/default.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/default.nix b/lib/default.nix index 1a57df2..280f042 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -187,6 +187,30 @@ let in filter (x: x != []) ([acc.chunk] ++ acc.chunks); + # Filter adjacent duplicate elements. + uniq = uniqBy eq; + + # Filter adjacent duplicate elements determined via the given function. + uniqBy = cmp: let + f = a: s: + if length s == 0 then + [] + else let + b = head s; + in + if cmp a b then + f b (tail s) + else + [b] ++ f b (tail s); + in + s: + if length s == 0 then + [] + else let + b = head s; + in + [b] ++ f b (tail s); + warnOldVersion = oldName: newName: if compareVersions oldName newName != -1 then trace "Upstream `${oldName}' gets overridden by `${newName}'." newName -- cgit v1.2.3 From 0d661dd94a6215d49397aabbaeaedab06a1fb66e Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 20 Dec 2022 20:00:01 +0100 Subject: lib.haskell.substitutePkg: sort and dedup deps --- lib/haskell.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/haskell.nix b/lib/haskell.nix index 4f0ee05..f87cfa7 100644 --- a/lib/haskell.nix +++ b/lib/haskell.nix @@ -39,7 +39,12 @@ rec { in if parse == null then (pkgs.writeText name s).overrideAttrs (old: { - dependencies = old.dependencies or [] ++ dependencies; + dependencies = + lib.uniq + (lib.sort (lib.on lib.lessThan (lib.getAttr "name")) + (filter + (lib.ne null) + (old.dependencies or [] ++ dependencies))); }) else -- cgit v1.2.3 From 6b4abfdf4ae8858f2c58acc5d52da7a4a35e5905 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Dec 2022 12:20:42 +0100 Subject: types host: remove cores --- lib/types.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 67a0c6f..9f278c6 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -18,9 +18,6 @@ rec { type = label; default = config._module.args.name; }; - cores = mkOption { - type = uint; - }; nets = mkOption { type = attrsOf net; default = {}; -- cgit v1.2.3 From 7d9eab0ae6efc35eee892e55cb81472357c5ebcb Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 29 Dec 2022 13:44:45 +0100 Subject: krebs.systemd.restartIfCredentialsChange: default = false --- tv/3modules/ejabberd/default.nix | 2 +- tv/3modules/x0vncserver.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix index e3a41a5..71a1a59 100644 --- a/tv/3modules/ejabberd/default.nix +++ b/tv/3modules/ejabberd/default.nix @@ -127,7 +127,7 @@ in { }) ]; - krebs.systemd.services.ejabberd = {}; + krebs.systemd.services.ejabberd.restartIfCredentialsChange = true; systemd.services.ejabberd = { wantedBy = [ "multi-user.target" ]; diff --git a/tv/3modules/x0vncserver.nix b/tv/3modules/x0vncserver.nix index f19bfeb..eb9b1ae 100644 --- a/tv/3modules/x0vncserver.nix +++ b/tv/3modules/x0vncserver.nix @@ -26,7 +26,7 @@ in { }; }; config = mkIf cfg.enable { - krebs.systemd.services.x0vncserver = {}; + krebs.systemd.services.x0vncserver.restartIfCredentialsChange = true; systemd.services.x0vncserver = { after = [ "graphical.target" ]; requires = [ "graphical.target" ]; -- cgit v1.2.3 From 78e2a32680d572b38d3df2d00170e5234c6e88f1 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 30 Dec 2022 17:38:23 +0100 Subject: tv autotether: init --- tv/2configs/autotether.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tv/2configs/autotether.nix diff --git a/tv/2configs/autotether.nix b/tv/2configs/autotether.nix new file mode 100644 index 0000000..43b5575 --- /dev/null +++ b/tv/2configs/autotether.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: let + cfg.serial = "17e064850405"; +in { + systemd.services.usb_tether.serviceConfig = { + SyslogIdentifier = "usb_tether"; + ExecStartPre = "${pkgs.android-tools}/bin/adb -s ${cfg.serial} wait-for-device"; + ExecStart = "${pkgs.android-tools}/bin/adb -s ${cfg.serial} shell svc usb setFunctions rndis"; + }; + services.udev.extraRules = /* sh */ '' + ACTION=="add", SUBSYSTEM=="net", KERNEL=="usb*", NAME="android" + + ACTION=="add", SUBSYSTEM=="usb", ATTR{serial}=="${cfg.serial}", \ + TAG+="systemd", ENV{SYSTEMD_WANTS}="usb_tether.service" + ''; + systemd.network.networks.android = { + matchConfig.Name = "android"; + DHCP = "yes"; + }; +} -- cgit v1.2.3 From 7d1347ef3dfa23df32168f8107e3523f6fe7835f Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 30 Dec 2022 17:51:23 +0100 Subject: lib.types.net.ip*: add prefixLength --- lib/types.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index 9f278c6..32b4541 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -146,6 +146,14 @@ rec { }.${config._module.args.name} or { default = "${ip4.config.addr}/32"; }); + prefixLength = mkOption ({ + type = uint; + } // { + retiolum.default = 16; + wiregrill.default = 16; + }.${config._module.args.name} or { + default = 32; + }); }; })); default = null; @@ -165,6 +173,14 @@ rec { }.${config._module.args.name} or { default = "${ip6.config.addr}/128"; }); + prefixLength = mkOption ({ + type = uint; + } // { + retiolum.default = 32; + wiregrill.default = 32; + }.${config._module.args.name} or { + default = 128; + }); }; })); default = null; -- cgit v1.2.3 From 01a49bf237d2777111eb5dd1f6210a26792f062b Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 30 Dec 2022 20:13:59 +0100 Subject: tv retiolum: use networkd --- tv/2configs/retiolum.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix index de77de3..1b176e0 100644 --- a/tv/2configs/retiolum.nix +++ b/tv/2configs/retiolum.nix @@ -11,6 +11,16 @@ with import ./lib; LocalDiscovery = yes ''; tincPackage = pkgs.tinc_pre; + tincUp = lib.mkIf config.systemd.network.enable ""; + }; + systemd.network.networks.retiolum = { + matchConfig.Name = "retiolum"; + address = let + inherit (config.krebs.build.host.nets.retiolum) ip4 ip6; + in [ + "${ip4.addr}/${toString ip4.prefixLength}" + "${ip6.addr}/${toString ip6.prefixLength}" + ]; }; tv.iptables.input-internet-accept-tcp = singleton "tinc"; tv.iptables.input-internet-accept-udp = singleton "tinc"; -- cgit v1.2.3 From 206a5d145418c3484100b0598a9593a950fbfc98 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 30 Dec 2022 17:40:00 +0100 Subject: tv xu: use autotether --- tv/1systems/xu/config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 6ca62ac..b83d01f 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -4,6 +4,7 @@ with import ./lib; imports = [ + ../../2configs/autotether.nix -- cgit v1.2.3