summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/gum/config.nix6
-rw-r--r--makefu/1systems/omo/config.nix1
-rw-r--r--makefu/1systems/sdev/config.nix9
-rw-r--r--makefu/2configs/bureautomation/default.nix26
-rw-r--r--makefu/2configs/bureautomation/deps/dwd_pollen.nix32
-rw-r--r--makefu/2configs/bureautomation/kalauerbot.nix3
-rw-r--r--makefu/2configs/hw/droidcam.nix7
-rw-r--r--makefu/2configs/hw/tp-x2x0.nix2
-rw-r--r--makefu/2configs/minimal.nix1
-rw-r--r--makefu/2configs/printer.nix16
-rw-r--r--makefu/2configs/remote-build/gum.nix8
-rw-r--r--makefu/2configs/share/omo.nix3
-rw-r--r--makefu/2configs/urlwatch/default.nix3
-rw-r--r--makefu/2configs/wireguard/server.nix6
-rw-r--r--makefu/5pkgs/droidcam/default.nix55
-rw-r--r--makefu/5pkgs/kalauerbot/badsync.patch14
-rw-r--r--makefu/5pkgs/kalauerbot/default.nix7
-rw-r--r--makefu/5pkgs/navi/default.nix37
-rw-r--r--makefu/5pkgs/v4l2loopback-dc/default.nix36
-rw-r--r--makefu/krops.nix2
20 files changed, 166 insertions, 108 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index d0ba1a3c6..f65c6672b 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -82,8 +82,12 @@ in {
# ci
# <stockholm/makefu/2configs/exim-retiolum.nix>
<stockholm/makefu/2configs/git/cgit-retiolum.nix>
+
+ ###### Shack #####
# <stockholm/makefu/2configs/shack/events-publisher>
- <stockholm/makefu/2configs/shack/gitlab-runner>
+ # <stockholm/makefu/2configs/shack/gitlab-runner>
+
+
<stockholm/makefu/2configs/remote-build/slave.nix>
<stockholm/makefu/2configs/remote-build/aarch64-community.nix>
<stockholm/makefu/2configs/taskd.nix>
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index dd89b4057..cbe97e28a 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -47,6 +47,7 @@ in {
# <stockholm/makefu/2configs/legacy_only.nix>
<stockholm/makefu/2configs/share/omo.nix>
+ <stockholm/makefu/2configs/share/gum-client.nix>
<stockholm/makefu/2configs/dcpp/airdcpp.nix>
{ krebs.airdcpp.dcpp.shares = let
d = path: "/media/cryptX/${path}";
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index e3c59e181..d02c30342 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -37,10 +37,11 @@
passwdqc-utils
gnupg
populate
- (pkgs.writeScriptBin "tor-browser" ''
- #! /bin/sh
- TOR_SKIP_LAUNCH=1 ${torbrowser}/bin/tor-browser
- '')
+ # 20.09: torbrowser is broken
+ #(pkgs.writeScriptBin "tor-browser" ''
+ # #! /bin/sh
+ # TOR_SKIP_LAUNCH=1 ${torbrowser}/bin/tor-browser
+ #'')
];
networking.firewall.allowedTCPPorts = [
diff --git a/makefu/2configs/bureautomation/default.nix b/makefu/2configs/bureautomation/default.nix
index 9b33595f4..cd598f0aa 100644
--- a/makefu/2configs/bureautomation/default.nix
+++ b/makefu/2configs/bureautomation/default.nix
@@ -15,30 +15,8 @@ in {
];
networking.firewall.allowedTCPPorts = [ 8123 ];
state = [ "/var/lib/hass/known_devices.yaml" ];
- services.home-assistant = let
- dwd_pollen = pkgs.fetchFromGitHub {
- owner = "marcschumacher";
- repo = "dwd_pollen";
- rev = "0.1";
- sha256 = "1af2mx99gv2hk1ad53g21fwkdfdbymqcdl3jvzd1yg7dgxlkhbj1";
- };
- in {
+ services.home-assistant = {
enable = true;
- package = (pkgs.home-assistant.overrideAttrs (old: {
- # TODO: find correct python package
- installCheckPhase = ''
- echo LOLLLLLLLLLLLLLL
- '';
- postInstall = ''
- cp -r ${dwd_pollen} $out/lib/python3.7/site-packages/homeassistant/components/dwd_pollen
- '';
- })).override {
- extraPackages = ps: with ps; [
- pkgs.picotts
- python-forecastio jsonrpc-async jsonrpc-websocket mpd2
- (callPackage ./deps/openwrt-luci-rpc.nix { })
- ];
- };
autoExtraComponents = true;
config = {
config = {};
@@ -139,7 +117,7 @@ in {
sensor = []
++ [{ platform = "version"; }] # pyhaversion
- ++ (import ./sensor/pollen.nix)
+ # ++ (import ./sensor/pollen.nix)
++ (import ./sensor/espeasy.nix)
++ (import ./sensor/airquality.nix)
++ ((import ./sensor/outside.nix) {inherit lib;})
diff --git a/makefu/2configs/bureautomation/deps/dwd_pollen.nix b/makefu/2configs/bureautomation/deps/dwd_pollen.nix
deleted file mode 100644
index 39d9c3069..000000000
--- a/makefu/2configs/bureautomation/deps/dwd_pollen.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, python
-, voluptuous
-}:
-
-buildPythonPackage rec {
- format = "other";
- pname = "dwd_pollen";
- version = "0.1";
-
- src = fetchFromGitHub {
- owner = "marcschumacher";
- repo = "dwd_pollen";
- rev = version;
- sha256 = "1af2mx99gv2hk1ad53g21fwkdfdbymqcdl3jvzd1yg7dgxlkhbj1";
- };
- propagatedBuildInputs = [
- voluptuous
- ];
- installPhase = ''
- install -D -t $out/${python.sitePackages}/homeassistant/components/sensor/dwd_pollen *
- '';
-
- meta = with lib; {
- description = "Home Assistant component to retrieve Pollen data from DWD (Germany)";
- homepage = https://github.com/marcschumacher/dwd_pollen;
- license = licenses.mit;
- maintainers = [ maintainers.makefu ];
- };
-}
diff --git a/makefu/2configs/bureautomation/kalauerbot.nix b/makefu/2configs/bureautomation/kalauerbot.nix
index d61b8885e..ff045e2f3 100644
--- a/makefu/2configs/bureautomation/kalauerbot.nix
+++ b/makefu/2configs/bureautomation/kalauerbot.nix
@@ -12,6 +12,9 @@
WorkingDirectory = "/var/lib/kalauerbot";
ExecStart = "${pkgs.kalauerbot}/bin/kalauerbot";
PrivateTmp = true;
+
+ Restart = "always";
+ RuntimeMaxSec = "12h";
};
};
}
diff --git a/makefu/2configs/hw/droidcam.nix b/makefu/2configs/hw/droidcam.nix
new file mode 100644
index 000000000..c638123bb
--- /dev/null
+++ b/makefu/2configs/hw/droidcam.nix
@@ -0,0 +1,7 @@
+{ pkgs, config, ... }:
+{
+ boot.extraModprobeConfig = "options v4l2loopback_dc width=640 height=480";
+ boot.extraModulePackages = [
+ (pkgs.callPackage ../../5pkgs/v4l2loopback-dc { kernel = config.boot.kernelPackages.kernel; })
+ ];
+}
diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix
index f4578bf77..b997a9eec 100644
--- a/makefu/2configs/hw/tp-x2x0.nix
+++ b/makefu/2configs/hw/tp-x2x0.nix
@@ -54,6 +54,6 @@
powerManagement.resumeCommands = ''
- ${pkgs.rfkill}/bin/rfkill unblock all
+ ${pkgs.utillinux}/bin/rfkill unblock all
'';
}
diff --git a/makefu/2configs/minimal.nix b/makefu/2configs/minimal.nix
index 78a9dcfa6..445e6c577 100644
--- a/makefu/2configs/minimal.nix
+++ b/makefu/2configs/minimal.nix
@@ -82,5 +82,4 @@
"net.ipv6.conf.default.use_tempaddr" = 2;
};
- services.nscd.enable = false;
}
diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix
index d297483b2..6fd1c1858 100644
--- a/makefu/2configs/printer.nix
+++ b/makefu/2configs/printer.nix
@@ -21,16 +21,20 @@ in {
hardware.sane = {
enable = true;
extraBackends = [ ];
+ netConf =
+ # drucker.lan SCX-3205W
+ ''
+ 192.168.1.6''
+ # uhrenkind.shack magicolor 1690mf
+ + ''
+ 10.42.20.30'';
# $ scanimage -p --format=jpg --mode=Gray --source="Automatic Document Feeder" -v --batch="lol%d.jpg" --resolution=150
# requires 'sane-extra', scan via:
- #extraConfig."magicolor" = ''
- # net 10.42.20.30 0x2098
- #''; # 10.42.20.30: uhrenkind.shack magicolor 1690mf
- extraConfig."xerox_mfp" = ''
- tcp 192.168.1.5
- ''; #home printer SCX-3205W
+ extraConfig."magicolor" = ''
+ net 10.42.20.30 0x2098
+ ''; # 10.42.20.30: uhrenkind.shack magicolor 1690mf
};
state = [ "/var/lib/cups" ];
}
diff --git a/makefu/2configs/remote-build/gum.nix b/makefu/2configs/remote-build/gum.nix
index 98e2e58b5..39e90f1b8 100644
--- a/makefu/2configs/remote-build/gum.nix
+++ b/makefu/2configs/remote-build/gum.nix
@@ -10,6 +10,14 @@
system = "x86_64-linux";
supportedFeatures = [ ];
}
+ {
+ hostName = "gum.krebsco.de";
+ maxJobs = 8;
+ sshKey = toString <secrets/id_nixBuild>;
+ sshUser = "nixBuild";
+ system = "armv6l-linux";
+ supportedFeatures = [ ];
+ }
];
};
}
diff --git a/makefu/2configs/share/omo.nix b/makefu/2configs/share/omo.nix
index 732dc2036..1a488e69c 100644
--- a/makefu/2configs/share/omo.nix
+++ b/makefu/2configs/share/omo.nix
@@ -82,6 +82,9 @@ in {
printing = bsd
printcap name = /dev/null
disable spoolss = yes
+ workgroup = WORKGROUP
+ server string = ${config.networking.hostName}
+ netbios name = ${config.networking.hostName}
'';
};
}
diff --git a/makefu/2configs/urlwatch/default.nix b/makefu/2configs/urlwatch/default.nix
index 838c26278..ecd03710e 100644
--- a/makefu/2configs/urlwatch/default.nix
+++ b/makefu/2configs/urlwatch/default.nix
@@ -34,6 +34,9 @@ in {
https://pypi.python.org/simple/pyserial/
https://pypi.python.org/simple/semantic_version/
# weird shit
+ { url = "https://www.zigbee2mqtt.io/information/supported_adapters.html";
+ filter = "html2text";
+ }
http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/
https://erdgeist.org/gitweb/opentracker/info/refs?service=git-upload-pack
diff --git a/makefu/2configs/wireguard/server.nix b/makefu/2configs/wireguard/server.nix
index ae10f34a2..1b81cf57f 100644
--- a/makefu/2configs/wireguard/server.nix
+++ b/makefu/2configs/wireguard/server.nix
@@ -54,4 +54,10 @@ in { # wireguard server
}
];
};
+ # TODO: this issue is related to the router which connects to the host but is
+ # unable to re-connect once restarted
+ systemd.services.wireguard-wg0.serviceConfig = {
+ Restart = "always";
+ RuntimeMaxSec = "12h";
+ };
}
diff --git a/makefu/5pkgs/droidcam/default.nix b/makefu/5pkgs/droidcam/default.nix
new file mode 100644
index 000000000..d30fb01a6
--- /dev/null
+++ b/makefu/5pkgs/droidcam/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchFromGitHub
+, pkg-config
+, alsaLib
+, libjpeg_turbo
+, ffmpeg
+, libusbmuxd
+, speex
+, gtk3
+, libappindicator-gtk3
+}:
+
+stdenv.mkDerivation rec {
+ pname = "droidcam";
+ version = "1.6";
+
+ src = fetchFromGitHub {
+ owner = "aramg";
+ repo = "droidcam";
+ rev = "v${version}";
+ sha256 = "1d9qpnmqa3pfwsrpjnxdz76ipk4w37bbxyrazchh4vslnfc886fx";
+ };
+
+ sourceRoot = "source/linux";
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [
+ alsaLib
+ libjpeg_turbo
+ ffmpeg
+ libusbmuxd
+ speex
+ gtk3
+ libappindicator-gtk3
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+ make JPEG_DIR="" JPEG_INCLUDE="" JPEG_LIB="" JPEG="$(pkg-config --libs --cflags libturbojpeg)"
+ '';
+ installPhase = ''
+ runHook preInstall
+ install -Dm755 "droidcam" "$out/bin/droidcam"
+ install -Dm755 "droidcam-cli" "$out/bin/droidcam-cli"
+ install -Dm644 icon2.png "$out/share/pixmaps/droidcam.png"
+ install -Dm644 README.md "$out/share/licenses/droidcam/LICENSE"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A kernel module to create V4L2 loopback devices";
+ homepage = "https://github.com/aramg/droidcam";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.makefu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/makefu/5pkgs/kalauerbot/badsync.patch b/makefu/5pkgs/kalauerbot/badsync.patch
new file mode 100644
index 000000000..842129b94
--- /dev/null
+++ b/makefu/5pkgs/kalauerbot/badsync.patch
@@ -0,0 +1,14 @@
+diff --git a/matrix_client/client.py b/matrix_client/client.py
+index af0e08f..f848c4f 100644
+--- a/matrix_client/client.py
++++ b/matrix_client/client.py
+@@ -471,7 +471,7 @@ class MatrixClient(object):
+ self._sync(timeout_ms)
+
+ def listen_forever(self, timeout_ms=30000, exception_handler=None,
+- bad_sync_timeout=5):
++ bad_sync_timeout=61):
+ """ Keep listening for events forever.
+
+ Args:
+
diff --git a/makefu/5pkgs/kalauerbot/default.nix b/makefu/5pkgs/kalauerbot/default.nix
index 2cecbc3f2..ee90fdeec 100644
--- a/makefu/5pkgs/kalauerbot/default.nix
+++ b/makefu/5pkgs/kalauerbot/default.nix
@@ -8,7 +8,12 @@ rev = "08d98aa";
sha256 = "017hh61smgq4zsxd10brgwmykwgwabgllxjs31xayvs1hnqmkv2v";
};
propagatedBuildInputs = with python3.pkgs;[
- (callPackage ./python-matrixbot.nix {})
+ (callPackage ./python-matrixbot.nix {
+ matrix-client = (stdenv.lib.overrideDerivation matrix-client (self: {
+ patches = [ ./badsync.patch ];
+ }));
+ })
+
(stdenv.lib.overrideDerivation googletrans (self: {
patches = [ ./translate.patch ];
}))
diff --git a/makefu/5pkgs/navi/default.nix b/makefu/5pkgs/navi/default.nix
deleted file mode 100644
index 1e8274f80..000000000
--- a/makefu/5pkgs/navi/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# via https://git.ingolf-wagner.de/palo/nixos-config/src/master/pkgs/navi/default.nix
-
-{ rustPlatform, fetchFromGitHub, stdenv, fzf, makeWrapper, openssl, pkgconfig }:
-
-rustPlatform.buildRustPackage rec {
- pname = "navi";
- version = "2.1.1";
-
- src = fetchFromGitHub {
- owner = "denisidoro";
- repo = "navi";
- rev = "v${version}";
- #rev = "${version}";
- sha256 = "1195f7c3ij2mkv0k1h9fwn6jkyjb01w0p6mj2xc39w5f6i0c0hwp";
- };
-
- cargoSha256 = "0ks25w0dncaiw3ma05r8jrng3cczancrynnpgdksbvgz49lg3wjw";
-
- postInstall = ''
- mkdir -p $out/share/navi/
- mv shell $out/share/navi/
-
- wrapProgram "$out/bin/navi" \
- --suffix "PATH" : "${fzf}/bin"
- '';
- buildInputs = [ openssl ];
- nativeBuildInputs = [ makeWrapper pkgconfig ];
-
- meta = with stdenv.lib; {
- description = "An interactive cheatsheet tool for the command-line";
- homepage = "https://github.com/denisidoro/navi";
- license = licenses.asl20;
- platforms = platforms.unix;
- maintainers = with maintainers; [ mrVanDalo ];
- };
-}
-
diff --git a/makefu/5pkgs/v4l2loopback-dc/default.nix b/makefu/5pkgs/v4l2loopback-dc/default.nix
new file mode 100644
index 000000000..2bb9d3d0b
--- /dev/null
+++ b/makefu/5pkgs/v4l2loopback-dc/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, kernel, kmod }:
+
+stdenv.mkDerivation rec {
+ name = "v4l2loopback-dc-${version}-${kernel.version}";
+ version = "1.6";
+
+ src = fetchFromGitHub {
+ owner = "aramg";
+ repo = "droidcam";
+ rev = "v${version}";
+ sha256 = "1d9qpnmqa3pfwsrpjnxdz76ipk4w37bbxyrazchh4vslnfc886fx";
+ };
+
+ sourceRoot = "source/linux/v4l2loopback";
+
+ buildTargets = "v4l2loopback-dc";
+ hardeningDisable = [ "pic" ];
+
+ nativeBuildInputs = kernel.moduleBuildDependencies;
+ buildInputs = [ kmod ];
+
+
+ makeFlags = [
+ "KERNELRELEASE=${kernel.modDirVersion}"
+ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+ "INSTALL_MOD_PATH=$(out)"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A kernel module to create V4L2 loopback devices";
+ homepage = "https://github.com/aramg/droidcam";
+ license = licenses.gpl2;
+ maintainers = [ maintainers.makefu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/makefu/krops.nix b/makefu/krops.nix
index 213af0497..2fa050e95 100644
--- a/makefu/krops.nix
+++ b/makefu/krops.nix
@@ -77,7 +77,7 @@
(lib.mkIf ( host-src.home-manager ) {
home-manager.git = {
url = https://github.com/rycee/home-manager;
- ref = "cb17f1e";
+ ref = "63f299b";
};
})
];
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 13:35:25 +0000