From aa919a77976a8b93430c99e1d63fae5eb3198254 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 27 Feb 2018 00:08:43 +0100
Subject: [PATCH] ma pkgs: cleanup awesomecfg, custom, shackie

---
 makefu/3modules/awesome-extra.nix   | 10 +--------
 makefu/5pkgs/awesomecfg/default.nix | 25 ++++++++++++++++++----
 makefu/5pkgs/awesomecfg/full.cfg    | 14 ++++++------
 makefu/5pkgs/awesomecfg/result      |  1 +
 makefu/5pkgs/custom/default.nix     |  3 ---
 makefu/5pkgs/shackie/default.nix    | 33 -----------------------------
 6 files changed, 30 insertions(+), 56 deletions(-)
 create mode 120000 makefu/5pkgs/awesomecfg/result
 delete mode 100644 makefu/5pkgs/custom/default.nix
 delete mode 100644 makefu/5pkgs/shackie/default.nix

diff --git a/makefu/3modules/awesome-extra.nix b/makefu/3modules/awesome-extra.nix
index 0561c15a8..e4a79aa87 100644
--- a/makefu/3modules/awesome-extra.nix
+++ b/makefu/3modules/awesome-extra.nix
@@ -29,15 +29,7 @@ let
     nixpkgs.config.packageOverrides = pkgs: rec {
       awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
           postFixup = let
-            rclua = pkgs.substituteAll {
-              src = cfg.baseConfig;
-              modkey = cfg.modkey;
-              # inherit (cfg) modkey;
-              amixer = "${pkgs.alsaUtils}/bin/amixer";
-              xlock = "${pkgs.xlockmore}/bin/xlock";
-              xbacklight = "${pkgs.xorg.xbacklight}/bin/xbacklight";
-
-            };
+            rclua = cfg.baseConfig.override { inherit (cfg) modkey; };
           in "cp ${rclua}  $out/etc/xdg/awesome/rc.lua";
       });
     };
diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
index 3c9340692..7e9724ec8 100644
--- a/makefu/5pkgs/awesomecfg/default.nix
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -1,7 +1,24 @@
-_:
+{ pkgs
+, lib
+, alsaUtils
+, xlockmore
+, xbacklight
+, modkey?"Mod4"
+, ... }:
 
 {
-  # replace: @amixer@ @xlock@ @xbacklight@
-  full = ./full.cfg;
-  kiosk = ./kiosk.lua;
+  # replace: @alsaUtils@ @xlockmore@ @xbacklight@ @modkey@
+  full = lib.makeOverridable pkgs.substituteAll {
+    name = "awesome_full_config";
+    inherit alsaUtils xlockmore xbacklight modkey;
+    isExecutable = false;
+    src = ./full.cfg;
+  };
+
+  kiosk = lib.makeOverridable pkgs.substituteAll {
+    name = "awesome_kiosk_config";
+    inherit alsaUtils xlockmore xbacklight modkey;
+    isExecutable = false;
+    src = ./kiosk.lua;
+  };
 }
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 993942771..3488d0102 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -365,22 +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@/bin/xbacklight -inc 5", false) end),
     awful.key({ }, "XF86MonBrightnessDown", function ()
-        awful.util.spawn("@xbacklight@ -dec 5", false) end),
+        awful.util.spawn("@xbacklight@/bin/xbacklight -dec 5", false) end),
 
     awful.key({ }, "XF86AudioRaiseVolume", function ()
-        awful.util.spawn("@amixer@ set Master 5%+", false) end),
+        awful.util.spawn("@alsaUtils@/bin/amixer set Master 5%+", false) end),
     awful.key({ }, "XF86AudioLowerVolume", function ()
-        awful.util.spawn("@amixer@ set Master 5%-", false) end),
+        awful.util.spawn("@alsaUtils@/bin/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("@alsaUtils@/bin/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,"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("@xlockmore@/bin/xlock -mode blank")   end),
+    awful.key({ }, "XF86ScreenSaver",  function ()  awful.util.spawn("@xlockmore@/bin/xlock -mode blank")   end),
 
 		awful.key({ modkey }, "x",
 									function ()
diff --git a/makefu/5pkgs/awesomecfg/result b/makefu/5pkgs/awesomecfg/result
new file mode 120000
index 000000000..b6e72501a
--- /dev/null
+++ b/makefu/5pkgs/awesomecfg/result
@@ -0,0 +1 @@
+/nix/store/w7c49s795z5g4j9fwq05a0bck0pbkz3h-awesome_full_config
\ No newline at end of file
diff --git a/makefu/5pkgs/custom/default.nix b/makefu/5pkgs/custom/default.nix
deleted file mode 100644
index 626938cdc..000000000
--- a/makefu/5pkgs/custom/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{}:
-{
-}
diff --git a/makefu/5pkgs/shackie/default.nix b/makefu/5pkgs/shackie/default.nix
deleted file mode 100644
index b6cf8afe6..000000000
--- a/makefu/5pkgs/shackie/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ pkgs, fetchFromGitHub, ... }:
-with pkgs.python3Packages;
-let
-  asyncio-irc = buildPythonPackage rec {
-      name = "asyncio-irc-${version}";
-      version = "2016-09-02";
-      src = fetchFromGitHub {
-        owner = "watchtower";
-        repo = "asyncirc";
-        rev = "5384d19";
-        sha256 = "0xgzdvp0ig0im7r3vbqd3a9rzac0lkk2mvf7y4fw56p8k61df8nv";
-      };
-      propagatedBuildInputs = [ blinker ];
-  };
-in
-buildPythonPackage rec {
-    name = "shackie-${version}";
-    version = "2017-04-24";
-    propagatedBuildInputs = [
-      asyncio-irc
-      beautifulsoup4
-      lxml
-      pytz
-      redis
-      requests
-    ];
-    src = fetchFromGitHub {
-      owner = "shackspace";
-      repo = "shackie";
-      rev = "e717ec7";
-      sha256 = "1ffbjm3x2xcyxl42hfsjs5xg1pm0xsprdi5if9zxa5ycqydmiw3l";
-    };
-}