Skip to content
This repository has been archived by the owner on Jun 17, 2021. It is now read-only.

Commit

Permalink
updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thomashighbaugh
Thomashighbaugh committed Jan 3, 2021
1 parent cd5b85f commit 91ee715
Show file tree
Hide file tree
Showing 14 changed files with 706 additions and 696 deletions.
50 changes: 8 additions & 42 deletions layout/bar/minimal_bar.lua
View file
Expand Up @@ -10,7 +10,8 @@ local helpers = require("main.helpers")
local icon_theme = "sheet"
local icons = require("icons")

local systray_margin = (beautiful.wibar_height - beautiful.systray_icon_size) / 2
local systray_margin = (beautiful.wibar_height - beautiful.systray_icon_size) /
2

-- Helper function that changes the appearance of progress bars and their icons
-- Create horizontal rounded bars
Expand All @@ -33,37 +34,22 @@ local awesome_icon = wibox.widget {
layout = wibox.container.margin
}

awesome_icon:connect_signal("mouse::enter",
function() panelPop.visible = true end)

panelPop:connect_signal("mouse::leave", function() panelPop.visible = false end)

-- Notifs Panel ---------------------------------------------------------------
local fancy_time_widget = wibox.widget.textclock("%H%M")
fancy_time_widget.markup = fancy_time_widget.text:sub(1, 2) ..
"<span foreground='" .. beautiful.xcolor12 ..
"'>" .. fancy_time_widget.text:sub(3, 4) ..
"</span>"
fancy_time_widget:connect_signal("widget::redraw_needed", function()
fancy_time_widget.markup = fancy_time_widget.text:sub(1, 2) ..
"<span foreground='" .. beautiful.xcolor12 ..
"'>" .. fancy_time_widget.text:sub(3, 4) ..
"</span>"
end)
local fancy_time_widget = wibox.widget.textclock()

fancy_time_widget.align = "center"
fancy_time_widget.valign = "center"
fancy_time_widget.font = "FuraCode Nerd Font Mono Bold 10"

local fancy_time = {fancy_time_widget, layout = wibox.layout.fixed.vertical}

fancy_time_widget.font = "FuraCode Nerd Font Mono Bold 13"

local fancy_time = {fancy_time_widget, layout = wibox.layout.flex.vertical}

-- Battery Bar Widget ---------------------------------------------------------

local battery_bar = require("widgets.battery_bar")
local battery = format_progress_bar(battery_bar)

local battery_widget = require("lib.awesome-wm-widgets.battery-widget.battery")
local battery_widget = require("lib.awesome-wm-widgets.batteryarc-widget.batteryarc")
-- Systray Widget -------------------------------------------------------------

local mysystray = wibox.widget.systray()
Expand Down Expand Up @@ -237,27 +223,7 @@ awful.screen.connect_for_each_screen(function(s)
},
{

{
{
{
battery,
right = 1,
left = 1,
widget = wibox.container.margin
},
shape = helpers.rrect(beautiful.border_radius),
bg = beautiful.xbackground,
border_width = beautiful.widget_border_width,
border_color = beautiful.widget_border_color,
widget = wibox.container.background
},
top = 5,
right = 5,
left = 5,
widget = wibox.container.margin
},

helpers.horizontal_pad(0),
helpers.horizontal_pad(0),
{
{
{
Expand Down
6 changes: 3 additions & 3 deletions layout/exitscreen/exitscreen.lua
View file
Expand Up @@ -126,9 +126,9 @@ function exit_screen_show()
end

exit_screen:buttons(gears.table.join( -- Left click - Hide exit_screen
awful.button({}, 1, function() exit_screen_hide() end),
awful.button({}, 2, function() exit_screen_hide() end),
awful.button({}, 3, function() exit_screen_hide() end)))
awful.button({}, 1, function() exit_screen_hide() end),
awful.button({}, 2, function() exit_screen_hide() end),
awful.button({}, 3, function() exit_screen_hide() end)))

-- Item placement
exit_screen:setup{
Expand Down
66 changes: 37 additions & 29 deletions layout/pop/panel.lua
View file
Expand Up @@ -32,7 +32,7 @@ local function create_boxed_widget(widget_to_be_boxed, width, height, bg_color)
box_container.forced_height = height
box_container.forced_width = width
box_container.shape = helpers.rrect(beautiful.client_radius)

local boxed_widget = wibox.widget {
{
{
Expand Down Expand Up @@ -71,7 +71,7 @@ local function format_progress_bar(bar, markup)
bar.forced_width = dpi(115)
bar.shape = gears.shape.rounded_bar
bar.bar_shape = gears.shape.rounded_bar

local w = wibox.widget {
nil,
{text, bar, spacing = dpi(5), layout = wibox.layout.fixed.horizontal},
Expand Down Expand Up @@ -109,7 +109,7 @@ local separator = wibox.widget {
local ram_icon = wibox.widget.imagebox(icons.ram)
local ram_bar = require("widgets.ram_bar")
local ram = format_progress_bar(ram_bar, "<span foreground='" ..
beautiful.xcolor6 .. "'> <b></b> </span>")
beautiful.xcolor6 .. "'> <b></b> </span>")

--- }}}

Expand All @@ -120,22 +120,22 @@ beautiful.xcolor6 .. "'> <b></b> </span>")
local cpu_icon = wibox.widget.imagebox(icons.cpu)
local cpu_bar = require("widgets.cpu_bar")
local cpu = format_progress_bar(cpu_bar, "<span foreground='" ..
beautiful.xcolor13 .. "'> <b></b> </span>")
beautiful.xcolor13 .. "'> <b></b> </span>")

--- }}}

