diff options
| author | jeschli <jeschli@gmail.com> | 2018-03-20 15:37:44 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-03-20 15:37:44 +0100 |
| commit | 01358d3947b46c2d9cceb7f6c53855cb536d6efe (patch) | |
| tree | 194c3c5e346327774603f8948a0fa301a082be90 /makefu/5pkgs/awesomecfg | |
| parent | 390375cd8a0c745eb6b4df93f3f6f3e5f2985c90 (diff) | |
| parent | 6267aa42509a4f56dc95dfc2db7773c33ca12522 (diff) | |
Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschli
Diffstat (limited to 'makefu/5pkgs/awesomecfg')
| -rw-r--r-- | makefu/5pkgs/awesomecfg/default.nix | 25 | ||||
| -rw-r--r-- | makefu/5pkgs/awesomecfg/full.cfg | 14 |
2 files changed, 28 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 () |