summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-08-29 21:08:02 +0200
committertv <tv@krebsco.de>2017-08-29 21:08:02 +0200
commit247477863628a44c60f591c6df6cc9f5e7818e89 (patch)
tree2492ffb4cda34e13d9653fbebbaba8823875d0a9 /lass/2configs
parentfd69096a27575b9d4d87a10af1492b273dad167c (diff)
parent48c75276c5a5ed8e7ea33ccb330f8ee6b7a6a927 (diff)
Merge remote-tracking branch 'stro/master'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/default.nix1
-rw-r--r--lass/2configs/mail.nix6
-rw-r--r--lass/2configs/mpv.nix26
3 files changed, 6 insertions, 27 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 22a7b1c19..e96f4dc7e 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -200,6 +200,7 @@ with import <stockholm/lib>;
filter.INPUT.policy = "DROP";
filter.FORWARD.policy = "DROP";
filter.INPUT.rules = [
+ { predicate = "-i retiolum -p udp --dport 60000:61000"; target = "ACCEPT";}
{ predicate = "-m conntrack --ctstate RELATED,ESTABLISHED"; target = "ACCEPT"; precedence = 10001; }
{ predicate = "-p icmp"; target = "ACCEPT"; precedence = 10000; }
{ predicate = "-p ipv6-icmp"; target = "ACCEPT"; v4 = false; precedence = 10000; }
diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index 9f9bb24fa..7a9881186 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -78,11 +78,13 @@ let
and NOT to:shackspace \
and NOT to:c-base \
and NOT from:security-alert@hpe.com \
- and NOT to:nix-devel"\
+ and NOT to:nix-devel\
+ and NOT to:radio"\
"shack" "notmuch://?query=to:shackspace"\
"c-base" "notmuch://?query=to:c-base"\
"security" "notmuch://?query=to:securityfocus or from:security-alert@hpe.com"\
"nix" "notmuch://?query=to:nix-devel"\
+ "radio" "notmuch://?query=to:radio or tag:radio"\
"TODO" "notmuch://?query=tag:TODO"\
"Starred" "notmuch://?query=tag:*"\
"Archive" "notmuch://?query=tag:archive"\
@@ -126,7 +128,7 @@ let
bind index t noop
bind pager t noop
- macro index t "<modify-labels>+TODO\n" # tag as Archived
+ macro index t "<modify-labels>" # tag as Archived
# top index bar in email view
set pager_index_lines=7
diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix
index 04fd9213e..b3de42c7b 100644
--- a/lass/2configs/mpv.nix
+++ b/lass/2configs/mpv.nix
@@ -2,40 +2,16 @@
let
- scripts = lib.concatStringsSep "," [
- good
- delete
- ];
-
mpv = pkgs.symlinkJoin {
name = "mpv";
paths = [
(pkgs.writeDashBin "mpv" ''
- exec ${pkgs.mpv}/bin/mpv --no-config --script=${scripts} "$@"
+ exec ${pkgs.mpv}/bin/mpv --no-config "$@"
'')
pkgs.mpv
];
};
- moveToDir = key: dir: pkgs.writeText "move-with-${key}.lua" ''
- tmp_dir = "${dir}"
-
- function move_current_track_${key}()
- track = mp.get_property("path")
- os.execute("mkdir -p '" .. tmp_dir .. "'")
- os.execute("mv '" .. track .. "' '" .. tmp_dir .. "'")
- print("moved '" .. track .. "' to " .. tmp_dir)
- end
-
- mp.add_key_binding("${key}", "move_current_track_${key}", move_current_track_${key})
- '';
-
- good = moveToDir "G" "./.good";
- delete = moveToDir "D" "./.graveyard";
-
- up = moveToDir "U" "./up";
- down = moveToDir "Y" "./down";
-
in {
environment.systemPackages = [
mpv