From d03236d878a8011520963fa0c1cdf72a1590c773 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Wed, 22 Jul 2015 15:11:21 -0300 Subject: Updates Adds powerarrow theme --- .gitmodules | 3 + config.dot/awesome.link/powerarrow | 1 + config.dot/awesome.link/rc.lua | 56 +++++++++++-- config.dot/awesome.link/theme.lua | 100 ---------------------- config.dot/awesome.link/themes/simplex/theme.lua | 102 +++++++++++++++++++++++ 5 files changed, 155 insertions(+), 107 deletions(-) create mode 160000 config.dot/awesome.link/powerarrow delete mode 100644 config.dot/awesome.link/theme.lua create mode 100644 config.dot/awesome.link/themes/simplex/theme.lua diff --git a/.gitmodules b/.gitmodules index 44a8ada..cd6b26f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "config.dot/awesome.link/awesompd"] path = config.dot/awesome.link/awesompd url = git://git.sarava.org/awesompd.git +[submodule "config.dot/awesome.link/powerarrow"] + path = config.dot/awesome.link/powerarrow + url = https://github.com/romockee/powerarrow diff --git a/config.dot/awesome.link/powerarrow b/config.dot/awesome.link/powerarrow new file mode 160000 index 0000000..530d208 --- /dev/null +++ b/config.dot/awesome.link/powerarrow @@ -0,0 +1 @@ +Subproject commit 530d208c76280d4f6f566394e6f6a7ebf18fc61e diff --git a/config.dot/awesome.link/rc.lua b/config.dot/awesome.link/rc.lua index b56e4c0..84e8dc8 100644 --- a/config.dot/awesome.link/rc.lua +++ b/config.dot/awesome.link/rc.lua @@ -17,10 +17,13 @@ require("debian.menu") -- {{{ Variable definitions -- Folders -homedir = os.getenv("HOME") -configdir = homedir .. "/.config/awesome" +homedir = os.getenv("HOME") +configdir = homedir .. "/.config/awesome" +themes_dir = configdir .. "/themes" + -- Themes define colours, icons, and wallpapers -beautiful.init(configdir .. "/theme.lua") +--beautiful.init(themes_dir .. "/simplex/theme.lua") +beautiful.init(themes_dir .. "/powerarrow/theme.lua") -- This is used later as the default terminal and editor to run. terminal = "terminal" @@ -159,8 +162,12 @@ for s = 1, screen.count() do return awful.widget.tasklist.label.currenttags(c, s) end, mytasklist.buttons) + -- Load widgets + dofile(configdir .. "/widgets.lua") + -- Create the wibox - mywibox[s] = awful.wibox({ position = "top", screen = s }) + --mywibox[s] = awful.wibox({ position = "top", screen = s }) + mywibox[s] = awful.wibox({ position = "top", screen = s, height = "16" }) -- Add widgets to the wibox - order matters mywibox[s].widgets = { { @@ -170,10 +177,45 @@ for s = 1, screen.count() do layout = awful.widget.layout.horizontal.leftright }, mylayoutbox[s], - mytextclock, + s == 1 and mysystray or nil, - volume_widget, - battery_widget, + arr1, + spr3f, + binaryclock.widget, + spr3f, + arrl, + --my_cal.widget, + arr2, + --netwidget, + --neticon, + arr3, + batwidget, + baticon, + arr4, + --fswidget, + --udisks_glue.widget, + arr5, + sensors, + tempicon, + arr6, + --cpuwidget, + --cpuicon, + arr7, + --memwidget, + --memicon, + arr8, + --task_warrior.widget, + arr9, + --music, + arr0, + --mailicon, + arr9, + spr, + -- s == 1 and mysystray, spr or nil, mytasklist[s], + + --mytextclock, + --volume_widget, + --battery_widget, myledbox, awesompd and musicwidget.widget or nil, mytasklist[s], diff --git a/config.dot/awesome.link/theme.lua b/config.dot/awesome.link/theme.lua deleted file mode 100644 index 1881afe..0000000 --- a/config.dot/awesome.link/theme.lua +++ /dev/null @@ -1,100 +0,0 @@ ---------------------------- --- Default awesome theme -- ---------------------------- - -theme = {} - -theme.font = "sans 8" ---theme.font = "mono 8" - ----theme.bg_normal = "#222222" -theme.bg_normal = "#000000" ----theme.bg_focus = "#535d6c" -theme.bg_focus = "#222222" -theme.bg_urgent = "#ff0000" -theme.bg_minimize = "#444444" - -theme.fg_normal = "#aaaaaa" -theme.fg_focus = "#ffffff" -theme.fg_urgent = "#ffffff" -theme.fg_minimize = "#ffffff" - -theme.border_width = "1" -theme.border_normal = "#000000" ----theme.border_focus = "#535d6c" -theme.border_focus = "#222222" -theme.border_marked = "#91231c" - --- There are other variable sets --- overriding the default one when --- defined, the sets are: --- [taglist|tasklist]_[bg|fg]_[focus|urgent] --- titlebar_[bg|fg]_[normal|focus] --- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color] --- mouse_finder_[color|timeout|animate_timeout|radius|factor] --- Example: ---theme.taglist_bg_focus = "#ff0000" - --- Display the taglist squares -theme.taglist_squares_sel = "/usr/share/awesome/themes/default/taglist/squarefw.png" -theme.taglist_squares_unsel = "/usr/share/awesome/themes/default/taglist/squarew.png" - -theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/floatingw.png" - --- Variables set for theming the menu: --- menu_[bg|fg]_[normal|focus] --- menu_[border_color|border_width] -theme.menu_submenu_icon = "/usr/share/awesome/themes/default/submenu.png" -theme.menu_height = "15" -theme.menu_width = "100" - --- You can add as many variables as --- you wish and access them by using --- beautiful.variable in your rc.lua ---theme.bg_widget = "#cc0000" - --- Define the image to load -theme.titlebar_close_button_normal = "/usr/share/awesome/themes/default/titlebar/close_normal.png" -theme.titlebar_close_button_focus = "/usr/share/awesome/themes/default/titlebar/close_focus.png" - -theme.titlebar_ontop_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_normal_inactive.png" -theme.titlebar_ontop_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_focus_inactive.png" -theme.titlebar_ontop_button_normal_active = "/usr/share/awesome/themes/default/titlebar/ontop_normal_active.png" -theme.titlebar_ontop_button_focus_active = "/usr/share/awesome/themes/default/titlebar/ontop_focus_active.png" - -theme.titlebar_sticky_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_normal_inactive.png" -theme.titlebar_sticky_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_focus_inactive.png" -theme.titlebar_sticky_button_normal_active = "/usr/share/awesome/themes/default/titlebar/sticky_normal_active.png" -theme.titlebar_sticky_button_focus_active = "/usr/share/awesome/themes/default/titlebar/sticky_focus_active.png" - -theme.titlebar_floating_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/floating_normal_inactive.png" -theme.titlebar_floating_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/floating_focus_inactive.png" -theme.titlebar_floating_button_normal_active = "/usr/share/awesome/themes/default/titlebar/floating_normal_active.png" -theme.titlebar_floating_button_focus_active = "/usr/share/awesome/themes/default/titlebar/floating_focus_active.png" - -theme.titlebar_maximized_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_normal_inactive.png" -theme.titlebar_maximized_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_focus_inactive.png" -theme.titlebar_maximized_button_normal_active = "/usr/share/awesome/themes/default/titlebar/maximized_normal_active.png" -theme.titlebar_maximized_button_focus_active = "/usr/share/awesome/themes/default/titlebar/maximized_focus_active.png" - --- You can use your own command to set your wallpaper ---theme.wallpaper_cmd = { "awsetbg " .. homedir .. "/themes/backgrounds/background.jpg" } -theme.wallpaper_cmd = { "xsetroot -solid black" } - --- You can use your own layout icons like this: -theme.layout_fairh = "/usr/share/awesome/themes/default/layouts/fairhw.png" -theme.layout_fairv = "/usr/share/awesome/themes/default/layouts/fairvw.png" -theme.layout_floating = "/usr/share/awesome/themes/default/layouts/floatingw.png" -theme.layout_magnifier = "/usr/share/awesome/themes/default/layouts/magnifierw.png" -theme.layout_max = "/usr/share/awesome/themes/default/layouts/maxw.png" -theme.layout_fullscreen = "/usr/share/awesome/themes/default/layouts/fullscreenw.png" -theme.layout_tilebottom = "/usr/share/awesome/themes/default/layouts/tilebottomw.png" -theme.layout_tileleft = "/usr/share/awesome/themes/default/layouts/tileleftw.png" -theme.layout_tile = "/usr/share/awesome/themes/default/layouts/tilew.png" -theme.layout_tiletop = "/usr/share/awesome/themes/default/layouts/tiletopw.png" -theme.layout_spiral = "/usr/share/awesome/themes/default/layouts/spiralw.png" -theme.layout_dwindle = "/usr/share/awesome/themes/default/layouts/dwindlew.png" - -theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png" - -return theme diff --git a/config.dot/awesome.link/themes/simplex/theme.lua b/config.dot/awesome.link/themes/simplex/theme.lua new file mode 100644 index 0000000..0f64c38 --- /dev/null +++ b/config.dot/awesome.link/themes/simplex/theme.lua @@ -0,0 +1,102 @@ +--------------------------- +-- Default awesome theme -- +--------------------------- + +theme = {} + +theme.font = "sans 8" +--theme.font = "inconsolata 8" +--theme.font = "terminus 8" +--theme.font = "mono 8" + +---theme.bg_normal = "#222222" +theme.bg_normal = "#000000" +---theme.bg_focus = "#535d6c" +theme.bg_focus = "#222222" +theme.bg_urgent = "#ff0000" +theme.bg_minimize = "#444444" + +theme.fg_normal = "#aaaaaa" +theme.fg_focus = "#ffffff" +theme.fg_urgent = "#ffffff" +theme.fg_minimize = "#ffffff" + +theme.border_width = "1" +theme.border_normal = "#000000" +---theme.border_focus = "#535d6c" +theme.border_focus = "#222222" +theme.border_marked = "#91231c" + +-- There are other variable sets +-- overriding the default one when +-- defined, the sets are: +-- [taglist|tasklist]_[bg|fg]_[focus|urgent] +-- titlebar_[bg|fg]_[normal|focus] +-- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color] +-- mouse_finder_[color|timeout|animate_timeout|radius|factor] +-- Example: +--theme.taglist_bg_focus = "#ff0000" + +-- Display the taglist squares +theme.taglist_squares_sel = "/usr/share/awesome/themes/default/taglist/squarefw.png" +theme.taglist_squares_unsel = "/usr/share/awesome/themes/default/taglist/squarew.png" + +theme.tasklist_floating_icon = "/usr/share/awesome/themes/default/tasklist/floatingw.png" + +-- Variables set for theming the menu: +-- menu_[bg|fg]_[normal|focus] +-- menu_[border_color|border_width] +theme.menu_submenu_icon = "/usr/share/awesome/themes/default/submenu.png" +theme.menu_height = "15" +theme.menu_width = "100" + +-- You can add as many variables as +-- you wish and access them by using +-- beautiful.variable in your rc.lua +--theme.bg_widget = "#cc0000" + +-- Define the image to load +theme.titlebar_close_button_normal = "/usr/share/awesome/themes/default/titlebar/close_normal.png" +theme.titlebar_close_button_focus = "/usr/share/awesome/themes/default/titlebar/close_focus.png" + +theme.titlebar_ontop_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_normal_inactive.png" +theme.titlebar_ontop_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/ontop_focus_inactive.png" +theme.titlebar_ontop_button_normal_active = "/usr/share/awesome/themes/default/titlebar/ontop_normal_active.png" +theme.titlebar_ontop_button_focus_active = "/usr/share/awesome/themes/default/titlebar/ontop_focus_active.png" + +theme.titlebar_sticky_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_normal_inactive.png" +theme.titlebar_sticky_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/sticky_focus_inactive.png" +theme.titlebar_sticky_button_normal_active = "/usr/share/awesome/themes/default/titlebar/sticky_normal_active.png" +theme.titlebar_sticky_button_focus_active = "/usr/share/awesome/themes/default/titlebar/sticky_focus_active.png" + +theme.titlebar_floating_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/floating_normal_inactive.png" +theme.titlebar_floating_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/floating_focus_inactive.png" +theme.titlebar_floating_button_normal_active = "/usr/share/awesome/themes/default/titlebar/floating_normal_active.png" +theme.titlebar_floating_button_focus_active = "/usr/share/awesome/themes/default/titlebar/floating_focus_active.png" + +theme.titlebar_maximized_button_normal_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_normal_inactive.png" +theme.titlebar_maximized_button_focus_inactive = "/usr/share/awesome/themes/default/titlebar/maximized_focus_inactive.png" +theme.titlebar_maximized_button_normal_active = "/usr/share/awesome/themes/default/titlebar/maximized_normal_active.png" +theme.titlebar_maximized_button_focus_active = "/usr/share/awesome/themes/default/titlebar/maximized_focus_active.png" + +-- You can use your own command to set your wallpaper +--theme.wallpaper_cmd = { "awsetbg " .. homedir .. "/themes/backgrounds/background.jpg" } +--theme.wallpaper_cmd = { "xsetroot -solid black" } + +-- You can use your own layout icons like this: +theme.layout_fairh = "/usr/share/awesome/themes/default/layouts/fairhw.png" +theme.layout_fairv = "/usr/share/awesome/themes/default/layouts/fairvw.png" +theme.layout_floating = "/usr/share/awesome/themes/default/layouts/floatingw.png" +theme.layout_magnifier = "/usr/share/awesome/themes/default/layouts/magnifierw.png" +theme.layout_max = "/usr/share/awesome/themes/default/layouts/maxw.png" +theme.layout_fullscreen = "/usr/share/awesome/themes/default/layouts/fullscreenw.png" +theme.layout_tilebottom = "/usr/share/awesome/themes/default/layouts/tilebottomw.png" +theme.layout_tileleft = "/usr/share/awesome/themes/default/layouts/tileleftw.png" +theme.layout_tile = "/usr/share/awesome/themes/default/layouts/tilew.png" +theme.layout_tiletop = "/usr/share/awesome/themes/default/layouts/tiletopw.png" +theme.layout_spiral = "/usr/share/awesome/themes/default/layouts/spiralw.png" +theme.layout_dwindle = "/usr/share/awesome/themes/default/layouts/dwindlew.png" + +theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png" + +return theme -- cgit v1.2.3