From f17fba9955c4d2c76956ded8655cc763138c979e Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Sat, 7 Jan 2017 15:13:41 +0100 Subject: [PATCH] dremora ported to 4.0 --- README.rst | 1 + lain | 2 +- rc.lua.blackburn | 86 ++-- rc.lua.copland | 7 +- rc.lua.dremora | 630 +++++++++++++++----------- themes/blackburn/icons/floating.png | Bin 175 -> 175 bytes themes/blackburn/theme.lua | 4 +- themes/dremora/icons/arrl_lr_post.png | Bin 192 -> 0 bytes themes/dremora/icons/arrl_lr_pre.png | Bin 189 -> 0 bytes themes/dremora/icons/awesome.png | Bin 0 -> 188 bytes themes/dremora/theme.lua | 13 +- 11 files changed, 427 insertions(+), 316 deletions(-) delete mode 100644 themes/dremora/icons/arrl_lr_post.png delete mode 100644 themes/dremora/icons/arrl_lr_pre.png create mode 100644 themes/dremora/icons/awesome.png diff --git a/README.rst b/README.rst index 497e992..5470f11 100644 --- a/README.rst +++ b/README.rst @@ -10,6 +10,7 @@ I am in the process of updating to awesome 4.0. Currently, the ported themes are - blackburn - copland +- dremora ------------------------- Themes for Awesome WM 4.x diff --git a/lain b/lain index 7dce46c..fd35485 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 7dce46c34d7bf3e8ccdc03aa10d25d4df581326d +Subproject commit fd35485c200a52c9429f9a4f3f5c8282b64dba30 diff --git a/rc.lua.blackburn b/rc.lua.blackburn index 63a3213..99bf284 100644 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -63,17 +63,22 @@ modkey = "Mod4" altkey = "Mod1" terminal = "urxvtc" or "xterm" editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor -- user defined browser = "firefox" gui_editor = "gvim" graphics = "gimp" +-- lain +lain.layout.termfair.nmaster = 3 +lain.layout.termfair.ncol = 1 +lain.layout.centerfair.nmaster = 3 +lain.layout.centerfair.ncol = 1 + -- quake terminal local quakeconsole = {} for s in screen do - quakeconsole[s] = lain.util.quake({ app = terminal, width = 0.999, horiz = "left" }) + quakeconsole[s] = lain.util.quake({ app = terminal }) end -- }}} @@ -94,23 +99,26 @@ end -- {{{ Menu myawesomemenu = { - { "hotkeys", function() return false, hotkeys_popup.show_help end}, - { "manual", terminal .. " -e man awesome" }, - { "edit config", editor_cmd .. " " .. awesome.conffile }, - { "restart", awesome.restart }, - { "quit", function() awesome.quit() end} + { "hotkeys", function() return false, hotkeys_popup.show_help end }, + { "manual", terminal .. " -e man awesome" }, + { "edit config", string.format("%s -e %s %s", terminal, editor, awesome.conffile) }, + { "restart", awesome.restart }, + { "quit", function() awesome.quit() end } } -mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, - { "applications", require("freedesktop").menu.build() }, - { "open terminal", terminal }, - } - }) +mymainmenu = awful.menu({ + items = { + { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "applications", require("freedesktop").menu.build() }, + { "open terminal", terminal }, + } +}) --menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it -- }}} -- {{{ Wibar -markup = lain.util.markup -gray = "#9E9C9A" +markup = lain.util.markup +separators = lain.util.separators +gray = "#9E9C9A" -- Textclock mytextclock = wibox.widget.textclock(" %H:%M ") @@ -183,8 +191,10 @@ batwidget = lain.widgets.bat({ }) -- ALSA volume -volumewidget = lain.widgets.alsa({ +volume = lain.widgets.alsa({ settings = function() +separators = lain.util.separators +separators = lain.util.separators header = " Vol " level = volume_now.level @@ -208,10 +218,8 @@ myweather = lain.widgets.weather({ -- Separators first = wibox.widget.textbox(' ') -arrl_pre = wibox.widget.imagebox() -arrl_pre:set_image(beautiful.arrl_lr_pre) -arrl_post = wibox.widget.imagebox() -arrl_post:set_image(beautiful.arrl_lr_post) +arrl_pre = separators.arrow_right("alpha", "#1A1A1A") +arrl_post = separators.arrow_right("#1A1A1A", "alpha") -- Create a wibox for each screen and add it local taglist_buttons = awful.util.table.join( @@ -277,10 +285,10 @@ awful.screen.connect_for_each_screen(function(s) awful.tag({ "ƀ", "Ƅ", "Ɗ", "ƈ", "ƙ" }, s, { awful.layout.suit.floating, - lain.layout.uselesstile, + awful.layout.suit.tile, awful.layout.suit.fair, - lain.layout.uselesstile.left, - lain.layout.uselesstile.top + awful.layout.suit.tile.left, + awful.layout.suit.tile.top }) -- Create a promptbox for each screen @@ -326,7 +334,7 @@ awful.screen.connect_for_each_screen(function(s) myweather, fshome, batwidget, - volumewidget, + volume, mytextclock, }, } @@ -345,7 +353,7 @@ root.buttons(awful.util.table.join( globalkeys = awful.util.table.join( -- Take a screenshot -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot - awful.key({ altkey }, "P", function() os.execute("screenshot") end), + awful.key({ altkey }, "p", function() os.execute("screenshot") end), -- Hotkeys awful.key({ modkey, }, "s", hotkeys_popup.show_help, @@ -444,9 +452,9 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Shift" }, "q", awesome.quit, {description = "quit awesome", group = "awesome"}), - awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, + awful.key({ altkey, "Shift" }, "l", function () awful.tag.incmwfact( 0.05) end, {description = "increase master width factor", group = "layout"}), - awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end, + awful.key({ altkey, "Shift" }, "h", 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"}), @@ -483,29 +491,29 @@ globalkeys = awful.util.table.join( -- ALSA volume control awful.key({ altkey }, "Up", function () - os.execute(string.format("amixer set %s 1%%+", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s 1%%+", volume.channel)) + volume.update() end), awful.key({ altkey }, "Down", function () - os.execute(string.format("amixer set %s 1%%-", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s 1%%-", volume.channel)) + volume.update() end), awful.key({ altkey }, "m", function () - os.execute(string.format("amixer set %s toggle", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s toggle", volume.togglechannel or volume.channel)) + volume.update() end), awful.key({ altkey, "Control" }, "m", function () - os.execute(string.format("amixer set %s 100%%", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s 100%%", volume.channel)) + volume.update() end), awful.key({ altkey, "Control" }, "0", function () os.execute(string.format("amixer -q set %s 0%%", volume.channel)) - volumewidget.update() + volume.update() end), -- MPD control @@ -671,12 +679,16 @@ awful.rules.rules = { }, -- Titlebars - { rule_any = { type = { "dialog" }, except = { instance = "pinentry" } }, - properties = { titlebars_enabled = true } }, + { rule_any = { type = { "dialog", "normal" } }, + properties = { titlebars_enabled = false } }, -- Set Firefox to always map on the first tag on screen 1. { rule = { class = "Firefox" }, properties = { screen = 1, tag = awful.screen.focused().tags[1] } }, + + { rule = { class = "Gimp", role = "gimp-image-window" }, + properties = { maximized_horizontal = true, + maximized_vertical = true } }, } -- }}} diff --git a/rc.lua.copland b/rc.lua.copland index aad7cef..d7eb17c 100644 --- a/rc.lua.copland +++ b/rc.lua.copland @@ -80,7 +80,7 @@ lain.layout.centerfair.ncol = 1 -- quake terminal local quakeconsole = {} for s in screen do - quakeconsole[s] = lain.util.quake({ app = terminal, width = 0.999, horiz = "left" }) + quakeconsole[s] = lain.util.quake({ app = terminal }) end -- }}} @@ -284,6 +284,7 @@ myweather = lain.widgets.weather({ spr = wibox.widget.textbox(' ') small_spr = wibox.widget.textbox(' ') bar_spr = wibox.widget.textbox(' ' .. markup("#333333", "|") .. ' ') + -- Create a wibox for each screen and add it local taglist_buttons = awful.util.table.join( awful.button({ }, 1, function(t) t:view_only() end), @@ -523,9 +524,9 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Shift" }, "q", awesome.quit, {description = "quit awesome", group = "awesome"}), - awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, + awful.key({ altkey, "Shift" }, "l", function () awful.tag.incmwfact( 0.05) end, {description = "increase master width factor", group = "layout"}), - awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end, + awful.key({ altkey, "Shift" }, "h", 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"}), diff --git a/rc.lua.dremora b/rc.lua.dremora index 9696649..9c8e77e 100644 --- a/rc.lua.dremora +++ b/rc.lua.dremora @@ -1,3 +1,4 @@ + --[[ Dremora Awesome WM config 2.0 @@ -6,15 +7,15 @@ --]] -- {{{ Required libraries -local gears = require("gears") -local awful = require("awful") -awful.rules = require("awful.rules") - require("awful.autofocus") -local wibox = require("wibox") -local beautiful = require("beautiful") -local naughty = require("naughty") -local lain = require("lain") ---local menubar = require("menubar") +local gears = require("gears") +local awful = require("awful") + require("awful.autofocus") +local wibox = require("wibox") +local beautiful = require("beautiful") +local naughty = require("naughty") +local lain = require("lain") +--local menubar = require("menubar") +local hotkeys_popup = require("awful.hotkeys_popup").widget -- }}} -- {{{ Error handling @@ -32,20 +33,20 @@ do naughty.notify({ preset = naughty.config.presets.critical, title = "Oops, an error happened!", - text = err }) + text = tostring(err) }) in_error = false end) end -- }}} -- {{{ Autostart applications -function run_once(cmd) +local function run_once(cmd) findme = cmd firstspace = cmd:find(" ") if firstspace then findme = cmd:sub(0, firstspace-1) end - awful.util.spawn_with_shell("pgrep -u $USER -x " .. findme .. " > /dev/null || (" .. cmd .. ")") + awful.spawn.with_shell(string.format("pgrep -u $USER -x %s > /dev/null || (%s)", findme, cmd)) end run_once("urxvtd") @@ -62,57 +63,63 @@ modkey = "Mod4" altkey = "Mod1" terminal = "urxvtc" or "xterm" editor = os.getenv("EDITOR") or "nano" or "vi" -editor_cmd = terminal .. " -e " .. editor -- user defined browser = "firefox" gui_editor = "gvim" graphics = "gimp" -local layouts = { - awful.layout.suit.floating, - lain.layout.uselesstile, - awful.layout.suit.fair, - lain.layout.uselesstile.left, - lain.layout.uselesstile.top -} +-- lain +lain.layout.termfair.nmaster = 3 +lain.layout.termfair.ncol = 1 +lain.layout.centerfair.nmaster = 3 +lain.layout.centerfair.ncol = 1 -- quake terminal local quakeconsole = {} -for s = 1, screen.count() do +for s in screen do quakeconsole[s] = lain.util.quake({ app = terminal }) end -- }}} --- {{{ Tags -tags = { - names = { "ƀ", "Ƅ", "Ɗ", "ƈ", "ƙ" }, - layout = { layouts[1], layouts[3], layouts[2], layouts[1], layouts[5] } -} -for s = 1, screen.count() do - tags[s] = awful.tag(tags.names, s, tags.layout) -end --- }}} +-- {{{ Helper functions +local function client_menu_toggle_fn() + local instance = nil --- {{{ Wallpaper -if beautiful.wallpaper then - for s = 1, screen.count() do - gears.wallpaper.maximized(beautiful.wallpaper, s, true) + return function () + if instance and instance.wibox.visible then + instance:hide() + instance = nil + else + instance = awful.menu.clients({ theme = { width = 250 } }) + end end end -- }}} -- {{{ Menu -mymainmenu = awful.menu.new({ items = require("freedesktop").menu.build(), - theme = { height = 16, width = 130 }}) --- Menubar configuration ---menubar.utils.terminal = terminal -- Set the terminal for applications that require it +myawesomemenu = { + { "hotkeys", function() return false, hotkeys_popup.show_help end }, + { "manual", terminal .. " -e man awesome" }, + { "edit config", string.format("%s -e %s %s", terminal, editor, awesome.conffile) }, + { "restart", awesome.restart }, + { "quit", function() awesome.quit() end } +} +mymainmenu = awful.menu({ + items = { + { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "applications", require("freedesktop").menu.build() }, + { "open terminal", terminal }, + } +}) +--menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it -- }}} -- {{{ Wibox -markup = lain.util.markup -white = beautiful.fg_focus -gray = "#858585" +markup = lain.util.markup +separators = lain.util.separators +white = beautiful.fg_focus +gray = "#858585" -- Textclock mytextclock = awful.widget.textclock(markup(gray, " %a") @@ -165,6 +172,7 @@ mpdwidget = lain.widgets.mpd({ -- /home fs fshome = lain.widgets.fs({ partition = "/home", + notification_preset = { fg = white }, settings = function() fs_header = "" fs_p = "" @@ -188,7 +196,8 @@ batwidget = lain.widgets.bat({ }) -- ALSA volume -volumewidget = lain.widgets.alsa({ +volume = lain.widgets.alsa({ + --togglechannel = "IEC958,3", settings = function() header = " Vol " vlevel = volume_now.level @@ -206,33 +215,33 @@ volumewidget = lain.widgets.alsa({ -- Weather myweather = lain.widgets.weather({ city_id = 123456, -- placeholder - settings = function() - w_notification_preset.fg = white - end + notification_preset = { fg = white } }) -- Separators first = wibox.widget.textbox(' ') -arrl_pre = wibox.widget.imagebox() -arrl_pre:set_image(beautiful.arrl_lr_pre) -arrl_post = wibox.widget.imagebox() -arrl_post:set_image(beautiful.arrl_lr_post) +arrl_pre = separators.arrow_right("alpha", "#1A1A1A") +arrl_post = separators.arrow_right("#1A1A1A", "alpha") -- Create a wibox for each screen and add it -mywibox = {} -mypromptbox = {} -mylayoutbox = {} -mytaglist = {} -mytaglist.buttons = awful.util.table.join( - awful.button({ }, 1, awful.tag.viewonly), - awful.button({ modkey }, 1, awful.client.movetotag), +local taglist_buttons = awful.util.table.join( + awful.button({ }, 1, function(t) t:view_only() end), + awful.button({ modkey }, 1, function(t) + if client.focus then + client.focus:move_to_tag(t) + end + end), awful.button({ }, 3, awful.tag.viewtoggle), - awful.button({ modkey }, 3, awful.client.toggletag), - awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end), - awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end) - ) -mytasklist = {} -mytasklist.buttons = awful.util.table.join( + awful.button({ modkey }, 3, function(t) + if client.focus then + client.focus:toggle_tag(t) + end + end), + awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end), + awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end) + ) + +local tasklist_buttons = awful.util.table.join( awful.button({ }, 1, function (c) if c == client.focus then c.minimized = true @@ -240,8 +249,8 @@ mytasklist.buttons = awful.util.table.join( -- Without this, the following -- :isvisible() makes no sense c.minimized = false - if not c:isvisible() then - awful.tag.viewonly(c:tags()[1]) + if not c:isvisible() and c.first_tag then + c.first_tag:view_only() end -- This will also un-minimize -- the client, if needed @@ -249,72 +258,87 @@ mytasklist.buttons = awful.util.table.join( c:raise() end end), - awful.button({ }, 3, function () - if instance then - instance:hide() - instance = nil - else - instance = awful.menu.clients({ width=250 }) - end - end), + awful.button({ }, 3, client_menu_toggle_fn()), awful.button({ }, 4, function () awful.client.focus.byidx(1) - if client.focus then client.focus:raise() end end), awful.button({ }, 5, function () awful.client.focus.byidx(-1) - if client.focus then client.focus:raise() end end)) -for s = 1, screen.count() do +local function set_wallpaper(s) + -- Wallpaper + if beautiful.wallpaper then + local wallpaper = beautiful.wallpaper + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + wallpaper = wallpaper(s) + end + gears.wallpaper.maximized(wallpaper, s, true) + end +end + +-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) +screen.connect_signal("property::geometry", set_wallpaper) + +awful.screen.connect_for_each_screen(function(s) + -- Wallpaper + set_wallpaper(s) + + awful.tag({ "ƀ", "Ƅ", "Ɗ", "ƈ", "ƙ" }, s, { + awful.layout.suit.floating, + awful.layout.suit.tile, + awful.layout.suit.fair, + awful.layout.suit.tile.left, + awful.layout.suit.tile.top + }) + -- Create a promptbox for each screen - mypromptbox[s] = awful.widget.prompt() + s.mypromptbox = awful.widget.prompt() -- Create an imagebox widget which will contains an icon indicating which layout we're using. -- We need one layoutbox per screen. - mylayoutbox[s] = awful.widget.layoutbox(s) - mylayoutbox[s]:buttons(awful.util.table.join( - awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), - awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end), - awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end), - awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end))) + s.mylayoutbox = awful.widget.layoutbox(s) + s.mylayoutbox:buttons(awful.util.table.join( + awful.button({ }, 1, function () awful.layout.inc( 1) end), + awful.button({ }, 3, function () awful.layout.inc(-1) end), + awful.button({ }, 4, function () awful.layout.inc( 1) end), + awful.button({ }, 5, function () awful.layout.inc(-1) end))) -- Create a taglist widget - mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons) + s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) -- Create a tasklist widget - mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons) + s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons) -- Create the wibox - mywibox[s] = awful.wibox({ position = "top", screen = s, height = 18 }) + s.mywibox = awful.wibar({ position = "top", screen = s, height = 18 }) - -- Widgets that are aligned to the left - local left_layout = wibox.layout.fixed.horizontal() - left_layout:add(first) - left_layout:add(mytaglist[s]) - left_layout:add(arrl_pre) - left_layout:add(mylayoutbox[s]) - left_layout:add(arrl_post) - left_layout:add(mypromptbox[s]) - left_layout:add(first) - - -- Widgets that are aligned to the right - local right_layout = wibox.layout.fixed.horizontal() - if s == 1 then right_layout:add(wibox.widget.systray()) end - right_layout:add(first) - right_layout:add(mpdwidget) - --right_layout:add(mailwidget) - right_layout:add(fshome) - right_layout:add(batwidget) - right_layout:add(volumewidget) - right_layout:add(mytextclock) - - -- Now bring it all together (with the tasklist in the middle) - local layout = wibox.layout.align.horizontal() - layout:set_left(left_layout) - layout:set_middle(mytasklist[s]) - layout:set_right(right_layout) - - mywibox[s]:set_widget(layout) -end + -- Add widgets to the wibox + s.mywibox:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + first, + s.mytaglist, + arrl_pre, + s.mylayoutbox, + arrl_post, + s.mypromptbox, + first, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + wibox.widget.systray(), + first, + mpdwidget, + --mailwidget, + fshome, + batwidget, + volume, + mytextclock, + }, + } +end) -- }}} -- {{{ Mouse bindings @@ -331,26 +355,36 @@ globalkeys = awful.util.table.join( -- https://github.com/copycat-killer/dots/blob/master/bin/screenshot awful.key({ altkey }, "p", function() os.execute("screenshot") end), + -- Hotkeys + awful.key({ modkey, }, "s", hotkeys_popup.show_help, + {description="show help", group="awesome"}), -- Tag browsing - awful.key({ modkey }, "Left", awful.tag.viewprev ), - awful.key({ modkey }, "Right", awful.tag.viewnext ), - awful.key({ modkey }, "Escape", awful.tag.history.restore), + awful.key({ modkey, }, "Left", awful.tag.viewprev, + {description = "view previous", group = "tag"}), + awful.key({ modkey, }, "Right", awful.tag.viewnext, + {description = "view next", group = "tag"}), + awful.key({ modkey, }, "Escape", awful.tag.history.restore, + {description = "go back", group = "tag"}), -- Non-empty tag browsing - awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end), - awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end), + awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end, + {description = "view previous nonempty", group = "tag"}), + awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end, + {description = "view previous nonempty", group = "tag"}), -- Default client focus - awful.key({ altkey }, "k", + awful.key({ altkey, }, "j", function () awful.client.focus.byidx( 1) - if client.focus then client.focus:raise() end - end), - awful.key({ altkey }, "j", + end, + {description = "focus next by index", group = "client"} + ), + awful.key({ altkey, }, "k", function () awful.client.focus.byidx(-1) - if client.focus then client.focus:raise() end - end), + end, + {description = "focus previous by index", group = "client"} + ), -- By direction client focus awful.key({ modkey }, "j", @@ -373,108 +407,144 @@ globalkeys = awful.util.table.join( awful.client.focus.bydirection("right") if client.focus then client.focus:raise() end end), - - -- Show Menu - awful.key({ modkey }, "w", - function () - mymainmenu:show({ keygrabber = true }) - end), - - -- Show/Hide Wibox - awful.key({ modkey }, "b", function () - mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible - end), - - -- On the fly useless gaps change - awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), - awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), + awful.key({ modkey, }, "w", function () mymainmenu:show() end, + {description = "show main menu", group = "awesome"}), -- Layout manipulation - awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), - awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), - awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end), - awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end), - awful.key({ modkey, }, "u", awful.client.urgent.jumpto), + awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end, + {description = "swap with next client by index", group = "client"}), + awful.key({ modkey, "Shift" }, "k", function () 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) end, + {description = "focus the next screen", group = "screen"}), + awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end, + {description = "focus the previous screen", group = "screen"}), + awful.key({ 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), - awful.key({ altkey, "Shift" }, "l", function () awful.tag.incmwfact( 0.05) end), - awful.key({ altkey, "Shift" }, "h", function () awful.tag.incmwfact(-0.05) end), - awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end), - awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end), - awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end), - awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end), - awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end), - awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), - awful.key({ modkey, "Control" }, "n", awful.client.restore), + end, + {description = "go back", group = "client"}), + + -- Show/Hide Wibox + awful.key({ modkey }, "b", function () + for s in screen do + s.mywibox.visible = not s.mywibox.visible + end + end), + + -- On the fly useless gaps change + awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), + awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), + + -- Rename tag + awful.key({ altkey, "Shift" }, "r", function () lain.util.rename_tag() end), -- Standard program - awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), - awful.key({ modkey, "Control" }, "r", awesome.restart), - awful.key({ modkey, "Shift" }, "q", awesome.quit), + awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, + {description = "open a terminal", group = "launcher"}), + awful.key({ modkey, "Control" }, "r", awesome.restart, + {description = "reload awesome", group = "awesome"}), + awful.key({ modkey, "Shift" }, "q", awesome.quit, + {description = "quit awesome", group = "awesome"}), + + awful.key({ altkey, "Shift" }, "l", function () awful.tag.incmwfact( 0.05) end, + {description = "increase master width factor", group = "layout"}), + awful.key({ altkey, "Shift" }, "h", 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"}), + awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1, nil, true) end, + {description = "increase the number of columns", group = "layout"}), + awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1, nil, true) end, + {description = "decrease the number of columns", group = "layout"}), + awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end, + {description = "select next", group = "layout"}), + awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end, + {description = "select previous", group = "layout"}), + + awful.key({ modkey, "Control" }, "n", + function () + local c = awful.client.restore() + -- Focus restored client + if c then + client.focus = c + c:raise() + end + end, + {description = "restore minimized", group = "client"}), -- Dropdown terminal awful.key({ modkey, }, "z", function () quakeconsole[mouse.screen]:toggle() end), -- Widgets popups awful.key({ altkey, }, "c", function () lain.widgets.calendar.show(7) end), - awful.key({ altkey, }, "h", function () fshome.show(7) end), + awful.key({ altkey, }, "h", function () fshome.show(7, "--exclude-type=tmpfs") end), awful.key({ altkey, }, "w", function () myweather.show(7) end), -- ALSA volume control awful.key({ altkey }, "Up", function () - os.execute(string.format("amixer set %s 1%%+", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s 1%%+", volume.channel)) + volume.update() end), awful.key({ altkey }, "Down", function () - os.execute(string.format("amixer set %s 1%%-", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s 1%%-", volume.channel)) + volume.update() end), awful.key({ altkey }, "m", function () - os.execute(string.format("amixer set %s toggle", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s toggle", volume.togglechannel or volume.channel)) + volume.update() end), awful.key({ altkey, "Control" }, "m", function () - os.execute(string.format("amixer set %s 100%%", volumewidget.channel)) - volumewidget.update() + os.execute(string.format("amixer set %s 100%%", volume.channel)) + volume.update() end), + awful.key({ altkey, "Control" }, "0", + function () + os.execute(string.format("amixer -q set %s 0%%", volume.channel)) + volume.update() + end), + -- MPD control awful.key({ altkey, "Control" }, "Up", function () - awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle") + awful.spawn.with_shell("mpc toggle || ncmpc toggle || pms toggle") mpdwidget.update() end), awful.key({ altkey, "Control" }, "Down", function () - awful.util.spawn_with_shell("mpc stop || ncmpc stop || pms stop") + awful.spawn.with_shell("mpc stop || ncmpc stop || pms stop") mpdwidget.update() end), awful.key({ altkey, "Control" }, "Left", function () - awful.util.spawn_with_shell("mpc prev || ncmpc prev || pms prev") + awful.spawn.with_shell("mpc prev || ncmpc prev || pms prev") mpdwidget.update() end), awful.key({ altkey, "Control" }, "Right", function () - awful.util.spawn_with_shell("mpc next || ncmpc next || pms next") + awful.spawn.with_shell("mpc next || ncmpc next || pms next") mpdwidget.update() end), + --]] - -- Copy to clipboard - awful.key({ modkey }, "c", function () os.execute("xsel -p -o | xsel -i -b") end), + -- Copy primary to clipboard + awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end), -- User programs awful.key({ modkey }, "q", function () awful.util.spawn(browser) end), - awful.key({ modkey }, "s", function () awful.util.spawn(gui_editor) end), + awful.key({ modkey }, "e", function () awful.util.spawn(gui_editor) end), awful.key({ modkey }, "g", function () awful.util.spawn(graphics) end), --[[ Default @@ -500,68 +570,86 @@ globalkeys = awful.util.table.join( ) clientkeys = awful.util.table.join( - awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end), - awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end), - awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ), - awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end), - awful.key({ modkey, }, "o", awful.client.movetoscreen ), - awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end), + awful.key({ altkey, "Shift" }, "m", lain.util.magnify_client ), + awful.key({ modkey, }, "f", + function (c) + c.fullscreen = not c.fullscreen + c:raise() + end, + {description = "toggle fullscreen", group = "client"}), + awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end, + {description = "close", group = "client"}), + awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle , + {description = "toggle floating", group = "client"}), + awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end, + {description = "move to master", group = "client"}), + awful.key({ modkey, }, "o", function (c) c:move_to_screen() end, + {description = "move to screen", group = "client"}), + awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end, + {description = "toggle keep on top", group = "client"}), awful.key({ modkey, }, "n", function (c) -- The client currently has the input focus, so it cannot be -- minimized, since minimized clients can't have the focus. c.minimized = true - end), + end , + {description = "minimize", group = "client"}), awful.key({ modkey, }, "m", function (c) - c.maximized_horizontal = not c.maximized_horizontal - c.maximized_vertical = not c.maximized_vertical - end) + c.maximized = not c.maximized + c:raise() + end , + {description = "maximize", group = "client"}) ) -- Bind all key numbers to tags. --- be careful: we use keycodes to make it works on any keyboard layout. +-- Be careful: we use keycodes to make it works on any keyboard layout. -- This should map on the top row of your keyboard, usually 1 to 9. for i = 1, 9 do globalkeys = awful.util.table.join(globalkeys, -- View tag only. awful.key({ modkey }, "#" .. i + 9, function () - local screen = mouse.screen - local tag = awful.tag.gettags(screen)[i] + local screen = awful.screen.focused() + local tag = screen.tags[i] if tag then - awful.tag.viewonly(tag) + tag:view_only() end - end), - -- Toggle tag. + end, + {description = "view tag #"..i, group = "tag"}), + -- Toggle tag display. awful.key({ modkey, "Control" }, "#" .. i + 9, function () - local screen = mouse.screen - local tag = awful.tag.gettags(screen)[i] + local screen = awful.screen.focused() + local tag = screen.tags[i] if tag then awful.tag.viewtoggle(tag) end - end), + end, + {description = "toggle tag #" .. i, group = "tag"}), -- Move client to tag. awful.key({ modkey, "Shift" }, "#" .. i + 9, function () if client.focus then - local tag = awful.tag.gettags(client.focus.screen)[i] + local tag = client.focus.screen.tags[i] if tag then - awful.client.movetotag(tag) + client.focus:move_to_tag(tag) end end - end), - -- Toggle tag. + end, + {description = "move focused client to tag #"..i, group = "tag"}), + -- Toggle tag on focused client. awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, function () if client.focus then - local tag = awful.tag.gettags(client.focus.screen)[i] + local tag = client.focus.screen.tags[i] if tag then - awful.client.toggletag(tag) + client.focus:toggle_tag(tag) end end - end)) + end, + {description = "toggle focused client on tag #" .. i, group = "tag"}) + ) end clientbuttons = awful.util.table.join( @@ -574,6 +662,7 @@ root.keys(globalkeys) -- }}} -- {{{ Rules +-- Rules to apply to new clients (through the "manage" signal). awful.rules.rules = { -- All clients will match this rule. { rule = { }, @@ -583,15 +672,19 @@ awful.rules.rules = { raise = true, keys = clientkeys, buttons = clientbuttons, - size_hints_honor = false } }, + screen = awful.screen.preferred, + placement = awful.placement.no_overlap+awful.placement.no_offscreen, + size_hints_honor = false + } + }, + + -- Titlebars + { rule_any = { type = { "dialog", "normal" } }, + properties = { titlebars_enabled = true } }, + + -- Set Firefox to always map on the first tag on screen 1. { rule = { class = "Firefox" }, - properties = { tag = tags[1][1] } }, - - { rule = { instance = "plugin-container" }, - properties = { tag = tags[1][1] } }, - - { rule = { class = "Gimp" }, - properties = { tag = tags[1][4] } }, + properties = { screen = 1, tag = awful.screen.focused().tags[1] } }, { rule = { class = "Gimp", role = "gimp-image-window" }, properties = { maximized_horizontal = true, @@ -601,55 +694,77 @@ awful.rules.rules = { -- {{{ Signals -- Signal function to execute when a new client appears. -local sloppyfocus_last = {c=nil} -client.connect_signal("manage", function (c, startup) - -- Enable sloppy focus - client.connect_signal("mouse::enter", function(c) - if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier - and awful.client.focus.filter(c) then - -- Skip focusing the client if the mouse wasn't moved. - if c ~= sloppyfocus_last.c then - client.focus = c - sloppyfocus_last.c = c - end - end - end) +client.connect_signal("manage", function (c) + -- Set the windows at the slave, + -- i.e. put it at the end of others instead of setting it master. + -- if not awesome.startup then awful.client.setslave(c) end - local titlebars_enabled = true - if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then - -- buttons for the titlebar - local buttons = awful.util.table.join( - awful.button({ }, 1, function() - client.focus = c - c:raise() - awful.mouse.client.move(c) - end), - awful.button({ }, 3, function() - client.focus = c - c:raise() - awful.mouse.client.resize(c) - end) - ) - - -- Title in the middle - local middle_layout = wibox.layout.flex.horizontal() - local title = awful.titlebar.widget.titlewidget(c) - title:set_align("center") - middle_layout:add(title) - middle_layout:buttons(buttons) - - local layout = wibox.layout.align.horizontal() - layout:set_middle(middle_layout) - - awful.titlebar(c,{size=18}):set_widget(layout) + if awesome.startup and + not c.size_hints.user_position + and not c.size_hints.program_position then + -- Prevent clients from being unreachable after screen count changes. + awful.placement.no_offscreen(c) end end) --- No border for maximized or single clients +-- Add a titlebar if titlebars_enabled is set to true in the rules. +client.connect_signal("request::titlebars", function(c) + -- buttons for the titlebar + local buttons = awful.util.table.join( + awful.button({ }, 1, function() + client.focus = c + c:raise() + awful.mouse.client.move(c) + end), + awful.button({ }, 3, function() + client.focus = c + c:raise() + awful.mouse.client.resize(c) + end) + ) + + awful.titlebar(c, {size = 16}) : setup { + { -- Left + awful.titlebar.widget.iconwidget(c), + buttons = buttons, + layout = wibox.layout.fixed.horizontal + }, + { -- Middle + { -- Title + align = "center", + widget = awful.titlebar.widget.titlewidget(c) + }, + buttons = buttons, + layout = wibox.layout.flex.horizontal + }, + { -- Right + awful.titlebar.widget.floatingbutton (c), + awful.titlebar.widget.maximizedbutton(c), + awful.titlebar.widget.stickybutton (c), + awful.titlebar.widget.ontopbutton (c), + awful.titlebar.widget.closebutton (c), + layout = wibox.layout.fixed.horizontal() + }, + layout = wibox.layout.align.horizontal + } +end) + +-- Enable sloppy focus, so that focus follows mouse. +--[[ +client.connect_signal("mouse::enter", function(c) + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier + and awful.client.focus.filter(c) then + client.focus = c + end +end) +]] + +-- No border for maximized clients client.connect_signal("focus", function(c) if c.maximized_horizontal == true and c.maximized_vertical == true then c.border_width = 0 + -- no borders if only 1 client visible elseif #awful.client.visible(mouse.screen) > 1 then c.border_width = beautiful.border_width c.border_color = beautiful.border_focus @@ -657,20 +772,3 @@ client.connect_signal("focus", end) client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) -- }}} - --- {{{ Arrange signal handler -for s = 1, screen.count() do screen[s]:connect_signal("arrange", - function () - local clients = awful.client.visible(s) - local layout = awful.layout.getname(awful.layout.get(s)) - - if #clients > 0 then - for _, c in pairs(clients) do -- Floaters always have borders - if awful.client.floating.get(c) or layout == "floating" then - c.border_width = beautiful.border_width - end - end - end - end) -end --- }}} diff --git a/themes/blackburn/icons/floating.png b/themes/blackburn/icons/floating.png index 9394df9c612f100759c29543d268a5ec508dcc2e..21326f4d6a0d5448c838be47f9b7c6ae7ef7bc35 100644 GIT binary patch delta 20 ccmZ3_xSnx>J=a4J=a|p32}BAhXUp~6Ft)aKW_#6 diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua index 0cc71db..83aa3fa 100644 --- a/themes/blackburn/theme.lua +++ b/themes/blackburn/theme.lua @@ -29,7 +29,7 @@ theme.taglist_bg_focus = "#060606" theme.tasklist_fg_focus = "#F6784F" theme.tasklist_bg_focus = "#060606" theme.menu_height = 16 -theme.menu_width = 140 +theme.menu_width = 130 theme.menu_submenu_icon = theme.dir .. "/icons/submenu.png" theme.taglist_squares_sel = theme.dir .. "/icons/square_sel.png" @@ -51,6 +51,6 @@ theme.layout_magnifier = theme.dir .. "/icons/magnifier.png" theme.layout_floating = theme.dir .. "/icons/floating.png" theme.tasklist_disable_icon = true -theme.useless_gap = 8 +theme.useless_gap = 0 return theme diff --git a/themes/dremora/icons/arrl_lr_post.png b/themes/dremora/icons/arrl_lr_post.png deleted file mode 100644 index 031cc63ebd8a51485fe15c607f762dd7768b0d8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^Ahr+(8<0%e?(YqxI14-?iy0WWg+Z8+Vb&Z8pdfpR zr>`sfU3NBZKIVT9wt4`C;yqm)Lp09!Ubx74z<`70!t36Jzx$_Iz6tO0y}DXKqEdq` zO-zt+Dhoq7f5!tok+eFW8R?4;ubCy9w*A$SIeaH(yoxrP_Tl@Ht=Ci^x+$Mo(WIwIyA}(B`GpTQq5m!Uq=8m3c)I$ztaD0e0su>1J;DG0 diff --git a/themes/dremora/icons/arrl_lr_pre.png b/themes/dremora/icons/arrl_lr_pre.png deleted file mode 100644 index 3c3a7d75413f40fa0435a2501f49d508f0137e66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^Ahr+(8<0%e?(YqxI14-?iy0WWg+Z8+Vb&Z8pdfpR zr>`sfU3NBZKK7rzg@Hh!7*7|+5RLP_mrips7;>;&IJqV9|I*0zYOa){=PQEc1Q)9- zC8RZ~axlEBQ(2L)?_|qNZrQZZH3qxGB#WgU9KEye=_Aoo`uElbIx3&}y}ZfmMy!zN hm*(5PL5>U`82L0*3YFv}{sHY_@O1TaS?83{1OWewJ3;^e diff --git a/themes/dremora/icons/awesome.png b/themes/dremora/icons/awesome.png new file mode 100644 index 0000000000000000000000000000000000000000..6ada627493d4404a344fc910b231b7cd64981c7d GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|wj^(N7l!{JxM1({$v_d#0*}aI zppNSx%;=;sy8Er~7oCd*TJF1`muP@>W z2un;!NdSUH)4JK_JN7Kea^Uxlkk}X?b)(t5XGNL-_rex8jSZYqExycphubR?`0W@N Yl7fYA+<3|81vHew)78&qol`;+06CC1w*UYD literal 0 HcmV?d00001 diff --git a/themes/dremora/theme.lua b/themes/dremora/theme.lua index b891562..7c9b771 100644 --- a/themes/dremora/theme.lua +++ b/themes/dremora/theme.lua @@ -6,7 +6,7 @@ --]] -theme = {} +local theme = {} theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/dremora" theme.wallpaper = theme.dir .. "/wall.png" @@ -26,17 +26,15 @@ theme.titlebar_bg_focus = "#292929" theme.taglist_fg_focus = "#dddcff" theme.taglist_bg_focus = "#121212" -theme.menu_height = "16" -theme.menu_width = "140" +theme.menu_height = 16 +theme.menu_width = 130 +theme.awesome_icon = theme.dir .."/icons/awesome.png" theme.menu_submenu_icon = theme.dir .. "/icons/submenu.png" theme.taglist_squares_sel = theme.dir .. "/icons/square_sel.png" theme.taglist_squares_unsel = theme.dir .. "/icons/square_unsel.png" -theme.arrl_lr_pre = theme.dir .. "/icons/arrl_lr_pre.png" -theme.arrl_lr_post = theme.dir .. "/icons/arrl_lr_post.png" theme.layout_tile = theme.dir .. "/icons/tile.png" -theme.layout_tilegaps = theme.dir .. "/icons/tilegaps.png" theme.layout_tileleft = theme.dir .. "/icons/tileleft.png" theme.layout_tilebottom = theme.dir .. "/icons/tilebottom.png" theme.layout_tiletop = theme.dir .. "/icons/tiletop.png" @@ -54,8 +52,9 @@ theme.tasklist_floating = "" theme.tasklist_maximized_horizontal = "" theme.tasklist_maximized_vertical = "" +theme.useless_gap = 10 + -- lain related -theme.useless_gap_width = 10 theme.layout_uselesstile = theme.dir .. "/icons/uselesstile.png" theme.layout_uselesstileleft = theme.dir .. "/icons/uselesstileleft.png" theme.layout_uselesstiletop = theme.dir .. "/icons/uselesstiletop.png"