From efd9eb69a141414bf217e8ba07e1f2833f66bbf1 Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Tue, 30 Jun 2015 03:22:41 +0200 Subject: [PATCH] a lot of cleanups --- .config/awesome/rc.lua | 114 ++++++++++++++++--------- .config/awesome/themes/hanez/theme.lua | 2 +- 2 files changed, 77 insertions(+), 39 deletions(-) diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index dbfe7145..f37399cd 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -112,46 +112,64 @@ vicious.register(thermalwidget, vicious.widgets.thermal, "$1C ", 20, "thermal_zo cpuwidget = awful.widget.graph() cpuwidget:set_width(50) cpuwidget:set_background_color("#222222") -cpuwidget:set_color({ type = "linear", from = { 0, 0 }, to = { 10,0 }, stops = { {0, "#FF5656"}, {0.5, "#88A175"}, - {1, "#AECF96" }}}) +cpuwidget:set_color({ type = "linear", from = { 0, 0 }, to = { 10,0 }, stops = { {0, "#FF5656"}, +{0.5, "#88A175"}, {1, "#AECF96" }}}) vicious.register(cpuwidget, vicious.widgets.cpu, "$1") -- {{{ Menu -- Create a laucher widget and a main menu accessoriesmenu = { - { "calculator", "/usr/bin/galculator", "/usr/share/icons/hicolor/48x48/apps/galculator.png" }, + { "calculator", "/usr/bin/galculator", + "/usr/share/icons/hicolor/48x48/apps/galculator.png" }, } developmentmenu = { - { "anjuta", "/usr/bin/anjuta", "/usr/share/icons/hicolor/"..theme.icon_size.."/apps/anjuta.png" }, - { "pycharm", "/usr/bin/pycharm", "/opt/pycharm-community/bin/pycharm.png" }, + { "anjuta", "/usr/bin/anjuta", + "/usr/share/icons/hicolor/48x48/apps/anjuta.png" }, + { "pycharm", "/usr/bin/pycharm", + "/opt/pycharm-community/bin/pycharm.png" }, } engineeringmenu = { } gamesmenu = { - { "vba-m", "/usr/bin/gvbam", "/usr/share/icons/hicolor/"..theme.icon_size.."/apps/vbam.png" }, + { "vba-m", "/usr/bin/gvbam", + "/usr/share/icons/hicolor/48x48/apps/vbam.png" }, } graphicsmenu = { - { "gimp", "/usr/bin/gimp", "/usr/share/icons/hicolor/"..theme.icon_size.."/apps/gimp.png" }, + { "gimp", "/usr/bin/gimp", + "/usr/share/icons/hicolor/48x48/apps/gimp.png" }, } internetmenu = { - { "chromium", "/usr/bin/chromium", "/usr/share/icons/hicolor/"..theme.icon_size.."/apps/chromium.png" }, - { "claws", "/usr/bin/claws-mail", "/usr/share/icons/hicolor/48x48/apps/claws-mail.png" }, - { "firefox", "/usr/bin/firefox", "/usr/share/icons/hicolor/"..theme.icon_size.."/apps/firefox.png" }, - { "pidgin", "/usr/bin/pidgin", "/usr/share/icons/hicolor/"..theme.icon_size.."/apps/pidgin.png" }, + { "chromium", "/usr/bin/chromium", + "/usr/share/icons/hicolor/48x48/apps/chromium.png" }, + { "claws", "/usr/bin/claws-mail", + "/usr/share/icons/hicolor/48x48/apps/claws-mail.png" }, + { "firefox", "/usr/bin/firefox", + "/usr/share/icons/hicolor/48x48/apps/firefox.png" }, + { "pidgin", "/usr/bin/pidgin", + "/usr/share/icons/hicolor/48x48/apps/pidgin.png" }, } multimediamenu = { - { "kaffeine", "/usr/bin/kaffeine", "/usr/share/icons/hicolor/"..theme.icon_size.."/apps/kaffeine.png" }, - { "spotify", "/usr/bin/spotify", "/usr/share/spotify/spotify-client/Icons/spotify-linux-22.png" }, - { "vlc", "/usr/bin/vlc", "/usr/share/icons/hicolor/48x48/apps/vlc.png" }, + { "kaffeine", "/usr/bin/kaffeine", + "/usr/share/icons/hicolor/48x48/apps/kaffeine.png" }, + { "spotify", "/usr/bin/spotify", + "/usr/share/spotify/spotify-client/Icons/spotify-linux-22.png" }, + { "vlc", "/usr/bin/vlc", + "/usr/share/icons/hicolor/48x48/apps/vlc.png" }, } officemenu = { - { "libreoffice base", "/usr/bin/libreoffice --base", "/usr/share/icons/hicolor/48x48/apps/libreoffice-base.png" }, - { "libreoffice calc", "/usr/bin/libreoffice --calc", "/usr/share/icons/hicolor/48x48/apps/libreoffice-calc.png" }, - { "libreoffice draw", "/usr/bin/libreoffice --draw", "/usr/share/icons/hicolor/48x48/apps/libreoffice-draw.png" }, - { "libreoffice impress", "/usr/bin/libreoffice --impress", "/usr/share/icons/hicolor/48x48/apps/libreoffice-impress.png" }, - { "libreoffice math", "/usr/bin/libreoffice --math", "/usr/share/icons/hicolor/48x48/apps/libreoffice-math.png" }, - { "libreoffice writer", "/usr/bin/libreoffice --writer", "/usr/share/icons/hicolor/48x48/apps/libreoffice-writer.png" }, + { "libreoffice base", "/usr/bin/libreoffice --base", + "/usr/share/icons/hicolor/48x48/apps/libreoffice-base.png" }, + { "libreoffice calc", "/usr/bin/libreoffice --calc", + "/usr/share/icons/hicolor/48x48/apps/libreoffice-calc.png" }, + { "libreoffice draw", "/usr/bin/libreoffice --draw", + "/usr/share/icons/hicolor/48x48/apps/libreoffice-draw.png" }, + { "libreoffice impress", "/usr/bin/libreoffice --impress", + "/usr/share/icons/hicolor/48x48/apps/libreoffice-impress.png" }, + { "libreoffice math", "/usr/bin/libreoffice --math", + "/usr/share/icons/hicolor/48x48/apps/libreoffice-math.png" }, + { "libreoffice writer", "/usr/bin/libreoffice --writer", + "/usr/share/icons/hicolor/48x48/apps/libreoffice-writer.png" }, } othermenu = { @@ -161,29 +179,49 @@ sciencemenu = { } systemmenu = { -- { "gufw", "/usr/bin/gufw" }, - { "virtualbox", "/usr/bin/virtualbox", "/usr/share/icons/hicolor/48x48/apps/virtualbox.png" }, + { "virtualbox", "/usr/bin/virtualbox", + "/usr/share/icons/hicolor/48x48/apps/virtualbox.png" }, + { "wireshark", "/usr/bin/wireshark", + "/usr/share/icons/hicolor/48x48/apps/wireshark.png" }, } utilitiesmenu = { } mymainmenu = awful.menu({ items = { - { "accessories", accessoriesmenu, beautiful.icon_path.."categories/applications-accessories.png" }, - { "development", developmentmenu, beautiful.icon_path.."categories/applications-development.png" }, - { "engineering", engineeringmenu, beautiful.icon_path.."categories/applications-engineering.png" }, - { "games", gamesmenu, beautiful.icon_path.."categories/applications-games.png" }, - { "graphics", graphicsmenu, beautiful.icon_path.."categories/applications-graphics.png" }, - { "internet", internetmenu, beautiful.icon_path.."categories/applications-internet.png" }, - { "multimedia", multimediamenu, beautiful.icon_path.."categories/applications-multimedia.png" }, - { "office", officemenu, beautiful.icon_path.."categories/applications-office.png" }, - { "other", othermenu, beautiful.icon_path.."categories/applications-other.png" }, - { "science", sciencemenu, beautiful.icon_path.."categories/applications-science.png" }, - { "system", systemmenu, beautiful.icon_path.."categories/applications-system.png" }, - { "utilities", utilitiesmenu, beautiful.icon_path.."categories/applications-utilities.png" }, - { "filemanager", "/usr/bin/thunar", beautiful.icon_path.."apps/system-file-manager.png" }, - { "open terminal", terminal, beautiful.icon_path.."apps/utilities-terminal.png" }, - { "edit config", editor_cmd .. " " .. awesome.conffile, beautiful.icon_path.."categories/preferences-other.png" }, - { "reload", awesome.restart, beautiful.icon_path.."actions/view-refresh.png" }, - { "quit", awesome.quit, beautiful.icon_path.."actions/system-log-out.png" } + { "accessories", accessoriesmenu, + beautiful.icon_path.."categories/applications-accessories.png" }, + { "development", developmentmenu, + beautiful.icon_path.."categories/applications-development.png" }, + { "engineering", engineeringmenu, + beautiful.icon_path.."categories/applications-engineering.png" }, + { "games", gamesmenu, + beautiful.icon_path.."categories/applications-games.png" }, + { "graphics", graphicsmenu, + beautiful.icon_path.."categories/applications-graphics.png" }, + { "internet", internetmenu, + beautiful.icon_path.."categories/applications-internet.png" }, + { "multimedia", multimediamenu, + beautiful.icon_path.."categories/applications-multimedia.png" }, + { "office", officemenu, + beautiful.icon_path.."categories/applications-office.png" }, + { "other", othermenu, + beautiful.icon_path.."categories/applications-other.png" }, + { "science", sciencemenu, + beautiful.icon_path.."categories/applications-science.png" }, + { "system", systemmenu, + beautiful.icon_path.."categories/applications-system.png" }, + { "utilities", utilitiesmenu, + beautiful.icon_path.."categories/applications-utilities.png" }, + { "filemanager", "/usr/bin/thunar", + beautiful.icon_path.."apps/system-file-manager.png" }, + { "open terminal", terminal, + beautiful.icon_path.."apps/utilities-terminal.png" }, + { "edit config", editor_cmd .. " " .. awesome.conffile, + beautiful.icon_path.."categories/preferences-other.png" }, + { "reload", awesome.restart, + beautiful.icon_path.."actions/view-refresh.png" }, + { "quit", awesome.quit, + beautiful.icon_path.."actions/system-log-out.png" } } }) diff --git a/.config/awesome/themes/hanez/theme.lua b/.config/awesome/themes/hanez/theme.lua index 7ba26a32..e30e89b0 100644 --- a/.config/awesome/themes/hanez/theme.lua +++ b/.config/awesome/themes/hanez/theme.lua @@ -51,7 +51,7 @@ theme.taglist_squares_unsel = "~/.config/awesome/themes/hanez/taglist/squarew.pn -- menu_[border_color|border_width] theme.menu_submenu_icon = theme.icon_path.."actions/media-playback-start.png" theme.menu_height = 22 -theme.menu_width = 120 +theme.menu_width = 180 -- You can add as many variables as -- you wish and access them by using