From 6ace0f7b6941c1c9476d84944cdba8bedf98d95d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 12 Apr 2020 09:45:06 +0200
Subject: tv xmonad: add pavucontrol

---
 tv/5pkgs/haskell/xmonad-tv/src/Paths.hs | 3 +++
 tv/5pkgs/haskell/xmonad-tv/src/main.hs  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
index 3a879b5d..dd21511b 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/Paths.hs
@@ -12,6 +12,9 @@ pactl = findExecutable "pactl"
 passmenu :: FilePath
 passmenu = findExecutable "passmenu"
 
+pavucontrol :: FilePath
+pavucontrol = findExecutable "pavucontrol"
+
 slock :: FilePath
 slock = findExecutable "slock"
 
diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
index c528017d..400c87ab 100644
--- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs
+++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs
@@ -160,6 +160,7 @@ myKeys conf = Map.fromList $
     , ((0, xF86XK_AudioLowerVolume), audioLowerVolume)
     , ((0, xF86XK_AudioRaiseVolume), audioRaiseVolume)
     , ((0, xF86XK_AudioMute), audioMute)
+    , ((_4, xF86XK_AudioMute), pavucontrol [])
 
     , ((_4, xK_Prior), forkFile Paths.xcalib ["-invert", "-alter"] Nothing)
     ]
@@ -175,6 +176,8 @@ myKeys conf = Map.fromList $
     _4SM = _4 .|. _S .|. _M
 
     pactl args = forkFile Paths.pactl args Nothing
+    pavucontrol args = forkFile Paths.pavucontrol args Nothing
+
     audioLowerVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "-5%"]
     audioRaiseVolume = pactl ["--", "set-sink-volume", "@DEFAULT_SINK@", "+5%"]
     audioMute = pactl ["--", "set-sink-mute", "@DEFAULT_SINK@", "toggle"]
-- 
cgit v1.2.3


From 4d9d0dcd98239237c2fecb37817832ed31e17d48 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 14 Apr 2020 20:50:48 +0200
Subject: l fzfmenu: use urxvt because of arg bug

---
 lass/5pkgs/fzfmenu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/5pkgs/fzfmenu/default.nix b/lass/5pkgs/fzfmenu/default.nix
index a158eeaa..64e95d23 100644
--- a/lass/5pkgs/fzfmenu/default.nix
+++ b/lass/5pkgs/fzfmenu/default.nix
@@ -33,7 +33,7 @@ pkgs.writeDashBin "fzfmenu" ''
   INPUT=$(${pkgs.coreutils}/bin/cat)
   OUTPUT="$(${pkgs.coreutils}/bin/mktemp)"
   if [ -z ''${TERM+x} ]; then #check if we can print fzf in the shell
-    ${pkgs.rxvt_unicode}/bin/urxvtc \
+    ${pkgs.rxvt_unicode}/bin/urxvt \
       -name fzfmenu -title fzfmenu \
       -e ${pkgs.dash}/bin/dash -c \
         "echo \"$INPUT\" | ${pkgs.fzf}/bin/fzf \
-- 
cgit v1.2.3


From fd178641b03886b1b732330f60226903011ccdc4 Mon Sep 17 00:00:00 2001
From: xkey <(xkey@freenode)>
Date: Tue, 14 Apr 2020 20:43:39 +0200
Subject: external: add catalonia

---
 krebs/3modules/external/default.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix
index 1d73fade..b437456e 100644
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@@ -373,6 +373,30 @@ in {
       syncthing.id = "22NLFY5-QMRM3BH-76QIBYI-OPMKVGM-DU4FNZI-3KN2POF-V4WIC6M-2SFFUAC";
       nets = {};
     };
+    catalonia = {
+     owner = config.krebs.users.xkey;
+     nets = {
+       retiolum = {
+         ip4.addr = "10.243.13.12";
+         aliases = [ "catalonia.r" ];
+         tinc.pubkey = ''
+           -----BEGIN RSA PUBLIC KEY-----
+           MIICCgKCAgEAug+nej8/spuRHdzcfBYAuzUVoiq4YufmJqXSshvgf4aqjeVEt91Y
+           gT6iBN8IKnMjYk3bAS7MxmgiyVE17MQlaQi0RSYY47M8I9TvCYtWX/FcXuP9e6CA
+           VcalDUNpy2qNB+yEE8gMa8vDA3smKk/iK47jTtpWoPtvejLK/SCi8RdlYjKlOErE
+           Yl9mCniGD1WEYgdrjf6Nl7av6uuGYNibivIMkB2JyGwGGmzvP+oBFi2Cwarw8K2e
+           FK2VGrAfkgiP5rTPACHseoeCsJtRLozgzYzmS5M9XhP5ZoPkbtR/pL5btCwoCTlZ
+           HotmLVg4DezbPjNOBB9gtJF4UuzQjSPNY6K1VvvLOhDwXdyln82LuNcm9l+cy9y3
+           mGeSvqOouBugDqie6OpkF0KrRwlGQVwzwtnDohGd/5f7TbiPf1QjC+JP/m4mxZl3
+           zE0BCOct9b4hUc/CFto71CPlytSbTsMhfJAn8JxttGvsWIAj+dQ0iuLXfLDflWt6
+           sImmnOo28YInvFx6pKoxTwcV1AVrPWn5TSePhZM50dmzs0exltOISFECDhpPabU3
+           ZymRCze8fH9Z3SHxfxTlTZV7IaW2kpyyBe1KsWpM46gLPk5icX+Xc6mdGwbdGBpf
+           vDZ+BoHCjq9FfQrAu1+E83yCYyu+3fWrLSgYyrqjg0gPcCcnb1g6hqECAwEAAQ==
+           -----END RSA PUBLIC KEY-----
+         '';
+        };
+      };
+    };
   };
   users = {
     ciko = {
@@ -421,6 +445,7 @@ in {
       mail = "xq@shackspace.de";
       pubkey = ssh-for "xq";
     };
+    xkey = {};
     miaoski = {
     };
     filly = {
-- 
cgit v1.2.3


From 993a8de856df192a172c25b5e9ededc3ece3e80d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 15 Apr 2020 17:20:28 +0200
Subject: l radio: listen to more experimental music

---
 lass/2configs/radio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 74b15a0a..e8ce66d3 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -12,7 +12,7 @@ let
   music_dir = "/home/radio/music";
 
   add_random = pkgs.writeDashBin "add_random" ''
-    ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.mpc_cli}/bin/mpc ls the_playlist/music | grep '\.ogg$' | shuf -n1)"
+    ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.findutils}/bin/find "${music_dir}/the_playlist" | grep '\.ogg$' | shuf -n1 | sed 's,${music_dir}/,,')"
   '';
 
   skip_track = pkgs.writeDashBin "skip_track" ''
-- 
cgit v1.2.3


From 07f18d851a974ee594c92e3332f167ef3b1d259f Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 15 Apr 2020 17:21:54 +0200
Subject: l radio: more complex track logic

---
 lass/2configs/radio.nix | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index e8ce66d3..c4c4b0ab 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -15,7 +15,7 @@ let
     ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.findutils}/bin/find "${music_dir}/the_playlist" | grep '\.ogg$' | shuf -n1 | sed 's,${music_dir}/,,')"
   '';
 
-  skip_track = pkgs.writeDashBin "skip_track" ''
+  skip_track = pkgs.writeBashBin "skip_track" ''
     set -eu
 
     ${add_random}/bin/add_random
@@ -23,17 +23,32 @@ let
     current_track=$(${pkgs.mpc_cli}/bin/mpc current -f %file%)
     track_infos=$(${print_current}/bin/print_current)
     skip_count=$(${pkgs.attr}/bin/getfattr -n user.skip_count --only-values "$music_dir"/"$current_track" || echo 0)
-    if [ "$skip_count" -gt 2 ]; then
-      mv "$music_dir"/"$current_track" "$music_dir"/.graveyard/
-      echo killing: "$track_infos"
-    else
+    if [[ "$current_track" =~ ^the_playlist/music/.* ]] && [ "$skip_count" -le 2 ]; then
       skip_count=$((skip_count+1))
       ${pkgs.attr}/bin/setfattr -n user.skip_count -v "$skip_count" "$music_dir"/"$current_track"
       echo skipping: "$track_infos" skip_count: "$skip_count"
