Improove theme notification and icons

2 files changed, 69 insertions, 16 deletions

diff --git a/themes/customII/icons/ache_i.png b/themes/customII/icons/ache_i.png
new file mode 100644
index 0000000..9e89c8e
--- /dev/null
+++ b/themes/customII/icons/ache_i.png
diff --git a/themes/customII/theme.lua b/themes/customII/theme.lua
index f8eac6d..171e87e 100644
--- a/themes/customII/theme.lua
+++ b/themes/customII/theme.lua
@@ -4,15 +4,32 @@ Custom II
 
 --]]
 
-local theme                               = {}
+local gears = require("gears")
+local dpi = require("beautiful").xresources.apply_dpi
+
 
+--- | Base theme | ---
+
+local theme                               = {}
 
 theme.confdir                       = os.getenv("HOME") .. "/.config/awesome/themes/customII"
 
 
-theme.font                          = "GohuFont Powerline Bold 8"
---theme.taglist_font                =
-theme.bg_normal                     = "#15151D"
+--theme.font                          = "GohuFont Powerline Bold 9"
+theme.font_family = "GohuFont "
+theme.font_family_powerline = theme.font_family .. "Powerline "
+theme.font = theme.font_family_powerline .. "Bold 9"
+
+theme.submenu_icon                  = theme.confdir .. "/icons/submenu.png"
+
+theme.mode = "dark"
+theme.text_color = theme.mode == "dark" and "#f4feff" or "#181B27"
+theme.background_color = theme.mode == "dark" and "#181B27" or "#f4feff"
+theme.danger_background = "#db5853"
+theme.danger_foreground = "#751d1a"
+
+
+theme.bg_normal                     = theme.background_color
 theme.bg_focus                      = "#393F4F"
 theme.bg_urgent                     = "#2b90d9"
 theme.fg_normal                     = "#839496"
@@ -29,23 +46,24 @@ theme.fg_cyan                       = "#2aa198"
 theme.fg_white                      = "#aaaaaa"
 theme.fg_blu                        = "#8ebdde"
 theme.border_width                  = "4"
-theme.border_normal                 = "#15151D"
+theme.border_normal                 = theme.background_color
 theme.border_focus                  = "#ffd300"
 theme.border_marked                 = "#3ca4d8"
 
 
-theme.taglist_squares_sel           = theme.confdir .. "/taglist/squarefw.png"
-theme.taglist_squares_unsel         = theme.confdir .. "/taglist/squarew.png"
+--- | menu | ---
 
 theme.menu_height                   = "15"
 theme.menu_width                    = "100"
 theme.menu_border_width             = "0"
 theme.menu_fg_normal                = "#839496"
 theme.menu_fg_focus                 = "#FFFFFF"
-theme.menu_bg_normal                = "#15151D"
-theme.menu_bg_focus                 = "#15151D"
+theme.menu_bg_normal                = theme.background_color
+theme.menu_bg_focus                 = theme.background_color
+
+
+--- | widget | ---
 
-theme.submenu_icon                  = theme.confdir .. "/icons/submenu.png"
 theme.widget_temp                   = theme.confdir .. "/icons/temp.png"
 theme.widget_uptime                 = theme.confdir .. "/icons/ac.png"
 theme.widget_cpu                    = theme.confdir .. "/icons/cpu.png"
@@ -63,16 +81,28 @@ theme.widget_clock                  = theme.confdir .. "/icons/clock.png"
 theme.widget_vol                    = theme.confdir .. "/icons/spkr.png"
 theme.awesome_icon		            = theme.confdir .. "/icons/starthere.png"
 
+
+
+--- | taglist | ---
+
+  --theme.taglist_font                =
+  --theme.taglist_squares_sel           = theme.confdir .. "/taglist/squarefw.png"
+  --theme.taglist_squares_unsel         = theme.confdir .. "/taglist/squarew.png"
 theme.taglist_squares_sel           = theme.confdir .. "/icons/square_a.png"
 theme.taglist_squares_unsel         = theme.confdir .. "/icons/square_b.png"
 
+
+--- | tasklist | ---
+
 theme.tasklist_disable_icon         = true
 theme.tasklist_floating             = ""
 theme.tasklist_maximized_horizontal = ""
 theme.tasklist_maximized_vertical   = ""
-theme.tasklist_bg_normal	    = "#15151D"
-theme.tasklist_bg_focus		    = "#15151D"
+theme.tasklist_bg_normal	    = theme.background_color
+theme.tasklist_bg_focus		    = theme.background_color
+
 
+--- | titlebar | ---
 
 theme.titlebar_close_button_normal              = theme.confdir .. "/titlebar/close_normal.png"
 theme.titlebar_close_button_focus               = theme.confdir .. "/titlebar/close_focus.png"
@@ -101,8 +131,27 @@ theme.titlebar_maximized_button_normal_active   = theme.confdir .. "/titlebar/ma
 theme.titlebar_maximized_button_focus_active    = theme.confdir .. "/titlebar/maximized_focus_active.png"
 
 
+--- | Notifications | ---
+
+
+theme.notification_max_width = dpi(640)
+theme.notification_max_height = dpi(160)
+theme.notification_font = theme.font_family .. "Regular 10"
+theme.notification_bg = theme.background_color
+theme.notification_fg = theme.text_color
+theme.notification_border_width = dpi(1)
+theme.notification_border_color = theme.background_color
+theme.notification_opacity = 0.8
+theme.notification_spacing = dpi(10)
+theme.notification_icon_size = dpi(48)
+theme.notification_shape = function(cr, width, height)
+  gears.shape.rounded_rect(cr, width, height, 7)
+end
+--]]
 
 
+-- | layout | --
+
 theme.layout_tile                               = theme.confdir .. "/icons/tile.png"
 theme.layout_tilegaps                           = theme.confdir .. "/icons/tilegaps.png"
 theme.layout_tileleft                           = theme.confdir .. "/icons/tileleft.png"
@@ -118,12 +167,16 @@ theme.layout_magnifier                          = theme.confdir .. "/icons/magni
 theme.layout_floating                           = theme.confdir .. "/icons/floating.png"
 theme.layout_termfair                           = theme.confdir .. "/icons/termfair.png"
 theme.layout_uselessfair                        = theme.confdir .. "/icons/uselessfair.png"
-theme.icon_theme                                = Moka
 
-theme.menu_submenu_icon                         = theme.confdir .. "/icons/ache_16p_i.png"
-theme.awesome_icon                              = theme.confdir .. "/icons/ache_16p_i.png"
-theme.icon_theme                                = theme.confdir .. "/icons/ache_16p_i.png"
+
+--- | icons | ---
+
+theme.icon_theme                                = Moka
+theme.menu_submenu_icon                         = theme.confdir .. "/icons/ache_i.png"
+theme.awesome_icon                              = theme.confdir .. "/icons/ache_i.png"
+theme.icon_theme                                = theme.confdir .. "/icons/ache_i.png"
 theme.useless_gap_width = 6
 
+
 return theme