merging onto master

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
 
 -- }}}