+    else
+      mkdir -p "$music_dir"/.graveyard/
+      mv "$music_dir"/"$current_track" "$music_dir"/.graveyard/
+      echo killing: "$track_infos"
     fi
     ${pkgs.mpc_cli}/bin/mpc -q next
   '';
 
+  good_track = pkgs.writeBashBin "good_track" ''
+    set -eu
+
+    music_dir=${escapeShellArg music_dir}
+    current_track=$(${pkgs.mpc_cli}/bin/mpc current -f %file%)
+    track_infos=$(${print_current}/bin/print_current)
+    if [[ "$current_track" =~ ^the_playlist/music/.* ]]; then
+      ${pkgs.attr}/bin/setfattr -n user.skip_count -v 0 "$music_dir"/"$current_track"
+    else
+      mv "$music_dir"/"$current_track" "$music_dir"/the_playlist/music/
+    fi
+      echo good: "$track_infos"
+  '';
+
   print_current = pkgs.writeDashBin "print_current" ''
     echo "$(${pkgs.mpc_cli}/bin/mpc current -f %file%) \
     $(${pkgs.mpc_cli}/bin/mpc current -f %file% \
@@ -63,6 +78,7 @@ in {
 
   krebs.per-user.${name}.packages = with pkgs; [
     add_random
+    good_track
     skip_track
     print_current
     ncmpcpp
@@ -224,6 +240,13 @@ in {
               arguments = [2];
               commands = {
                 skip.filename = "${skip_track}/bin/skip_track";
+                next.filename = "${skip_track}/bin/skip_track";
+                bad.filename = "${skip_track}/bin/skip_track";
+
+                good.filename = "${good_track}/bin/good_track";
+                nice.filename = "${good_track}/bin/good_track";
+                like.filename = "${good_track}/bin/good_track";
+
                 current.filename = "${print_current}/bin/print_current";
                 suggest.filename = pkgs.writeDash "suggest" ''
                   echo "$@" >> playlist_suggest
-- 
cgit v1.2.3


From 0715c3cba9fa860c49be1f665b5c7d4470e4098d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 15 Apr 2020 17:48:51 +0200
Subject: nixpkgs: 598a9cb -> f6c1d3b

---
 krebs/nixpkgs.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 123d624d..43dc0ddf 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "598a9cbed6348ebda43c6b1a9a3061e0206297e7",
-  "date": "2020-03-28T03:06:32+01:00",
-  "sha256": "12m910j2sfhm3a6skw4janxy010gzdxp15bn8v9w7w9hhjzvdw8c",
+  "rev": "f6c1d3b113ce9e7c908991df2e8eed02f03df1bc",
+  "date": "2020-04-14T08:34:46-04:00",
+  "sha256": "08z6qbjmx64bcil3cnvflb7bv9ibdizxcr63yvhgcqzsja7m51n5",
   "fetchSubmodules": false
 }
-- 
cgit v1.2.3


From aa65c483ecedab18cec8f3db3de5742960f19385 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 17 Apr 2020 19:22:14 +0200
Subject: reaktor2: 0.2.2 -> 0.2.3-pre1

---
 krebs/5pkgs/haskell/reaktor2.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index f06e7912..feaa55dc 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -1,17 +1,18 @@
 { mkDerivation, aeson, async, attoparsec, base, blessings
 , bytestring, containers, data-default, fetchgit, filepath
 , hashable, lens, lens-aeson, network, network-simple
-, network-simple-tls, pcre-light, process, random, stdenv
-, string-conversions, stringsearch, text, time, transformers
-, unagi-chan, unix, unordered-containers, vector
+, network-simple-tls, pcre-light, process, random, servant-server
+, stdenv, string-conversions, stringsearch, text, time
+, transformers, unagi-chan, unix, unordered-containers, vector, wai
+, warp
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.2.2";
+  version = "0.2.3-pre1";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "1kyr5i5zdzvc7fcyac1i1yvi88kcxafrgp8p79c1b9l4g9sjnv78";
-    rev = "9f4e2644188f985d7cd806c13e2c0dee1688b9f0";
+    sha256 = "0jg8yln1np5w3bg8jpkymfqi0x3a47pfsk20sz4lp3r2hfpw0zlk";
+    rev = "56bb8aef0018650e14624e086bb8884bb7ecd4f7";
     fetchSubmodules = true;
   };
   isLibrary = false;
@@ -20,8 +21,8 @@ mkDerivation {
     aeson async attoparsec base blessings bytestring containers
     data-default filepath hashable lens lens-aeson network
     network-simple network-simple-tls pcre-light process random
-    string-conversions stringsearch text time transformers unagi-chan
-    unix unordered-containers vector
+    servant-server string-conversions stringsearch text time
+    transformers unagi-chan unix unordered-containers vector wai warp
   ];
   license = stdenv.lib.licenses.mit;
 }
-- 
cgit v1.2.3


From b20942d07d10afa68a58f7a0690ad4397e90a57f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 17 Apr 2020 23:14:19 +0200
Subject: reaktor2: 0.2.3-pre1 -> 0.3.0

---
 krebs/5pkgs/haskell/reaktor2.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/krebs/5pkgs/haskell/reaktor2.nix b/krebs/5pkgs/haskell/reaktor2.nix
index feaa55dc..ae242efe 100644
--- a/krebs/5pkgs/haskell/reaktor2.nix
+++ b/krebs/5pkgs/haskell/reaktor2.nix
@@ -1,18 +1,18 @@
 { mkDerivation, aeson, async, attoparsec, base, blessings
 , bytestring, containers, data-default, fetchgit, filepath
 , hashable, lens, lens-aeson, network, network-simple
-, network-simple-tls, pcre-light, process, random, servant-server
-, stdenv, string-conversions, stringsearch, text, time
-, transformers, unagi-chan, unix, unordered-containers, vector, wai
-, warp
+, network-simple-tls, network-uri, pcre-light, process, random
+, servant-server, stdenv, string-conversions, stringsearch, text
+, time, transformers, unagi-chan, unix, unordered-containers
+, vector, wai, warp
 }:
 mkDerivation {
   pname = "reaktor2";
-  version = "0.2.3-pre1";
+  version = "0.3.0";
   src = fetchgit {
     url = "https://cgit.krebsco.de/reaktor2";
-    sha256 = "0jg8yln1np5w3bg8jpkymfqi0x3a47pfsk20sz4lp3r2hfpw0zlk";
-    rev = "56bb8aef0018650e14624e086bb8884bb7ecd4f7";
+    sha256 = "02hqpq8wcfd6rvi8qk10zy3f3lrzzqnjwqal4cbvksjn3vahz36h";
+    rev = "a6893c00f78a8acd0a4bfe7da87ab6889eabcf21";
     fetchSubmodules = true;
   };
   isLibrary = false;
@@ -20,8 +20,8 @@ mkDerivation {
   executableHaskellDepends = [
     aeson async attoparsec base blessings bytestring containers
     data-default filepath hashable lens lens-aeson network
-    network-simple network-simple-tls pcre-light process random
-    servant-server string-conversions stringsearch text time
+    network-simple network-simple-tls network-uri pcre-light process
+    random servant-server string-conversions stringsearch text time
     transformers unagi-chan unix unordered-containers vector wai warp
   ];
   license = stdenv.lib.licenses.mit;
-- 
cgit v1.2.3


From 8772a311a82040c187a04df3f5393c3083780db8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 09:32:38 +0200
Subject: l radio: filter other music out

---
 lass/2configs/radio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index c4c4b0ab..60659d04 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -12,7 +12,7 @@ let
   music_dir = "/home/radio/music";
 
   add_random = pkgs.writeDashBin "add_random" ''
-    ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.findutils}/bin/find "${music_dir}/the_playlist" | grep '\.ogg$' | shuf -n1 | sed 's,${music_dir}/,,')"
+    ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.findutils}/bin/find "${music_dir}/the_playlist" | grep -v '/other/' | grep '\.ogg$' | shuf -n1 | sed 's,${music_dir}/,,')"
   '';
 
   skip_track = pkgs.writeBashBin "skip_track" ''
-- 
cgit v1.2.3


