11 files changed, 55 insertions, 7 deletions
diff --git a/makefu/2configs/dict.nix b/makefu/2configs/dict.nix
index 6db9102ba..08f1f8502 100644
--- a/makefu/2configs/dict.nix
+++ b/makefu/2configs/dict.nix
@@ -1,5 +1,6 @@
 { pkgs, ... }:
 {
+  environment.shellAliases.dict = "dict -h 127.0.0.1";
   services.dictd.enable = true;
   services.dictd.DBs = with pkgs.dictdDBs; [ wiktionary wordnet deu2eng eng2deu ];
 }
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 4890e4afe..0ff855980 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -62,6 +62,15 @@ let
   make-krebs-repo = with git; name: { cgit ? {}, ... }: {
     inherit cgit name;
     public = true;
+    hooks = {
+      post-receive = pkgs.git-hooks.irc-announce {
+        nick = config.networking.hostName;
+        verbose = config.krebs.build.host.name == "gum";
+        channel = "#xxx";
+        # TODO remove the hardcoded hostname
+        server = "irc.r";
+      };
+    };
   };
 
 
diff --git a/makefu/2configs/home-manager/desktop.nix b/makefu/2configs/home-manager/desktop.nix
index 3be020faa..63a5cdbef 100644
--- a/makefu/2configs/home-manager/desktop.nix
+++ b/makefu/2configs/home-manager/desktop.nix
@@ -11,6 +11,15 @@
     services.network-manager-applet.enable = true;
     services.blueman-applet.enable = true;
     services.pasystray.enable = true;
+    services.flameshot.enable = true;
+    home.file.".config/Dharkael/flameshot.ini".text = ''
+      [General]
+      disabledTrayIcon=false
+      drawColor=@Variant(\0\0\0\x43\x1\xff\xff\0\0\0\0\xff\xff\0\0)
+      drawThickness=0
+      filenamePattern=%F_%T_shot
+    '';
+
     systemd.user.services.pasystray.Service.Environment = "PATH=" + (lib.makeBinPath (with pkgs;[ pavucontrol paprefs /* pavumeter  */  /* paman */ ]) );
     programs.chromium = {
       enable = true;
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 59658e667..6c7b632e1 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -86,7 +86,8 @@
         share = true;
       };
       sessionVariables = {
-        TERM = "rxvt-unicode-256color";
+        # TERM = "rxvt-unicode-256color";
+        TERM = "xterm";
         LANG = "en_US.UTF8";
         LS_COLORS = ":di=1;31:";
         EDITOR = "vim";
diff --git a/makefu/2configs/homeautomation/default.nix b/makefu/2configs/homeautomation/default.nix
index 596d0002a..2af311c3b 100644
--- a/makefu/2configs/homeautomation/default.nix
+++ b/makefu/2configs/homeautomation/default.nix
@@ -257,4 +257,8 @@ in {
     enable = true;
     #configDir = "/var/lib/hass";
   };
+  nixpkgs.config.permittedInsecurePackages = [
+    "homeassistant-0.77.2"
+  ];
+
 }
diff --git a/makefu/2configs/homeautomation/google-muell.nix b/makefu/2configs/homeautomation/google-muell.nix
index 235cc1546..5870f298d 100644
--- a/makefu/2configs/homeautomation/google-muell.nix
+++ b/makefu/2configs/homeautomation/google-muell.nix
@@ -3,13 +3,20 @@ with import <stockholm/lib>;
 let
   pkg = pkgs.ampel;
   home = "/var/lib/ampel";
-  sec = "${toString <secrets>}/google-muell.json";
+  sec = "${toString <secrets>}/ampel/google-muell.json";
   ampelsec = "${home}/google-muell.json";
-  cred = "${toString <secrets>}/google-muell-creds.json";
+  cred = "${toString <secrets>}/ampel/google-muell-creds.json";
   # TODO: generate this credential file locally
   ampelcred = "${home}/google-muell-creds.json";
