ma awesome: make locker configurable
This commit is contained in:
parent
d22893058c
commit
df15d6979d
|
@ -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 = {
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 ()
|
||||
|
|
Loading…
Reference in a new issue