From fae3c95c6c32c67c7d0c67bf466890a1ffee803d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 09:32:52 +0200
Subject: l radio: add REST api

---
 lass/2configs/radio.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 60659d04..9da0a499 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -146,6 +146,7 @@ in {
     tables = {
       filter.INPUT.rules = [
         { predicate = "-p tcp --dport 8000"; target = "ACCEPT"; }
+        { predicate = "-i retiolum -p tcp --dport 8001"; target = "ACCEPT"; }
       ];
     };
   };
@@ -259,6 +260,29 @@ in {
     ];
   };
 
+  krebs.htgen.radio = {
+    port = 8001;
+    user = {
+      name = "radio";
+    };
+    script = ''
+      case "$Method $Request_URI" in
+        "POST /skip")
+          ${skip_track}/bin/skip_track
+          exit
+        ;;
+        "POST /good")
+          ${good_track}/bin/good_track
+          exit
+        ;;
+        "POST /current")
+          ${print_current}/bin/print_current
+          exit
+        ;;
+      esac
+    '';
+  };
+
   services.nginx = {
     enable = true;
     virtualHosts."radio.lassul.us" = {
-- 
cgit v1.2.3


From 75debd3e2580303a69daf05b7478befad4c8cbbb Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 09:53:23 +0200
Subject: nixpkgs: f6c1d3b -> b67bc34

---
 krebs/nixpkgs.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 43dc0ddf..3a8998e4 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "f6c1d3b113ce9e7c908991df2e8eed02f03df1bc",
-  "date": "2020-04-14T08:34:46-04:00",
-  "sha256": "08z6qbjmx64bcil3cnvflb7bv9ibdizxcr63yvhgcqzsja7m51n5",
+  "rev": "b67bc34d4e3de1e89b8bb7cd6e375ba44f1ae8ca",
+  "date": "2020-04-15T22:11:06+01:00",
+  "sha256": "1q9a64bl5afflgpa2iaw1q7z7s08c8xq9w6lndlnc5c3siajrp8v",
   "fetchSubmodules": false
 }
-- 
cgit v1.2.3


From d1b6b379747223b863e01438ff8bb4764f61256e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 09:53:45 +0200
Subject: nixpkgs-unstable: d96bd33 -> b61999e

---
 krebs/nixpkgs-unstable.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index 847e3c61..8f426cc0 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/NixOS/nixpkgs-channels",
-  "rev": "d96bd3394b734487d1c3bfbac0e8f17465e03afe",
-  "date": "2020-03-19T15:32:34+01:00",
-  "sha256": "05n27wz5ln9ni5cy5rhjcy612i44gmblkq5m0g827v8pd0nk00da",
+  "rev": "b61999e4ad60c351b4da63ae3ff43aae3c0bbdfb",
+  "date": "2020-04-16T08:43:36-04:00",
+  "sha256": "0cggpdks4qscyirqwfprgdl91mlhjlw24wkg0riapk5f2g2llbpq",
   "fetchSubmodules": false
 }
-- 
cgit v1.2.3


From 3c3e20599e32d1aef3639a7b0056cbc277e36b94 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 14:37:15 +0200
Subject: realwallpaper: make ice gray

---
 krebs/5pkgs/simple/realwallpaper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/krebs/5pkgs/simple/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix
index c511458f..057983fe 100644
--- a/krebs/5pkgs/simple/realwallpaper/default.nix
+++ b/krebs/5pkgs/simple/realwallpaper/default.nix
@@ -138,7 +138,7 @@ pkgs.writers.writeDashBin "generate-wallpaper" ''
 
     # remove snow from ice map
     if needs_rebuild ice.png ice-raw.jpg; then
-      convert ice-raw.jpg -fuzz 20% -fill black -opaque white -scale "$in_size" ice.png
+      convert ice-raw.jpg -fuzz 20% -fill black -opaque white -colorspace gray -blur 0x6 -scale "$in_size" ice.png
     fi
 
     if needs_rebuild snow.png snow-raw.jpg; then
-- 
cgit v1.2.3


From 29e969cae1c58a4279d476c2e9d44a3e87907ea7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 14:37:33 +0200
Subject: l icarus.r: set thinkfan levels

---
 lass/1systems/icarus/physical.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lass/1systems/icarus/physical.nix b/lass/1systems/icarus/physical.nix
index 861bd8b0..bd74c29f 100644
--- a/lass/1systems/icarus/physical.nix
+++ b/lass/1systems/icarus/physical.nix
@@ -46,6 +46,15 @@
   '';
 
   services.thinkfan.enable = true;
+  services.thinkfan.levels = ''
+    (0,     0,      55)
+    (1,     48,     60)
+    (2,     50,     61)
+    (3,     52,     63)
+    (6,     60,     65)
+    (7,     80,     85)
+    (127,   90,     32767)
+  '';
 
   services.logind.lidSwitch = "ignore";
   services.logind.lidSwitchDocked = "ignore";
-- 
cgit v1.2.3


From d593ce40856c791648bc3fbd7465ab1c185d5c5e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 14:55:16 +0200
Subject: l prism.r: move pubkeys

---
 lass/1systems/prism/config.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix
