diff options
| -rwxr-xr-x | awesome/rc.lua | 89 |
1 files changed, 34 insertions, 55 deletions
diff --git a/awesome/rc.lua b/awesome/rc.lua index df8fa4d1..4e7c2987 100755 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -48,13 +48,13 @@ modkey = "Mod4" -- Table of layouts to cover with awful.layout.inc, order matters. awful.layout.layouts = { - awful.layout.suit.spiral.dwindle, awful.layout.suit.fair, + awful.layout.suit.spiral.dwindle, + awful.layout.suit.max, awful.layout.suit.magnifier, awful.layout.suit.floating, - awful.layout.suit.max, - awful.layout.suit.fair.horizontal, awful.layout.suit.tile.left, + awful.layout.suit.fair.horizontal, -- awful.layout.suit.max.fullscreen, -- awful.layout.suit.corner.nw, -- awful.layout.suit.tile, @@ -67,46 +67,6 @@ awful.layout.layouts = { } -- }}} --- {{{ Menu --- Create a launcher widget and a main menu --- myawesomemenu = { --- { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end }, --- { "manual", terminal .. " -e man awesome" }, --- { "edit config", editor_cmd .. " " .. awesome.conffile }, --- { "restart", awesome.restart }, --- { "quit", function() awesome.quit() end }, --- { "fix wallpaper", function() awful.spawn.with_shell("nitrogen --restore") end }, --- } --- --- appdrawer = { --- {"pcmanfm", function() awful.spawn.with_shell("pcmanfm") end}, --- {"pavucontrol", function() awful.spawn.with_shell("pavucontrol") end}, --- {"lxappearance", function() awful.spawn.with_shell("lxappearance") end}, --- {"nitrogen", function() awful.spawn.with_shell("nitrogen") end}, --- {"gimp", function() awful.spawn.with_shell("gimp") end} --- -- {"", function() awful.spawn.with_shell("") end} --- } --- --- powermenu = { --- {"shutdown", function() awful.spawn.with_shell("shutdown now") end}, --- {"reboot", function() awful.spawn.with_shell("reboot") end} --- } --- --- --- mymainmenu = awful.menu({ items = { { "apps", appdrawer }, --- { "awesome", myawesomemenu, beautiful.awesome_icon }, --- { "power", powermenu } --- --- } --- }) --- --- mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, --- menu = mymainmenu }) --- --- -- Menubar configuration --- menubar.utils.terminal = terminal -- Set the terminal for applications that require it --- -- }}} - -- Keyboard map indicator and switcher mykeyboardlayout = awful.widget.keyboardlayout() @@ -177,7 +137,7 @@ awful.screen.connect_for_each_screen(function(s) awful.tag({ "一", "二", "三", "四", "五", "六", "七", "八", "九", "十" }, s, awful.layout.layouts[1]) -- Create a promptbox for each screen - s.mypromptbox = awful.widget.prompt() + -- s.mypromptbox = awful.widget.prompt() -- Create an imagebox widget which will contain an icon indicating which layout we're using. -- We need one layoutbox per screen. s.mylayoutbox = awful.widget.layoutbox(s) @@ -279,12 +239,15 @@ vimLayoutKeys = gears.table.join( layoutKeys = gears.table.join( awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end, {description = "select next", group = "layout"}), - - awful.key({ "Mod1", }, "j", function () awful.tag.incmwfact( 0.05) end, + awful.key({ "Mod4", }, "=", function () awful.tag.incmwfact( 0.05) end, {description = "increase master width factor", group = "layout"}), - awful.key({ "Mod1", }, "k", function () awful.tag.incmwfact(-0.05) end, + awful.key({ "Mod4", }, "-", function () awful.tag.incmwfact(-0.05) end, {description = "decrease master width factor", group = "layout"}) + -- move client to next/prev tag + -- and focus said tag +-- awful.key({ "Mod1", }, "l" + -- I don't need these keys since -- I don't use master and stack layout -- because it's CRINGE lol @@ -298,7 +261,6 @@ layoutKeys = gears.table.join( -- {description = "decrease the number of columns", group = "layout"}), ) - -- keybindings to navigate b/w monitors -- uncomment multiMonitorNavKeys in -- globalkeys to enable @@ -309,6 +271,29 @@ multiMonitorNavKeys = gears.table.join( {description = "focus the previous screen", group = "screen"}) ) +tagKeys = gears.table.join( + -- cycle tabs using h and l + awful.key({ "Mod1", }, "h", awful.tag.viewprev, + {description = "view previous", group = "tag"}), + awful.key({ "Mod1", }, "l", awful.tag.viewnext, + {description = "view next", group = "tag"}), + + -- move clients to prev/next tag + -- and focus said tag using h and l +-- awful.key({ "Mod1", "Shift"}, "l", function () +-- currentTag = client.focus.screen.tags +-- naughty.notify(currentTag, currentTag) + -- end, {description = "", group = ""}), + + + awful.key({ "Mod1", }, "Tab", awful.tag.history.restore, + {description = "go back", group = "tag"}) + +) + + + + -- keybindings to handle clients -- i.e minimizing, maximizing, hiding, closing windows clientkeys = gears.table.join( @@ -360,16 +345,10 @@ globalkeys = gears.table.join( vimNavKeys, vimLayoutKeys, layoutKeys, + tagKeys, -- multiMonitorNavKeys, awful.key({ modkey, }, "s", hotkeys_popup.show_help, {description="show help", group="awesome"}), - awful.key({ "Mod1", }, "h", awful.tag.viewprev, - {description = "view previous", group = "tag"}), - awful.key({ "Mod1", }, "l", awful.tag.viewnext, - {description = "view next", group = "tag"}), - awful.key({ "Mod1", }, "Tab", awful.tag.history.restore, - {description = "go back", group = "tag"}), - |