adjust themes and other stuff

home/.config/awesome/rc.lua

@@ -8,6 +8,7 @@ local awful = require("awful")
 require("awful.autofocus")
 -- Widget and layout library
 local wibox = require("wibox")
+local deficient = require("deficient")
 -- Theme handling library
 local beautiful = require("beautiful")
 -- Notification library
@@ -45,7 +46,9 @@ end
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, font and wallpapers.
-beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")
+if not beautiful.init(require("theme")) then
+	beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua")
+end
 
 -- This is used later as the default terminal and editor to run.
 terminal = "kitty"
@@ -83,11 +86,11 @@ awful.layout.layouts = {
 -- {{{ Menu
 -- Create a launcher widget and a main menu
 myawesomemenu = {
-   { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
-   { "manual", terminal .. " -e man awesome" },
-   { "edit config", editor_cmd .. " " .. awesome.conffile },
-   { "restart", awesome.restart },
-   { "quit", function() awesome.quit() end },
+	{ "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
+	{ "manual", terminal .. " -e man awesome" },
+	{ "edit config", editor_cmd .. " " .. awesome.conffile },
+	{ "restart", awesome.restart },
+	{ "quit", function() awesome.quit() end },
 }
 
 mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
@@ -107,7 +110,14 @@ mykeyboardlayout = awful.widget.keyboardlayout()
 
 -- {{{ Wibar
 -- Create a textclock widget
-mytextclock = wibox.widget.textclock()
+local mytextclock = wibox.widget {
+	format = "%a %d/%m/%y %H:%M %b",
+	widget = wibox.widget.textclock,
+}
+
+local my_brightness = deficient.brightness {
+}
+local my_volume = deficient.volume_control({})
 
 -- Create a wibox for each screen and add it
 local taglist_buttons = gears.table.join(
@@ -213,6 +223,8 @@ awful.screen.connect_for_each_screen(function(s)
 			mykeyboardlayout,
 			wibox.widget.systray(),
 			mytextclock,
+			my_brightness.widget,
+			my_volume.widget,
 			s.mylayoutbox,
 		},
 	}
@@ -250,8 +262,6 @@ globalkeys = gears.table.join(
 		end,
 		{description = "focus previous by index", group = "client"}
 	),
-	awful.key({ modkey,           }, "w", function () mymainmenu:show() end,
-			  {description = "show main menu", group = "awesome"}),
 
 	-- Layout manipulation
 	awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
@@ -313,7 +323,7 @@ globalkeys = gears.table.join(
 	-- Prompt
 	awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
 			  {description = "run prompt", group = "launcher"}),
-	awful.key({ modkey },            "d",     function () awful.spawn("rofi -show drun") end,
+	awful.key({ modkey },            "d",     function () awful.spawn("rofi -show drun -drun-show-actions") end,
 			  {description = "run prompt", group = "launcher"}),
 
 	awful.key({ modkey }, "x",
@@ -328,7 +338,15 @@ globalkeys = gears.table.join(
 			  {description = "lua execute prompt", group = "awesome"}),
 	-- Menubar
 	awful.key({ modkey }, "p", function() menubar.show() end,
-			  {description = "show the menubar", group = "launcher"})
+			  {description = "show the menubar", group = "launcher"}),
+
+	-- fns
+	awful.key({}, "XF86AudioRaiseVolume", function() my_volume:up() end),
+	awful.key({}, "XF86AudioLowerVolume", function() my_volume:down() end),
+	awful.key({}, "XF86AudioMute",        function() my_volume:toggle() end),
+
+	awful.key({}, "XF86MonBrightnessDown", function() my_brightness:down() end),
+	awful.key({}, "XF86MonBrightnessUp",   function() my_brightness:up() end)
 )
 
 clientkeys = gears.table.join(

home/.config/awesome/theme.lua

@@ -0,0 +1,109 @@
+-- based on https://github.com/micro-hawk/awesomight/blob/master/dotfiles/.config/awesome/themes/tokyo-night/theme.lua
+local theme_assets = require("beautiful.theme_assets")
+local xresources = require("beautiful.xresources")
+local dpi = xresources.apply_dpi
+
+local gfs = require("gears.filesystem")
+local themes_path = gfs.get_themes_dir()
+
+local theme                                     = {}
+-- theme.dir                                       = os.getenv("HOME") .. "/.config/awesome/"
+-- theme.wallpaper                                 = theme.dir .. "/tokyo-night/witcher-wall7.png"
+theme.font                                      = "FiraCode Nerd Font Mono 11"
+theme.fg_normal                                 = "#DDDDFF"
+theme.fg_focus                                  = "#f7768e"
+theme.fg_urgent                                 = "#ff9e64"
+theme.bg_normal                                 = "#16161e"
+theme.temp_color                                = "#16161e"
+theme.bg_focus                                  = "#292e42"
+theme.bg_urgent                                 = "#292e42"
+
+
+theme.border_width                              = 2
+theme.border_normal                             = theme.bg_urgent
+theme.border_focus                              = theme.fg_focus
+theme.border_marked                             = theme.fg_focus
+theme.tasklist_bg_focus                         = theme.bg_focus
+
+theme.titlebar_bg_focus                         = theme.bg_focus
+theme.titlebar_bg_normal                        = theme.bg_normal
+theme.titlebar_fg_focus                         = theme.fg_focus
+
+local taglist_square_size = dpi(4)
+theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
+	taglist_square_size, theme.fg_focus
+)
+theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
+	taglist_square_size, theme.fg_normal
+)
+
+-- Variables set for theming notifications:
+-- notification_font
+-- notification_[bg|fg]
+-- notification_[width|height|margin]
+-- notification_[border_color|border_width|shape|opacity]
+
+-- Variables set for theming the menu:
+-- menu_[bg|fg]_[normal|focus]
+-- menu_[border_color|border_width]
+theme.menu_submenu_icon = themes_path.."default/submenu.png"
+theme.menu_height = dpi(15)
+theme.menu_width  = dpi(100)
+
+-- Define the image to load
+theme.titlebar_close_button_normal = themes_path.."default/titlebar/close_normal.png"
+theme.titlebar_close_button_focus  = themes_path.."default/titlebar/close_focus.png"
+
+theme.titlebar_minimize_button_normal = themes_path.."default/titlebar/minimize_normal.png"
+theme.titlebar_minimize_button_focus  = themes_path.."default/titlebar/minimize_focus.png"
+
+theme.titlebar_ontop_button_normal_inactive = themes_path.."default/titlebar/ontop_normal_inactive.png"
+theme.titlebar_ontop_button_focus_inactive  = themes_path.."default/titlebar/ontop_focus_inactive.png"
+theme.titlebar_ontop_button_normal_active = themes_path.."default/titlebar/ontop_normal_active.png"
+theme.titlebar_ontop_button_focus_active  = themes_path.."default/titlebar/ontop_focus_active.png"
+
+theme.titlebar_sticky_button_normal_inactive = themes_path.."default/titlebar/sticky_normal_inactive.png"
+theme.titlebar_sticky_button_focus_inactive  = themes_path.."default/titlebar/sticky_focus_inactive.png"
+theme.titlebar_sticky_button_normal_active = themes_path.."default/titlebar/sticky_normal_active.png"
+theme.titlebar_sticky_button_focus_active  = themes_path.."default/titlebar/sticky_focus_active.png"
+
+theme.titlebar_floating_button_normal_inactive = themes_path.."default/titlebar/floating_normal_inactive.png"
+theme.titlebar_floating_button_focus_inactive  = themes_path.."default/titlebar/floating_focus_inactive.png"
+theme.titlebar_floating_button_normal_active = themes_path.."default/titlebar/floating_normal_active.png"
+theme.titlebar_floating_button_focus_active  = themes_path.."default/titlebar/floating_focus_active.png"
+
+theme.titlebar_maximized_button_normal_inactive = themes_path.."default/titlebar/maximized_normal_inactive.png"
+theme.titlebar_maximized_button_focus_inactive  = themes_path.."default/titlebar/maximized_focus_inactive.png"
+theme.titlebar_maximized_button_normal_active = themes_path.."default/titlebar/maximized_normal_active.png"
+theme.titlebar_maximized_button_focus_active  = themes_path.."default/titlebar/maximized_focus_active.png"
+
+-- theme.wallpaper = themes_path.."default/background.png"
+
+-- You can use your own layout icons like this:
+theme.layout_fairh = themes_path.."default/layouts/fairhw.png"
+theme.layout_fairv = themes_path.."default/layouts/fairvw.png"
+theme.layout_floating  = themes_path.."default/layouts/floatingw.png"
+theme.layout_magnifier = themes_path.."default/layouts/magnifierw.png"
+theme.layout_max = themes_path.."default/layouts/maxw.png"
+theme.layout_fullscreen = themes_path.."default/layouts/fullscreenw.png"
+theme.layout_tilebottom = themes_path.."default/layouts/tilebottomw.png"
+theme.layout_tileleft   = themes_path.."default/layouts/tileleftw.png"
+theme.layout_tile = themes_path.."default/layouts/tilew.png"
+theme.layout_tiletop = themes_path.."default/layouts/tiletopw.png"
+theme.layout_spiral  = themes_path.."default/layouts/spiralw.png"
+theme.layout_dwindle = themes_path.."default/layouts/dwindlew.png"
+theme.layout_cornernw = themes_path.."default/layouts/cornernww.png"
+theme.layout_cornerne = themes_path.."default/layouts/cornernew.png"
+theme.layout_cornersw = themes_path.."default/layouts/cornersww.png"
+theme.layout_cornerse = themes_path.."default/layouts/cornersew.png"
+
+-- Generate Awesome icon:
+theme.awesome_icon = theme_assets.awesome_icon(
+	theme.menu_height, theme.bg_focus, theme.fg_focus
+)
+
+-- Define the icon theme for application icons. If not set then the icons
+-- from /usr/share/icons and /usr/share/icons/hicolor will be used.
+theme.icon_theme = nil
+
+return theme