index c6e0400b..d8bb14d0 100644
--- a/lass/1systems/prism/config.nix
+++ b/lass/1systems/prism/config.nix
@@ -263,8 +263,6 @@ with import <stockholm/lib>;
     }
     {
       users.users.download.openssh.authorizedKeys.keys = [
-        "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDB0d0JA20Vqn7I4lCte6Ne2EOmLZyMJyS9yIKJYXNLjbLwkQ4AYoQKantPBkTxR75M09E7d3j5heuWnCjWH45TrfQfe1EOSSC3ppCI6C6aIVlaNs+KhAYZS0m2Y8WkKn+TT5JLEa8yybYVN/RlZPOilpj/1QgjU6CQK+eJ1k/kK+QFXcwN82GDVh5kbTVcKUNp2tiyxFA+z9LY0xFDg/JHif2ROpjJVLQBJ+YPuOXZN5LDnVcuyLWKThjxy5srQ8iDjoxBg7dwLHjby5Mv41K4W61Gq6xM53gDEgfXk4cQhJnmx7jA/pUnsn2ZQDeww3hcc7vRf8soogXXz2KC9maiq0M/svaATsa9Ul4hrKnqPZP9Q8ScSEAUX+VI+x54iWrnW0p/yqBiRAzwsczdPzaQroUFTBxrq8R/n5TFdSHRMX7fYNOeVMjhfNca/gtfw9dYBVquCvuqUuFiRc0I7yK44rrMjjVQRcAbw6F8O7+04qWCmaJ8MPlmApwu2c05VMv9hiJo5p6PnzterRSLCqF6rIdhSnuOwrUIt1s/V+EEZXHCwSaNLaQJnYL0H9YjaIuGz4c8kVzxw4c0B6nl+hqW5y5/B2cuHiumnlRIDKOIzlv8ufhh21iN7QpIsPizahPezGoT1XqvzeXfH4qryo8O4yTN/PWoA+f7o9POU7L6hQ== lhebendanz@nixos"
-        config.krebs.users.palo.pubkey
       ];
     }
     {
@@ -382,6 +380,9 @@ with import <stockholm/lib>;
             lass.pubkey
             lass-android.pubkey
             makefu.pubkey
+            palo.pubkey
+            "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDB0d0JA20Vqn7I4lCte6Ne2EOmLZyMJyS9yIKJYXNLjbLwkQ4AYoQKantPBkTxR75M09E7d3j5heuWnCjWH45TrfQfe1EOSSC3ppCI6C6aIVlaNs+KhAYZS0m2Y8WkKn+TT5JLEa8yybYVN/RlZPOilpj/1QgjU6CQK+eJ1k/kK+QFXcwN82GDVh5kbTVcKUNp2tiyxFA+z9LY0xFDg/JHif2ROpjJVLQBJ+YPuOXZN5LDnVcuyLWKThjxy5srQ8iDjoxBg7dwLHjby5Mv41K4W61Gq6xM53gDEgfXk4cQhJnmx7jA/pUnsn2ZQDeww3hcc7vRf8soogXXz2KC9maiq0M/svaATsa9Ul4hrKnqPZP9Q8ScSEAUX+VI+x54iWrnW0p/yqBiRAzwsczdPzaQroUFTBxrq8R/n5TFdSHRMX7fYNOeVMjhfNca/gtfw9dYBVquCvuqUuFiRc0I7yK44rrMjjVQRcAbw6F8O7+04qWCmaJ8MPlmApwu2c05VMv9hiJo5p6PnzterRSLCqF6rIdhSnuOwrUIt1s/V+EEZXHCwSaNLaQJnYL0H9YjaIuGz4c8kVzxw4c0B6nl+hqW5y5/B2cuHiumnlRIDKOIzlv8ufhh21iN7QpIsPizahPezGoT1XqvzeXfH4qryo8O4yTN/PWoA+f7o9POU7L6hQ== lhebendanz@nixos"
+            "AAAAB3NzaC1yc2EAAAADAQABAAABgQC4ECL9NSCWqs4KVe+FF+2BPtl5Bv5aQPHqnXllCyiESZykwRKLx6/AbF5SbUAUMVZtp9oDSdp28m3BvVeWJ/q7hAbIxUtfd/jp+JBRZ8Kj6K5GzUO7Bhgl/o0A7xEjAeOKHiYuLjdPMcFUyl6Ah4ey/mcQYf6AdU0+hYUDeUlKe/YxxYD6202W0GJq2xGdIqs/TbopT9iaX+sv0wdXDVfFY72nFqOUwJW3u6O2viKKRugrz/eo50Eo3ts7pYz/FpDXExrUvV9Vu/bQ34pa8nKgF3/AKQHgmzljNQSVZKyAV8OY0UFonjBMXCBg2tXtwfnlzdx2SyuQVv55x+0AuRKsi85G2xLpXu1A3921pseBTW6Q6kbYK9eqxAay2c/kNbwNqFnO+nCvQ6Ier/hvGddOtItMu96IuU2E7mPN6WgvM8/3fjJRFWnZxFxqu/k7iH+yYT8qwRgdiSqZc76qvkYEuabdk2itstTRY0A3SpI3hFMZDw/7bxgMZtqpfyoRk5s= philip@shiki11:15 <Profpatsch> AAAAB3NzaC1yc2EAAAADAQABAAABgQC4ECL9NSCWqs4KVe+FF+2BPtl5Bv5aQPHqnXllCyiESZykwRKLx6/AbF5SbUAUMVZtp9oDSdp28m3BvVeWJ/q7hAbIxUtfd/jp+JBRZ8Kj6K5GzUO7Bhgl/o0A7xEjAeOKHiYuLjdPMcFUyl6Ah4ey/mcQYf6AdU0+hYUDeUlKe/YxxYD6202W0GJq2xGdIqs/TbopT9iaX+sv0wdXDVfFY72nFqOUwJW3u6O2viKKRugrz/eo50Eo3ts7pYz/FpDXExrUvV9Vu/bQ34pa8nKgF3/AKQHgmzljNQSVZKyAV8OY0UFonjBMXCBg2tXtwfnlzdx2SyuQVv55x+0AuRKsi85G2xLpXu1A3921pseBTW6Q6kbYK9eqxAay2c/kNbwNqFnO+nCvQ6Ier/hvGddOtItMu96IuU2E7mPN6WgvM8/3fjJRFWnZxFxqu/k7iH+yYT8qwRgdiSqZc76qvkYEuabdk2itstTRY0A3SpI3hFMZDw/7bxgMZtqpfyoRk5s= philip@shiki"
           ];
         };
       };
-- 
cgit v1.2.3


From 4e97430ef636724afe237a6b9184c7baa9303249 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 14:55:39 +0200
Subject: l blue: enable tor client

---
 lass/2configs/blue.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lass/2configs/blue.nix b/lass/2configs/blue.nix
index aad8411b..a4000cad 100644
--- a/lass/2configs/blue.nix
+++ b/lass/2configs/blue.nix
@@ -19,6 +19,7 @@ with (import <stockholm/lib>);
   ];
 
   services.tor.enable = true;
+  services.tor.client.enable = true;
 
   krebs.iptables.tables.filter.INPUT.rules = [
     { predicate = "-i retiolum -p udp --dport 60000:61000"; target = "ACCEPT";}
-- 
cgit v1.2.3


From eeeff5f7d4c22053af549378150dcfc7af399dd1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 14:57:21 +0200
Subject: l: init review-mail-queue

---
 lass/2configs/exim-smarthost.nix         |  2 ++
 lass/5pkgs/review-mail-queue/default.nix | 39 ++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 lass/5pkgs/review-mail-queue/default.nix

diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index 08a226e6..82839beb 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -113,6 +113,8 @@
   ];
 
 in {
+  environment.systemPackages = [ pkgs.review-mail-queue ];
+
   krebs.exim-smarthost = {
     enable = true;
     dkim = [
diff --git a/lass/5pkgs/review-mail-queue/default.nix b/lass/5pkgs/review-mail-queue/default.nix
new file mode 100644
index 00000000..c8c66706
--- /dev/null
+++ b/lass/5pkgs/review-mail-queue/default.nix
@@ -0,0 +1,39 @@
+{ pkgs }: let
+
+  review = pkgs.writers.writeBash "review-mail" ''
+    mail="$1"
+    ${pkgs.exim}/bin/exim -Mvc "$mail" | grep -E 'Subject:|To:'
+    ${pkgs.exim}/bin/exim -Mvl "$mail"
+    while :; do
+    read -p 'delete?' key
+      case "$key" in
+        v*)
+          ${pkgs.exim}/bin/exim -Mvc "$mail"
+        ;;
+        d*)
+          ${pkgs.exim}/bin/exim -Mrm "$mail"
+          break
+        ;;
+        r*)
+          ${pkgs.exim}/bin/exim -Mt "$mail"
+          break
+        ;;
+        n*)
+          break
+        ;;
+      esac
+    done
+    echo '-------------------'
+    echo '-------------------'
+    echo '-------------------'
+    echo '-------------------'
+    echo '-------------------'
+  '';
+
+in pkgs.writers.writeBashBin "review-mail" ''
+  for mail in $(${pkgs.exim}/bin/exim -bp \
+  | ${pkgs.gnugrep}/bin/grep frozen \
+  | ${pkgs.gawk}/bin/awk '{print $3}'); do
+    ${review} "$mail"
+  done
+''
-- 
cgit v1.2.3


From 018efa847f1ae3ef1890ab11a0e4dc247aa603df Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 14:59:17 +0200
Subject: l: init nm-dmenu

---
 lass/2configs/network-manager.nix         | 6 +++++-
 lass/5pkgs/custom/xmonad-lass/default.nix | 5 +----
 lass/5pkgs/nm-dmenu/default.nix           | 6 ++++++
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 lass/5pkgs/nm-dmenu/default.nix

diff --git a/lass/2configs/network-manager.nix b/lass/2configs/network-manager.nix
index ab27eb84..75b9bd1f 100644
--- a/lass/2configs/network-manager.nix
+++ b/lass/2configs/network-manager.nix
@@ -26,7 +26,11 @@
   users.users.mainUser = {
     extraGroups = [ "networkmanager" ];
     packages = with pkgs; [
-      gnome3.gnome_keyring gnome3.dconf
+      gnome3.gnome_keyring
+      gnome3.dconf
     ];
   };
+  environment.systemPackages = [
+    pkgs.nm-dmenu
+  ];
 }
diff --git a/lass/5pkgs/custom/xmonad-lass/default.nix b/lass/5pkgs/custom/xmonad-lass/default.nix
index c0aef513..5d865372 100644
--- a/lass/5pkgs/custom/xmonad-lass/default.nix
+++ b/lass/5pkgs/custom/xmonad-lass/default.nix
@@ -150,10 +150,7 @@ myKeyMap =
 
     , ("M4-<F2>", windows copyToAll)
 
