From 4719eb8d581dc6462e8531959c6e841e51c4f0d7 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 2 Aug 2016 15:40:41 +0200
Subject: m 2 main-laptop: remove obsolete display

---
 makefu/2configs/base-gui.nix    |  2 +-
 makefu/2configs/main-laptop.nix | 27 +++++++++++++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index a028e5073..b039c12ca 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -55,7 +55,7 @@ in
 
   hardware.pulseaudio = {
      enable = true;
-   #  systemWide = true;
+     systemWide = true;
   };
   services.xserver.displayManager.sessionCommands = let
     xdefaultsfile = pkgs.writeText "Xdefaults"  ''
diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
index 92cc1fc43..9d5b06f70 100644
--- a/makefu/2configs/main-laptop.nix
+++ b/makefu/2configs/main-laptop.nix
@@ -6,7 +6,10 @@
 # TODO split generic desktop stuff and laptop-specifics like lidswitching
 
 with config.krebs.lib;
-{
+let
+  window-manager = "awesome";
+  user = config.krebs.build.user.name;
+in {
   imports = [
     ./base-gui.nix
     ./fetchWallpaper.nix
@@ -17,23 +20,32 @@ with config.krebs.lib;
   users.users.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];
 
   krebs.power-action = let
-    speak = "${pkgs.espeak}/bin/espeak";
-    whisper = text: ''${pkgs.espeak}/bin/espeak -v +whisper -s 110 "${text}"'';
-    note = "${pkgs.libnotify}/bin/notify-send";
+    #speak = "XDG_RUNTIME_DIR=/run/user/$(id -u) ${pkgs.espeak}/bin/espeak"; # when run as user
+    speak = "${pkgs.espeak}/bin/espeak"; # systemwide pulse
+    whisper = text: ''${speak} -v +whisper -s 110 "${text}"'';
+
+    note = pkgs.writeDash "note-as-user" ''
+      eval "export $(egrep -z DBUS_SESSION_BUS_ADDRESS /proc/$(${pkgs.procps}/bin/pgrep -u ${user} ${window-manager})/environ)"
+      ${pkgs.libnotify}/bin/notify-send "$@";
+    '';
   in {
     enable = true;
+    inherit user;
     plans.low-battery = {
       upperLimit = 25;
       lowerLimit = 15;
       charging = false;
-      action = whisper "power level low, please plug me in";
+      action = pkgs.writeDash "low-speak" ''
+        ${whisper "power level low, please plug me in"}
+      '';
     };
     plans.nag-harder = {
       upperLimit = 15;
       lowerLimit = 5;
+      charging = false;
       action = pkgs.writeDash "crit-speak" ''
+        ${note} Battery -u critical -t 60000 "Power level critical, do something!"
         ${whisper "Power level critical, do something"}
-        ${note} Battery -u critical -t 600000 "Power level critical, do something!"
       '';
     };
     plans.last-chance = {
@@ -52,8 +64,7 @@ with config.krebs.lib;
       '';
     };
   };
-  users.users.power-action.extraGroups = [ "audio" ];
-  security.sudo.extraConfig = "${config.krebs.power-action.user.name} ALL= (root) NOPASSWD: ${pkgs.systemd}/bin/systemctl suspend";
+  security.sudo.extraConfig = "${config.krebs.power-action.user} ALL= (root) NOPASSWD: ${pkgs.systemd}/bin/systemctl suspend";
 
   services.redshift = {
     enable = true;
-- 
cgit v1.2.3


From b197949ab83ee3ee87b5774e0fc7c8d0123a6708 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 2 Aug 2016 19:09:42 +0200
Subject: m 5 f3: init

---
 makefu/5pkgs/default.nix    |  1 +
 makefu/5pkgs/f3/default.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 makefu/5pkgs/f3/default.nix

diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 29e762f27..6598f5d3f 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -11,6 +11,7 @@ in
     awesomecfg = callPackage ./awesomecfg {};
     bintray-upload = callPackage ./bintray-upload {};
     inherit (callPackage ./devpi {}) devpi-web devpi-server;
+    f3 = callPackage ./f3 {};
     farpd = callPackage ./farpd {};
     git-xlsx-textconv = callPackage ./git-xlsx-textconv {};
     mergerfs = callPackage ./mergerfs {};
diff --git a/makefu/5pkgs/f3/default.nix b/makefu/5pkgs/f3/default.nix
new file mode 100644
index 000000000..e7f20b1e6
--- /dev/null
+++ b/makefu/5pkgs/f3/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "f3-${version}";
+  version = "6.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchFromGitHub {
+    owner = "AltraMayor";
+    repo = "f3";
+    rev = "v${version}";
+    sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+  patchPhase = "sed -i 's/-oroot -groot//' Makefile";
+
+  meta = {
+    description = "Fight Flash Fraud";
+    homepage = http://oss.digirati.com.br/f3/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ makefu ];
+  };
+}
-- 
cgit v1.2.3