From 63493967419334d28ad43c31656fb4553f1093bc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:52:37 +0200 Subject: l: set ca-bundle to /etc/ssl --- lass/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index f745dc4a..10d14e15 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -50,7 +50,7 @@ with import ; NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src"; }; } - (let ca-bundle = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; in { + (let ca-bundle = "/etc/ssl/certs/ca-bundle.crt"; in { environment.variables = { CURL_CA_BUNDLE = ca-bundle; GIT_SSL_CAINFO = ca-bundle; -- cgit v1.2.3 From 4640fd15c69c448405a55c846f544b9e289ee2bc Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:53:05 +0200 Subject: l baseX: set default font to clean --- lass/2configs/baseX.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lass/2configs') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 9d4ad8c6..5669eb77 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -31,15 +31,15 @@ in { options.lass.fonts = { regular = mkOption { type = types.str; - default = "xft:Hack-Regular:pixelsize=11,xft:Symbola"; + default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; }; bold = mkOption { type = types.str; - default = "xft:Hack-Bold:pixelsize=11,xft:Symbola"; + default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; }; italic = mkOption { type = types.str; - default = "xft:Hack-RegularOblique:pixelsize=11,xft:Symbol"; + default = "-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1"; }; }; } -- cgit v1.2.3 From 55f89e6ecae55e206ee6f0ac4e0edc116cdbba8e Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 18 Oct 2017 19:53:53 +0200 Subject: l dns: don't resolve local queries --- lass/2configs/dns-stuff.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs') diff --git a/lass/2configs/dns-stuff.nix b/lass/2configs/dns-stuff.nix index e305145f..411b0750 100644 --- a/lass/2configs/dns-stuff.nix +++ b/lass/2configs/dns-stuff.nix @@ -13,6 +13,7 @@ with import ; }; services.dnsmasq = { enable = true; + resolveLocalQueries = false; extraConfig = '' server=127.1.0.1 #no-resolv -- cgit v1.2.3 From 9064b8e5ce92c3380b8765d55e5ba722361286aa Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 19 Oct 2017 18:42:09 +0200 Subject: l: make screenlock configureable --- lass/2configs/baseX.nix | 2 +- lass/2configs/screenlock.nix | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 lass/2configs/screenlock.nix (limited to 'lass/2configs') diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 5669eb77..a8bb8693 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -6,7 +6,6 @@ in { imports = [ ./mpv.nix ./power-action.nix - ./screenlock.nix ./copyq.nix ./xresources.nix ./livestream.nix @@ -136,4 +135,5 @@ in { }; services.urxvtd.enable = true; + lass.screenlock.enable = true; } diff --git a/lass/2configs/screenlock.nix b/lass/2configs/screenlock.nix deleted file mode 100644 index b5bc4ee2..00000000 --- a/lass/2configs/screenlock.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, config, ... }: - -{ - systemd.services.screenlock = { - before = [ "sleep.target" ]; - wantedBy = [ "sleep.target" ]; - environment = { - DISPLAY = ":0"; - }; - serviceConfig = { - SyslogIdentifier = "screenlock"; - ExecStart = "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper -f"; - Type = "forking"; - User = "lass"; - }; - }; -} -- 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(+) (limited to 'lass/2configs') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index 0b56f6f4..f9c8f8eb 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(+) (limited to 'lass/2configs') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 10ff142f..6fbd4d0d 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(+) (limited to 'lass/2configs') diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 10d14e15..180647a6 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/2configs/br.nix | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 lass/2configs/br.nix (limited to 'lass/2configs') diff --git a/lass/2configs/br.nix b/lass/2configs/br.nix new file mode 100644 index 00000000..35bac8fe --- /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