Update my neovim config

1 files changed, 447 insertions, 420 deletions

diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 4a5354e..c64d457 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -1,34 +1,33 @@
-
 -- {{{ Required libraries
-local awesome, client, mouse, screen, tag = awesome, client, mouse, screen, tag
+local awesome, client, mouse, screen, tag                 = awesome, client, mouse, screen, tag
 local ipairs, string, os, table, tostring, tonumber, type = ipairs, string, os, table, tostring, tonumber, type
 
 --https://awesomewm.org/doc/api/documentation/05-awesomerc.md.html
 -- Standard awesome library
-local gears         = require("gears") --Utilities such as color parsing and objects
-local awful         = require("awful") --Everything related to window managment
-                      require("awful.autofocus")
+local gears                                               = require("gears") --Utilities such as color parsing and objects
+local awful                                               = require("awful") --Everything related to window managment
+require("awful.autofocus")
 -- Widget and layout library
-local wibox         = require("wibox")
+local wibox                          = require("wibox")
 
 -- Theme handling library
-local beautiful     = require("beautiful")
+local beautiful                      = require("beautiful")
 
 -- Notification library
-local naughty       = require("naughty")
+local naughty                        = require("naughty")
 naughty.config.defaults['icon_size'] = 100
 
 --local menubar       = require("menubar")
 
-local lain          = require("lain")
-local freedesktop   = require("freedesktop")
+local lain                           = require("lain")
+local freedesktop                    = require("freedesktop")
 
 -- Enable hotkeys help widget for VIM and other apps
 -- when client with a matching name is opened:
-local hotkeys_popup = require("awful.hotkeys_popup").widget
-                      require("awful.hotkeys_popup.keys")
-local my_table      = awful.util.table or gears.table -- 4.{0,1} compatibility
-local dpi           = require("beautiful.xresources").apply_dpi
+local hotkeys_popup                  = require("awful.hotkeys_popup").widget
+require("awful.hotkeys_popup.keys")
+local my_table = awful.util.table or gears.table      -- 4.{0,1} compatibility
+local dpi      = require("beautiful.xresources").apply_dpi
 -- }}}
 
 
@@ -37,21 +36,25 @@ local dpi           = require("beautiful.xresources").apply_dpi
 -- Check if awesome encountered an error during startup and fell back to
 -- another config (This code will only ever execute for the fallback config)
 if awesome.startup_errors then
-    naughty.notify({ preset = naughty.config.presets.critical,
-                     title = "Oops, there were errors during startup!",
-                     text = awesome.startup_errors })
+    naughty.notify({
+        preset = naughty.config.presets.critical,
+        title = "Oops, there were errors during startup!",
+        text = awesome.startup_errors
+    })
 end
 
 -- Handle runtime errors after startup
 do
     local in_error = false
-    awesome.connect_signal("debug::error", function (err)
+    awesome.connect_signal("debug::error", function(err)
         if in_error then return end
         in_error = true
 
-        naughty.notify({ preset = naughty.config.presets.critical,
-                         title = "Oops, an error happened!",
-                         text = tostring(err) })
+        naughty.notify({
+            preset = naughty.config.presets.critical,
+            title = "Oops, an error happened!",
+            text = tostring(err)
+        })
         in_error = false
     end)
 end
@@ -78,19 +81,18 @@ awful.spawn.with_shell(
     'dex --environment Awesome --autostart --search-paths "$XDG_CONFIG_DIRS/autostart:$XDG_CONFIG_HOME/autostart"' -- https://github.com/jceb/dex
 )
 --]]