--- {{{ Clock

local fancy_time_widget = wibox.widget.textclock("%H%M")
fancy_time_widget.markup = fancy_time_widget.text:sub(1, 2) ..
"<span foreground='" .. beautiful.xcolor12 ..
"'>" .. fancy_time_widget.text:sub(3, 4) ..
"</span>"
"<span foreground='" .. beautiful.xcolor12 ..
"'>" .. fancy_time_widget.text:sub(3, 4) ..
"</span>"
fancy_time_widget:connect_signal("widget::redraw_needed", function()
fancy_time_widget.markup = fancy_time_widget.text:sub(1, 2) ..
"<span foreground='" .. beautiful.xcolor12 ..
"'>" .. fancy_time_widget.text:sub(3, 4) ..
"</span>"
"<span foreground='" .. beautiful.xcolor12 ..
"'>" .. fancy_time_widget.text:sub(3, 4) ..
"</span>"
end)
fancy_time_widget.align = "center"
fancy_time_widget.valign = "center"
Expand All @@ -145,20 +145,20 @@ local fancy_time = {fancy_time_widget, layout = wibox.layout.fixed.vertical}

local fancy_date_widget = wibox.widget.textclock("%m/%d/%Y")
fancy_date_widget.markup = fancy_date_widget.text:sub(1, 3) ..
"<span foreground='" .. beautiful.xcolor12 ..
"'>" .. fancy_date_widget.text:sub(4, 6) ..
"</span>" .. "<span foreground='" ..
beautiful.xcolor6 .. "'>" ..
fancy_date_widget.text:sub(7, 10) .. "</span>"
"<span foreground='" .. beautiful.xcolor12 ..
"'>" .. fancy_date_widget.text:sub(4, 6) ..
"</span>" .. "<span foreground='" ..
beautiful.xcolor6 .. "'>" ..
fancy_date_widget.text:sub(7, 10) .. "</span>"
fancy_date_widget:connect_signal("widget::redraw_needed", function()
fancy_date_widget.markup = fancy_date_widget.text:sub(1, 3) ..
"<span foreground='" .. beautiful.xcolor6 ..
"'>" .. fancy_date_widget.text:sub(4, 6) ..
"</span>" .. "<span foreground='" ..
beautiful.xcolor6 .. "'>" ..
fancy_date_widget.text:sub(7, 10) ..
"</span>"
"<span foreground='" .. beautiful.xcolor6 ..
"'>" .. fancy_date_widget.text:sub(4, 6) ..
"</span>" .. "<span foreground='" ..
beautiful.xcolor6 .. "'>" ..
fancy_date_widget.text:sub(7, 10) ..
"</span>"

end)
fancy_date_widget.align = "center"
fancy_date_widget.valign = "center"
Expand All @@ -176,22 +176,30 @@ local info_box = create_boxed_widget(info, 500, 80, beautiful.xbackground)
---}}}

local cpuset = wibox.widget {
cpuwidget, separator, separator, separator, cpu,
cpuwidget,
separator,
separator,
separator,
cpu,
layout = wibox.layout.fixed.horizontal,

top = dpi(10),
left = dpi(20),
right = dpi(20),
bottom = dpi(10),
bottom = dpi(10)
}
local ramset = wibox.widget {
memwidget, separator, separator, separator, ram,
memwidget,
separator,
separator,
separator,
ram,
layout = wibox.layout.fixed.horizontal,
top = dpi(10),
left = dpi(20),
right = dpi(20),
bottom = dpi(10),
bottom = dpi(10)

}

local sys = wibox.widget {
Expand Down Expand Up @@ -224,7 +232,7 @@ local width = 500
local margin = 5

local panelPop = popupLib.create(margin, beautiful.wibar_height + margin, nil,
width, panelWidget)
width, panelWidget)

panelPop:set_xproperty("WM_NAME", "panel")

Expand Down

0 comments on commit 91ee715

Please sign in to comment.