-    , ("M4-<F4>", spawn "${pkgs.writeDash "nm-dmenu" ''
-      export PATH=$PATH:${pkgs.dmenu}/bin:${pkgs.networkmanagerapplet}/bin
-      exec ${pkgs.networkmanager_dmenu}/bin/networkmanager_dmenu "$@"
-    ''}")
+    , ("M4-<F4>", spawn "${pkgs.nm-dmenu}/bin/nm-dmenu")
     , ("M4-<Insert>", spawn "${pkgs.writeDash "paste" ''
       ${pkgs.coreutils}/bin/sleep 0.1
       ${pkgs.xclip}/bin/xclip -o | ${pkgs.xdotool}/bin/xdotool type -f -
diff --git a/lass/5pkgs/nm-dmenu/default.nix b/lass/5pkgs/nm-dmenu/default.nix
new file mode 100644
index 00000000..cb47bded
--- /dev/null
+++ b/lass/5pkgs/nm-dmenu/default.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+
+pkgs.writeDashBin "nm-dmenu" ''
+  export PATH=$PATH:${pkgs.dmenu}/bin:${pkgs.networkmanagerapplet}/bin
+  exec ${pkgs.networkmanager_dmenu}/bin/networkmanager_dmenu "$@"
+''
-- 
cgit v1.2.3


From eb15765624036550a9b1d9186bbadea5d937ffd8 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 14:59:35 +0200
Subject: l xmonad: use upstream writers

---
 lass/5pkgs/custom/xmonad-lass/default.nix | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/lass/5pkgs/custom/xmonad-lass/default.nix b/lass/5pkgs/custom/xmonad-lass/default.nix
index 5d865372..f9d73c13 100644
--- a/lass/5pkgs/custom/xmonad-lass/default.nix
+++ b/lass/5pkgs/custom/xmonad-lass/default.nix
@@ -1,16 +1,10 @@
 { config, pkgs, ... }:
-pkgs.writeHaskellPackage "xmonad-lass" {
-  executables.xmonad = {
-    extra-depends = [
-      "containers"
-      "extra"
-      "unix"
-      "X11"
-      "xmonad"
-      "xmonad-contrib"
-      "xmonad-stockholm"
-    ];
-    text = /* haskell */ ''
+pkgs.writers.writeHaskellBin "xmonad" {
+  libraries = with pkgs.haskellPackages; [
+    extra
+    xmonad-stockholm
+  ];
+} /* haskell */ ''
 {-# LANGUAGE LambdaCase #-}
 
 
@@ -220,6 +214,4 @@ gridConfig = def
 allWorkspaceNames :: W.StackSet i l a sid sd -> X [i]
 allWorkspaceNames ws =
     return $ map W.tag (W.hidden ws ++ (map W.workspace $ W.visible ws)) ++ [W.tag $ W.workspace $ W.current ws]
-    '';
-  };
-}
+''
-- 
cgit v1.2.3


From 54827be4cce4770db0150cd8bea8b7a73d84536b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 18:48:54 +0200
Subject: lib: add stripAttr

---
 lib/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/default.nix b/lib/default.nix
index 14e6e27a..5a948bbf 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -49,6 +49,8 @@ let
 
     indent = replaceChars ["\n"] ["\n  "];
 
+    stripAttr = converge (filterAttrsRecursive (n: v: v != {} && v != null));
+
     mapNixDir = f: x: {
       list = foldl' mergeAttrs {} (map (mapNixDir1 f) x);
       path = mapNixDir1 f x;
-- 
cgit v1.2.3


From 1e29f558953e47bd77e1514dd993304ecb9f453e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 18:49:10 +0200
Subject: reaktor2: add listen option

---
 krebs/3modules/reaktor2.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/krebs/3modules/reaktor2.nix b/krebs/3modules/reaktor2.nix
index 837a9bea..fcc453fa 100644
--- a/krebs/3modules/reaktor2.nix
+++ b/krebs/3modules/reaktor2.nix
@@ -45,6 +45,10 @@ with import <stockholm/lib>;
           default = self.config.port == "6697";
           type = types.bool;
         };
+        API.listen = mkOption {
+          default = null;
+          type = types.nullOr types.str;
+        };
       };
     }));
   };
@@ -65,9 +69,11 @@ with import <stockholm/lib>;
           ExecStart = let
             configFile = pkgs.writeJSON configFileName configValue;
             configFileName = "${cfg.systemd-service-name}.config.json";
-            configValue = recursiveUpdate {
-              logTime = false;
-            } (removeAttrs cfg ["_module"]);
+            configValue = stripAttr (
+              recursiveUpdate {
+                logTime = false;
+              } (removeAttrs cfg ["_module"])
+            );
           in "${pkgs.reaktor2}/bin/reaktor ${configFile}";
           Restart = "always";
           RestartSec = "30";
-- 
cgit v1.2.3


From e0576eb972a8ad60bd8f9a4418add448d1e674a5 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 18 Apr 2020 19:17:27 +0200
Subject: l radio: post currently playing song to irc

