added more widgets, rewritten folder structure
This commit is contained in:
@@ -2,10 +2,9 @@
|
||||
local awful = require("awful")
|
||||
local gears = require("gears")
|
||||
|
||||
local _M = {}
|
||||
local modkey = RC.vars.modkey
|
||||
local modkey = user_vars.vars.modkey
|
||||
|
||||
function _M.get(globalkeys)
|
||||
return function (globalkeys)
|
||||
for i = 1, 9 do
|
||||
globalkeys = gears.table.join(globalkeys,
|
||||
|
||||
@@ -67,6 +66,4 @@ function _M.get(globalkeys)
|
||||
)
|
||||
end
|
||||
return globalkeys
|
||||
end
|
||||
|
||||
return _M.get
|
||||
end
|
||||
@@ -2,10 +2,9 @@
|
||||
local awful = require("awful")
|
||||
local gears = require("gears")
|
||||
|
||||
local _M = {}
|
||||
local modkey = RC.vars.modkey
|
||||
local modkey = user_vars.vars.modkey
|
||||
|
||||
function _M.get()
|
||||
return function ()
|
||||
local clientbuttons = gears.table.join(
|
||||
awful.button({ }, 1, function (c)
|
||||
c:emit_signal("request::activate", "mouse_click", { raise = true })
|
||||
@@ -20,6 +19,4 @@ function _M.get()
|
||||
end)
|
||||
)
|
||||
return clientbuttons
|
||||
end
|
||||
|
||||
return _M.get
|
||||
end
|
||||
@@ -2,10 +2,9 @@
|
||||
local awful = require("awful")
|
||||
local gears = require("gears")
|
||||
|
||||
local _M = {}
|
||||
local modkey = RC.vars.modkey
|
||||
local modkey = user_vars.vars.modkey
|
||||
|
||||
function _M.get()
|
||||
return function ()
|
||||
local clientkeys = gears.table.join(
|
||||
awful.key(
|
||||
{ modkey },
|
||||
@@ -22,11 +21,11 @@ function _M.get()
|
||||
function(c)
|
||||
c:kill()
|
||||
end,
|
||||
{ description = "Close window", group = "Client" }
|
||||
{ description = "Close focused client", group = "Client" }
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"space",
|
||||
"g",
|
||||
awful.client.floating.toggle,
|
||||
{ description = "Toggle floating window", group = "Client" }
|
||||
),
|
||||
@@ -37,19 +36,8 @@ function _M.get()
|
||||
c.maximized = not c.maximized
|
||||
c:raise()
|
||||
end ,
|
||||
{description = "(un)maximize", group = "client"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
"m",
|
||||
function (c)
|
||||
c.maximized_vertical = not c.maximized_vertical
|
||||
c:raise()
|
||||
end,
|
||||
{ description = "Unmaximize", group = "client"}
|
||||
{description = "(un)maximize", group = "Client"}
|
||||
)
|
||||
)
|
||||
return clientkeys
|
||||
end
|
||||
|
||||
return _M.get
|
||||
end
|
||||
@@ -2,18 +2,13 @@
|
||||
local gears = require("gears")
|
||||
local awful = require("awful")
|
||||
|
||||
local _M = {}
|
||||
local modkey = RC.vars.modkey
|
||||
|
||||
function _M.get()
|
||||
return function ()
|
||||
local globalbuttons = gears.table.join(
|
||||
awful.button({ }, 3, function()
|
||||
RC.mainmenu:toggle()
|
||||
user_vars.main_menu:toggle()
|
||||
end),
|
||||
awful.button({ }, 4, awful.tag.viewnext),
|
||||
awful.button({ }, 5, awful.tag.viewprev)
|
||||
)
|
||||
return globalbuttons
|
||||
end
|
||||
|
||||
return _M.get
|
||||
end
|
||||
@@ -4,45 +4,42 @@ local awful = require("awful")
|
||||
local hotkeys_popup = require("awful.hotkeys_popup")
|
||||
|
||||
-- Resource Configuration
|
||||
local modkey = RC.vars.modkey
|
||||
local terminal = RC.vars.terminal
|
||||
local modkey = user_vars.vars.modkey
|
||||
|
||||
local _M = {}
|
||||
|
||||
function _M.get()
|
||||
return function()
|
||||
local globalkeys = gears.table.join(
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"s",
|
||||
hotkeys_popup.show_help,
|
||||
{description="Cheet Sheet", group="Awesome"}
|
||||
{description="Cheat sheet", group="Awesome"}
|
||||
),
|
||||
-- Tag browsing
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"Left",
|
||||
awful.tag.viewprev,
|
||||
{description = "View previous", group = "Tag"}
|
||||
{description = "View previous tag", group = "Tag"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"Right",
|
||||
awful.tag.viewnext,
|
||||
{description = "View next", group = "Tag"}
|
||||
{description = "View next tag", group = "Tag"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"Escape",
|
||||
awful.tag.history.restore,
|
||||
{description = "Go back", group = "Tag"}
|
||||
{description = "Go back to last tag", group = "Tag"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"j",
|
||||
function ()
|
||||
awful.client.focus.byidx( 1)
|
||||
awful.client.focus.byidx(1)
|
||||
end,
|
||||
{description = "Focus next by index", group = "Client"}
|
||||
{description = "Focus next client by index", group = "Client"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
@@ -50,21 +47,21 @@ function _M.get()
|
||||
function ()
|
||||
awful.client.focus.byidx(-1)
|
||||
end,
|
||||
{description = "Focus previous by index", group = "Client"}
|
||||
{description = "Focus previous client by index", group = "Client"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"w",
|
||||
function ()
|
||||
RC.mainmenu:show()
|
||||
function ()
|
||||
user_vars.main_menu:show()
|
||||
end,
|
||||
{description = "Show main menu", group = "Awesome"}
|
||||
{description = "Show context menu", group = "Awesome"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Shift" },
|
||||
"j",
|
||||
function ()
|
||||
awful.client.swap.byidx( 1)
|
||||
awful.client.swap.byidx(1)
|
||||
end,
|
||||
{description = "Swap with next client by index", group = "Client"}
|
||||
),
|
||||
@@ -72,22 +69,22 @@ function _M.get()
|
||||
{ modkey, "Shift" },
|
||||
"k",
|
||||
function ()
|
||||
awful.client.swap.byidx( -1)
|
||||
awful.client.swap.byidx(-1)
|
||||
end,
|
||||
{description = "Swap with previous client by index", group = "Client"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
"j",
|
||||
function ()
|
||||
awful.screen.focus_relative( 1)
|
||||
function ()
|
||||
awful.screen.focus_relative(1)
|
||||
end,
|
||||
{description = "Focus the next screen", group = "Screen"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
"k",
|
||||
function ()
|
||||
function ()
|
||||
awful.screen.focus_relative(-1)
|
||||
end,
|
||||
{description = "Focus the previous screen", group = "Screen"}
|
||||
@@ -96,25 +93,15 @@ function _M.get()
|
||||
{ modkey },
|
||||
"u",
|
||||
awful.client.urgent.jumpto,
|
||||
{description = "Jump to urgent client", group = "Client"}),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"Tab",
|
||||
function ()
|
||||
awful.client.focus.history.previous()
|
||||
if client.focus then
|
||||
client.focus:raise()
|
||||
end
|
||||
end,
|
||||
{description = "Go back", group = "Client"}
|
||||
{description = "Jump to urgent client", group = "Client"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"Return",
|
||||
function ()
|
||||
awful.spawn("alacritty -o font.size=8.0")
|
||||
awful.spawn(user_vars.vars.terminal)
|
||||
end,
|
||||
{description = "Open terminal", group = "Launcher"}
|
||||
{description = "Open terminal", group = "Applications"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
@@ -128,7 +115,7 @@ function _M.get()
|
||||
function ()
|
||||
awful.tag.incmwfact( 0.05)
|
||||
end,
|
||||
{description = "Increase master width factor", group = "Layout"}
|
||||
{description = "Increase client width", group = "Layout"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
@@ -136,29 +123,13 @@ function _M.get()
|
||||
function ()
|
||||
awful.tag.incmwfact(-0.05)
|
||||
end,
|
||||
{description = "Decrease master width factor", group = "Layout"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Shift" },
|
||||
"h",
|
||||
function ()
|
||||
awful.tag.incnmaster( 1, nil, true)
|
||||
end,
|
||||
{description = "Increase the number of master clients", group = "Layout"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Shift" },
|
||||
"l",
|
||||
function ()
|
||||
awful.tag.incnmaster(-1, nil, true)
|
||||
end,
|
||||
{description = "Decrease the number of master clients", group = "Layout"}
|
||||
{description = "Decrease client width", group = "Layout"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
"h",
|
||||
function ()
|
||||
awful.tag.incncol( 1, nil, true)
|
||||
awful.tag.incncol(1, nil, true)
|
||||
end,
|
||||
{description = "Increase the number of columns", group = "Layout"}
|
||||
),
|
||||
@@ -176,189 +147,131 @@ function _M.get()
|
||||
function ()
|
||||
awful.layout.inc(-1)
|
||||
end,
|
||||
{description = "Select previous", group = "Layout"}
|
||||
{description = "Select previous layout", group = "Layout"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
"n",
|
||||
{ modkey, "Shift" },
|
||||
"Return",
|
||||
function ()
|
||||
local c = awful.client.restore()
|
||||
-- Focus restored client
|
||||
if c then
|
||||
c:emit_signal(
|
||||
"request::activate", "key.unminimize", {raise = true}
|
||||
)
|
||||
end
|
||||
awful.layout.inc(1)
|
||||
end,
|
||||
{description = "Restore minimized", group = "Client"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
"Up",
|
||||
function ()
|
||||
awful.client.moveresize( 0, 0, 0, -20)
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
"Down",
|
||||
function ()
|
||||
awful.client.moveresize( 0, 0, 0, 20)
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
"Left",
|
||||
function ()
|
||||
awful.client.moveresize( 0, 0, -20, 0)
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Control" },
|
||||
"Right",
|
||||
function ()
|
||||
awful.client.moveresize( 0, 0, 20, 0)
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Shift" },
|
||||
"Down",
|
||||
function ()
|
||||
awful.client.moveresize( 0, 20, 0, 0)
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Shift" },
|
||||
"Up",
|
||||
function ()
|
||||
awful.client.moveresize( 0, -20, 0, 0)
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Shift" },
|
||||
"Left",
|
||||
function ()
|
||||
awful.client.moveresize(-20, 0, 0, 0)
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Shift" },
|
||||
"Right",
|
||||
function ()
|
||||
awful.client.moveresize( 20, 0, 0, 0)
|
||||
end
|
||||
{description = "Select next layout", group = "Layout"}
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"d",
|
||||
function ()
|
||||
awful.spawn("rofi -show drun -theme ~/.config/rofi/appmenu/rofi.rasi")
|
||||
awful.spawn("rofi -show drun -theme ~/.config/rofi/launcher/launcher.rasi")
|
||||
end,
|
||||
{ descripton = "Start a Application", group = "Application" }
|
||||
{ descripton = "Application launcher", group = "Application" }
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"Tab",
|
||||
function ()
|
||||
awful.spawn("rofi -show window -theme ~/.config/rofi/appmenu/rofi.rasi")
|
||||
awful.spawn("rofi -show window -theme ~/.config/rofi/launcher/launcher.rasi")
|
||||
end,
|
||||
{ descripton = "Start a Application", group = "Application" }
|
||||
{ descripton = "Client switcher (alt+tab)", group = "Application" }
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"e",
|
||||
function ()
|
||||
awful.spawn('nautilus')
|
||||
end,
|
||||
{ descripton = "Start a Application", group = "Application" }
|
||||
),
|
||||
{ modkey },
|
||||
"e",
|
||||
function ()
|
||||
awful.spawn(user_vars.vars.file_manager)
|
||||
end,
|
||||
{ descripton = "Open file manager", group = "System" }
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Shift" },
|
||||
"e",
|
||||
function ()
|
||||
awesome.emit_signal("module::powermenu:show")
|
||||
end,
|
||||
{ descripton = "Open the exit window", group = "System" }
|
||||
{ descripton = "Session options", group = "System" }
|
||||
),
|
||||
awful.key(
|
||||
{ },
|
||||
"Print",
|
||||
function ()
|
||||
awful.spawn("flameshot gui")
|
||||
end
|
||||
awful.spawn(user_vars.vars.screenshot_program)
|
||||
end,
|
||||
{ description = "Screenshot", group = "Applications" }
|
||||
),
|
||||
awful.key(
|
||||
{ },
|
||||
"XF86AudioLowerVolume",
|
||||
function (c)
|
||||
awful.spawn("amixer sset Master 5%-")
|
||||
awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ -2%")
|
||||
awesome.emit_signal("widget::volume")
|
||||
awesome.emit_signal("module::volume_osd:show", true)
|
||||
awesome.emit_signal("module::slider:update")
|
||||
awesome.emit_signal("widget::volume_osd:rerun")
|
||||
end
|
||||
end,
|
||||
{ description = "Lower volume", group = "System" }
|
||||
),
|
||||
awful.key(
|
||||
{ },
|
||||
"XF86AudioRaiseVolume",
|
||||
function (c)
|
||||
awful.spawn("amixer sset Master 5%+")
|
||||
awful.spawn.easy_async_with_shell(
|
||||
[[ pacmd list-sinks | grep "volume: front" | awk '{print $5}' ]],
|
||||
function (stdout)
|
||||
stdout = stdout:gsub("%%", "")
|
||||
local volume = tonumber(stdout) or 0
|
||||
if volume <= 98 then
|
||||
awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ +2%")
|
||||
end
|
||||
end)
|
||||
awesome.emit_signal("widget::volume")
|
||||
awesome.emit_signal("module::volume_osd:show", true)
|
||||
awesome.emit_signal("module::slider:update")
|
||||
awesome.emit_signal("widget::volume_osd:rerun")
|
||||
end
|
||||
end,
|
||||
{ description = "Increase volume", group = "System" }
|
||||
),
|
||||
awful.key(
|
||||
{ },
|
||||
"XF86AudioMute",
|
||||
function (c)
|
||||
awful.spawn("pactl -- set-sink-mute @DEFAULT_SINK@ toggle")
|
||||
awful.spawn("pactl set-sink-mute @DEFAULT_SINK@ toggle")
|
||||
awesome.emit_signal("widget::volume")
|
||||
awesome.emit_signal("module::volume_osd:show", true)
|
||||
awesome.emit_signal("module::slider:update")
|
||||
awesome.emit_signal("widget::volume_osd:rerun")
|
||||
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"F5",
|
||||
function (c)
|
||||
awful.spawn("xbacklight -inc 10%+")
|
||||
awesome.emit_signal("module::brightness_osd:show", true)
|
||||
awesome.emit_signal("module::brightness_slider:update")
|
||||
awesome.emit_signal("widget::brightness_osd:rerun")
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey },
|
||||
"F4",
|
||||
function (c)
|
||||
awful.spawn("xbacklight -dec 10%-")
|
||||
awesome.emit_signal("widget::brightness_osd:rerun")
|
||||
awesome.emit_signal("module::brightness_osd:show", true)
|
||||
awesome.emit_signal("module::brightness_slider:update")
|
||||
end
|
||||
),
|
||||
awful.key(
|
||||
{ modkey, "Shift" },
|
||||
"q",
|
||||
function ()
|
||||
local t = awful.screen.focused().selected_tag
|
||||
t:delete()
|
||||
end
|
||||
end,
|
||||
{ description = "Mute volume", group = "System" }
|
||||
),
|
||||
awful.key(
|
||||
{ },
|
||||
"Escape",
|
||||
"XF86MonBrightnessUp",
|
||||
function (c)
|
||||
awful.spawn("xbacklight -time 100 -inc 10%+")
|
||||
awesome.emit_signal("module::brightness_osd:show", true)
|
||||
awesome.emit_signal("module::brightness_slider:update")
|
||||
awesome.emit_signal("widget::brightness_osd:rerun")
|
||||
end,
|
||||
{ description = "Raise backlight brightness", group = "System" }
|
||||
),
|
||||
awful.key(
|
||||
{ },
|
||||
"XF86MonBrightnessDown",
|
||||
function (c)
|
||||
awful.spawn("xbacklight -time 100 -dec 10%-")
|
||||
awesome.emit_signal("widget::brightness_osd:rerun")
|
||||
awesome.emit_signal("module::brightness_osd:show", true)
|
||||
awesome.emit_signal("module::brightness_slider:update")
|
||||
end,
|
||||
{ description = "Lower backlight brightness", group = "System" }
|
||||
),
|
||||
awful.key(
|
||||
{modkey},
|
||||
"space",
|
||||
function ()
|
||||
awesome.emit_signal("module::powermenu:hide")
|
||||
end
|
||||
awesome.emit_signal("kblayout::toggle")
|
||||
end,
|
||||
{ description = "Toggle keyboard layout", group = "System" }
|
||||
)
|
||||
)
|
||||
|
||||
return globalkeys
|
||||
end
|
||||
|
||||
return setmetatable({ }, { __call = function(_, ...) return _M.get(...) end })
|
||||
Reference in New Issue
Block a user