5 files changed, 21 insertions, 15 deletions
diff --git a/programs/dotfiles/awesome/dmenu.lua b/programs/dotfiles/awesome/dmenu.lua
new file mode 100644
index 0000000..17301d3
--- /dev/null
+++ b/programs/dotfiles/awesome/dmenu.lua
@@ -0,0 +1,12 @@
+local awful = require("awful")
+local keygrabber = require("awful.keygrabber")
+local beautiful = require("beautiful")
+local wibox = require("wibox")
+local gears = require("gears")
+
+local dmenu_widget = {}
+
+local function worker(user_args)
+    
+end
+
diff --git a/programs/dotfiles/awesome/rc.lua b/programs/dotfiles/awesome/rc.lua
index 904164a..3bf090f 100644
--- a/programs/dotfiles/awesome/rc.lua
+++ b/programs/dotfiles/awesome/rc.lua
@@ -137,10 +137,10 @@ toptextclock = wibox.widget.textclock()
 --    shape = gears.shape.rounded_rect
 --}
 
-local calendar_widget = require("calendar")
+local calendar_widget = require("widgets.calendar")
 local topcalendar = calendar_widget()
 
-local volume_widget = require("volume")
+local volume_widget = require("widgets.volume")
 local volumebar = volume_widget()
 
 toptextclock:connect_signal("button::press",
@@ -316,7 +316,7 @@ awful.screen.connect_for_each_screen(function(s)
     }
 
     -- Create the wibox
-    s.mywibox = awful.wibar({ position = "top", screen = s, bg = "#00000000"})
+    s.mywibox = awful.wibar({ position = "top", screen = s, bg = "#00000000", border_width = 8,})
 
     s.systray = wibox.widget.systray()
     s.systray.visible = true
@@ -327,11 +327,14 @@ awful.screen.connect_for_each_screen(function(s)
         expand = "none",
         { -- Left widgets
             layout = wibox.layout.fixed.horizontal,
-            wibox.container.margin(s.mytaglist, 5, 0, 0),
+            s.mytaglist,
             s.mypromptbox,
         },
         s.mytasklist, -- Middle widget
         { -- Right widgets
+            volumebar,
+            toptextclock,
+            wibox.container.margin(s.mylayoutbox, 4, 4, 4, 4),
             {
                 {
                     layout = wibox.layout.fixed.horizontal,
@@ -344,9 +347,6 @@ awful.screen.connect_for_each_screen(function(s)
                         top = 4,
                         bottom = 4
                     },
-                    volumebar,
-                    toptextclock,
-                    wibox.container.margin(s.mylayoutbox, 4, 4, 4, 4),
                 },
                 widget = wibox.container.background,
                 shape = gears.shape.rounded_rect,
diff --git a/programs/dotfiles/awesome/theme.lua b/programs/dotfiles/awesome/theme.lua
index c2da65a..49fe840 100644
--- a/programs/dotfiles/awesome/theme.lua
+++ b/programs/dotfiles/awesome/theme.lua
@@ -29,8 +29,8 @@ theme.tag_list_occupied = "#767d98"
 theme.tag_list_focused  = "#cdd6f4"
 theme.tag_list_urgent   = "#f38ba8"
 
-theme.useless_gap   = dpi(8)
-theme.border_width  = dpi(3)
+theme.useless_gap   = dpi(4)
+theme.border_width  = dpi(4)
 theme.border_normal = theme.bg_normal
 theme.border_focus  = theme.bg_focus
 theme.border_marked = theme.fg_focus
@@ -132,12 +132,6 @@ theme.awesome_icon = theme_assets.awesome_icon(
 -- from /usr/share/icons and /usr/share/icons/hicolor will be used.
 theme.icon_theme = nil
 
-theme.taglist_text_font = "FiraCode Nerd Font"
-
-theme.taglist_text_empty    = { "", "", "", "", "", "", "", "", "", "" }
-theme.taglist_text_occupied = { "", "", "", "", "", "", "", "", "", "" }
-theme.taglist_text_focused  = { "", "", "", "", "", "", "", "", "", "" }
-
 return theme
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/programs/dotfiles/awesome/calendar.lua b/programs/dotfiles/awesome/widgets/calendar.lua
index 6e791b3..6e791b3 100644
--- a/programs/dotfiles/awesome/calendar.lua
+++ b/programs/dotfiles/awesome/widgets/calendar.lua
diff --git a/programs/dotfiles/awesome/volume.lua b/programs/dotfiles/awesome/widgets/volume.lua
index 21c200b..21c200b 100644
--- a/programs/dotfiles/awesome/volume.lua
+++ b/programs/dotfiles/awesome/widgets/volume.lua