Merge branch 'master' of git.unixpeople.org:hanez/home

This commit is contained in:
Johannes Findeisen 2021-04-09 00:27:09 +02:00
commit b49ec25b89
3 changed files with 52 additions and 32 deletions

View file

@ -8,19 +8,29 @@ accessoriesmenu = {
{ "freemind", "/usr/bin/freemind", "/usr/share/icons/hicolor/32x32/apps/freemind.png" },
{ "gscriptor", "/usr/bin/gscriptor", "/usr/share/icons/hicolor/48x48/apps/gcr-smart-card.png" },
{ "gvim", "/usr/bin/gvim", "/usr/share/icons/hicolor/48x48/apps/gvim.png" },
{ "lector", "/usr/bin/lector", "/usr/share/icons/hicolor/scalable/apps/Lector.png" },
{ "pluma", "/usr/bin/pluma", "/usr/share/icons/Moka/48x48/apps/gedit.png" },
{ "regexxer", "/usr/bin/regexxer", "/usr/share/icons/hicolor/48x48/apps/regexxer.png" },
{ "retext", "/usr/bin/retext", "/usr/share/icons/hicolor/48x48/apps/retext.png" },
{ "xarchiver", "xarchiver", "/usr/share/icons/hicolor/48x48/apps/xarchiver.png" },
}
audiomenu = {
{ "ardour", "/usr/bin/ardour6", "/usr/share/icons/hicolor/48x48/apps/ardour6.png" },
{ "audacity", "/usr/bin/audacity", "/usr/share/icons/hicolor/48x48/apps/audacity.png" },
{ "bitwig studio", "/usr/bin/bitwig-studio", "/usr/share/icons/hicolor/scalable/apps/bitwig-studio.svg" },
{ "reaper", "/usr/bin/reaper", "/usr/share/icons/hicolor/256x256/apps/cockos-reaper.png" },
}
communicationmenu = {
{ "gajim", "/usr/bin/gajim", "/usr/share/icons/hicolor/scalable/apps/org.gajim.Gajim.svg" },
{ "skype", "/usr/bin/skypeforlinux", "/usr/share/pixmaps/skypeforlinux.png" },
{ "teams", "/usr/bin/teams", "/usr/share/pixmaps/teams.png" },
{ "thunderbird", "/usr/bin/birdtray", "/usr/share/icons/hicolor/48x48/apps/thunderbird.png" },
{ "zoom", "/usr/bin/zoom", "/usr/share/pixmaps/application-x-zoom.png" },
}
dbmenu = {
{ "datagrip", "/home/hanez/bin/datagrip.sh", "/opt/datagrip/bin/datagrip.svg" },
{ "dbeaver", "/usr/bin/dbeaver", "/usr/share/pixmaps/dbeaver.xpm" },
{ "mysql workbench", "/usr/bin/mysql-workbench", "/usr/share/icons/hicolor/48x48/apps/mysql-workbench.png" },
{ "sqlitebrowser", "/usr/bin/sqlitebrowser", "/usr/share/icons/hicolor/256x256/apps/sqlitebrowser.png" },
{ "umongo", "/usr/bin/umongo.sh", "/usr/share/pixmaps/umongo.png" },
}
@ -30,7 +40,8 @@ developmentmenu = {
{ "bluegriffon", "/usr/bin/bluegriffon", "/usr/share/icons/hicolor/48x48/apps/bluegriffon.png" },
{ "codeblocks", "/usr/bin/codeblocks", "/usr/share/icons/hicolor/64x64/apps/codeblocks.png" },
{ "clion", "/home/hanez/bin/clion.sh", "/usr/share/pixmaps/clion.svg" },
--{ "ddd", "/usr/bin/ddd", "/usr/share/pixmaps/ddd.xpm" },
{ "cmake gui", "/usr/bin/cmake-gui", "/usr/share/icons/hicolor/64x64/apps/cmake.png" },
{ "ddd", "/usr/bin/ddd", "/usr/share/pixmaps/ddd.xpm" },
{ "fluid", "/usr/bin/fluid", "/usr/share/icons/hicolor/48x48/apps/fluid.png" },
{ "glade", "/usr/bin/glade ", "/usr/share/icons/hicolor/scalable/apps/glade-3.svg" },
{ "goland", "/home/hanez/bin/goland.sh", "/usr/share/pixmaps/goland.png"},
@ -44,7 +55,7 @@ developmentmenu = {
{ "pycharm professional", "/home/hanez/bin/pycharm.sh", "/usr/share/icons/hicolor/scalable/apps/pycharm.svg" },
{ "qgit", "/usr/bin/qgit", "/usr/share/icons/hicolor/48x48/apps/qgit.png" },
{ "qtcreator", "/usr/bin/qtcreator", "/usr/share/icons/hicolor/48x48/apps/QtProject-qtcreator.png" },
--{ "sasm", "/usr/bin/sasm", "/usr/share/sasm/sasm.png" },
{ "sasm", "/usr/bin/sasm", "/usr/share/sasm/sasm.png" },
{ "rider", "/home/hanez/bin/rider.sh", "/usr/share/rider/bin/rider.svg" },
{ "rubymine", "/home/hanez/bin/rubymine.sh", "/usr/share/icons/hicolor/scalable/apps/rubymine.svg" },
{ "smartgit", "/usr/bin/smartgit", "/opt/smartgit/bin/smartgit.svg" },
@ -56,19 +67,26 @@ engineeringmenu = {
{ "arduino", "/usr/bin/arduino", "/usr/share/icons/hicolor/48x48/apps/arduino.png" },
{ "eagle", "/home/hanez/bin/eagle.sh", "/usr/share/pixmaps/eagle.png" },
{ "energia", "/usr/bin/energia", "/usr/share/pixmaps/energia.png" },
{ "fritzing", "/usr/bin/Fritzing", "/usr/share/icons/fritzing.png" },
{ "fritzing", "/usr/bin/Fritzing", "/usr/share/pixmaps/fritzing.png" },
{ "kicad", "/usr/bin/kicad", "/usr/share/icons/hicolor/48x48/apps/kicad.png" },
{ "leocad", "/usr/bin/leocad", "/usr/share/icons/hicolor/scalable/mimetypes/application-vnd.leocad.svg" },
{ "librecad", "/usr/bin/librecad", "/usr/share/icons/hicolor/scalable/apps/librecad.svg" },
{ "openscad", "/usr/bin/openscad", "/usr/share/pixmaps/openscad.png" },
{ "processing", "/usr/bin/processing", "/usr/share/pixmaps/processing.png" },
--{ "processing", "/usr/bin/processing", "/usr/share/pixmaps/processing.png" },
{ "qcad", "/usr/bin/qcad", "/usr/share/pixmaps/qcad_icon.png" },
{ "qtresistors", "/usr/bin/qtResistors", "/usr/share/icons/hicolor/64x64/apps/qtResistors.png" },
}
gamesmenu = {
{ "0 a.d.", "/usr/bin/0ad", "/usr/share/pixmaps/0ad.png" },
{ "kobodeluxe", "/usr/bin/kobodl", "/usr/share/icons/hicolor/48x48/apps/kobodl.png" },
{ "neverball", "/usr/bin/neverball", "/usr/share/icons/hicolor/48x48/apps/neverball.png" },
{ "neverputt", "/usr/bin/neverputt", "/usr/share/icons/hicolor/48x48/apps/neverputt.png" },
{ "supertux", "/usr/bin/supertux2", "/usr/share/icons/hicolor/scalable/apps/supertux2.svg" },
{ "supertux kart", "/usr/bin/supertuxkart", "/usr/share/icons/hicolor/48x48/apps/supertuxkart.png" },
{ "retroarch", "/usr/bin/retroarch", "/usr/share/pixmaps/retroarch.svg" },
{ "steam", "/home/hanez/bin/steam.sh", "/usr/share/pixmaps/steam.png" },
--{ "thimbleweed park", "/home/hanez/bin/thimbleweedpark", "/home/hanez/.local/share/Steam/steamapps/common/Thimbleweed Park/Icon32.png" },
{ "xgalaga++", "/usr/bin/xgalaga++", "/usr/share/pixmaps/xgalaga++.xpm" },
}
graphicsmenu = {
{ "aseprite", "/usr/bin/aseprite", "/usr/share/icons/hicolor/48x48/apps/aseprite.png" },
@ -97,6 +115,8 @@ internetmenu = {
{ "chrome (incognito)", "/usr/bin/google-chrome-stable", "/usr/share/icons/hicolor/48x48/apps/google-chrome.png" },
{ "chromium", "/usr/bin/chromium", "/usr/share/icons/hicolor/48x48/apps/chromium.png" },
{ "chromium (incognito)", "/usr/bin/chromium --incognito", "/usr/share/icons/hicolor/48x48/apps/chromium.png" },
{ "edge", "/usr/bin/microsoft-edge-dev", "/usr/share/icons/hicolor/48x48/apps/microsoft-edge-dev.png" },
{ "edge (private)", "/usr/bin/microsoft-edge-dev --inprivate", "/usr/share/icons/hicolor/48x48/apps/microsoft-edge-dev.png" },
{ "firefox", "/usr/bin/firefox", "/usr/share/icons/hicolor/48x48/apps/firefox.png" },
{ "firefox (private)", "/usr/bin/firefox --private-window", "/usr/share/icons/hicolor/48x48/apps/firefox.png" },
{ "google earth", "/usr/bin/google-earth-pro", "/opt/google/earth/pro/product_logo_32.xpm" },
@ -107,8 +127,6 @@ internetmenu = {
}
multimediamenu = {
{ "acidrip", "/usr/bin/acidrip", "/usr/share/icons/Vimix/scalable/apps/acidrip.svg" },
{ "ardour", "/usr/bin/ardour6", "/usr/share/icons/hicolor/48x48/apps/ardour6.png" },
{ "audacity", "/usr/bin/audacity", "/usr/share/icons/hicolor/48x48/apps/audacity.png" },
{ "brasero", "/usr/bin/brasero", "/usr/share/icons/hicolor/48x48/apps/brasero.png" },
{ "handbrake", "/usr/bin/ghb", "/usr/share/icons/hicolor/scalable/apps/hb-icon.svg" },
{ "k3b", "/usr/bin/k3b", "/usr/share/icons/hicolor/48x48/apps/k3b.png" },
@ -151,9 +169,10 @@ sciencemenu = {
}
systemmenu = {
{ "gparted", "/usr/bin/gparted", "/usr/share/icons/hicolor/48x48/apps/gparted.png" },
{ "hardinfo", "/usr/bin/hardinfo", "/usr/share/icons/matefaenza/apps/scalable/hardinfo.svg" },
{ "hardinfo", "/usr/bin/hardinfo", "/usr/share/icons/hicolor/48x48/apps/hardinfo.png" },
{ "ksysguard", "/usr/bin/ksysguard", "/usr/share/icons/hicolor/16x16/apps/ksysguardd.png" },
{ "partition manager", "/usr/bin/partitionmanager", "/usr/share/icons/hicolor/scalable/apps/partitionmanager.svg" },
{ "printer", "/usr/bin/system-config-printer", "/usr/share/icons/paper-vimix/scalable/devices/stock_printers.png" },
{ "printer", "/usr/bin/system-config-printer", "/usr/share/icons/Adwaita/48x48/legacy/printer-printing.png" },
{ "timeshift", "/usr/bin/timeshift-launcher", "/usr/share/icons/hicolor/48x48/apps/timeshift.png" },
{ "virt-manager", "/usr/bin/virt-manager", "/usr/share/icons/hicolor/48x48/apps/virt-manager.png" },
{ "virtualbox", "/usr/bin/virtualbox", "/usr/share/pixmaps/VBox.png" },
@ -164,6 +183,7 @@ utilitiesmenu = {
}
mainmenu = awful.menu({ items = {
{ "accessories", accessoriesmenu, "/usr/share/icons/Adwaita/22x22/legacy/applications-accessories.png" },
{ "audio", audiomenu, "/usr/share/icons/hicolor/scalable/devices/audio-card.svg" },
{ "communication", communicationmenu, icondir.."actions/quote.png" },
{ "database", dbmenu, "/usr/share/icons/oxygen/base/48x48/places/server-database.png" },
{ "development", developmentmenu, "/usr/share/icons/Adwaita/22x22/legacy/applications-development.png" },

View file

@ -48,7 +48,7 @@ awful.screen.connect_for_each_screen(function(s)
cpuwidget,
---batterywidget,
--thermalwidget,
myweather.icon,
--myweather.icon,
wibox.widget.systray(),
mytextclock,
s.mylayoutbox,

View file

@ -126,29 +126,29 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ
-- }}}
-- {{{ Vicious widgets
batterywidget = wibox.widget.textbox()
vicious.register(batterywidget, vicious.widgets.bat, "$1$2% / ", 20, config.battery)
--batterywidget = wibox.widget.textbox()
--vicious.register(batterywidget, vicious.widgets.bat, "$1$2% / ", 20, config.battery)
netwidget = wibox.widget.textbox()
vicious.register(netwidget, vicious.widgets.net,
'<span color="green">⇩${'..config.net_device..' down_kb}</span> / <span color="#C83321">${'..config.net_device..' up_kb}⇧</span> ', 1)
--netwidget = wibox.widget.textbox()
--vicious.register(netwidget, vicious.widgets.net,
--'<span color="green">⇩${'..config.net_device..' down_kb}</span> / <span color="#C83321">${'..config.net_device..' up_kb}⇧</span> ', 1)
thermalwidget = wibox.widget.textbox()
vicious.register(thermalwidget, vicious.widgets.thermal, "$1°C ", 20, config.thermal_zone )
--thermalwidget = wibox.widget.textbox()
--vicious.register(thermalwidget, vicious.widgets.thermal, "$1°C ", 20, config.thermal_zone )
myweather = lain.widget.weather({
APPID = config.openweather_api_key,
city_id = config.cityid,
notification_preset = { font = beautiful.font },
notification_text_fun = function (wn)
local day = os.date("%a %d", wn["dt"])
local tmin = math.floor(wn["temp"]["min"])
local tmax = math.floor(wn["temp"]["max"])
local desc = wn["weather"][1]["description"]
return string.format("<b>%s</b>: %s, %d°C/%d°C ", day, desc, tmin, tmax)
end,
})
myweather.attach(myweather.icon)
--myweather = lain.widget.weather({
-- APPID = config.openweather_api_key,
-- city_id = config.cityid,
-- notification_preset = { font = beautiful.font },
-- notification_text_fun = function (wn)
-- local day = os.date("%a %d", wn["dt"])
-- local tmin = math.floor(wn["temp"]["min"])
-- local tmax = math.floor(wn["temp"]["max"])
-- local desc = wn["weather"][1]["description"]
-- return string.format("<b>%s</b>: %s, %d°C/%d°C ", day, desc, tmin, tmax)
-- end,
--})
--myweather.attach(myweather.icon)
cpuwidget = awful.widget.graph()
cpuwidget:set_width(100)