From df15d6979d775fce124eaf617341cb5e19301262 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 13 Mar 2018 11:34:28 +0100
Subject: [PATCH] ma awesome: make locker configurable

---
 3modules/awesome-extra.nix   |  4 +++-
 5pkgs/awesomecfg/default.nix |  6 +++---
 5pkgs/awesomecfg/full.cfg    | 32 ++++++++++++++++----------------
 5pkgs/awesomecfg/kiosk.lua   |  4 ++--
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/3modules/awesome-extra.nix b/3modules/awesome-extra.nix
index e4a79aa..6f19f8f 100644
--- a/3modules/awesome-extra.nix
+++ b/3modules/awesome-extra.nix
@@ -21,7 +21,9 @@ let
         This module will use substituteAll to replace strings before writing to
         /etc/xdg/awesome/rc.lua
       '';
-      default = pkgs.awesomecfg.full;
+      default = pkgs.awesomecfg.full.override {
+        locker = "${pkgs.i3lock}/bin/i3lock -i /var/lib/wallpaper/wallpaper";
+      };
     };
   };
   imp = {
diff --git a/5pkgs/awesomecfg/default.nix b/5pkgs/awesomecfg/default.nix
index 7e9724e..e5f62e9 100644
--- a/5pkgs/awesomecfg/default.nix
+++ b/5pkgs/awesomecfg/default.nix
@@ -1,23 +1,23 @@
 { pkgs
 , lib
 , alsaUtils
-, xlockmore
 , xbacklight
 , modkey?"Mod4"
+, locker? "${pkgs.xlock}/bin/xlock -mode blank"
 , ... }:
 
 {
   # replace: @alsaUtils@ @xlockmore@ @xbacklight@ @modkey@
   full = lib.makeOverridable pkgs.substituteAll {
     name = "awesome_full_config";
-    inherit alsaUtils xlockmore xbacklight modkey;
+    inherit alsaUtils locker xbacklight modkey;
     isExecutable = false;
     src = ./full.cfg;
   };
 
   kiosk = lib.makeOverridable pkgs.substituteAll {
     name = "awesome_kiosk_config";
-    inherit alsaUtils xlockmore xbacklight modkey;
+    inherit alsaUtils locker xbacklight modkey;
     isExecutable = false;
     src = ./kiosk.lua;
   };
diff --git a/5pkgs/awesomecfg/full.cfg b/5pkgs/awesomecfg/full.cfg
index 3488d01..e748981 100644
--- a/5pkgs/awesomecfg/full.cfg
+++ b/5pkgs/awesomecfg/full.cfg
@@ -243,7 +243,7 @@ awful.screen.connect_for_each_screen(function(s)
     set_wallpaper(s)
 
     -- Each screen has its own tag table.
-		awful.tag({ "tmp", "news", "www", "im", "work1","work2","net","misc","remote" }, s, awful.layout.layouts[1])
+    awful.tag({ "tmp", "news", "www", "im", "work1","work2","net","misc","remote" }, s, awful.layout.layouts[1])
 
     -- Create a promptbox for each screen
     s.mypromptbox = awful.widget.prompt()
@@ -277,10 +277,10 @@ awful.screen.connect_for_each_screen(function(s)
         { -- Right widgets
             layout = wibox.layout.fixed.horizontal,
             mykeyboardlayout,
-						mailwidget,
+            mailwidget,
             wibox.widget.systray(),
-						cpuwidget,
-						batwidget,
+            cpuwidget,
+            batwidget,
             mytextclock,
             s.mylayoutbox,
         },
@@ -379,19 +379,19 @@ globalkeys = awful.util.table.join(
     -- Prompt
     awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
               {description = "run prompt", group = "launcher"}),
-    awful.key({ modkey,"Control"  }, "BackSpace",  function ()  awful.util.spawn("@xlockmore@/bin/xlock -mode blank")   end),
-    awful.key({ }, "XF86ScreenSaver",  function ()  awful.util.spawn("@xlockmore@/bin/xlock -mode blank")   end),
+    awful.key({ modkey,"Control"  }, "BackSpace",  function () awful.util.spawn("@locker@")   end),
+    awful.key({ }, "XF86ScreenSaver",  function () awful.util.spawn("@locker@")   end),
 
-		awful.key({ modkey }, "x",
-									function ()
-											awful.prompt.run {
-												prompt       = "Run Lua code: ",
-												textbox      = awful.screen.focused().mypromptbox.widget,
-												exe_callback = awful.util.eval,
-												history_path = awful.util.get_cache_dir() .. "/history_eval"
-											}
-									end,
-									{description = "lua execute prompt", group = "awesome"}),
+    awful.key({ modkey }, "x",
+                  function ()
+                      awful.prompt.run {
+                        prompt       = "Run Lua code: ",
+                        textbox      = awful.screen.focused().mypromptbox.widget,
+                        exe_callback = awful.util.eval,
+                        history_path = awful.util.get_cache_dir() .. "/history_eval"
+                      }
+                  end,
+                  {description = "lua execute prompt", group = "awesome"}),
 
     -- Menubar
     awful.key({ modkey }, "p", function() menubar.show() end)
diff --git a/5pkgs/awesomecfg/kiosk.lua b/5pkgs/awesomecfg/kiosk.lua
index ec255a8..d0261f7 100644
--- a/5pkgs/awesomecfg/kiosk.lua
+++ b/5pkgs/awesomecfg/kiosk.lua
@@ -331,8 +331,8 @@ globalkeys = awful.util.table.join(
     -- Prompt
     awful.key({ modkey },                 "r",     function () mypromptbox[mouse.screen]:run() end),
     -- 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("@locker@")   end),
+    awful.key({ }, "XF86ScreenSaver",  function ()  awful.util.spawn("@locker@")   end),
 
     awful.key({ modkey }, "x",
               function ()