---
 lass/2configs/radio.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 9da0a499..562dbbe5 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -196,6 +196,14 @@ in {
       done | while read track; do
         echo "$(date -Is)" "$track" | tee -a "$HISTORY_FILE"
         echo "$(tail -$LIMIT "$HISTORY_FILE")" > "$HISTORY_FILE"
+        ${pkgs.curl}/bin/curl -fsSv --unix-socket /home/radio/reaktor.sock http://z/ \
+          -H content-type:application/json \
+          -d "$(${pkgs.jq}/bin/jq -n \
+            --arg track "$track" '{
+              command:"PRIVMSG",
+              params:["#the_playlist","playing: " + $track]
+            }'
+          )"
       done
     '';
   in {
@@ -207,6 +215,7 @@ in {
 
     serviceConfig = {
       ExecStart = recentlyPlayed;
+      User = "radio";
     };
   };
 
@@ -219,6 +228,7 @@ in {
     useTLS = true;
     nick = "the_playlist";
     username = "radio";
+    API.listen = "unix:/home/radio/reaktor.sock";
     plugins = [
       {
         plugin = "register";
-- 
cgit v1.2.3


From 8bc2a64f49c4f49d942576cd8dadfec832088ffe Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 19 Apr 2020 12:30:46 +0200
Subject: l radio: set /current method to GET

---
 lass/2configs/radio.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 562dbbe5..146472e5 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -277,6 +277,10 @@ in {
     };
     script = ''
       case "$Method $Request_URI" in
+        "GET /current")
+          ${print_current}/bin/print_current
+          exit
+        ;;
         "POST /skip")
           ${skip_track}/bin/skip_track
           exit
@@ -285,10 +289,6 @@ in {
           ${good_track}/bin/good_track
           exit
         ;;
-        "POST /current")
-          ${print_current}/bin/print_current
-          exit
-        ;;
       esac
     '';
   };
-- 
cgit v1.2.3


From 355ebd73ee298a845ec2393f964354aa8e411073 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 19 Apr 2020 13:21:58 +0200
Subject: l radio: be more http compliant

---
 lass/2configs/radio.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 146472e5..c2815217 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -44,9 +44,9 @@ let
     if [[ "$current_track" =~ ^the_playlist/music/.* ]]; then
       ${pkgs.attr}/bin/setfattr -n user.skip_count -v 0 "$music_dir"/"$current_track"
     else
-      mv "$music_dir"/"$current_track" "$music_dir"/the_playlist/music/
+      mv "$music_dir"/"$current_track" "$music_dir"/the_playlist/music/ || :
     fi
-      echo good: "$track_infos"
+    echo good: "$track_infos"
   '';
 
   print_current = pkgs.writeDashBin "print_current" ''
@@ -278,6 +278,9 @@ in {
     script = ''
       case "$Method $Request_URI" in
         "GET /current")
+          printf 'HTTP/1.1 200 OK\r\n'
+          printf 'Connection: close\r\n'
+          printf '\r\n'
           ${print_current}/bin/print_current
           exit
         ;;
-- 
cgit v1.2.3


From 1f0af710d80dbc0fd9dd2f3053ad7417bc173947 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 19 Apr 2020 16:26:45 +0200
Subject: l baseX: add some pkgs

---
 lass/2configs/baseX.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 52d694c4..b3340cb3 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -71,12 +71,14 @@ in {
     gitAndTools.qgit
     git-preview
     gnome3.dconf
+    iodine
     lm_sensors
     ncdu
     nix-index
     nix-review
     nmap
     pavucontrol
+    ponymix
     powertop
     rxvt_unicode-with-plugins
     sxiv
-- 
cgit v1.2.3


From 0efd13f942680fae75e46296a643d86c554aa33b Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 19 Apr 2020 20:35:55 +0200
Subject: l radio: return /current as json

---
 lass/2configs/radio.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index c2815217..a457d632 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -49,10 +49,25 @@ let
     echo good: "$track_infos"
   '';
 
+  track_youtube_link = pkgs.writeDash "track_youtube_link" ''
+    ${pkgs.mpc_cli}/bin/mpc current -f %file% \
+      | ${pkgs.gnused}/bin/sed 's@.*\(.\{11\}\)\.ogg@https://www.youtube.com/watch?v=\1@'
+  '';
+
   print_current = pkgs.writeDashBin "print_current" ''
     echo "$(${pkgs.mpc_cli}/bin/mpc current -f %file%) \
-    $(${pkgs.mpc_cli}/bin/mpc current -f %file% \
-      | ${pkgs.gnused}/bin/sed 's@.*\(.\{11\}\)\.ogg@http://www.youtube.com/watch?v=\1@')"
+    $(${track_youtube_link})"
+  '';
+
+  print_current_json = pkgs.writeDashBin "print_current_json" ''
+    ${pkgs.jq}/bin/jq -n -c \
+      --arg name "$(${pkgs.mpc_cli}/bin/mpc current)" \
+      --arg filename "$(${pkgs.mpc_cli}/bin/mpc current -f %file%)" \
+      --arg youtube "$(${track_youtube_link})" '{
+        name: $name,
+        filename: $filename,
+        youtube: $youtube
+      }'
   '';
 
 in {
@@ -81,6 +96,7 @@ in {
     good_track
     skip_track
     print_current
+    print_current_json
     ncmpcpp
     mpc_cli
   ];
@@ -281,7 +297,7 @@ in {
           printf 'HTTP/1.1 200 OK\r\n'
           printf 'Connection: close\r\n'
           printf '\r\n'
-          ${print_current}/bin/print_current
+          ${print_current_json}/bin/print_current_json
           exit
         ;;
         "POST /skip")
-- 
cgit v1.2.3


From e3b37e2bc0b4315254969a622a74120518d59eb0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 20 Apr 2020 08:46:10 +0200
Subject: l radio: log /skip & /good in irc

---
 lass/2configs/radio.nix | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index a457d632..6245691f 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -70,6 +70,17 @@ let
       }'
   '';
 
+  write_to_irc = pkgs.writeDash "write_to_irc" ''
+    ${pkgs.curl}/bin/curl -fsSv --unix-socket /home/radio/reaktor.sock http://z/ \
+      -H content-type:application/json \
+      -d "$(${pkgs.jq}/bin/jq -n \
+        --arg text "$1" '{
+          command:"PRIVMSG",
+          params:["#the_playlist",$text]
+        }'
+      )"
+  '';
+
 in {
   users.users = {
     "${name}" = rec {
@@ -212,14 +223,7 @@ in {
       done | while read track; do
         echo "$(date -Is)" "$track" | tee -a "$HISTORY_FILE"
         echo "$(tail -$LIMIT "$HISTORY_FILE")" > "$HISTORY_FILE"
-        ${pkgs.curl}/bin/curl -fsSv --unix-socket /home/radio/reaktor.sock http://z/ \
-          -H content-type:application/json \
-          -d "$(${pkgs.jq}/bin/jq -n \
-            --arg track "$track" '{
-              command:"PRIVMSG",
-              params:["#the_playlist","playing: " + $track]
-            }'
-          )"
+        ${write_to_irc} "playing: $track"
       done
     '';
   in {
@@ -301,11 +305,21 @@ in {
           exit
         ;;
         "POST /skip")
-          ${skip_track}/bin/skip_track
+          printf 'HTTP/1.1 200 OK\r\n'
+          printf 'Connection: close\r\n'
+          printf '\r\n'
+          msg=$(${skip_track}/bin/skip_track)
+          ${write_to_irc} "$msg"
+          echo "$msg"
           exit
         ;;
         "POST /good")
-          ${good_track}/bin/good_track
+          printf 'HTTP/1.1 200 OK\r\n'
+          printf 'Connection: close\r\n'
+          printf '\r\n'
+          msg=$(${good_track}/bin/good_track)
+          ${write_to_irc} "$msg"
+          echo "$msg"
           exit
         ;;
       esac
-- 
cgit v1.2.3


From bf4b5ef13c8f232401d5def002ab0c6e337d4e62 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 21 Apr 2020 14:21:17 +0200
Subject: l: split hass config

---
 lass/1systems/shodan/config.nix   |   1 +
 lass/2configs/gg23.nix            |  77 +------------------
 lass/2configs/hass/default.nix    |  86 +++++++++++++++++++++
 lass/2configs/hass/lib.nix        |  83 +++++++++++++++++++++
 lass/2configs/hass/rooms/bett.nix |  27 +++++++
 lass/2configs/hass/zigbee.nix     | 152 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 353 insertions(+), 73 deletions(-)
 create mode 100644 lass/2configs/hass/default.nix
 create mode 100644 lass/2configs/hass/lib.nix
 create mode 100644 lass/2configs/hass/rooms/bett.nix
 create mode 100644 lass/2configs/hass/zigbee.nix

diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix
index 9bb31191..064a5695 100644
--- a/lass/1systems/shodan/config.nix
+++ b/lass/1systems/shodan/config.nix
@@ -19,6 +19,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/ssh-cryptsetup.nix>
     <stockholm/lass/2configs/nfs-dl.nix>
     <stockholm/lass/2configs/gg23.nix>
+    <stockholm/lass/2configs/hass>
     <stockholm/lass/2configs/br.nix>
   ];
 
diff --git a/lass/2configs/gg23.nix b/lass/2configs/gg23.nix
index b23494b2..3d4c1e30 100644
--- a/lass/2configs/gg23.nix
+++ b/lass/2configs/gg23.nix
@@ -20,12 +20,13 @@ with import <stockholm/lib>;
       }
     '';
     machines = [
-      { ethernetAddress = "c8:3d:d4:2c:40:ae"; hostName = "tv"; ipAddress = "10.42.0.3"; }
+      { ethernetAddress = "a8:a6:48:65:ce:4c"; hostName = "tv"; ipAddress = "10.42.0.3"; }
       { ethernetAddress = "3c:2a:f4:22:28:37"; hostName = "drucker"; ipAddress = "10.42.0.4"; }
-      { ethernetAddress = "80:7d:3a:67:b7:01"; hostName = "s20-bett"; ipAddress = "10.42.0.10"; }
+      { ethernetAddress = "80:7d:3a:67:b7:01"; hostName = "s20-tv"; ipAddress = "10.42.0.10"; }
       { ethernetAddress = "80:7d:3a:68:04:f0"; hostName = "s20-drucker"; ipAddress = "10.42.0.11"; }
-      { ethernetAddress = "80:7d:3a:68:11:a5"; hostName = "s20-kueche"; ipAddress = "10.42.0.12"; }
+      { ethernetAddress = "80:7d:3a:68:11:a5"; hostName = "s20-wasch"; ipAddress = "10.42.0.12"; }
       { ethernetAddress = "80:7d:3a:67:bb:69"; hostName = "s20-stereo"; ipAddress = "10.42.0.13"; }
+      { ethernetAddress = "ec:b5:fa:07:78:16"; hostName = "hue-bridge"; ipAddress = "10.42.0.21"; }
       { ethernetAddress = "80:8d:b7:c5:80:dc"; hostName = "arubaAP"; ipAddress = "10.42.0.99"; }
     ];
   };
