diff --git a/awesome/module/notifications.lua b/awesome/module/notifications.lua index 25c2b4d..c6141fd 100644 --- a/awesome/module/notifications.lua +++ b/awesome/module/notifications.lua @@ -111,6 +111,7 @@ naughty.connect_signal( -- Naughty template naughty.connect_signal("request::display", function(n) +<<<<<<< HEAD -- naughty.actions template local actions_template = wibox.widget { notification = n, @@ -142,7 +143,148 @@ 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 { + notification = n, + type = "notification", + screen = awful.screen.preferred(), + shape = gears.shape.rounded_rectangle, + widget_template = { + { + { + { + { + { + { + { + { + { + { + { + markup = n.app_name or 'System Notification', + font = 'VictorMono Nerd Font 10', + align = 'center', + valign = 'center', + widget = wibox.widget.textbox + }, + margins = beautiful.notification_margin, + widget = wibox.container.margin, + }, + bg = '#000000'.. '44', + widget = wibox.container.background, + }, + { + { + { + resize_strategy = 'center', + widget = naughty.widget.icon, + }, + margins = beautiful.notification_margin, + widget = wibox.container.margin, + }, + { + { + layout = wibox.layout.align.vertical, + expand = 'none', + nil, + { + { + align = 'center', + widget = naughty.widget.title + }, + { + align = "center", + widget = naughty.widget.message, + }, + layout = wibox.layout.fixed.vertical + }, + nil + }, + margins = beautiful.notification_margin, + widget = wibox.container.margin, + }, + layout = wibox.layout.fixed.horizontal, + }, + fill_space = true, + spacing = beautiful.notification_margin, + layout = wibox.layout.fixed.vertical, + }, + -- Margin between the fake background + -- Set to 0 to preserve the 'titlebar' effect + margins = dpi(0), + widget = wibox.container.margin, + }, + bg = beautiful.bg_normal, + widget = wibox.container.background, + }, + -- Notification action list + -- naughty.list.actions, + actions_template, + spacing = dpi(4), + layout = wibox.layout.fixed.vertical, + }, + bg = beautiful.bg_normal, + id = "background_role", + shape = gears.shape.rounded_rect, -- Custom notification layout naughty.layout.box { notification = n, @@ -254,6 +396,7 @@ 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 diff --git a/awesome/rc.lua b/awesome/rc.lua index b60ee9a..e8d519f 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -18,13 +18,9 @@ local beautiful = require("beautiful") -- local naughty = require("naughty") local menubar = require("menubar") local hotkeys_popup = require("awful.hotkeys_popup") -<<<<<<< HEAD -local nice = require("nice") -======= local ruled = require("ruled") local ruls = require("configuration.client.rules") -- local nice = require("nice") ->>>>>>> 05f8e08... making nice only work on desktop for now -- Enable hotkeys help widget for VIM and other apps -- when client with a matching name is opened: require("awful.hotkeys_popup.keys") @@ -46,7 +42,6 @@ require('module.brightness-osd') -- require('module.lockscreen') <<<<<<< HEAD -======= -- }}} -- -- {{{ Error handling @@ -74,7 +69,12 @@ 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") @@ -719,91 +719,6 @@ end) root.keys(globalkeys) -- }}} -<<<<<<< HEAD -======= --- {{{ Rules --- Rules to apply to new clients (through the "manage" signal). -ruled.client.connect_signal( - 'request::rules', - function() - -- All clients will match this rule. - ruled.client.append_rule { - -- All clients will match this rule. - rule = {}, - properties = { - border_width = beautiful.border_width, - border_color = beautiful.border_normal, - focus = awful.client.focus.filter, - raise = true, - rounded_corners = true, - keys = clientkeys, - buttons = clientbuttons, - screen = awful.screen.preferred, - placement = awful.placement.no_overlap+awful.placement.no_offscreen - }, - } - ruled.client.append_rule { - -- make mpv float - rule_any = { - class = { - "mpv", - "gl", - "vlc" - } - }, - properties = { - placement = awful.placement.centered, - floating = true, - ontop = true, - raise = true - }, - } -end) - --- ruled.client.append_rule { --- -- Floating clients. --- rule_any = { --- class = { --- "Arandr", --- "Blender", --- "dolphin", --- }, --- name = { --- "Event Tester", -- xev. --- "remove images?" -- darktable delete window. --- }, --- role = { --- "AlarmWindow", -- Thunderbird's calendar. --- "ConfigManager", -- Thunderbird's about:config. --- "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. --- } --- }, --- properties = { floating = true }, --- } - --- ruled.client.append_rule { --- -- Add titlebars to normal clients and dialogs --- rule_any = { type = { "normal", "dialog" } }, --- properties = { titlebars_enabled = false}, --- } - --- ruled.client.append_rule { --- -- Set Firefox to never have titlebars --- rule = { class = "Firefox" }, --- properties = { requests_no_titlebar = true, titlebars_enabled = false }, --- } - --- ruled.client.append_rule { --- -- Set Feh center --- rule = { class = "feh" }, --- properties = { --- placement = awful.placement.centered, --- floating = true --- }, --- } - --- }}} ->>>>>>> 05f8e08... making nice only work on desktop for now -- {{{ Signals -- Signal function to execute when a new client appears. @@ -827,19 +742,20 @@ end) -- c:emit_signal("request::activate", "mouse_enter", {raise = false}) -- end) -<<<<<<< HEAD +-- Enable nice titlebars +-- nice() + ======= -- Enable nice titlebars -- nice() ->>>>>>> 05f8e08... making nice only work on desktop for now +>>>>>>> 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) -- }}} -- {{{ Autostart Applications -<<<<<<< HEAD -- awful.spawn.with_shell("picom --experimental-backend") -- awful.spawn.with_shell("libinput-gestures-setup start") -- awful.spawn.with_shell("flameshot") @@ -849,16 +765,5 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n -- awful.spawn.with_shell("emacs -daemon") -- awful.spawn.with_shell("nextcloud --background") -- awful.spawn.with_shell("caffeine") -======= -awful.spawn.with_shell("picom --experimental-backend") -awful.spawn.with_shell("libinput-gestures-setup start") -awful.spawn.with_shell("flameshot") -awful.spawn.with_shell("xset r rate 220 90") --- awful.spawn.with_shell("feh --bg-fill ~/Pictures/wallpapers/RoyalKing.png") -awful.spawn.with_shell("/usr/lib/polkit-kde-authentication-agent-1") -awful.spawn.with_shell("emacs -daemon") -awful.spawn.with_shell("nextcloud --background") -awful.spawn.with_shell("caffeine") ->>>>>>> 05f8e08... making nice only work on desktop for now -- }}} diff --git a/picom.conf b/picom.conf index 0cedc1b..296d741 100644 --- a/picom.conf +++ b/picom.conf @@ -159,11 +159,8 @@ frame-opacity = 0.7; inactive-opacity-override = false; # Default opacity for active windows. (0.0 - 1.0, defaults to 1.0) -<<<<<<< HEAD active-opacity = 0.8; -======= -active-opacity = 0.85; ->>>>>>> 05f8e08... making nice only work on desktop for now +>>>>>>> 1d4ba76... making nice only work on desktop for now # Dim inactive windows. (0.0 - 1.0, defaults to 0.0) # inactive-dim = 0.0 @@ -200,12 +197,9 @@ opacity-rule = [ "70:class_g = 'TelegramDesktop'", "90:class_g = 'Joplin'", "100:class_g = 'firefox'", -<<<<<<< HEAD "100:class_g = 'dolphin'", "100:class_g = 'mpv'", -======= - "100:class_g = 'soffice'", ->>>>>>> 05f8e08... making nice only work on desktop for now +>>>>>>> 1d4ba76... making nice only work on desktop for now "100:class_g = 'libreoffice'", "100:class_g = 'Thunderbird'" ]; @@ -270,14 +264,13 @@ blur-background-exclude = [ # when taking selection screenshot with `main` # https://github.com/naelstrof/maim/issues/130 "class_g = 'slop'", -<<<<<<< HEAD "_GTK_FRAME_EXTENTS@:c", # "window_type = '_NET_WM_WINDOW_TYPE_NOTIFICATION'" "window_type = 'notification'" ======= "class_g = 'soffice'", "_GTK_FRAME_EXTENTS@:c" ->>>>>>> 05f8e08... making nice only work on desktop for now +>>>>>>> 1d4ba76... making nice only work on desktop for now ];