-
 -- }}}
 
 -- {{{ Variable definitions
 
 local themes = {
-    "multicolor",		-- 1
-    "powerarrow",      		-- 2
-    "powerarrow-blue",	 	-- 3
-    "blackburn",		-- 4
-    "copland",        -- 5    
+    "multicolor",      -- 1
+    "powerarrow",      -- 2
+    "powerarrow-blue", -- 3
+    "blackburn",       -- 4
+    "copland",         -- 5
     "minmalist",       --6
-    "powerarrow-black"       --7
+    "powerarrow-black" --7
 }
 
 -- choose your theme here
@@ -100,34 +102,34 @@ local theme_path = string.format("%s/.config/awesome/themes/%s/theme.lua", os.ge
 beautiful.init(theme_path)
 
 -- modkey or mod4 = super key
-local modkey       = "Mod4"
-local altkey       = "Mod1"
-local modkey1      = "Control"
+local modkey                           = "Mod4"
+local altkey                           = "Mod1"
+local modkey1                          = "Control"
 
 -- personal variables
 --change these variables if you want
-local browser1          = "brave"
-local browser2          = "FireDragon"
-local editor            = os.getenv("EDITOR") or "nano"
-local editorgui         = "neovide"
-local filemanager       = "pcmanfm"
-local mailclient        = "mailspring"
-local mediaplayer       = "spotify"
-local terminal          = "kitty"
-local virtualmachine    = "virtualbox"
+local browser1                         = "brave"
+local browser2                         = "FireDragon"
+local editor                           = os.getenv("EDITOR") or "nano"
+local editorgui                        = "neovide"
+local filemanager                      = "pcmanfm"
+local mailclient                       = "mailspring"
+local mediaplayer                      = "spotify"
+local terminal                         = "kitty"
+local virtualmachine                   = "virtualbox"
 
 -- awesome variables
-awful.util.terminal = terminal
+awful.util.terminal                    = terminal
 -- awful.util.tagnames = {  "➊", "➋", "➌", "➍", "➎", "➏", "➐", "➑", "➒" }
-awful.util.tagnames = {  "1", "2", "3", "4", "5", "6", "7", "8", "9" }
+awful.util.tagnames                    = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }
 --awful.util.tagnames = { "⠐", "⠡", "⠲", "⠵", "⠻", "⠿" }
 --awful.util.tagnames = { "⌘", "♐", "⌥", "ℵ" }
 -- awful.util.tagnames = { " WWW ", " DEV ", " STUDY ", " MUSIC ", " MAIL ", " LEISURE " }
 -- awful.util.tagnames = {"  ", "  ", " 龎 ", "  ", "  "}
 -- Use this : https://fontawesome.com/cheatsheet
 -- awful.util.tagnames = { "", "", "", "", "" }
-awful.layout.suit.tile.left.mirror = true
-awful.layout.layouts = {
+awful.layout.suit.tile.left.mirror     = true
+awful.layout.layouts                   = {
     awful.layout.suit.tile,
     awful.layout.suit.floating,
     -- awful.layout.suit.tile.left,
@@ -152,25 +154,25 @@ awful.layout.layouts = {
     -- lain.layout.termfair.center,
 }
 
-awful.util.taglist_buttons = my_table.join(
-    awful.button({ }, 1, function(t) t:view_only() end),
+awful.util.taglist_buttons             = my_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({}, 3, awful.tag.viewtoggle),
     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)
+    awful.button({}, 4, function(t) awful.tag.viewnext(t.screen) end),
+    awful.button({}, 5, function(t) awful.tag.viewprev(t.screen) end)
 )
 
-awful.util.tasklist_buttons = my_table.join(
-    awful.button({ }, 1, function (c)
+awful.util.tasklist_buttons            = my_table.join(
+    awful.button({}, 1, function(c)
         if c == client.focus then
             c.minimized = true
         else
@@ -188,20 +190,20 @@ awful.util.tasklist_buttons = my_table.join(
             c:raise()
         end
     end),
-    awful.button({ }, 3, function ()
+    awful.button({}, 3, function()
         local instance = nil
 
-        return function ()
+        return function()
             if instance and instance.wibox.visible then
                 instance:hide()
                 instance = nil
             else
-                instance = awful.menu.clients({theme = {width = dpi(250)}})
+                instance = awful.menu.clients({ theme = { width = dpi(250) } })
             end
         end
     end),
-    awful.button({ }, 4, function () awful.client.focus.byidx(1) end),
-    awful.button({ }, 5, function () awful.client.focus.byidx(-1) end)
+    awful.button({}, 4, function() awful.client.focus.byidx(1) end),
+    awful.button({}, 5, function() awful.client.focus.byidx(-1) end)
 )
 
 lain.layout.termfair.nmaster           = 3
@@ -222,7 +224,7 @@ beautiful.init(string.format("%s/.config/awesome/themes/%s/theme.lua", os.getenv
 -- {{{ Menu
 local myawesomemenu = {
     { "hotkeys", function() return false, hotkeys_popup.show_help end },
-    { "arandr", "arandr" },
+    { "arandr",  "arandr" },
 }
 
 awful.util.mymainmenu = freedesktop.menu.build({
@@ -231,9 +233,9 @@ awful.util.mymainmenu = freedesktop.menu.build({
     },
     after = {
         { "Terminal", terminal },
-        { "Log out", function() awesome.quit() end },
-        { "Sleep", "systemctl suspend" },
-        { "Restart", "systemctl reboot" },
+        { "Log out",  function() awesome.quit() end },
+        { "Sleep",    "systemctl suspend" },
+        { "Restart",  "systemctl reboot" },
         { "Shutdown", "systemctl poweroff" },
         -- other triads can be put here
     }
@@ -254,7 +256,7 @@ screen.connect_signal("property::geometry", function(s)
 end)
 
 -- No borders when rearranging only 1 non-floating or maximized client
-screen.connect_signal("arrange", function (s)
+screen.connect_signal("arrange", function(s)
     local only_one = #s.tiled_clients == 1
     for _, c in pairs(s.clients) do
         if only_one and not c.floating or c.maximized then
@@ -266,10 +268,11 @@ screen.connect_signal("arrange", function (s)
 end)
 
 -- Create a wibox for each screen and add it
-awful.screen.connect_for_each_screen(function(s) beautiful.at_screen_connect(s)
+awful.screen.connect_for_each_screen(function(s)
+    beautiful.at_screen_connect(s)
     s.systray = wibox.widget.systray()
     s.systray.visible = true
- end)
+end)
 -- }}}
 
 
@@ -286,131 +289,141 @@ awful.screen.connect_for_each_screen(function(s) beautiful.at_screen_connect(s)
 
 -- {{{ Key bindings
 globalkeys = my_table.join(
-    -- super + ... function keys
+-- super + ... function keys
     awful.key({ modkey }, "d",
-    function ()
-        awful.spawn(string.format("dmenu_run -i -nb '#191919' -nf '#fea63c' -sb '#fea63c' -sf '#191919' -fn NotoMonoRegular:bold:pixelsize=14",
-        beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus))
-	end,
-    {description = "show dmenu", group = "hotkeys"}),
-    awful.key({ modkey }, "b", function () awful.util.spawn( browser1 ) end,
-        {description = browser1, group = "function keys"}),
-    awful.key({ modkey }, "r", function () awful.util.spawn( "kitty -e ranger" ) end,
-        {description = "launch ranger", group = "function keys"}),
-    awful.key({ modkey }, "f", function() awful.util.spawn( filemanager ) end,
-        {description = filemanager, group = "alt+ctrl"}),
-    awful.key({ altkey }, "c", function () awful.spawn( "/home/omar/.scripts/pscontests.sh" ) end,
-        {description = "contest init" , group = "hotkeys"}),
-    awful.key({ altkey }, "w", function () awful.spawn( "/home/omar/.scripts/wally.sh" ) end,
-        {description = "set random wallpaper" , group = "hotkeys"}),
-    awful.key({ altkey }, "d", function () awful.spawn( "/home/omar/.scripts/dmenuscripts.sh" ) end,
-        {description = "all scripts" , group = "hotkeys"}),
-    awful.key({ altkey }, "b", function () awful.spawn( "/home/omar/.scripts/books.sh" ) end,
-        {description = "Books" , group = "hotkeys"}),
-    awful.key({ altkey }, "p", function () awful.spawn( "/home/omar/.scripts/power.sh" ) end,
-        {description = "books" , group = "hotkeys"}),
-    awful.key({ modkey }, "o", function () awful.util.spawn( "rofi -show run" ) end,
-        {description = "rofi" , group = "function keys" }),
+        function()
+            awful.spawn(string.format(
+                "dmenu_run -i -nb '#191919' -nf '#fea63c' -sb '#fea63c' -sf '#191919' -fn NotoMonoRegular:bold:pixelsize=14",
+                beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus))
+        end,
+        { description = "show dmenu", group = "hotkeys" }),
+    awful.key({ modkey }, "b", function() awful.util.spawn(browser1) end,
+        { description = browser1, group = "function keys" }),
+    awful.key({ modkey }, "r", function() awful.util.spawn("kitty -e ranger") end,
+        { description = "launch ranger", group = "function keys" }),
+    awful.key({ modkey }, "f", function() awful.util.spawn(filemanager) end,
+        { description = filemanager, group = "alt+ctrl" }),
+    awful.key({ altkey }, "c", function() awful.spawn("/home/omar/.scripts/pscontests.sh") end,
+        { description = "contest init", group = "hotkeys" }),
+    awful.key({ altkey }, "w", function() awful.spawn("/home/omar/.scripts/wally.sh") end,
+        { description = "set random wallpaper", group = "hotkeys" }),
+    awful.key({ altkey }, "d", function() awful.spawn("/home/omar/.scripts/dmenuscripts.sh") end,
+        { description = "all scripts", group = "hotkeys" }),
+    awful.key({ altkey }, "b", function() awful.spawn("/home/omar/.scripts/books.sh") end,
+        { description = "Books", group = "hotkeys" }),
+    awful.key({ altkey }, "p", function() awful.spawn("/home/omar/.scripts/power.sh") end,
+        { description = "books", group = "hotkeys" }),
+    awful.key({ modkey }, "o", function() awful.util.spawn("rofi -show drun") end,
+        { description = "rofi", group = "function keys" }),
 
     -- super + ...
-    awful.key({ modkey }, "v", function () awful.util.spawn( "pavucontrol" ) end,
-        {description = "pulseaudio control", group = "super"}),
-    awful.key({ modkey }, "Escape", function () awful.util.spawn( "xkill" ) end,
-        {description = "Kill proces", group = "hotkeys"}),
+    awful.key({ modkey }, "v", function() awful.util.spawn("pavucontrol") end,
+        { description = "pulseaudio control", group = "super" }),
+    awful.key({ modkey }, "Escape", function() awful.util.spawn("xkill") end,
+        { description = "Kill proces", group = "hotkeys" }),
 
     -- super + shift + ...
-    awful.key({ modkey, "Shift"   }, "Return", function() awful.util.spawn( filemanager ) end),
-    awful.key({ modkey, "Shift"   }, "t", function () awful.util.spawn( "kitty -e nvim /tmp/temp.txt" ) end,
-        {description = "launch a temp file in nvim", group = "super+shift"}),
-    awful.key({ modkey, "Shift"   }, "c", function () awful.util.spawn( "/home/omar/.scripts/config_files.sh" ) end,
-        {description = "dmenu with config files", group = "super+shift"}),
+    awful.key({ modkey, "Shift" }, "Return", function() awful.util.spawn(filemanager) end),
+    awful.key({ modkey, "Shift" }, "t", function() awful.util.spawn("kitty -e nvim /tmp/temp.txt") end,
+        { description = "launch a temp file in nvim", group = "super+shift" }),
+    awful.key({ modkey, "Shift" }, "c", function() awful.util.spawn("/home/omar/.scripts/config_files.sh") end,
+        { description = "dmenu with config files", group = "super+shift" }),
 
 
 
     -- ctrl+alt +  ...
-    awful.key({ modkey1, altkey   }, "t", function() awful.util.spawn( terminal ) end,
-        {description = terminal, group = "alt+ctrl"}),
+    awful.key({ modkey1, altkey }, "t", function() awful.util.spawn(terminal) end,
+        { description = terminal, group = "alt+ctrl" }),
 
     -- alt + ...
-    awful.key({ altkey, "Shift"   }, "t", function () awful.spawn.with_shell( "variety -t  && wal -i $(cat $HOME/.config/variety/wallpaper/wallpaper.jpg.txt)&" ) end,
-        {description = "Pywal Wallpaper trash", group = "altkey"}),
-    awful.key({ altkey, "Shift"   }, "n", function () awful.spawn.with_shell( "variety -n  && wal -i $(cat $HOME/.config/variety/wallpaper/wallpaper.jpg.txt)&" ) end,
-        {description = "Pywal Wallpaper next", group = "altkey"}),
-    awful.key({ altkey, "Shift"   }, "u", function () awful.spawn.with_shell( "wal -i $(cat $HOME/.config/variety/wallpaper/wallpaper.jpg.txt)&" ) end,
-        {description = "Pywal Wallpaper update", group = "altkey"}),
-    awful.key({ altkey, "Shift"   }, "p", function () awful.spawn.with_shell( "variety -p  && wal -i $(cat $HOME/.config/variety/wallpaper/wallpaper.jpg.txt)&" ) end,
-        {description = "Pywal Wallpaper previous", group = "altkey"}),
+    awful.key({ altkey, "Shift" }, "t",
+        function() awful.spawn.with_shell(
+            "variety -t  && wal -i $(cat $HOME/.config/variety/wallpaper/wallpaper.jpg.txt)&") end,
+        { description = "Pywal Wallpaper trash", group = "altkey" }),
+    awful.key({ altkey, "Shift" }, "n",
+        function() awful.spawn.with_shell(
+            "variety -n  && wal -i $(cat $HOME/.config/variety/wallpaper/wallpaper.jpg.txt)&") end,
+        { description = "Pywal Wallpaper next", group = "altkey" }),
+    awful.key({ altkey, "Shift" }, "u",
+        function() awful.spawn.with_shell("wal -i $(cat $HOME/.config/variety/wallpaper/wallpaper.jpg.txt)&") end,
+        { description = "Pywal Wallpaper update", group = "altkey" }),
+    awful.key({ altkey, "Shift" }, "p",
+        function() awful.spawn.with_shell(
+            "variety -p  && wal -i $(cat $HOME/.config/variety/wallpaper/wallpaper.jpg.txt)&") end,
+        { description = "Pywal Wallpaper previous", group = "altkey" }),
 
     -- screenshots
-    awful.key({ }, "Print", function () awful.util.spawn("scrot 'ArcoLinux-%Y-%m-%d-%s_screenshot_$wx$h.jpg' -e 'mv $f $$(xdg-user-dir PICTURES)'") end,
-        {description = "Scrot", group = "screenshots"}),
-    awful.key({ modkey1           }, "Print", function () awful.util.spawn( "xfce4-screenshooter" ) end,
-        {description = "Xfce screenshot", group = "screenshots"}),
-    awful.key({ modkey, "Shift"  }, "s", function() awful.util.spawn("/home/omar/.scripts/screenshot.sh") end,
-        {description = "Gnome screenshot", group = "screenshots"}),
+    awful.key({}, "Print",
+        function() awful.util.spawn(
+            "scrot 'ArcoLinux-%Y-%m-%d-%s_screenshot_$wx$h.jpg' -e 'mv $f $$(xdg-user-dir PICTURES)'") end,
+        { description = "Scrot", group = "screenshots" }),
+    awful.key({ modkey1 }, "Print", function() awful.util.spawn("xfce4-screenshooter") end,
+        { description = "Xfce screenshot", group = "screenshots" }),
+    awful.key({ modkey, "Shift" }, "s", function() awful.util.spawn("/home/omar/.scripts/screenshot.sh") end,
+        { description = "Gnome screenshot", group = "screenshots" }),
 
     -- Personal keybindings}}}
 
 
     -- Hotkeys Awesome
-    awful.key({ modkey,           }, "s",      hotkeys_popup.show_help,
-        {description = "show help", group="awesome"}),
+    awful.key({ modkey, }, "s", hotkeys_popup.show_help,
+        { description = "show help", group = "awesome" }),
     -- Tag browsing with modkey
-    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({ altkey,           }, "Escape", awful.tag.history.restore,
-        {description = "go back", group = "tag"}),
-
-     -- Tag browsing alt + tab
+    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({ altkey, }, "Escape", awful.tag.history.restore,
+        { description = "go back", group = "tag" }),
+
+    -- Tag browsing alt + tab
     -- awful.key({ altkey,           }, "Tab",   awful.tag.viewnext,
     --     {description = "view next", group = "tag"}),
     -- awful.key({ altkey, "Shift"   }, "Tab",  awful.tag.viewprev,
     --     {description = "view previous", group = "tag"}),
 
-  awful.key({ altkey,           }, "Tab",
-    function ()
-        local c = awful.client.restore()
-        -- Focus restored client
-        if c then
-            client.focus = c
-            c:raise()
-        end
-    end),
-  awful.key({ altkey, "Shift"   }, "Tab",
-    function ()
-        -- awful.client.focus.history.previous()
-        awful.client.focus.byidx(1)
-        if client.focus then
-            client.focus:raise()
-        end
-    end),
+    awful.key({ altkey, }, "Tab",
+        function()
+            local c = awful.client.restore()
+            -- Focus restored client
+            if c then
+                client.focus = c
+                c:raise()
+            end
+        end),
+    awful.key({ altkey, "Shift" }, "Tab",
+        function()
+            -- awful.client.focus.history.previous()
+            awful.client.focus.byidx(1)
+            if client.focus then
+                client.focus:raise()
+            end
+        end),
 
-     -- Tag browsing modkey + tab
-    awful.key({ modkey,           }, "Tab",   awful.tag.viewnext,
-        {description = "view next", group = "tag"}),
-    awful.key({ modkey, "Shift"   }, "Tab",  awful.tag.viewprev,
-        {description = "view previous", group = "tag"}),
+    -- Tag browsing modkey + tab
+    awful.key({ modkey, }, "Tab", awful.tag.viewnext,
+        { description = "view next", group = "tag" }),
+    awful.key({ modkey, "Shift" }, "Tab", awful.tag.viewprev,
+        { description = "view previous", group = "tag" }),
 
-        --Keyboard layout
-    awful.key({ altkey  }, "2", function () awful.spawn( "/home/omar/.scripts/klayoutar.sh" ) end,
-        {description = "change keyboardlayout to arabic" , group = "hotkeys" }),
-    awful.key({ altkey }, "1", function () awful.spawn( "/home/omar/.scripts/klayoutus.sh" ) end,
-        {description = "change keyboardlayout to english" , group = "hotkeys" }),
+    --Keyboard layout
+    awful.key({ altkey }, "2", function() awful.spawn("/home/omar/.scripts/klayoutar.sh") end,
+        { description = "change keyboardlayout to arabic", group = "hotkeys" }),
+    awful.key({ altkey }, "1", function() awful.spawn("/home/omar/.scripts/klayoutus.sh") end,
+        { description = "change keyboardlayout to english", group = "hotkeys" }),
 
     -- Default client focus
-    awful.key({ altkey,           }, "j",
-        function ()
-            awful.client.focus.byidx( 1)
+    awful.key({ altkey, }, "j",
+        function()
+            awful.client.focus.byidx(1)
         end,
-        {description = "focus next by index", group = "client"}
+        { description = "focus next by index", group = "client" }
     ),
-    awful.key({ altkey,           }, "k",
-        function ()
+    awful.key({ altkey, }, "k",
+        function()
             awful.client.focus.byidx(-1)
         end,
-        {description = "focus previous by index", group = "client"}
+        { description = "focus previous by index", group = "client" }
     ),
 
     -- By direction client focus
@@ -419,77 +432,77 @@ globalkeys = my_table.join(
             awful.client.focus.global_bydirection("down")
             if client.focus then client.focus:raise() end
         end,
-        {description = "focus down", group = "client"}),
+        { description = "focus down", group = "client" }),
     awful.key({ modkey }, "k",
         function()
             awful.client.focus.global_bydirection("up")
             if client.focus then client.focus:raise() end
         end,
-        {description = "focus up", group = "client"}),
+        { description = "focus up", group = "client" }),
     awful.key({ modkey }, "h",
         function()
             awful.client.focus.global_bydirection("left")
             if client.focus then client.focus:raise() end
         end,
-        {description = "focus left", group = "client"}),
+        { description = "focus left", group = "client" }),
     awful.key({ modkey }, "l",
         function()
             awful.client.focus.global_bydirection("right")
             if client.focus then client.focus:raise() end
         end,
-        {description = "focus right", group = "client"}),
+        { description = "focus right", group = "client" }),
 
 
-        -- By direction client focus with arrows
-        awful.key({ modkey1, modkey }, "Down",
-            function()
-                awful.client.focus.global_bydirection("down")
-                if client.focus then client.focus:raise() end
-            end,
-            {description = "focus down", group = "client"}),
-        awful.key({ modkey1, modkey }, "Up",
-            function()
-                awful.client.focus.global_bydirection("up")
-                if client.focus then client.focus:raise() end
-            end,
-            {description = "focus up", group = "client"}),
-        awful.key({ modkey1, modkey }, "Left",
-            function()
-                awful.client.focus.global_bydirection("left")
-                if client.focus then client.focus:raise() end
-            end,
-            {description = "focus left", group = "client"}),
-        awful.key({ modkey1, modkey }, "Right",
-            function()
-                awful.client.focus.global_bydirection("right")
-                if client.focus then client.focus:raise() end
-            end,
-            {description = "focus right", group = "client"}),
+    -- By direction client focus with arrows
+    awful.key({ modkey1, modkey }, "Down",
+        function()
+            awful.client.focus.global_bydirection("down")
+            if client.focus then client.focus:raise() end
+        end,
+        { description = "focus down", group = "client" }),
+    awful.key({ modkey1, modkey }, "Up",
+        function()
+            awful.client.focus.global_bydirection("up")
+            if client.focus then client.focus:raise() end
+        end,
+        { description = "focus up", group = "client" }),
+    awful.key({ modkey1, modkey }, "Left",
+        function()
+            awful.client.focus.global_bydirection("left")
+            if client.focus then client.focus:raise() end
+        end,
+        { description = "focus left", group = "client" }),
+    awful.key({ modkey1, modkey }, "Right",
+        function()
+            awful.client.focus.global_bydirection("right")
+            if client.focus then client.focus:raise() end
+        end,
+        { description = "focus right", group = "client" }),
 
 
 
     -- Layout manipulation
-    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({ modkey1,           }, "Tab",
-        function ()
+    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({ modkey1, }, "Tab",
+        function()
             awful.client.focus.history.previous()
             if client.focus then
                 client.focus:raise()
             end
         end,
-        {description = "go back", group = "client"}),
+        { description = "go back", group = "client" }),
 
     -- Show/Hide Wibox
-    awful.key({ modkey, "Shift" }, "b", function ()
+    awful.key({ modkey, "Shift" }, "b", function()
             for s in screen do
                 s.mywibox.visible = not s.mywibox.visible
                 if s.mybottomwibox then
@@ -497,99 +510,99 @@ globalkeys = my_table.join(
                 end
             end
         end,
-        {description = "toggle wibox", group = "awesome"}),
+        { description = "toggle wibox", group = "awesome" }),
 
- -- Show/Hide Systray
-    awful.key({ modkey }, "-", function ()
-    awful.screen.focused().systray.visible = not awful.screen.focused().systray.visible
-    end, {description = "Toggle systray visibility", group = "awesome"}),
+    -- Show/Hide Systray
+    awful.key({ modkey }, "-", function()
+        awful.screen.focused().systray.visible = not awful.screen.focused().systray.visible
+    end, { description = "Toggle systray visibility", group = "awesome" }),
 
- -- Show/Hide Systray
-    awful.key({ modkey }, "KP_Subtract", function ()
-    awful.screen.focused().systray.visible = not awful.screen.focused().systray.visible
-    end, {description = "Toggle systray visibility", group = "awesome"}),
+    -- Show/Hide Systray
+    awful.key({ modkey }, "KP_Subtract", function()
+        awful.screen.focused().systray.visible = not awful.screen.focused().systray.visible
+    end, { description = "Toggle systray visibility", group = "awesome" }),
 
 
 
     -- On the fly useless gaps change
-    awful.key({ altkey, "Control" }, "j", function () lain.util.useless_gaps_resize(1) end,
-              {description = "increment useless gaps", group = "tag"}),
-    awful.key({ altkey, "Control" }, "h", function () lain.util.useless_gaps_resize(-1) end,
-              {description = "decrement useless gaps", group = "tag"}),
+    awful.key({ altkey, "Control" }, "j", function() lain.util.useless_gaps_resize(1) end,
+        { description = "increment useless gaps", group = "tag" }),
+    awful.key({ altkey, "Control" }, "h", function() lain.util.useless_gaps_resize(-1) end,
+        { description = "decrement useless gaps", group = "tag" }),
 
     -- Dynamic tagging
-    awful.key({ modkey, "Shift" }, "n", function () lain.util.add_tag() end,
-              {description = "add new tag", group = "tag"}),
-    awful.key({ modkey, "Control" }, "r", function () lain.util.rename_tag() end,
-              {description = "rename tag", group = "tag"}),
-    awful.key({ modkey, "Shift" }, "y", function () lain.util.delete_tag() end,
-              {description = "delete tag", group = "tag"}),
+    awful.key({ modkey, "Shift" }, "n", function() lain.util.add_tag() end,
+        { description = "add new tag", group = "tag" }),
+    awful.key({ modkey, "Control" }, "r", function() lain.util.rename_tag() end,
+        { description = "rename tag", group = "tag" }),
+    awful.key({ modkey, "Shift" }, "y", function() lain.util.delete_tag() end,
+        { description = "delete tag", group = "tag" }),
 
     -- Standard program
-    awful.key({ modkey,           }, "Return", function () awful.spawn(terminal) end,
-              {description = terminal, group = "super"}),
+    awful.key({ modkey, }, "Return", function() awful.spawn(terminal) end,
+        { description = terminal, group = "super" }),
     awful.key({ modkey, "Shift" }, "r", awesome.restart,
-              {description = "reload awesome", group = "awesome"}),
-
-    awful.key({ altkey, "Shift"   }, "l",     function () awful.tag.incmwfact( 0.03)          end,
-              {description = "increase master width factor", group = "layout"}),
-    awful.key({ altkey, "Shift"   }, "h",     function () awful.tag.incmwfact(-0.03)          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"}),
+        { description = "reload awesome", group = "awesome" }),
+    awful.key({ altkey, "Shift" }, "l", function() awful.tag.incmwfact(0.03) end,
+        { description = "increase master width factor", group = "layout" }),
+    awful.key({ altkey, "Shift" }, "h", function() awful.tag.incmwfact(-0.03) 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"}),
+    -- {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"}),
+        function()
+            local c = awful.client.restore()
+            -- Focus restored client
+            if c then
+                client.focus = c
+                c:raise()
+            end
+        end,
+        { description = "restore minimized", group = "client" }),
 
     -- Brightness
-    awful.key({ }, "XF86MonBrightnessUp", function () os.execute("xbacklight -inc 10") end,
-              {description = "+10%", group = "hotkeys"}),
-    awful.key({ }, "XF86MonBrightnessDown", function () os.execute("xbacklight -dec 10") end,
-              {description = "-10%", group = "hotkeys"}),
+    awful.key({}, "XF86MonBrightnessUp", function() os.execute("xbacklight -inc 10") end,
+        { description = "+10%", group = "hotkeys" }),
+    awful.key({}, "XF86MonBrightnessDown", function() os.execute("xbacklight -dec 10") end,
+        { description = "-10%", group = "hotkeys" }),
 
     -- ALSA volume control
     --awful.key({ modkey1 }, "Up",
-    awful.key({ }, "XF86AudioRaiseVolume",
-        function ()
+    awful.key({}, "XF86AudioRaiseVolume",
+        function()
             os.execute(string.format("amixer -q set %s 5%%+", beautiful.volume.channel))
             beautiful.volume.update()
         end),
     --awful.key({ modkey1 }, "Down",
-    awful.key({ }, "XF86AudioLowerVolume",
-        function ()
+    awful.key({}, "XF86AudioLowerVolume",
+        function()
             os.execute(string.format("amixer -q set %s 5%%-", beautiful.volume.channel))
             beautiful.volume.update()
         end),
-    awful.key({ }, "XF86AudioMute",
-        function ()
-            os.execute(string.format("amixer -q set %s toggle", beautiful.volume.togglechannel or beautiful.volume.channel))
+    awful.key({}, "XF86AudioMute",
+        function()
+            os.execute(string.format("amixer -q set %s toggle",
+            beautiful.volume.togglechannel or beautiful.volume.channel))
             beautiful.volume.update()
         end),
     awful.key({ modkey1, "Shift" }, "m",
-        function ()
+        function()
             os.execute(string.format("amixer -q set %s 100%%", beautiful.volume.channel))
             beautiful.volume.update()
         end),
     awful.key({ modkey1, "Shift" }, "0",
-        function ()
+        function()
             os.execute(string.format("amixer -q set %s 0%%", beautiful.volume.channel))
             beautiful.volume.update()
         end),
@@ -602,52 +615,52 @@ globalkeys = my_table.join(
 
 
     awful.key({ altkey }, "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"})
-    --]]
+        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" })
+--]]
 )
 
 clientkeys = my_table.join(
-    awful.key({ altkey, "Shift"   }, "m",      lain.util.magnify_client,
-              {description = "magnify client", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "f",
-        function (c)
+    awful.key({ altkey, "Shift" }, "m", lain.util.magnify_client,
+        { description = "magnify client", group = "client" }),
+    awful.key({ modkey, "Shift" }, "f",
+        function(c)
             c.fullscreen = not c.fullscreen
             c:raise()
         end,
-        {description = "toggle fullscreen", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "q",      function (c) c:kill()                         end,
-              {description = "close", group = "hotkeys"}),
-    awful.key({ modkey, },           "c",      function (c) c:kill()                         end,
-              {description = "close", group = "hotkeys"}),
-    awful.key({ modkey, "Shift" }, "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, "Shift"   }, "Left",   function (c) c:move_to_screen()               end,
-              {description = "move to screen", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "Right",  function (c) c:move_to_screen()               end,
-              {description = "move to screen", group = "client"}),    
+        { description = "toggle fullscreen", group =