@@ -45,9 +46,6 @@ with import <stockholm/lib>;
 
   boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
   krebs.iptables.tables.filter.INPUT.rules = [
-    { predicate = "-i int0 -p tcp --dport 8123"; target = "ACCEPT"; } # hass
-    { predicate = "-i retiolum -p tcp --dport 8123"; target = "ACCEPT"; } # hass
-    { predicate = "-i int0 -p tcp --dport 1883"; target = "ACCEPT"; } # mosquitto
     { predicate = "-i int0 -p udp --dport 53"; target = "ACCEPT"; } # dns
   ];
   krebs.iptables.tables.filter.FORWARD.rules = [
@@ -62,72 +60,5 @@ with import <stockholm/lib>;
   krebs.iptables.tables.nat.POSTROUTING.rules = [
     { v6 = false; predicate = "-s 10.42.0.0/24 ! -d 10.42.0.0/24"; target = "MASQUERADE"; }
   ];
-
-  services.home-assistant = let
-    tasmota_s20 = name: topic: {
-      platform = "mqtt";
-      inherit name;
-      state_topic = "stat/${topic}/POWER";
-      command_topic = "cmnd/${topic}/POWER";
-      payload_on = "ON";
-      payload_off = "OFF";
-    };
-  in {
-    enable = true;
-    package = pkgs.home-assistant.override {
-      #extraComponents = [
-      #  (pkgs.fetchgit {
-      #    url = "https://github.com/marcschumacher/dwd_pollen";
-      #    rev = "0.1";
-      #    sha256 = "12vldwsds27c9l15ffc6svk9mj17jhypcz736pvpmpqbsymllz2p";
-      #  })
-      #];
-    };
-    config = {
-      homeassistant = {
-        name = "Home"; time_zone = "Europe/Berlin";
-        latitude = "48.7687";
-        longitude = "9.2478";
-        elevation = 247;
-      };
-      sun.elevation = 66;
-      discovery = {};
-      frontend = { };
-      mqtt = {
-        broker = "localhost";
-        port = 1883;
-        client_id = "home-assistant";
-        username = "gg23";
-        password = "gg23-mqtt";
-        keepalive = 60;
-        protocol = 3.1;
-      };
-      sensor = [
-      ];
-      switch = [
-        (tasmota_s20 "Drucker Strom" "drucker")
-        (tasmota_s20 "Bett Licht" "bett")
-        (tasmota_s20 "Kueche Licht" "kueche")
-      ];
-      device_tracker = [
-        {
-          platform = "luci";
-        }
-      ];
-    };
-  };
-
-  services.mosquitto = {
-    enable = true;
-    host = "0.0.0.0";
-    allowAnonymous = false;
-    checkPasswords = true;
-    users.gg23 = {
-      password = "gg23-mqtt";
-      acl = [ "topic readwrite #" ];
-    };
-  };
-  environment.systemPackages = [ pkgs.mosquitto ];
-
 }
 
diff --git a/lass/2configs/hass/default.nix b/lass/2configs/hass/default.nix
new file mode 100644
index 00000000..ef936110
--- /dev/null
+++ b/lass/2configs/hass/default.nix
@@ -0,0 +1,86 @@
+{ config, lib, pkgs, ... }:
+{
+  imports = [
+    ./zigbee.nix
+    ./rooms/bett.nix
+  ];
+
+  krebs.iptables.tables.filter.INPUT.rules = [
+    { predicate = "-i int0 -p tcp --dport 1883"; target = "ACCEPT"; } # mosquitto
+    { predicate = "-i docker0 -p tcp --dport 1883"; target = "ACCEPT"; } # mosquitto
+    { predicate = "-i int0 -p tcp --dport 8123"; target = "ACCEPT"; } # hass
+    { predicate = "-i retiolum -p tcp --dport 8123"; target = "ACCEPT"; } # hass
+  ];
+
+  services.home-assistant = {
+    enable = true;
+    package = pkgs.home-assistant.override {
+      # extraComponents = [ "hue" ];
+    };
+    configWritable = true;
+  };
+
+  lass.hass.config = let
+    tasmota_s20 = name: topic: {
+      platform = "mqtt";
+      inherit name;
+      state_topic = "stat/${topic}/POWER";
+      command_topic = "cmnd/${topic}/POWER";
+      payload_on = "ON";
+      payload_off = "OFF";
+    };
+  in {
+    homeassistant = {
+      name = "Home";
+      time_zone = "Europe/Berlin";
+      latitude = "48.7687";
+      longitude = "9.2478";
+      elevation = 247;
+    };
+    config = {};
+    sun.elevation = 66;
+    discovery = {};
+    frontend = {};
+    mqtt = {
+      broker = "localhost";
+      port = 1883;
+      client_id = "home-assistant";
+      username = "gg23";
+      password = "gg23-mqtt";
+      keepalive = 60;
+      protocol = 3.1;
+
+      discovery = true;
+      birth_message = {
+        topic = "/hass/status";
+        payload = "online";
+      };
+      will_message = {
+        topic = "/hass/status";
+        payload = "offline";
+      };
+    };
+    sensor = [
+    ];
+    switch = [
+      (tasmota_s20 "TV" "tv")
+      (tasmota_s20 "Drucker Strom" "drucker")
+      (tasmota_s20 "Waschmaschine" "wasch")
+      (tasmota_s20 "Stereo Anlage" "stereo")
+    ];
+    mobile_app = {};
+  };
+
+  services.mosquitto = {
+    enable = true;
+    host = "0.0.0.0";
+    allowAnonymous = false;
+    checkPasswords = true;
+    users.gg23 = {
+      password = "gg23-mqtt";
+      acl = [ "topic readwrite #" ];
+    };
+  };
+
+  environment.systemPackages = [ pkgs.mosquitto ];
+}
diff --git a/lass/2configs/hass/lib.nix b/lass/2configs/hass/lib.nix
new file mode 100644
index 00000000..c69f5e88
--- /dev/null
+++ b/lass/2configs/hass/lib.nix
@@ -0,0 +1,83 @@
+{
+  lights = {
+    bett = "light.0x0017880106ed3bd8_light";
+    essen = "light.0x0017880108327622_light";
+    arbeit = "light.0x0017880106ee2865_light";
+    nass = "light.0x00178801082e9f2f_light";
+  };
+
+  sensors = {
+    bett = "0x00178801086ac38c";
+  };
+
+  lightswitch = switch: light: {
+    automation = [
+      {
+        trigger = {
+          platform = "mqtt";
+          topic = "zigbee/${switch}";
+        };
+        condition = {
+          condition = "or";
+          conditions = [
+            {
+              condition = "template";
+              value_template = "{{ trigger.payload_json.action == 'on-press' }}";
+            }
+            {
+              condition = "template";
+              value_template = "{{ trigger.payload_json.action == 'up-press' }}";
+            }
+            {
+              condition = "and";
+              conditions = [
+                {
+                  condition = "template";
+                  value_template = "{{ trigger.payload_json.action == 'down-press' }}";
+                }
+                {
+                  condition = "template";
+                  value_template = "{{ trigger.payload_json.brightness > 30 }}";
+                }
+              ];
+            }
+          ];
+        };
+        action = [
+          {
+            service = "light.turn_on";
+            data_template = {
+              entity_id = light;
+              brightness = "{{ trigger.payload_json.brightness }}";
+            };
+          }
+        ];
+      }
+      {
+        trigger = {
+          platform = "mqtt";
+          topic = "zigbee/${switch}";
+        };
+        condition = {
+          condition = "or";
+          conditions = [
+            {
+              condition = "template";
+              value_template = "{{ trigger.payload_json.action == 'off-press' }}";
+            }
+            {
+              condition = "template";
+              value_template = "{{ trigger.payload_json.brightness < 30 }}";
+            }
+          ];
+        };
+        action = {
+          service = "light.turn_off";
+          data_template = {
+            entity_id = light;
+          };
+        };
+      }
+    ];
+  };
+}
diff --git a/lass/2configs/hass/rooms/bett.nix b/lass/2configs/hass/rooms/bett.nix
new file mode 100644
index 00000000..21092ef5
--- /dev/null
+++ b/lass/2configs/hass/rooms/bett.nix
@@ -0,0 +1,27 @@
+{ lib, ... }:
+with import ../lib.nix;
+
+{
+  lass.hass.config = lib.lists.fold lib.recursiveUpdate {} [
+    {
+      #automation = [{
+      #  trigger = {
+      #    platform = "mqtt";
+      #    topic = "zigbee/0x00178801086ac38c/action";
+      #    payload = "on-press";
+      #  };
+      #  action = {
+      #    service = "light.turn_on";
+      #    data = {
+      #      brightness = 150;
+      #      rgb_color = [ 255 0 0 ];
+      #      entity_id = [
+      #        "light.0x0017880108327622_light"
+      #      ];
+      #    };
+      #  };
+      #}];
+    }
+    (lightswitch sensors.bett lights.bett)
+  ];
+}
diff --git a/lass/2configs/hass/zigbee.nix b/lass/2configs/hass/zigbee.nix
new file mode 100644
index 00000000..4d57f9ca
--- /dev/null
+++ b/lass/2configs/hass/zigbee.nix
@@ -0,0 +1,152 @@
+{config, pkgs, lib, ...}: let
+
+  zigbee2mqtt_cfg = pkgs.writeText "zigbee2mqtt.json" (builtins.toJSON {
+    homeassistant = true;
+    permit_join = true;
+    mqtt = {
+      discovery = true;
+      base_topic = "zigbee";
+      server = "mqtt://10.42.0.1";
+      user = "gg23";
+      password = "gg23-mqtt";
+    };
+    serial.port = "/dev/cc2531";
+  });
+
+in {
+  # symlink the zigbee controller
+  services.udev.extraRules = ''
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="16a8", SYMLINK+="cc2531", MODE="0660", GROUP="dailout"
+  '';
+
+  system.activationScripts.installZigbee = ''
+    install -d /var/lib/zigbee2mqtt
+    install ${zigbee2mqtt_cfg} /var/lib/zigbee2mqtt/configuration.yaml
+  '';
+
+  # hack to restart docker container on config change
+  systemd.services.docker-zigbee2mqtt.environment.cfg = zigbee2mqtt_cfg;
+
+  docker-containers.zigbee2mqtt = {
+    image = "koenkk/zigbee2mqtt";
+    extraDockerOptions = [
+      "--device=/dev/cc2531:/dev/cc2531"
+    ];
+    volumes = ["/var/lib/zigbee2mqtt:/app/data"];
+  };
+
+  lass.hass.config = {
+    sensor = [
+      # Sensor for monitoring the bridge state
+      {
+        platform = "mqtt";
+        name = "Zigbee2mqtt Bridge state";
+        state_topic = "/zigbee/bridge/state";
+        icon = "mdi:router-wireless";
+      }
+      # Sensor for Showing the Zigbee2mqtt Version
+      {
+        platform = "mqtt";
+        name = "Zigbee2mqtt Version";
+        state_topic = "/zigbee/bridge/config";
+        value_template = "{{ value_json.version }}";
+        icon = "mdi:zigbee";
+      }
+      # Sensor for Showing the Coordinator Version
+      {
+        platform = "mqtt";
+        name = "Coordinator Version";
+        state_topic = "/zigbee/bridge/config";
+        value_template = "{{ value_json.coordinator }}";
+        icon = "mdi:chip";
+      }
+    ];
+    switch = [
+      {
+        platform = "mqtt";
+        name = "Zigbee2mqtt Main join";
+        state_topic = "/zigbee/bridge/config/permit_join";
+        command_topic = "/zigbee/bridge/config/permit_join";
+        payload_on = "true";
+        payload_off = "false";
+      }
+    ];
+    automation = [
+      {
+        alias = "Zigbee2mqtt Log Level";
+        initial_state = "on";
+        trigger = {
+          platform = "state";
+          entity_id = "input_select.zigbee2mqtt_log_level";
+        };
+        action = [
+          {
+            service =  "mqtt.publish";
+            data = {
+              payload_template = "{{ states('input_select.zigbee2mqtt_log_level') }}";
+              topic =  "/zigbee/bridge/config/log_level";
+            };
+          }
+        ];
+      }
+      # Automation to start timer when enable join is turned on
+      {
+        id = "zigbee_join_enabled";
+        alias = "Zigbee Join Enabled";
+        hide_entity = "true";
+        trigger = {
+          platform = "state";
+          entity_id = "switch.zigbee2mqtt_main_join";
+          to = "on";
+        };
+        action = {
+          service = "timer.start";
+          entity_id = "timer.zigbee_permit_join";
+        };
+      }
+      # Automation to stop timer when switch turned off and turn off switch when timer finished
+      {
+        id = "zigbee_join_disabled";
+        alias = "Zigbee Join Disabled";
+        hide_entity = "true";
+        trigger = [
+          {
+            platform = "event";
+            event_type = "timer.finished";
+            event_data.entity_id = "timer.zigbee_permit_join";
+          }
+          {
+            platform = "state";
+            entity_id = "switch.zigbee2mqtt_main_join";
+            to = "off";
+          }
+        ];
+        action = [
+          { service = "timer.cancel";
+            data.entity_id = "timer.zigbee_permit_join";
+          }
+          { service = "switch.turn_off";
+            entity_id = "switch.zigbee2mqtt_main_join";
+          }
+        ];
+      }
+    ];
+    input_select.zigbee2mqtt_log_level = {
+      name = "Zigbee2mqtt Log Level";
+      options = [
+        "debug"
+        "info"
+        "warn"
+        "error"
+      ];
+      initial = "info";
+      icon = "mdi:format-list-bulleted";
+    };
+
+    timer.zigbee_permit_join = {
+      name = "Zigbee Time remaining";
+      duration = 120;
+    };
+  };
+}
+
-- 
cgit v1.2.3


