chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Manually merging?

Browse source
This commit is contained in:
Chris Cochrun 2020-09-16 06:46:33 -05:00
parent fb23eb9da6
commit 567e03be28
3 changed files with 1 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

60
awesome/module/notifications.lua
View file

@ -111,7 +111,6 @@ naughty.connect_signal(
-- Naughty template
naughty.connect_signal("request::display", function(n)
<<<<<<< HEAD
-- naughty.actions template
local actions_template = wibox.widget {
notification = n,
@ -143,64 +142,6 @@ naughty.connect_signal("request::display", function(n)
style = { underline_normal = false, underline_selected = true },
widget = naughty.list.actions
}
=======
-- naughty.actions template
local actions_template = wibox.widget {
notification = n,
base_layout = wibox.widget {
spacing = dpi(4),
layout = wibox.layout.flex.horizontal
},
widget_template = {
{
{
{
{
id = 'text_role',
font = 'VictorMono Nerd Font 10',
widget = wibox.widget.textbox
},
widget = wibox.container.place
},
widget = clickable_container
},
bg = beautiful.groups_bg,
shape = gears.shape.rounded_rect,
forced_height = dpi(35),
widget = wibox.container.background
},
margins = dpi(8),
widget = wibox.container.margin
},
style = { underline_normal = false, underline_selected = true },
widget = naughty.list.actions
}
<<<<<<< HEAD
-- Custom notification layout
naughty.layout.box {
notification = n,
type = "notification",
screen = awful.screen.preferred(),
shape = gears.shape.rectangle,
widget_template = {
{
{
{
{
{
{
{
{
{
{
{
markup = n.app_name or 'System Notification',
font = 'VictorMono Nerd Font 10',
align = 'center',
valign = 'center',
widget = wibox.widget.textbox
>>>>>>> 1d4ba76... making nice only work on desktop for now
-- Custom notification layout
naughty.layout.box {
@ -396,7 +337,6 @@ naughty.connect_signal("request::display", function(n)
bg = beautiful.transparent,
widget = wibox.container.background
}
>>>>>>> 1d4ba76... making nice only work on desktop for now
-- Destroy popups if dont_disturb mode is on
-- Or if the right_panel is visible

13
awesome/rc.lua
View file

@ -41,7 +41,6 @@ require('module.brightness-osd')
-- require('module.battery-notifier')
-- require('module.lockscreen')
<<<<<<< HEAD
-- }}}
-- -- {{{ Error handling
@ -69,12 +68,6 @@ require('module.brightness-osd')
-- end
-- -- }}}
<<<<<<< HEAD
>>>>>>> 05f8e08... making nice only work on desktop for now
=======
=======
>>>>>>> bdc9927... Added more of awesome into fennel over lua
>>>>>>> 1d4ba76... making nice only work on desktop for now
-- {{{ Variable definitions
-- Themes define colours, icons, font and wallpapers.
beautiful.init("/home/chris/.config/awesome/theme.lua")
@ -745,12 +738,6 @@ end)
-- Enable nice titlebars
-- nice()
=======
-- Enable nice titlebars
-- nice()
>>>>>>> 1d4ba76... making nice only work on desktop for now
client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
-- }}}