Skip to content

Commit

Permalink
chore: polish aesthetic theme
Browse files Browse the repository at this point in the history
  • Loading branch information
rxyhn committed Jun 1, 2022
1 parent 812c5a7 commit 905f552
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 91 deletions.
2 changes: 1 addition & 1 deletion config/awesome/configuration/picom.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# ░█░░░█░█░█▀▄░█░█░█▀▀░█▀▄░▀▀█
# ░▀▀▀░▀▀▀░▀░▀░▀░▀░▀▀▀░▀░▀░▀▀▀

corner-radius = 8;
corner-radius = 10;
rounded-corners-exclude = [
# "class_g ?= 'rofi'",
#"window_type *= 'dock'",
Expand Down
7 changes: 2 additions & 5 deletions config/awesome/theme/theme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,14 @@ theme.widget_border_width = dpi(2)
theme.widget_border_color = theme.darker_bg

-- Corner Radius
theme.border_radius = dpi(6)
theme.border_radius = dpi(8)

-- Edge snap
theme.snap_bg = theme.xcolor8
theme.snap_shape = helpers.rrect(0)

-- Playerctl
theme.playerctl_ignore = { "firefox", "qutebrowser", "chromium", "brave" }
theme.playerctl_player = { "spotify", "mpd", "%any" }
theme.playerctl_player = { "firefox", "spotify", "mpd", "%any" }
theme.playerctl_update_on_activity = true
theme.playerctl_position_update_interval = 1

Expand Down Expand Up @@ -214,8 +213,6 @@ theme.notification_border_radius = theme.border_radius
theme.notification_border_width = dpi(0)

-- Notif center
theme.notif_center_radius = theme.border_radius
theme.notif_center_box_radius = theme.notif_center_radius
theme.notif_center_notifs_bg = theme.lighter_bg
theme.notif_center_notifs_accent = theme.xcolor0

Expand Down
7 changes: 3 additions & 4 deletions config/awesome/ui/bar/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ awful.screen.connect_for_each_screen(function(s)
local layoutbox = wibox.widget({
{
s.mylayoutbox,
margins = { top = dpi(10), bottom = dpi(10), left = dpi(8), right = dpi(8) },
margins = dpi(9),
widget = wibox.container.margin,
},
widget = clickable_container,
Expand Down Expand Up @@ -84,7 +84,7 @@ awful.screen.connect_for_each_screen(function(s)
local control_center_toggle = wibox.widget({
{
s.control_center_toggle,
margins = dpi(3),
margins = { top = dpi(2), bottom = dpi(2), left = dpi(3), right = dpi(3) },
widget = wibox.container.margin,
},
widget = clickable_container,
Expand Down Expand Up @@ -143,7 +143,7 @@ awful.screen.connect_for_each_screen(function(s)
{
s.dashboard_toggle,
s.mytaglist,
spacing = dpi(10),
spacing = dpi(5),
layout = wibox.layout.fixed.horizontal,
},
clock,
Expand All @@ -159,7 +159,6 @@ awful.screen.connect_for_each_screen(function(s)
s.github_activity,
control_center_toggle,
layoutbox,
spacing = dpi(5),
layout = wibox.layout.fixed.horizontal,
},
},
Expand Down
36 changes: 0 additions & 36 deletions config/awesome/ui/widgets/control-center-toggle/init.lua

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -132,30 +132,26 @@ local media_buttons = wibox.widget({

-- Playerctl
playerctl:connect_signal("metadata", function(_, title, artist, album_path, album, ___, player_name)
if player_name == "mpd" then
if title == "" then
title = "Nothing Playing"
end
if artist == "" then
artist = "Nothing Playing"
end
if album_path == "" then
album_path = gears.filesystem.get_configuration_dir() .. "theme/assets/no_music.png"
end

album_cover:set_image(gears.surface.load_uncached(album_path))
title_now:set_markup_silently(title)
artist_now:set_markup_silently(artist)
if title == "" then
title = "Nothing Playing"
end
if artist == "" then
artist = "Nothing Playing"
end
if album_path == "" then
album_path = gears.filesystem.get_configuration_dir() .. "theme/assets/no_music.png"
end

album_cover:set_image(gears.surface.load_uncached(album_path))
title_now:set_markup_silently(title)
artist_now:set_markup_silently(artist)
end)

playerctl:connect_signal("playback_status", function(_, playing, player_name)
if player_name == "mpd" then
if playing then
music_play_pause:set_text("")
else
music_play_pause:set_text("")
end
if playing then
music_play_pause:set_text("")
else
music_play_pause:set_text("")
end
end)

Expand Down
2 changes: 1 addition & 1 deletion config/awesome/ui/widgets/network/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ local return_button = function()
text = "",
align = "center",
valign = "center",
font = beautiful.icon_font .. "Round 19",
font = beautiful.icon_font .. "Round 20",
widget = wibox.widget.textbox,
},
layout = wibox.layout.align.horizontal,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,7 @@ notifbox_box = function(notif, icon, title, message, app, bgcolor)
},
bg = bgcolor,
shape = function(cr, width, height)
gears.shape.partially_rounded_rect(
cr,
width,
height,
true,
true,
true,
true,
beautiful.notif_center_box_radius
)
gears.shape.partially_rounded_rect(cr, width, height, true, true, true, true, beautiful.border_radius)
end,
widget = wibox.container.background,
})
Expand All @@ -123,16 +114,7 @@ notifbox_box = function(notif, icon, title, message, app, bgcolor)
local notifbox = wibox.widget({
notifbox_template,
shape = function(cr, width, height)
gears.shape.partially_rounded_rect(
cr,
width,
height,
true,
true,
true,
true,
beautiful.notif_center_box_radius
)
gears.shape.partially_rounded_rect(cr, width, height, true, true, true, true, beautiful.border_radius)
end,
widget = wibox.container.background,
})
Expand Down
8 changes: 4 additions & 4 deletions config/awesome/ui/widgets/taglist/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ rubato.set_def_rate(60)

--- useful color constants
local ia_rgb = color.color({ hex = beautiful.xcolor8, disable_hsl = true }) --inactive color
local a_rgb = color.color({ hex = beautiful.accent, disable_hsl = true }) --active color
local u_rgb = color.color({ hex = beautiful.xcolor1, disable_hsl = true }) --urgent color
local s_rgb = color.color({ hex = beautiful.xforeground, disable_hsl = true }) --slidey color
local a_rgb = color.color({ hex = beautiful.xforeground, disable_hsl = true }) --active color
local u_rgb = color.color({ hex = beautiful.accent, disable_hsl = true }) --urgent color
local s_rgb = color.color({ hex = beautiful.accent, disable_hsl = true }) --slidey color

-- Calculate the diff in colors for some stuff later on
local diff = {}
Expand Down Expand Up @@ -280,7 +280,7 @@ function get_taglist(s)
},
bg = beautiful.widget_bg,
shape = function(cr, width, height)
return gears.shape.rounded_rect(cr, width, height, dpi(3))
return gears.shape.rounded_rect(cr, width, height, dpi(4))
end,
shape_clip = true,
layout = wibox.container.background,
Expand Down

0 comments on commit 905f552

Please sign in to comment.