-  esp = "192.168.8.204";
   sleepval = "1800";
+  default-color = "244,220,66";
+  config_json = toFile "config.json" (toJSON {
+    mq_hostname = "localhost";
+    mq_port = 1883;
+    mq_username = "sensor";
+    mq_topic = "/ham/flurlicht/cmnd/MEM1";
+    mq_password = replaceChars ["\n"] [""] (readFile "${toString <secrets>}/mqtt/sensor");
+  });
 in {
   users.users.ampel = {
     uid = genid "ampel";
@@ -27,7 +34,7 @@ in {
         install -m600 -o ampel ${sec} ${ampelsec}
         install -m600 -o ampel ${cred} ${ampelcred}
       '';
-      ExecStart = "${pkg}/bin/google-muell --esp=${esp} --client-secrets=${ampelsec} --credential-path=${ampelcred} --sleepval=${sleepval}";
+      ExecStart = "${pkg}/bin/google-muell --config ${config_json} --default-color=${default-color} --client-secrets=${ampelsec} --credential-path=${ampelcred} --sleepval=${sleepval}";
       PermissionsStartOnly = true;
       Restart = "always";
       RestartSec = 10;
diff --git a/makefu/2configs/remote-build/gum.nix b/makefu/2configs/remote-build/gum.nix
new file mode 100644
index 000000000..98e2e58b5
--- /dev/null
+++ b/makefu/2configs/remote-build/gum.nix
@@ -0,0 +1,15 @@
+{
+  nix = {
+    distributedBuilds = true;
+    buildMachines = [
+      {
+        hostName = "gum.krebsco.de";
+        maxJobs = 8;
+        sshKey = toString <secrets/id_nixBuild>;
+        sshUser = "nixBuild";
+        system = "x86_64-linux";
+        supportedFeatures = [ ];
+      }
+    ];
+  };
+}
diff --git a/makefu/2configs/remote-build/slave.nix b/makefu/2configs/remote-build/slave.nix
index 89121ffd6..0227f512a 100644
--- a/makefu/2configs/remote-build/slave.nix
+++ b/makefu/2configs/remote-build/slave.nix
@@ -5,6 +5,7 @@
       useDefaultShell = true;
       openssh.authorizedKeys.keys = [
         config.krebs.users.buildbotSlave.pubkey
+        config.krebs.users.makefu-remote-builder.pubkey
       ];
     };
 }
diff --git a/makefu/2configs/tools/core-gui.nix b/makefu/2configs/tools/core-gui.nix
index 1e85da53c..582d941a6 100644
--- a/makefu/2configs/tools/core-gui.nix
+++ b/makefu/2configs/tools/core-gui.nix
@@ -2,6 +2,7 @@
 
 {
   users.users.makefu.packages = with pkgs; [
+    at_spi2_core
     chromium
     feh
     clipit
diff --git a/makefu/2configs/tools/core.nix b/makefu/2configs/tools/core.nix
index 33e896d4c..b4c3a431e 100644
--- a/makefu/2configs/tools/core.nix
+++ b/makefu/2configs/tools/core.nix
@@ -8,7 +8,6 @@
     ( pkgs.writeScriptBin "unknow" ''#!/bin/sh
 ${gnused}/bin/sed -i "''${1}d" ~/.ssh/known_hosts
     '')
-    at_spi2_core
     acpi
     bc
     rsync
@@ -17,6 +16,7 @@ ${gnused}/bin/sed -i "''${1}d" ~/.ssh/known_hosts
     lsof
     which
     binutils
+    screen
 
     # fs
     cifs-utils
diff --git a/makefu/2configs/tools/games.nix b/makefu/2configs/tools/games.nix
index 40ea4523d..0f1e61791 100644
--- a/makefu/2configs/tools/games.nix
+++ b/makefu/2configs/tools/games.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./steam.nix
+    # ./steam.nix
   ];
   users.users.makefu.packages = with pkgs; [
     games-user-env