From 09ef35cb4cbf6e3e4a27cd40ce54bbeb82f7dcbf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 6 Aug 2017 20:28:00 +0200
Subject: ma awesome: template insert packages

---
 makefu/3modules/awesome-extra.nix   |  9 +++++++--
 makefu/5pkgs/awesomecfg/default.nix |  2 +-
 makefu/5pkgs/awesomecfg/full.cfg    | 15 +++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/makefu/3modules/awesome-extra.nix b/makefu/3modules/awesome-extra.nix
index 81c42cba7..0561c15a8 100644
--- a/makefu/3modules/awesome-extra.nix
+++ b/makefu/3modules/awesome-extra.nix
@@ -28,10 +28,15 @@ let
     # TODO: configure display manager as well
     nixpkgs.config.packageOverrides = pkgs: rec {
       awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
-          postFixup = let 
+          postFixup = let
             rclua = pkgs.substituteAll {
               src = cfg.baseConfig;
-              inherit (cfg) modkey;
+              modkey = cfg.modkey;
+              # inherit (cfg) modkey;
+              amixer = "${pkgs.alsaUtils}/bin/amixer";
+              xlock = "${pkgs.xlockmore}/bin/xlock";
+              xbacklight = "${pkgs.xorg.xbacklight}/bin/xbacklight";
+
             };
           in "cp ${rclua}  $out/etc/xdg/awesome/rc.lua";
       });
diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
index b94b6fa54..3c9340692 100644
--- a/makefu/5pkgs/awesomecfg/default.nix
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -1,7 +1,7 @@
 _:
 
 {
-  # TODO:  requires in path: amixer, xlock, xbacklight
+  # replace: @amixer@ @xlock@ @xbacklight@
   full = ./full.cfg;
   kiosk = ./kiosk.lua;
 }
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 73ff42e9f..993942771 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -365,23 +365,22 @@ globalkeys = awful.util.table.join(
               {description = "restore minimized", group = "client"}),
 
     awful.key({ }, "XF86MonBrightnessUp", function ()
-        awful.util.spawn("xbacklight -inc 5", false) end),
+        awful.util.spawn("@xbacklight@ -inc 5", false) end),
     awful.key({ }, "XF86MonBrightnessDown", function ()
-        awful.util.spawn("xbacklight -dec 5", false) end),
+        awful.util.spawn("@xbacklight@ -dec 5", false) end),
 
     awful.key({ }, "XF86AudioRaiseVolume", function ()
-        awful.util.spawn("amixer set Master 5%+", false) end),
+        awful.util.spawn("@amixer@ set Master 5%+", false) end),
     awful.key({ }, "XF86AudioLowerVolume", function ()
-        awful.util.spawn("amixer set Master 5%-", false) end),
+        awful.util.spawn("@amixer@ set Master 5%-", false) end),
     awful.key({ }, "XF86AudioMute", function ()
-        awful.util.spawn("amixer -q -D default sset Master toggle", false) end),
+        awful.util.spawn("@amixer@ -q -D default sset Master toggle", false) end),
 
     -- Prompt
     awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
               {description = "run prompt", group = "launcher"}),
-    -- awful.key({ modkey },            "r",    function () awful.util.spawn( "dmenu_run" ) end ),
-    awful.key({ modkey,"Control"  }, "BackSpace",  function ()  awful.util.spawn("xlock -mode blank")   end),
-    awful.key({ }, "XF86ScreenSaver",  function ()  awful.util.spawn("xlock -mode blank")   end),
+    awful.key({ modkey,"Control"  }, "BackSpace",  function ()  awful.util.spawn("@xlock@ -mode blank")   end),
+    awful.key({ }, "XF86ScreenSaver",  function ()  awful.util.spawn("@xlock@ -mode blank")   end),
 
 		awful.key({ modkey }, "x",
 									function ()
-- 
cgit v1.2.3