From 27c919fbf35fbfab90bb9b1f79171c853f716442 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 19:13:02 +0200 Subject: l screenlock: fix enableOption --- lass/3modules/screenlock.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/3modules/screenlock.nix b/lass/3modules/screenlock.nix index cf38f8357..06ca1f27d 100644 --- a/lass/3modules/screenlock.nix +++ b/lass/3modules/screenlock.nix @@ -11,7 +11,7 @@ let }; api = { - enable = mkEnableOption "news"; + enable = mkEnableOption "screenlock"; command = mkOption { type = types.str; default = "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f"; -- cgit v1.2.3 From e2512c4634b83a172d6f927b21ce0791b39a0ba9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 19:13:30 +0200 Subject: l: add tomtop@lassul.us --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 0b56f6f47..f9c8f8ebc 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -45,6 +45,7 @@ with import ; { from = "raf@lassul.us"; to = lass.mail; } { from = "apple@lassul.us"; to = lass.mail; } { from = "coinbase@lassul.us"; to = lass.mail; } + { from = "tomtop@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.2.3 From bdbddc4c281c2d108568901319ac0cdc2866578f Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 19:16:24 +0200 Subject: l domsen: add habsys mails --- lass/2configs/websites/domsen.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 10ff142f9..6fbd4d0df 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -126,6 +126,8 @@ in { { from = "dominik@apanowicz.de"; to = "dominik_a@gmx.de"; } { from = "dma@ubikmedia.de"; to = "domsen"; } { from = "dma@ubikmedia.eu"; to = "domsen"; } + { from = "mail@habsys.de"; to = "domsen"; } + { from = "mail@habsys.eu"; to = "domsen"; } { from = "bruno@apanowicz.de"; to = "bruno"; } { from = "mail@jla-trading.com"; to = "jla-trading"; } { from = "jms@ubikmedia.eu"; to = "jms"; } -- cgit v1.2.3 From 45f205e1c5b7d5d1d45eab1fb293c86f7c93bd49 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 19:18:53 +0200 Subject: l: allow dns requests from retiolum --- lass/2configs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 10d14e151..180647a6d 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -210,6 +210,7 @@ with import ; { predicate = "-p tcp -i retiolum"; target = "REJECT --reject-with tcp-reset"; precedence = -10000; } { predicate = "-p udp -i retiolum"; target = "REJECT --reject-with icmp-port-unreachable"; v6 = false; precedence = -10000; } { predicate = "-i retiolum"; target = "REJECT --reject-with icmp-proto-unreachable"; v6 = false; precedence = -10000; } + { predicate = "-i retiolum -p udp -m udp --dport 53"; target = "ACCEPT"; } ]; }; }; -- cgit v1.2.3 From 8083880f49973eff49673da30b442f75b729594c Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Oct 2017 20:01:37 +0200 Subject: l: steal br from tv --- lass/1systems/mors/config.nix | 1 + lass/2configs/br.nix | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 lass/2configs/br.nix diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix index 610bfef8e..6a61ce1fa 100644 --- a/lass/1systems/mors/config.nix +++ b/lass/1systems/mors/config.nix @@ -29,6 +29,7 @@ with import ; + { #risk of rain port krebs.iptables.tables.filter.INPUT.rules = [ diff --git a/lass/2configs/br.nix b/lass/2configs/br.nix new file mode 100644 index 000000000..35bac8fee --- /dev/null +++ b/lass/2configs/br.nix @@ -0,0 +1,48 @@ +with import ; +{ config, pkgs, ... }: { + + imports = [ + + ]; + + krebs.nixpkgs.allowUnfreePredicate = pkg: any (flip hasPrefix pkg.name) [ + "brother-udev-rule-type1-" + "brscan4-" + "mfcl2700dnlpr-" + ]; + + hardware.sane = { + enable = true; + brscan4 = { + enable = true; + netDevices = { + bra = { + model = "MFCL2700DN"; + ip = "10.23.42.221"; + }; + }; + }; + }; + + services.saned.enable = true; + + # usage: scanimage -d "$(find-scanner bra)" --batch --format=tiff --resolution 150 -x 211 -y 298 + environment.systemPackages = [ + (pkgs.writeDashBin "find-scanner" '' + set -efu + name=$1 + ${pkgs.sane-backends}/bin/scanimage -f '%m %d + ' \ + | ${pkgs.gawk}/bin/awk -v dev="*$name" '$1 == dev { print $2; exit }' \ + | ${pkgs.gnugrep}/bin/grep . + '') + ]; + + services.printing = { + enable = true; + drivers = [ + pkgs.mfcl2700dncupswrapper + ]; + }; + +} -- cgit v1.2.3 From b6be4c6f40a699e7fd6032e5d33395aaa9c8c497 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 27 Oct 2017 17:13:38 +0200 Subject: l nixpkgs: c99239b -> ac2bb56 --- lass/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/source.nix b/lass/source.nix index 910d70334..36210423b 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "c99239b"; + ref = "ac2bb56"; }; secrets.file = getAttr builder { buildbot = toString ; -- cgit v1.2.3 From 6934b5d83f245b723cf7d685d7ab0a758947bdc8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 1 Nov 2017 18:34:06 +0100 Subject: l nixpkgs: ac2bb56 -> 6a0a00d --- lass/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lass/source.nix b/lass/source.nix index 36210423b..4849cadcc 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -10,7 +10,7 @@ in nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix"; nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "ac2bb56"; + ref = "6a0a00d"; }; secrets.file = getAttr builder { buildbot = toString ; -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/d0100000.lock: No such file or directory (2)