From 085074a5c6d3ac4ea6d1517e4f96e46d49d720fa Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 21 Apr 2020 14:21:40 +0200
Subject: l shodan.r: show realwallpaper

---
 lass/1systems/shodan/config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix
index 064a5695..831e03f7 100644
--- a/lass/1systems/shodan/config.nix
+++ b/lass/1systems/shodan/config.nix
@@ -21,6 +21,7 @@ with import <stockholm/lib>;
     <stockholm/lass/2configs/gg23.nix>
     <stockholm/lass/2configs/hass>
     <stockholm/lass/2configs/br.nix>
+    <stockholm/lass/2configs/fetchWallpaper.nix>
   ];
 
   krebs.build.host = config.krebs.hosts.shodan;
-- 
cgit v1.2.3


From a50494cc5a192161151cce84716666d205873fd5 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 21 Apr 2020 14:24:14 +0200
Subject: l emot-menu: add more

---
 lass/5pkgs/emot-menu/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lass/5pkgs/emot-menu/default.nix b/lass/5pkgs/emot-menu/default.nix
index d5d84e45..440e160d 100644
--- a/lass/5pkgs/emot-menu/default.nix
+++ b/lass/5pkgs/emot-menu/default.nix
@@ -18,6 +18,9 @@
 ζ | zeta
 (╯°□°）╯ ┻━┻ | table flip
 (」゜ロ゜)」 | why woot
+(_゜_゜_) | gloom I see you
+༼ ༎ຶ ෴ ༎ຶ༽ | sad
+(\/) (°,,,,°) (\/) | krebs
   '';
 
 in
-- 
cgit v1.2.3


From cabaf519b5970cbe5c1e57832d3bd12da4f47371 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 21 Apr 2020 14:38:00 +0200
Subject: l: add hass module

---
 lass/3modules/default.nix |  1 +
 lass/3modules/hass.nix    | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 lass/3modules/hass.nix

diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index 90dcb9d9..057c7c74 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -4,6 +4,7 @@ _:
     ./dnsmasq.nix
     ./ejabberd
     ./folderPerms.nix
+    ./hass.nix
     ./hosts.nix
     ./mysql-backup.nix
     ./news.nix
diff --git a/lass/3modules/hass.nix b/lass/3modules/hass.nix
new file mode 100644
index 00000000..30158e78
--- /dev/null
+++ b/lass/3modules/hass.nix
@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+with import <stockholm/lib>;
+let
+
+  cfg = config.lass.hass;
+
+in {
+  options.lass.hass = {
+    config = mkOption {
+      default = {};
+      type =  with lib.types; let
+          valueType = nullOr (oneOf [
+            bool
+            int
+            float
+            str
+            (attrsOf valueType)
+            (listOf valueType)
+          ]) // {
+            description = "Yaml value";
+            emptyValue.value = {};
+          };
+        in valueType;
+    };
+  };
+
+  config =
+    assert versionOlder version "20.09";
+    mkIf (cfg.config != {})
+     {
+      services.home-assistant.config = cfg.config;
+    };
+}
+
-- 
cgit v1.2.3