summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs/awesomecfg
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-02-27 00:08:43 +0100
committermakefu <github@syntax-fehler.de>2018-02-27 00:08:43 +0100
commitaa919a77976a8b93430c99e1d63fae5eb3198254 (patch)
tree738af92056720790137eddea47177d8bc0d9a92f /makefu/5pkgs/awesomecfg
parent02a53c3b9e530d5c30d1dc68b1620ee7240b3874 (diff)
ma pkgs: cleanup awesomecfg, custom, shackie
Diffstat (limited to 'makefu/5pkgs/awesomecfg')
-rw-r--r--makefu/5pkgs/awesomecfg/default.nix25
-rw-r--r--makefu/5pkgs/awesomecfg/full.cfg14
l---------makefu/5pkgs/awesomecfg/result1
3 files changed, 29 insertions, 11 deletions
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