diff --git a/.vscode/settings.json b/.vscode/settings.json index e1addcf..9b0ef91 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,6 +2,10 @@ "Lua.diagnostics.globals": [ "user_vars", "modkey", - "root" + "root", + "awesome", + "client", + "screen", + "mouse" ] } diff --git a/awesome/bindings/client_buttons.lua b/awesome/bindings/client_buttons.lua deleted file mode 100644 index 4b5e0bb..0000000 --- a/awesome/bindings/client_buttons.lua +++ /dev/null @@ -1,22 +0,0 @@ --- Awesome Libs -local awful = require("awful") -local gears = require("gears") - -local modkey = user_vars.vars.modkey - -return function () - local clientbuttons = gears.table.join( - awful.button({ }, 1, function (c) - c:emit_signal("request::activate", "mouse_click", { raise = true }) - end), - awful.button({ modkey }, 1, function (c) - c:emit_signal("request::activate", "mouse_click", { raise = true }) - awful.mouse.client.move(c) - end), - awful.button({ modkey }, 3, function (c) - c:emit_signal("request::activate", "mouse_click", { raise = true }) - awful.mouse.client.resize(c) - end) - ) - return clientbuttons -end \ No newline at end of file diff --git a/awesome/bindings/client_keys.lua b/awesome/bindings/client_keys.lua deleted file mode 100644 index 13110af..0000000 --- a/awesome/bindings/client_keys.lua +++ /dev/null @@ -1,43 +0,0 @@ --- Awesome Libs -local awful = require("awful") -local gears = require("gears") - -local modkey = user_vars.vars.modkey - -return function () - local clientkeys = gears.table.join( - awful.key( - { modkey }, - "f", - function(c) - c.fullscreen = not c.fullscreen - c:raise() - end, - { description = "Toggle fullscreen", group = "Client" } - ), - awful.key( - { modkey }, - "q", - function(c) - c:kill() - end, - { description = "Close focused client", group = "Client" } - ), - awful.key( - { modkey }, - "g", - awful.client.floating.toggle, - { description = "Toggle floating window", group = "Client" } - ), - awful.key( - { modkey}, - "m", - function (c) - c.maximized = not c.maximized - c:raise() - end , - {description = "(un)maximize", group = "Client"} - ) - ) - return clientkeys -end \ No newline at end of file diff --git a/awesome/bindings/global_buttons.lua b/awesome/bindings/global_buttons.lua deleted file mode 100644 index e476a38..0000000 --- a/awesome/bindings/global_buttons.lua +++ /dev/null @@ -1,14 +0,0 @@ --- Awesome Libs -local gears = require("gears") -local awful = require("awful") - -return function () - local globalbuttons = gears.table.join( - awful.button({ }, 3, function() - user_vars.main_menu:toggle() - end), - awful.button({ }, 4, awful.tag.viewnext), - awful.button({ }, 5, awful.tag.viewprev) - ) - return globalbuttons -end \ No newline at end of file diff --git a/awesome/bindings/global_keys.lua b/awesome/bindings/global_keys.lua deleted file mode 100644 index 2753078..0000000 --- a/awesome/bindings/global_keys.lua +++ /dev/null @@ -1,309 +0,0 @@ --- Awesome Libs -local gears = require("gears") -local awful = require("awful") -local hotkeys_popup = require("awful.hotkeys_popup") - --- Resource Configuration -local modkey = user_vars.vars.modkey - -return function() - local globalkeys = gears.table.join( - awful.key( - { modkey }, - "#39", - hotkeys_popup.show_help, - { description = "Cheat sheet", group = "Awesome" } - ), - -- Tag browsing - awful.key( - { modkey }, - "#113", - awful.tag.viewprev, - { description = "View previous tag", group = "Tag" } - ), - awful.key( - { modkey }, - "#114", - awful.tag.viewnext, - { description = "View next tag", group = "Tag" } - ), - awful.key( - { modkey }, - "#66", - awful.tag.history.restore, - { description = "Go back to last tag", group = "Tag" } - ), - awful.key( - { modkey }, - "#44", - function() - awful.client.focus.byidx(1) - end, - { description = "Focus next client by index", group = "Client" } - ), - awful.key( - { modkey }, - "#45", - function() - awful.client.focus.byidx(-1) - end, - { description = "Focus previous client by index", group = "Client" } - ), - awful.key( - { modkey }, - "#25", - function() - user_vars.main_menu:show() - end, - { description = "Show context menu", group = "Awesome" } - ), - awful.key( - { modkey, "Shift" }, - "#44", - function() - awful.client.swap.byidx(1) - end, - { description = "Swap with next client by index", group = "Client" } - ), - awful.key( - { modkey, "Shift" }, - "#45", - function() - awful.client.swap.byidx(-1) - end, - { description = "Swap with previous client by index", group = "Client" } - ), - awful.key( - { modkey, "Control" }, - "#44", - function() - awful.screen.focus_relative(1) - end, - { description = "Focus the next screen", group = "Screen" } - ), - awful.key( - { modkey, "Control" }, - "#45", - function() - awful.screen.focus_relative(-1) - end, - { description = "Focus the previous screen", group = "Screen" } - ), - awful.key( - { modkey }, - "#30", - awful.client.urgent.jumpto, - { description = "Jump to urgent client", group = "Client" } - ), - awful.key( - { modkey }, - "#36", - function() - awful.spawn(user_vars.vars.terminal) - end, - { description = "Open terminal", group = "Applications" } - ), - awful.key( - { modkey, "Control" }, - "#27", - awesome.restart, - { description = "Reload awesome", group = "Awesome" } - ), - awful.key( - { modkey }, - "#46", - function() - awful.tag.incmwfact(0.05) - end, - { description = "Increase client width", group = "Layout" } - ), - awful.key( - { modkey }, - "#43", - function() - awful.tag.incmwfact(-0.05) - end, - { description = "Decrease client width", group = "Layout" } - ), - awful.key( - { modkey, "Control" }, - "#43", - function() - awful.tag.incncol(1, nil, true) - end, - { description = "Increase the number of columns", group = "Layout" } - ), - awful.key( - { modkey, "Control" }, - "#46", - function() - awful.tag.incncol(-1, nil, true) - end, - { description = "Decrease the number of columns", group = "Layout" } - ), - awful.key( - { modkey, "Shift" }, - "#65", - function() - awful.layout.inc(-1) - end, - { description = "Select previous layout", group = "Layout" } - ), - awful.key( - { modkey, "Shift" }, - "#36", - function() - awful.layout.inc(1) - end, - { description = "Select next layout", group = "Layout" } - ), - awful.key( - { modkey }, - "#40", - function() - awful.spawn("rofi -show drun -theme ~/.config/rofi/rofi.rasi") - end, - { descripton = "Application launcher", group = "Application" } - ), - awful.key( - { modkey }, - "#23", - function() - awful.spawn("rofi -show window -theme ~/.config/rofi/window.rasi") - end, - { descripton = "Client switcher (alt+tab)", group = "Application" } - ), - awful.key( - { "Mod1" }, - "#23", - function() - awful.spawn("rofi -show window -theme ~/.config/rofi/window.rasi") - end, - { descripton = "Client switcher (alt+tab)", group = "Application" } - ), - awful.key( - { modkey }, - "#26", - function() - awful.spawn(user_vars.vars.file_manager) - end, - { descripton = "Open file manager", group = "System" } - ), - awful.key( - { modkey, "Shift" }, - "#26", - function() - awesome.emit_signal("module::powermenu:show") - end, - { descripton = "Session options", group = "System" } - ), - awful.key( - {}, - "#107", - function() - awful.spawn(user_vars.vars.screenshot_program) - end, - { description = "Screenshot", group = "Applications" } - ), - awful.key( - {}, - "XF86AudioLowerVolume", - function(c) - awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ -2%") - awesome.emit_signal("widget::volume") - awesome.emit_signal("module::volume_osd:show", true) - awesome.emit_signal("module::slider:update") - awesome.emit_signal("widget::volume_osd:rerun") - end, - { description = "Lower volume", group = "System" } - ), - awful.key( - {}, - "XF86AudioRaiseVolume", - function(c) - awful.spawn.easy_async_with_shell( - [[ pacmd list-sinks | grep "volume: front" | awk '{print $5}' ]], - function(stdout) - stdout = stdout:gsub("%%", "") - local volume = tonumber(stdout) or 0 - if volume <= 98 then - awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ +2%") - end - end) - awesome.emit_signal("widget::volume") - awesome.emit_signal("module::volume_osd:show", true) - awesome.emit_signal("module::slider:update") - awesome.emit_signal("widget::volume_osd:rerun") - end, - { description = "Increase volume", group = "System" } - ), - awful.key( - {}, - "XF86AudioMute", - function(c) - awful.spawn("pactl set-sink-mute @DEFAULT_SINK@ toggle") - awesome.emit_signal("widget::volume") - awesome.emit_signal("module::volume_osd:show", true) - awesome.emit_signal("module::slider:update") - awesome.emit_signal("widget::volume_osd:rerun") - end, - { description = "Mute volume", group = "System" } - ), - awful.key( - {}, - "XF86MonBrightnessUp", - function(c) - awful.spawn("xbacklight -time 100 -inc 10%+") - awesome.emit_signal("module::brightness_osd:show", true) - awesome.emit_signal("module::brightness_slider:update") - awesome.emit_signal("widget::brightness_osd:rerun") - end, - { description = "Raise backlight brightness", group = "System" } - ), - awful.key( - {}, - "XF86MonBrightnessDown", - function(c) - awful.spawn("xbacklight -time 100 -dec 10%-") - awesome.emit_signal("widget::brightness_osd:rerun") - awesome.emit_signal("module::brightness_osd:show", true) - awesome.emit_signal("module::brightness_slider:update") - end, - { description = "Lower backlight brightness", group = "System" } - ), - awful.key( - {}, - "XF86AudioPlay", - function(c) - awful.spawn("playerctl play-pause") - end, - { description = "Play / Pause audio", group = "System" } - ), - awful.key( - {}, - "XF86AudioNext", - function(c) - awful.spawn("playerctl next") - end, - { description = "Play / Pause audio", group = "System" } - ), - awful.key( - {}, - "XF86AudioPrev", - function(c) - awful.spawn("playerctl previous") - end, - { description = "Play / Pause audio", group = "System" } - ), - awful.key( - { modkey }, - "#65", - function() - awesome.emit_signal("kblayout::toggle") - end, - { description = "Toggle keyboard layout", group = "System" } - ) - ) - - return globalkeys -end diff --git a/awesome/crylia_bar/center_bar.lua b/awesome/crylia_bar/center_bar.lua index 39db493..967832c 100644 --- a/awesome/crylia_bar/center_bar.lua +++ b/awesome/crylia_bar/center_bar.lua @@ -3,27 +3,27 @@ -------------------------------------------------------------------------------------------------------------- -- Awesome Libs local awful = require("awful") -local colors = require ("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -return function (s, widget) +return function(s, widget) - local top_center = awful.popup{ + local top_center = awful.popup { screen = s, widget = wibox.container.background, ontop = false, - bg = colors.color["Grey900"], + bg = color["Grey900"], visible = true, maximum_width = dpi(500), - placement = function (c) awful.placement.top(c, {margins = dpi(10)}) end, - shape = function (cr, width, height) + placement = function(c) awful.placement.top(c, { margins = dpi(10) }) end, + shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 10) end } - local naught = require("naughty") - top_center:setup{ + + top_center:setup { nil, { widget, @@ -37,8 +37,8 @@ return function (s, widget) client.connect_signal( "manage", - function (c) - if #s:get_clients() < 1 then + function(c) + if #s.selected_tag:clients() < 1 then top_center.visible = false else top_center.visible = true @@ -48,8 +48,8 @@ return function (s, widget) client.connect_signal( "unmanage", - function (c) - if #s:get_clients() < 1 then + function(c) + if #s.selected_tag:clients() < 1 then top_center.visible = false else top_center.visible = true @@ -59,8 +59,8 @@ return function (s, widget) client.connect_signal( "tag::switched", - function (c) - if #s:get_clients() < 1 then + function(c) + if #s.selected_tag:clients() < 1 then top_center.visible = false else top_center.visible = true @@ -70,8 +70,8 @@ return function (s, widget) awesome.connect_signal( "refresh", - function (c) - if #s:get_clients() < 1 then + function(c) + if #s.selected_tag:clients() < 1 then top_center.visible = false else top_center.visible = true diff --git a/awesome/crylia_bar/dock.lua b/awesome/crylia_bar/dock.lua index 8ae73f2..9553e46 100644 --- a/awesome/crylia_bar/dock.lua +++ b/awesome/crylia_bar/dock.lua @@ -3,7 +3,7 @@ -------------------------------------------------------------------------------------------------------------- -- Awesome Libs local awful = require("awful") -local colors = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") @@ -13,6 +13,42 @@ return function(screen, programs) local function create_dock_element(program, name, is_steam, size) is_steam = is_steam or false + if program:match("com.*%a.Client") ~= nil then + program = program:gsub("com.", ""):gsub(".Client", ""):gsub("flatpak", ""):gsub("run", ""):gsub(" ", "") + end + + local function create_indicator() + local col = "#fff" + local indicators = { layout = wibox.layout.flex.horizontal, spacing = dpi(5) } + for i, c in ipairs(client.get()) do + if string.lower(c.class):match(program or name) then + if c == client.focus then + col = color["YellowA200"] + elseif c.urgent then + col = color["RedA200"] + elseif c.maximized then + col = color["GreenA200"] + elseif c.minimized then + col = color["BlueA200"] + elseif c.fullscreen then + col = color["PinkA200"] + else + col = color["Grey600"] + end + local indicator = wibox.widget { + widget = wibox.container.background, + shape = gears.shape.rounded_rect, + forced_height = dpi(3), + spacing_widget = dpi(5), + spacing = dpi(5), + bg = col + } + indicators[i] = indicator + end + end + return indicators + end + local dock_element = wibox.widget { { { @@ -21,14 +57,11 @@ return function(screen, programs) resize = true, forced_width = size, forced_height = size, - image = Get_icon("Papirus-Dark", program, is_steam), - widget = wibox.widget.imagebox - }, - { - widget = nil, - layout = wibox.layout.align.horizontal, - id = "indicator" + image = Get_icon(user_vars.icon_theme, program, is_steam), + widget = wibox.widget.imagebox, + id = "icon" }, + create_indicator(), layout = wibox.layout.align.vertical, id = "dock_layout" }, @@ -39,7 +72,7 @@ return function(screen, programs) shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 10) end, - bg = colors.color["Grey900"], + bg = color["Grey900"], widget = wibox.container.background, id = "background" }, @@ -47,7 +80,13 @@ return function(screen, programs) widget = wibox.container.margin } - Hover_signal(dock_element.background, colors.color["Grey800"], colors.color["White"]) + for k, c in ipairs(client.get()) do + if string.lower(c.class):match(program) and c == client.focus then + dock_element.background.bg = color["Grey800"] + end + end + + Hover_signal(dock_element.background, color["Grey800"], color["White"]) dock_element:connect_signal( "button::press", @@ -68,52 +107,17 @@ return function(screen, programs) margins = dpi(10) } - local function create_indicator() - local color = "" - local indicators - local t = 1 - --[[ for indicator_screen in screen do - for j, indicator_client in ipairs(indicator_screen.get_clients()) do - if indicator_client.class == program then - if indicator_client.maximized then - color = colors.color["Green200"] - elseif indicator_client.fullscreen then - color = colors.color["Red200"] - elseif indicator_client.focus then - color = colors.color["Blue200"] - elseif indicator_client.minimised then - color = colors.color["Pink200"] - else - color = colors.color["White"] - end - - local indicator = wibox.widget { - widget = wibox.container.background, - shape = gears.shape.circle, - forced_height = dpi(50), - bg = color - } - indicators.add(indicator) - t = t + 1 - end - end - end ]] - return indicators - end - - dock_element.background.margin.dock_layout.indicator = create_indicator() - return dock_element end local dock = awful.popup { widget = wibox.container.background, ontop = true, - bg = colors.color["Grey900"], + bg = color["Grey900"], visible = true, screen = screen, type = "dock", - height = user_vars.vars.dock_icon_size + 10, + height = user_vars.dock_icon_size + 10, placement = function(c) awful.placement.bottom(c, { margins = dpi(10) }) end, shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 15) @@ -136,7 +140,7 @@ return function(screen, programs) local dock_elements = { layout = wibox.layout.fixed.horizontal } for i, p in ipairs(pr) do - dock_elements[i] = create_dock_element(p[1], p[2], p[3], user_vars.vars.dock_icon_size) + dock_elements[i] = create_dock_element(p[1], p[2], p[3], user_vars.dock_icon_size) end return dock_elements @@ -148,7 +152,7 @@ return function(screen, programs) for i = 0, amount, 1 do fake_elements[i] = wibox.widget { bg = '00000000', - forced_width = user_vars.vars.dock_icon_size + dpi(20), + forced_width = user_vars.dock_icon_size + dpi(20), forced_height = dpi(10), widget = wibox.container.background } @@ -161,28 +165,26 @@ return function(screen, programs) layout = wibox.layout.fixed.vertical } - --TODO: Replace with fake elements fakedock:setup { get_fake_elements(#programs), + type = 'dock', layout = wibox.layout.fixed.vertical } - local naughty = require("naughty") - --[[ TODO: This function runs every 0.1 second, it can be optimized by - calling it every time the mouse is over the dock, a client changes it states ... - but im too lazy rn ]] - -- TODO: draw a invisible non clickable fake dock and check of mouse if over that - local function check_for_dock_hide(s) - if s == mouse.screen then - --local mx, my = mouse.coords().x * 100 / screen.geometry.width, mouse.coords().y * 100 / screen.geometry.height + local function check_for_dock_hide(s) + if #s:get_clients() < 1 then + dock.visible = true + return + end + if s == mouse.screen then if mouse.current_widget then dock.visible = true return end - for j, c in ipairs(screen.get_clients()) do + for j, c in ipairs(screen.selected_tag:clients()) do local y = c:geometry().y local h = c.height - if (y + h) >= screen.geometry.height - user_vars.vars.dock_icon_size - 35 then + if (y + h) >= screen.geometry.height - user_vars.dock_icon_size - 35 then dock.visible = false else dock.visible = true @@ -197,6 +199,32 @@ return function(screen, programs) "manage", function() check_for_dock_hide(screen) + dock:setup { + get_dock_elements(programs), + layout = wibox.layout.fixed.vertical + } + end + ) + + client.connect_signal( + "unmanage", + function() + check_for_dock_hide(screen) + dock:setup { + get_dock_elements(programs), + layout = wibox.layout.fixed.vertical + } + end + ) + + client.connect_signal( + "focus", + function() + check_for_dock_hide(screen) + dock:setup { + get_dock_elements(programs), + layout = wibox.layout.fixed.vertical + } end ) diff --git a/awesome/crylia_bar/init.lua b/awesome/crylia_bar/init.lua index 18cf5d8..a33583e 100644 --- a/awesome/crylia_bar/init.lua +++ b/awesome/crylia_bar/init.lua @@ -5,31 +5,38 @@ local awful = require("awful") awful.screen.connect_for_each_screen( - -- For each screen this function is called once - -- If you want to change the modules per screen use the indices - -- e.g. 1 would be the primary screen and 2 the secondary screen. - function (s) +-- For each screen this function is called once +-- If you want to change the modules per screen use the indices +-- e.g. 1 would be the primary screen and 2 the secondary screen. + function(s) + -- Create 9 tags + awful.layout.layouts = user_vars.layouts + awful.tag( + { "1", "2", "3", "4", "5", "6", "7", "8", "9" }, + s, + user_vars.layouts[1] + ) - require("theme.crylia.modules.powermenu")(s) + require("src.modules.powermenu")(s) -- TODO: rewrite calendar osd, maybe write an own inplementation - -- require("theme.crylia.modules.calendar_osd")(s) - require("theme.crylia.modules.volume_osd")(s) - require("theme.crylia.modules.brightness_osd")(s) - require("theme.crylia.modules.titlebar") + -- require("src.modules.calendar_osd")(s) + require("src.modules.volume_osd")(s) + require("src.modules.brightness_osd")(s) + require("src.modules.titlebar") -- Widgets - s.battery = require("theme.crylia.widgets.battery")() - s.network = require("theme.crylia.widgets.network")() - s.audio = require("theme.crylia.widgets.audio")() - s.date = require("theme.crylia.widgets.date")() - s.clock = require("theme.crylia.widgets.clock")() - s.bluetooth = require("theme.crylia.widgets.bluetooth")() - s.layoutlist = require("theme.crylia.widgets.layout_list")() - s.powerbutton = require("theme.crylia.widgets.power")() - s.kblayout = require("theme.crylia.widgets.kblayout")(s) - s.taglist = require("theme.crylia.widgets.taglist")(s) - s.tasklist = require("theme.crylia.widgets.tasklist")(s) - s.systray = require("theme.crylia.widgets.systray")(s) + s.battery = require("src.widgets.battery")() + s.network = require("src.widgets.network")() + s.audio = require("src.widgets.audio")() + s.date = require("src.widgets.date")() + s.clock = require("src.widgets.clock")() + s.bluetooth = require("src.widgets.bluetooth")() + s.layoutlist = require("src.widgets.layout_list")() + s.powerbutton = require("src.widgets.power")() + s.kblayout = require("src.widgets.kblayout")(s) + s.taglist = require("src.widgets.taglist")(s) + s.tasklist = require("src.widgets.tasklist")(s) + s.systray = require("src.widgets.systray")(s) -- Add more of these if statements if you want to change -- the modules/widgets per screen. @@ -38,7 +45,7 @@ awful.screen.connect_for_each_screen( require("crylia_bar.left_bar")(s, {s.layoutlist, s.systray, s.taglist}) require("crylia_bar.center_bar")(s, s.tasklist) require("crylia_bar.right_bar")(s, {s.date, s.clock,s.powerbutton}) - require("crylia_bar.dock")(s, user_vars.vars.dock_programs) + require("crylia_bar.dock")(s, user_vars.dock_programs) end ]] --[[ if s.index == 2 then @@ -47,10 +54,10 @@ awful.screen.connect_for_each_screen( require("crylia_bar.right_bar")(s, {s.battery, s.network, s.bluetooth, s.audio, s.kblayout, s.date, s.clock,s.powerbutton}) end ]] -- Bars - require("crylia_bar.left_bar")(s, {s.layoutlist, s.systray, s.taglist}) + require("crylia_bar.left_bar")(s, { s.layoutlist, s.systray, s.taglist }) require("crylia_bar.center_bar")(s, s.tasklist) - require("crylia_bar.right_bar")(s, {s.battery, s.network, s.bluetooth, s.audio, s.kblayout, s.date, s.clock,s.powerbutton}) - require("crylia_bar.dock")(s, user_vars.vars.dock_programs) + require("crylia_bar.right_bar")(s, { s.battery, s.network, s.bluetooth, s.audio, s.kblayout, s.date, s.clock, s.powerbutton }) + require("crylia_bar.dock")(s, user_vars.dock_programs) end ) diff --git a/awesome/crylia_bar/left_bar.lua b/awesome/crylia_bar/left_bar.lua index c783a21..1529eca 100644 --- a/awesome/crylia_bar/left_bar.lua +++ b/awesome/crylia_bar/left_bar.lua @@ -3,7 +3,7 @@ -------------------------------------------------------------------------------------------------------------- -- Awesome Libs local awful = require("awful") -local colors = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") @@ -14,7 +14,7 @@ return function(s, widgets) screen = s, widget = wibox.container.background, ontop = false, - bg = colors.color["Grey900"], + bg = color["Grey900"], visible = true, maximum_width = dpi(650), placement = function(c) awful.placement.top_left(c, { margins = dpi(10) }) end, diff --git a/awesome/crylia_bar/right_bar.lua b/awesome/crylia_bar/right_bar.lua index 9f3e955..3c232db 100644 --- a/awesome/crylia_bar/right_bar.lua +++ b/awesome/crylia_bar/right_bar.lua @@ -3,21 +3,21 @@ -------------------------------------------------------------------------------------------------------------- -- Awesome Libs local awful = require("awful") -local colors = require ("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -return function (s, widgets) +return function(s, widgets) - local top_right = awful.popup{ + local top_right = awful.popup { widget = wibox.container.background, ontop = false, - bg = colors.color["Grey900"], + bg = color["Grey900"], visible = true, screen = s, - placement = function (c) awful.placement.top_right(c, {margins = dpi(10)}) end, - shape = function (cr, width, height) + placement = function(c) awful.placement.top_right(c, { margins = dpi(10) }) end, + shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end } @@ -95,4 +95,4 @@ return function (s, widgets) }, layout = wibox.layout.align.horizontal } -end \ No newline at end of file +end diff --git a/awesome/main/layouts.lua b/awesome/main/layouts.lua deleted file mode 100644 index d370a4a..0000000 --- a/awesome/main/layouts.lua +++ /dev/null @@ -1,15 +0,0 @@ ------------------------------------------------------------------------------------------- --- Layout class, if you want to add or remove layouts from the list do it in this table -- ------------------------------------------------------------------------------------------- --- Awesome Libs -local awful = require("awful") - -return function() - local layouts = { - awful.layout.suit.tile, - awful.layout.suit.floating, - awful.layout.suit.fair, - } - - return layouts -end diff --git a/awesome/main/menu.lua b/awesome/main/menu.lua deleted file mode 100644 index 2ce6f61..0000000 --- a/awesome/main/menu.lua +++ /dev/null @@ -1,38 +0,0 @@ --------------------------------------------------------------- --- Menu class, this is where you change the rightclick menu -- --------------------------------------------------------------- --- Awesome Libs -local awful = require("awful") - --- Module Namespace -local _M = { } - -local session = { - { "Logout", function () awesome.quit() end }, - { "Shutdown", function () awful.spawn.with_shell('shutdown now') end }, - { "Reboot", function () awful.spawn.with_shell('reboot') end }, -} - -local applications = { - { "Firefox", "firefox" }, - { "VS Code", "code" }, - { "Blender", "blender" }, - { "Steam", "steam" }, - { "Lutris", "lutris" }, -} - -local settings = { - { "General Settings", "gnome-control-center" }, - { "Power Settings", "xfce4-power-manager-settings" }, - { "Display Settings", "arandr" } -} - -return function() - local menu_items = { - { "Power Menu", session }, - { "Applications", applications }, - { "Open Terminal", user_vars.vars.terminal }, - { "Settings", settings }, - } - return menu_items -end diff --git a/awesome/main/rules.lua b/awesome/main/rules.lua deleted file mode 100644 index 056b236..0000000 --- a/awesome/main/rules.lua +++ /dev/null @@ -1,53 +0,0 @@ -------------------------------------------------------------------------------------------------- --- This class contains rules for float exceptions or special themeing for certain applications -- -------------------------------------------------------------------------------------------------- - --- Awesome Libs -local awful = require("awful") -local beautiful = require("beautiful") - -return function (clientkeys, clientbuttons) - local rules = { - { - rule = { }, - properties = { - border_width = beautiful.border_width, - border_color = beautiful.border_normal, - focus = awful.client.focus.filter, - raise = true, - keys = clientkeys, - buttons = clientbuttons, - screen = awful.screen.preferred, - placement = awful.placement.no_overlap+awful.placement.no_offscreen - } - }, - { - rule_any = { - instance = { }, - class = { - "Arandr", - "Lxappearance", - "kdeconnect.app", - "zoom", - "file-roller", - "File-roller" - }, - name = { }, - role = { - "AlarmWindow", - "ConfigManager", - "pop-up" - } - }, - properties = { floating = true, titlebars_enabled = true } - }, - { - id = "titlebar", - rule_any = { - type = { "normal", "dialog", "modal", "utility" } - }, - properties = { titlebars_enabled = true } - } - } - return rules -end \ No newline at end of file diff --git a/awesome/main/tags.lua b/awesome/main/tags.lua deleted file mode 100644 index 96c558b..0000000 --- a/awesome/main/tags.lua +++ /dev/null @@ -1,23 +0,0 @@ ------------------------------------------------------------------------------------------------------ --- Here are the ammount of tags generated, edit the awful.tag args if you want a different ammount -- ------------------------------------------------------------------------------------------------------ - --- Awesome Libs -local awful = require("awful") - -return function() - local tags = {} - awful.screen.connect_for_each_screen( - function(s) - tags[s] = awful.tag( - { - "1", "2", "3", "4", "5", "6", "7", "8", "9" - }, - s, - user_vars.Layouts[1] - ) - end - ) - - return tags -end diff --git a/awesome/main/theme.lua b/awesome/main/theme.lua deleted file mode 100644 index 7245b09..0000000 --- a/awesome/main/theme.lua +++ /dev/null @@ -1,19 +0,0 @@ -local awful = require("awful") -local beautiful = require("beautiful") -local gears = require("gears") -local home = os.getenv("HOME") - -beautiful.init(home .. "/.config/awesome/theme/crylia/theme.lua") - -if(user_vars.vars.wallpaper) then - local wallpaper = user_vars.vars.wallpaper - if awful.util.file_readable(wallpaper) then - Theme.wallpaper = wallpaper - end -end - -if beautiful.wallpaper then - for s = 1, screen.count() do - gears.wallpaper.maximized(beautiful.wallpaper, s, true) - end -end \ No newline at end of file diff --git a/awesome/main/wallpaper.lua b/awesome/main/wallpaper.lua deleted file mode 100644 index 8c48c24..0000000 --- a/awesome/main/wallpaper.lua +++ /dev/null @@ -1,18 +0,0 @@ ---------------------------------------- --- This function sets your wallpaper -- ---------------------------------------- --- Awesome Libs -local gears = require("gears") -local beautiful = require("beautiful") - -function Set_wallpaper(s) - if beautiful.wallpaper then - local wallpaper = beautiful.wallpaper - if type(wallpaper) == "function" then - wallpaper = wallpaper(s) - end - gears.wallpaper.maximized(wallpaper, s, true) - end -end - -screen.connect_signal("property::geometry", Set_wallpaper) \ No newline at end of file diff --git a/awesome/bindings/bind_to_tags.lua b/awesome/mappings/bind_to_tags.lua similarity index 73% rename from awesome/bindings/bind_to_tags.lua rename to awesome/mappings/bind_to_tags.lua index e7165ad..d3ad616 100644 --- a/awesome/bindings/bind_to_tags.lua +++ b/awesome/mappings/bind_to_tags.lua @@ -1,16 +1,15 @@ -- Awesome Libs local awful = require("awful") local gears = require("gears") +local globalkeys = require("../mappings/global_keys") +local modkey = user_vars.modkey -local modkey = user_vars.vars.modkey - -return function (globalkeys) - for i = 1, 9 do - globalkeys = gears.table.join(globalkeys, +for i = 1, 9 do + globalkeys = gears.table.join(globalkeys, -- View tag only awful.key( - {modkey}, + { modkey }, "#" .. i + 9, function() local screen = awful.screen.focused() @@ -20,11 +19,11 @@ return function (globalkeys) end client.emit_signal("tag::switched") end, - {description = "View Tag " .. i, group = "Tag"} + { description = "View Tag " .. i, group = "Tag" } ), -- Brings the window over without chaning the tag, reverts automatically on tag change awful.key( - {modkey, "Control"}, + { modkey, "Control" }, "#" .. i + 9, function() local screen = awful.screen.focused() @@ -33,11 +32,11 @@ return function (globalkeys) awful.tag.viewtoggle(tag) end end, - {description = "Toggle Tag " .. i, group = "Tag"} + { description = "Toggle Tag " .. i, group = "Tag" } ), -- Brings the window over without chaning the tag, reverts automatically on tag change awful.key( - {modkey, "Shift"}, + { modkey, "Shift" }, "#" .. i + 9, function() local screen = awful.screen.focused() @@ -48,11 +47,11 @@ return function (globalkeys) end end end, - {description = "Move focused client on tag " .. i, group = "Tag"} + { description = "Move focused client on tag " .. i, group = "Tag" } ), -- Brings the window over without chaning the tag, reverts automatically on tag change awful.key( - {modkey, "Control", "Shift"}, + { modkey, "Control", "Shift" }, "#" .. i + 9, function() local screen = awful.screen.focused() @@ -61,9 +60,8 @@ return function (globalkeys) awful.tag.viewtoggle(tag) end end, - {description = "Move focused client on tag " .. i, group = "Tag"} + { description = "Move focused client on tag " .. i, group = "Tag" } ) ) - end - return globalkeys -end \ No newline at end of file +end +root.keys(globalkeys) diff --git a/awesome/mappings/client_buttons.lua b/awesome/mappings/client_buttons.lua new file mode 100644 index 0000000..a539193 --- /dev/null +++ b/awesome/mappings/client_buttons.lua @@ -0,0 +1,19 @@ +-- Awesome Libs +local awful = require("awful") +local gears = require("gears") + +local modkey = user_vars.modkey + +return gears.table.join( + awful.button({}, 1, function(c) + c:emit_signal("request::activate", "mouse_click", { raise = true }) + end), + awful.button({ modkey }, 1, function(c) + c:emit_signal("request::activate", "mouse_click", { raise = true }) + awful.mouse.client.move(c) + end), + awful.button({ modkey }, 3, function(c) + c:emit_signal("request::activate", "mouse_click", { raise = true }) + awful.mouse.client.resize(c) + end) +) diff --git a/awesome/mappings/client_keys.lua b/awesome/mappings/client_keys.lua new file mode 100644 index 0000000..4945915 --- /dev/null +++ b/awesome/mappings/client_keys.lua @@ -0,0 +1,57 @@ +-- Awesome Libs +local awful = require("awful") +local gears = require("gears") + +local modkey = user_vars.modkey + +return gears.table.join( + awful.key( + { modkey }, + "#41", + function(c) + c.fullscreen = not c.fullscreen + c:raise() + end, + { description = "Toggle fullscreen", group = "Client" } + ), + awful.key( + { modkey }, + "#24", + function(c) + c:kill() + end, + { description = "Close focused client", group = "Client" } + ), + awful.key( + { modkey }, + "#42", + awful.client.floating.toggle, + { description = "Toggle floating window", group = "Client" } + ), + awful.key( + { modkey }, + "#58", + function(c) + c.maximized = not c.maximized + c:raise() + end, + { description = "(un)maximize", group = "Client" } + ), + awful.key( + { modkey }, + "#57", + function(c) + if c == client.focus then + c.minimized = true + else + c.minimized = false + if not c:isvisible() and c.first_tag then + c.first_tag:view_only() + end + c:emit_signal('request::activate') + c:raise() + end + end, + { description = "(un)hide", group = "Client" } + ) +) diff --git a/awesome/mappings/global_buttons.lua b/awesome/mappings/global_buttons.lua new file mode 100644 index 0000000..f7ebd39 --- /dev/null +++ b/awesome/mappings/global_buttons.lua @@ -0,0 +1,8 @@ +-- Awesome Libs +local gears = require("gears") +local awful = require("awful") + +root.buttons = gears.table.join( + awful.button({}, 4, awful.tag.viewnext), + awful.button({}, 5, awful.tag.viewprev) +) diff --git a/awesome/mappings/global_keys.lua b/awesome/mappings/global_keys.lua new file mode 100644 index 0000000..b397969 --- /dev/null +++ b/awesome/mappings/global_keys.lua @@ -0,0 +1,304 @@ +-- Awesome Libs +local gears = require("gears") +local awful = require("awful") +local hotkeys_popup = require("awful.hotkeys_popup") + +local modkey = user_vars.modkey + +return gears.table.join( + awful.key( + { modkey }, + "#39", + hotkeys_popup.show_help, + { description = "Cheat sheet", group = "Awesome" } + ), + -- Tag browsing + awful.key( + { modkey }, + "#113", + awful.tag.viewprev, + { description = "View previous tag", group = "Tag" } + ), + awful.key( + { modkey }, + "#114", + awful.tag.viewnext, + { description = "View next tag", group = "Tag" } + ), + awful.key( + { modkey }, + "#66", + awful.tag.history.restore, + { description = "Go back to last tag", group = "Tag" } + ), + awful.key( + { modkey }, + "#44", + function() + awful.client.focus.byidx(1) + end, + { description = "Focus next client by index", group = "Client" } + ), + awful.key( + { modkey }, + "#45", + function() + awful.client.focus.byidx(-1) + end, + { description = "Focus previous client by index", group = "Client" } + ), + awful.key( + { modkey }, + "#25", + function() + user_vars.main_menu:show() + end, + { description = "Show context menu", group = "Awesome" } + ), + awful.key( + { modkey, "Shift" }, + "#44", + function() + awful.client.swap.byidx(1) + end, + { description = "Swap with next client by index", group = "Client" } + ), + awful.key( + { modkey, "Shift" }, + "#45", + function() + awful.client.swap.byidx(-1) + end, + { description = "Swap with previous client by index", group = "Client" } + ), + awful.key( + { modkey, "Control" }, + "#44", + function() + awful.screen.focus_relative(1) + end, + { description = "Focus the next screen", group = "Screen" } + ), + awful.key( + { modkey, "Control" }, + "#45", + function() + awful.screen.focus_relative(-1) + end, + { description = "Focus the previous screen", group = "Screen" } + ), + awful.key( + { modkey }, + "#30", + awful.client.urgent.jumpto, + { description = "Jump to urgent client", group = "Client" } + ), + awful.key( + { modkey }, + "#36", + function() + awful.spawn(user_vars.terminal) + end, + { description = "Open terminal", group = "Applications" } + ), + awful.key( + { modkey, "Control" }, + "#27", + awesome.restart, + { description = "Reload awesome", group = "Awesome" } + ), + awful.key( + { modkey }, + "#46", + function() + awful.tag.incmwfact(0.05) + end, + { description = "Increase client width", group = "Layout" } + ), + awful.key( + { modkey }, + "#43", + function() + awful.tag.incmwfact(-0.05) + end, + { description = "Decrease client width", group = "Layout" } + ), + awful.key( + { modkey, "Control" }, + "#43", + function() + awful.tag.incncol(1, nil, true) + end, + { description = "Increase the number of columns", group = "Layout" } + ), + awful.key( + { modkey, "Control" }, + "#46", + function() + awful.tag.incncol(-1, nil, true) + end, + { description = "Decrease the number of columns", group = "Layout" } + ), + awful.key( + { modkey, "Shift" }, + "#65", + function() + awful.layout.inc(-1) + end, + { description = "Select previous layout", group = "Layout" } + ), + awful.key( + { modkey, "Shift" }, + "#36", + function() + awful.layout.inc(1) + end, + { description = "Select next layout", group = "Layout" } + ), + awful.key( + { modkey }, + "#40", + function() + awful.spawn("rofi -show drun -theme ~/.config/rofi/rofi.rasi") + end, + { descripton = "Application launcher", group = "Application" } + ), + awful.key( + { modkey }, + "#23", + function() + awful.spawn("rofi -show window -theme ~/.config/rofi/window.rasi") + end, + { descripton = "Client switcher (alt+tab)", group = "Application" } + ), + awful.key( + { "Mod1" }, + "#23", + function() + awful.spawn("rofi -show window -theme ~/.config/rofi/window.rasi") + end, + { descripton = "Client switcher (alt+tab)", group = "Application" } + ), + awful.key( + { modkey }, + "#26", + function() + awful.spawn(user_vars.file_manager) + end, + { descripton = "Open file manager", group = "System" } + ), + awful.key( + { modkey, "Shift" }, + "#26", + function() + awesome.emit_signal("module::powermenu:show") + end, + { descripton = "Session options", group = "System" } + ), + awful.key( + {}, + "#107", + function() + awful.spawn(user_vars.screenshot_program) + end, + { description = "Screenshot", group = "Applications" } + ), + awful.key( + {}, + "XF86AudioLowerVolume", + function(c) + awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ -2%") + awesome.emit_signal("widget::volume") + awesome.emit_signal("module::volume_osd:show", true) + awesome.emit_signal("module::slider:update") + awesome.emit_signal("widget::volume_osd:rerun") + end, + { description = "Lower volume", group = "System" } + ), + awful.key( + {}, + "XF86AudioRaiseVolume", + function(c) + awful.spawn.easy_async_with_shell( + [[ pacmd list-sinks | grep "volume: front" | awk '{print $5}' ]], + function(stdout) + stdout = stdout:gsub("%%", "") + local volume = tonumber(stdout) or 0 + if volume <= 98 then + awful.spawn("pactl set-sink-volume @DEFAULT_SINK@ +2%") + end + end) + awesome.emit_signal("widget::volume") + awesome.emit_signal("module::volume_osd:show", true) + awesome.emit_signal("module::slider:update") + awesome.emit_signal("widget::volume_osd:rerun") + end, + { description = "Increase volume", group = "System" } + ), + awful.key( + {}, + "XF86AudioMute", + function(c) + awful.spawn("pactl set-sink-mute @DEFAULT_SINK@ toggle") + awesome.emit_signal("widget::volume") + awesome.emit_signal("module::volume_osd:show", true) + awesome.emit_signal("module::slider:update") + awesome.emit_signal("widget::volume_osd:rerun") + end, + { description = "Mute volume", group = "System" } + ), + awful.key( + {}, + "XF86MonBrightnessUp", + function(c) + awful.spawn("xbacklight -time 100 -inc 10%+") + awesome.emit_signal("module::brightness_osd:show", true) + awesome.emit_signal("module::brightness_slider:update") + awesome.emit_signal("widget::brightness_osd:rerun") + end, + { description = "Raise backlight brightness", group = "System" } + ), + awful.key( + {}, + "XF86MonBrightnessDown", + function(c) + awful.spawn("xbacklight -time 100 -dec 10%-") + awesome.emit_signal("widget::brightness_osd:rerun") + awesome.emit_signal("module::brightness_osd:show", true) + awesome.emit_signal("module::brightness_slider:update") + end, + { description = "Lower backlight brightness", group = "System" } + ), + awful.key( + {}, + "XF86AudioPlay", + function(c) + awful.spawn("playerctl play-pause") + end, + { description = "Play / Pause audio", group = "System" } + ), + awful.key( + {}, + "XF86AudioNext", + function(c) + awful.spawn("playerctl next") + end, + { description = "Play / Pause audio", group = "System" } + ), + awful.key( + {}, + "XF86AudioPrev", + function(c) + awful.spawn("playerctl previous") + end, + { description = "Play / Pause audio", group = "System" } + ), + awful.key( + { modkey }, + "#65", + function() + awesome.emit_signal("kblayout::toggle") + end, + { description = "Toggle keyboard layout", group = "System" } + ) +) diff --git a/awesome/rc.lua b/awesome/rc.lua index 405fee7..c37265c 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -7,51 +7,13 @@ -- ╚═╝ ╚═╝ ╚══╝╚══╝ ╚══════╝╚══════╝ ╚═════╝ ╚═╝ ╚═╝╚══════╝ ╚══╝╚══╝ ╚═╝ ╚═╝ -- ----------------------------------------------------------------------------------------- -local awful = require("awful") -local beautiful = require("beautiful") -local gears = require("gears") - -user_vars = {} -user_vars.vars = require("main.user_variables") - -require("main.error_handling") - -beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua") -require("main.theme") - -local main = { - layouts = require("main.layouts"), - tags = require("main.tags"), - menu = require("main.menu"), - rules = require("main.rules") -} - -local bindings = { - global_buttons = require("bindings.global_buttons"), - client_buttons = require("bindings.client_buttons"), - global_keys = require("bindings.global_keys"), - bind_to_tags = require("bindings.bind_to_tags"), - client_keys = require("bindings.client_keys") -} - -user_vars.Layouts = main.layouts() -awful.layout.layouts = main.layouts() -user_vars.tags = main.tags() -user_vars.main_menu = awful.menu({ - items = main.menu() -}) - -root.buttons(bindings.global_buttons()) -root.keys(bindings.bind_to_tags(bindings.global_keys())) - +-- Initialising, order is important! +require("src.theme.user_variables") +require("src.theme.init") +require("src.core.error_handling") +require("src.core.rules") +require("src.core.signals") +require("mappings.global_buttons") +require("mappings.bind_to_tags") require("crylia_bar.init") - -awful.rules.rules = main.rules( - bindings.client_keys(), - bindings.client_buttons() -) - -require("main.signals") - -require("theme.crylia.tools.auto_starter") ---Autostarter(user_vars.vars.autostart) +require("src.tools.auto_starter")(user_vars.autostart) diff --git a/awesome/theme/crylia/assets/fuji.jpg b/awesome/src/assets/fuji.jpg similarity index 100% rename from awesome/theme/crylia/assets/fuji.jpg rename to awesome/src/assets/fuji.jpg diff --git a/awesome/theme/crylia/assets/icons/ArchLogo.png b/awesome/src/assets/icons/ArchLogo.png similarity index 100% rename from awesome/theme/crylia/assets/icons/ArchLogo.png rename to awesome/src/assets/icons/ArchLogo.png diff --git a/awesome/theme/crylia/assets/icons/audio/volume-high.svg b/awesome/src/assets/icons/audio/volume-high.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/audio/volume-high.svg rename to awesome/src/assets/icons/audio/volume-high.svg diff --git a/awesome/theme/crylia/assets/icons/audio/volume-low.svg b/awesome/src/assets/icons/audio/volume-low.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/audio/volume-low.svg rename to awesome/src/assets/icons/audio/volume-low.svg diff --git a/awesome/theme/crylia/assets/icons/audio/volume-medium.svg b/awesome/src/assets/icons/audio/volume-medium.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/audio/volume-medium.svg rename to awesome/src/assets/icons/audio/volume-medium.svg diff --git a/awesome/theme/crylia/assets/icons/audio/volume-mute.svg b/awesome/src/assets/icons/audio/volume-mute.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/audio/volume-mute.svg rename to awesome/src/assets/icons/audio/volume-mute.svg diff --git a/awesome/theme/crylia/assets/icons/audio/volume-off.svg b/awesome/src/assets/icons/audio/volume-off.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/audio/volume-off.svg rename to awesome/src/assets/icons/audio/volume-off.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-alert.svg b/awesome/src/assets/icons/battery/battery-alert.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-alert.svg rename to awesome/src/assets/icons/battery/battery-alert.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-10.svg b/awesome/src/assets/icons/battery/battery-charging-10.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-10.svg rename to awesome/src/assets/icons/battery/battery-charging-10.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-100.svg b/awesome/src/assets/icons/battery/battery-charging-100.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-100.svg rename to awesome/src/assets/icons/battery/battery-charging-100.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-20.svg b/awesome/src/assets/icons/battery/battery-charging-20.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-20.svg rename to awesome/src/assets/icons/battery/battery-charging-20.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-30.svg b/awesome/src/assets/icons/battery/battery-charging-30.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-30.svg rename to awesome/src/assets/icons/battery/battery-charging-30.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-40.svg b/awesome/src/assets/icons/battery/battery-charging-40.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-40.svg rename to awesome/src/assets/icons/battery/battery-charging-40.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-50.svg b/awesome/src/assets/icons/battery/battery-charging-50.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-50.svg rename to awesome/src/assets/icons/battery/battery-charging-50.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-60.svg b/awesome/src/assets/icons/battery/battery-charging-60.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-60.svg rename to awesome/src/assets/icons/battery/battery-charging-60.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-70.svg b/awesome/src/assets/icons/battery/battery-charging-70.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-70.svg rename to awesome/src/assets/icons/battery/battery-charging-70.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-80.svg b/awesome/src/assets/icons/battery/battery-charging-80.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-80.svg rename to awesome/src/assets/icons/battery/battery-charging-80.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-90.svg b/awesome/src/assets/icons/battery/battery-charging-90.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-90.svg rename to awesome/src/assets/icons/battery/battery-charging-90.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging-outline.svg b/awesome/src/assets/icons/battery/battery-charging-outline.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging-outline.svg rename to awesome/src/assets/icons/battery/battery-charging-outline.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-charging.svg b/awesome/src/assets/icons/battery/battery-charging.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-charging.svg rename to awesome/src/assets/icons/battery/battery-charging.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-discharging-10.svg b/awesome/src/assets/icons/battery/battery-discharging-10.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-discharging-10.svg rename to awesome/src/assets/icons/battery/battery-discharging-10.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-discharging-20.svg b/awesome/src/assets/icons/battery/battery-discharging-20.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-discharging-20.svg rename to awesome/src/assets/icons/battery/battery-discharging-20.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-discharging-30.svg b/awesome/src/assets/icons/battery/battery-discharging-30.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-discharging-30.svg rename to awesome/src/assets/icons/battery/battery-discharging-30.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-discharging-40.svg b/awesome/src/assets/icons/battery/battery-discharging-40.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-discharging-40.svg rename to awesome/src/assets/icons/battery/battery-discharging-40.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-discharging-50.svg b/awesome/src/assets/icons/battery/battery-discharging-50.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-discharging-50.svg rename to awesome/src/assets/icons/battery/battery-discharging-50.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-discharging-60.svg b/awesome/src/assets/icons/battery/battery-discharging-60.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-discharging-60.svg rename to awesome/src/assets/icons/battery/battery-discharging-60.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-discharging-70.svg b/awesome/src/assets/icons/battery/battery-discharging-70.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-discharging-70.svg rename to awesome/src/assets/icons/battery/battery-discharging-70.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-discharging-80.svg b/awesome/src/assets/icons/battery/battery-discharging-80.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-discharging-80.svg rename to awesome/src/assets/icons/battery/battery-discharging-80.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-discharging-90.svg b/awesome/src/assets/icons/battery/battery-discharging-90.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-discharging-90.svg rename to awesome/src/assets/icons/battery/battery-discharging-90.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-off.svg b/awesome/src/assets/icons/battery/battery-off.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-off.svg rename to awesome/src/assets/icons/battery/battery-off.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-outline.svg b/awesome/src/assets/icons/battery/battery-outline.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-outline.svg rename to awesome/src/assets/icons/battery/battery-outline.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery-unknown.svg b/awesome/src/assets/icons/battery/battery-unknown.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery-unknown.svg rename to awesome/src/assets/icons/battery/battery-unknown.svg diff --git a/awesome/theme/crylia/assets/icons/battery/battery.svg b/awesome/src/assets/icons/battery/battery.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/battery/battery.svg rename to awesome/src/assets/icons/battery/battery.svg diff --git a/awesome/theme/crylia/assets/icons/bluetooth/bluetooth-off.svg b/awesome/src/assets/icons/bluetooth/bluetooth-off.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/bluetooth/bluetooth-off.svg rename to awesome/src/assets/icons/bluetooth/bluetooth-off.svg diff --git a/awesome/theme/crylia/assets/icons/bluetooth/bluetooth-on.svg b/awesome/src/assets/icons/bluetooth/bluetooth-on.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/bluetooth/bluetooth-on.svg rename to awesome/src/assets/icons/bluetooth/bluetooth-on.svg diff --git a/awesome/theme/crylia/assets/icons/brightness/brightness-high.svg b/awesome/src/assets/icons/brightness/brightness-high.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/brightness/brightness-high.svg rename to awesome/src/assets/icons/brightness/brightness-high.svg diff --git a/awesome/theme/crylia/assets/icons/brightness/brightness-low.svg b/awesome/src/assets/icons/brightness/brightness-low.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/brightness/brightness-low.svg rename to awesome/src/assets/icons/brightness/brightness-low.svg diff --git a/awesome/theme/crylia/assets/icons/brightness/brightness-medium.svg b/awesome/src/assets/icons/brightness/brightness-medium.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/brightness/brightness-medium.svg rename to awesome/src/assets/icons/brightness/brightness-medium.svg diff --git a/awesome/theme/crylia/assets/icons/clock/clock.svg b/awesome/src/assets/icons/clock/clock.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/clock/clock.svg rename to awesome/src/assets/icons/clock/clock.svg diff --git a/awesome/theme/crylia/assets/icons/date/calendar.svg b/awesome/src/assets/icons/date/calendar.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/date/calendar.svg rename to awesome/src/assets/icons/date/calendar.svg diff --git a/awesome/theme/crylia/assets/icons/kblayout/keyboard.svg b/awesome/src/assets/icons/kblayout/keyboard.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/kblayout/keyboard.svg rename to awesome/src/assets/icons/kblayout/keyboard.svg diff --git a/awesome/theme/crylia/assets/icons/network/ethernet.svg b/awesome/src/assets/icons/network/ethernet.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/network/ethernet.svg rename to awesome/src/assets/icons/network/ethernet.svg diff --git a/awesome/theme/crylia/assets/icons/network/no-internet.svg b/awesome/src/assets/icons/network/no-internet.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/network/no-internet.svg rename to awesome/src/assets/icons/network/no-internet.svg diff --git a/awesome/theme/crylia/assets/icons/network/wifi-strength-1.svg b/awesome/src/assets/icons/network/wifi-strength-1.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/network/wifi-strength-1.svg rename to awesome/src/assets/icons/network/wifi-strength-1.svg diff --git a/awesome/theme/crylia/assets/icons/network/wifi-strength-2.svg b/awesome/src/assets/icons/network/wifi-strength-2.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/network/wifi-strength-2.svg rename to awesome/src/assets/icons/network/wifi-strength-2.svg diff --git a/awesome/theme/crylia/assets/icons/network/wifi-strength-3.svg b/awesome/src/assets/icons/network/wifi-strength-3.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/network/wifi-strength-3.svg rename to awesome/src/assets/icons/network/wifi-strength-3.svg diff --git a/awesome/theme/crylia/assets/icons/network/wifi-strength-4.svg b/awesome/src/assets/icons/network/wifi-strength-4.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/network/wifi-strength-4.svg rename to awesome/src/assets/icons/network/wifi-strength-4.svg diff --git a/awesome/theme/crylia/assets/icons/network/wifi-strength-off-outline.svg b/awesome/src/assets/icons/network/wifi-strength-off-outline.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/network/wifi-strength-off-outline.svg rename to awesome/src/assets/icons/network/wifi-strength-off-outline.svg diff --git a/awesome/theme/crylia/assets/icons/network/wifi-strength-outline.svg b/awesome/src/assets/icons/network/wifi-strength-outline.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/network/wifi-strength-outline.svg rename to awesome/src/assets/icons/network/wifi-strength-outline.svg diff --git a/awesome/theme/crylia/assets/icons/power/power.svg b/awesome/src/assets/icons/power/power.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/power/power.svg rename to awesome/src/assets/icons/power/power.svg diff --git a/awesome/theme/crylia/assets/icons/powermenu/defaultpfp.svg b/awesome/src/assets/icons/powermenu/defaultpfp.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/powermenu/defaultpfp.svg rename to awesome/src/assets/icons/powermenu/defaultpfp.svg diff --git a/awesome/theme/crylia/assets/icons/powermenu/lock.svg b/awesome/src/assets/icons/powermenu/lock.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/powermenu/lock.svg rename to awesome/src/assets/icons/powermenu/lock.svg diff --git a/awesome/theme/crylia/assets/icons/powermenu/logout.svg b/awesome/src/assets/icons/powermenu/logout.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/powermenu/logout.svg rename to awesome/src/assets/icons/powermenu/logout.svg diff --git a/awesome/theme/crylia/assets/icons/powermenu/reboot.svg b/awesome/src/assets/icons/powermenu/reboot.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/powermenu/reboot.svg rename to awesome/src/assets/icons/powermenu/reboot.svg diff --git a/awesome/theme/crylia/assets/icons/powermenu/shutdown.svg b/awesome/src/assets/icons/powermenu/shutdown.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/powermenu/shutdown.svg rename to awesome/src/assets/icons/powermenu/shutdown.svg diff --git a/awesome/theme/crylia/assets/icons/powermenu/suspend.svg b/awesome/src/assets/icons/powermenu/suspend.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/powermenu/suspend.svg rename to awesome/src/assets/icons/powermenu/suspend.svg diff --git a/awesome/theme/crylia/assets/icons/titlebar/close.svg b/awesome/src/assets/icons/titlebar/close.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/titlebar/close.svg rename to awesome/src/assets/icons/titlebar/close.svg diff --git a/awesome/theme/crylia/assets/icons/titlebar/maximize.svg b/awesome/src/assets/icons/titlebar/maximize.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/titlebar/maximize.svg rename to awesome/src/assets/icons/titlebar/maximize.svg diff --git a/awesome/theme/crylia/assets/icons/titlebar/minimize.svg b/awesome/src/assets/icons/titlebar/minimize.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/titlebar/minimize.svg rename to awesome/src/assets/icons/titlebar/minimize.svg diff --git a/awesome/theme/crylia/assets/icons/titlebar/stick.svg b/awesome/src/assets/icons/titlebar/stick.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/titlebar/stick.svg rename to awesome/src/assets/icons/titlebar/stick.svg diff --git a/awesome/theme/crylia/assets/icons/titlebar/unmaximize.svg b/awesome/src/assets/icons/titlebar/unmaximize.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/titlebar/unmaximize.svg rename to awesome/src/assets/icons/titlebar/unmaximize.svg diff --git a/awesome/theme/crylia/assets/icons/titlebar/unstick.svg b/awesome/src/assets/icons/titlebar/unstick.svg similarity index 100% rename from awesome/theme/crylia/assets/icons/titlebar/unstick.svg rename to awesome/src/assets/icons/titlebar/unstick.svg diff --git a/awesome/theme/crylia/assets/layout/dwindle.svg b/awesome/src/assets/layout/dwindle.svg similarity index 100% rename from awesome/theme/crylia/assets/layout/dwindle.svg rename to awesome/src/assets/layout/dwindle.svg diff --git a/awesome/theme/crylia/assets/layout/floating.svg b/awesome/src/assets/layout/floating.svg similarity index 100% rename from awesome/theme/crylia/assets/layout/floating.svg rename to awesome/src/assets/layout/floating.svg diff --git a/awesome/theme/crylia/assets/layout/fullscreen.svg b/awesome/src/assets/layout/fullscreen.svg similarity index 100% rename from awesome/theme/crylia/assets/layout/fullscreen.svg rename to awesome/src/assets/layout/fullscreen.svg diff --git a/awesome/theme/crylia/assets/layout/max.svg b/awesome/src/assets/layout/max.svg similarity index 100% rename from awesome/theme/crylia/assets/layout/max.svg rename to awesome/src/assets/layout/max.svg diff --git a/awesome/theme/crylia/assets/layout/tile.svg b/awesome/src/assets/layout/tile.svg similarity index 100% rename from awesome/theme/crylia/assets/layout/tile.svg rename to awesome/src/assets/layout/tile.svg diff --git a/awesome/theme/crylia/assets/space.jpg b/awesome/src/assets/space.jpg similarity index 100% rename from awesome/theme/crylia/assets/space.jpg rename to awesome/src/assets/space.jpg diff --git a/awesome/theme/crylia/assets/userpfp/crylia.png b/awesome/src/assets/userpfp/crylia.png similarity index 100% rename from awesome/theme/crylia/assets/userpfp/crylia.png rename to awesome/src/assets/userpfp/crylia.png diff --git a/awesome/theme/crylia/assets/userpfp/rickastley.jpg b/awesome/src/assets/userpfp/rickastley.jpg similarity index 100% rename from awesome/theme/crylia/assets/userpfp/rickastley.jpg rename to awesome/src/assets/userpfp/rickastley.jpg diff --git a/awesome/theme/crylia/assets/wallpaper.png b/awesome/src/assets/wallpaper.png similarity index 100% rename from awesome/theme/crylia/assets/wallpaper.png rename to awesome/src/assets/wallpaper.png diff --git a/awesome/main/error_handling.lua b/awesome/src/core/error_handling.lua similarity index 100% rename from awesome/main/error_handling.lua rename to awesome/src/core/error_handling.lua diff --git a/awesome/src/core/rules.lua b/awesome/src/core/rules.lua new file mode 100644 index 0000000..e8946c8 --- /dev/null +++ b/awesome/src/core/rules.lua @@ -0,0 +1,50 @@ +------------------------------------------------------------------------------------------------- +-- This class contains rules for float exceptions or special themeing for certain applications -- +------------------------------------------------------------------------------------------------- + +-- Awesome Libs +local awful = require("awful") +local beautiful = require("beautiful") + +awful.rules.rules = { + { + rule = {}, + properties = { + border_width = beautiful.border_width, + border_color = beautiful.border_normal, + focus = awful.client.focus.filter, + raise = true, + keys = require("../../mappings/client_keys"), + buttons = require("../../mappings/client_buttons"), + screen = awful.screen.preferred, + placement = awful.placement.no_overlap + awful.placement.no_offscreen + } + }, + { + rule_any = { + instance = {}, + class = { + "Arandr", + "Lxappearance", + "kdeconnect.app", + "zoom", + "file-roller", + "File-roller" + }, + name = {}, + role = { + "AlarmWindow", + "ConfigManager", + "pop-up" + } + }, + properties = { floating = true, titlebars_enabled = true } + }, + { + id = "titlebar", + rule_any = { + type = { "normal", "dialog", "modal", "utility" } + }, + properties = { titlebars_enabled = true } + } +} diff --git a/awesome/main/signals.lua b/awesome/src/core/signals.lua similarity index 100% rename from awesome/main/signals.lua rename to awesome/src/core/signals.lua diff --git a/awesome/theme/crylia/modules/brightness_osd.lua b/awesome/src/modules/brightness_osd.lua similarity index 94% rename from awesome/theme/crylia/modules/brightness_osd.lua rename to awesome/src/modules/brightness_osd.lua index 0abbd4e..3b09b2f 100644 --- a/awesome/theme/crylia/modules/brightness_osd.lua +++ b/awesome/src/modules/brightness_osd.lua @@ -4,13 +4,13 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/brightness/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/brightness/" -- TODO: fix backlight keys and osd not working correctly return function(s) @@ -64,12 +64,12 @@ return function(s) id = "brightness_slider", bar_shape = gears.shape.rounded_rect, bar_height = dpi(10), - bar_color = color.color["Grey800"] .. "88", + bar_color = color["Grey800"] .. "88", bar_active_color = "#ffffff", handle_color = "#ffffff", handle_shape = gears.shape.circle, handle_width = dpi(10), - handle_border_color = color.color["White"], + handle_border_color = color["White"], maximum = 100, widget = wibox.widget.slider }, @@ -89,7 +89,7 @@ return function(s) right = dpi(24), widget = wibox.container.margin }, - bg = color.color["Grey900"] .. "88", + bg = color["Grey900"] .. "88", widget = wibox.container.background, ontop = true, visible = true, @@ -103,7 +103,7 @@ return function(s) "property::value", function() local brightness_value = brightness_osd_widget.container.osd_layout.icon_slider_layout.slider_layout.brightness_slider:get_value() - -- Performance is horrible, or it overrides and executes at the same time as the keybindings + -- Performance is horrible, or it overrides and executes at the same time as the keymappings --awful.spawn("xbacklight -set " .. brightness_value, false) brightness_osd_widget.container.osd_layout.icon_slider_layout.label_value_layout.value:set_text(brightness_value .. "%") @@ -160,7 +160,7 @@ return function(s) local brightness_container = awful.popup { widget = wibox.container.background, ontop = true, - bg = color.color["Grey900"] .. "00", + bg = color["Grey900"] .. "00", stretch = false, visible = false, screen = s, diff --git a/awesome/theme/crylia/modules/calendar_osd.lua b/awesome/src/modules/calendar_osd.lua similarity index 89% rename from awesome/theme/crylia/modules/calendar_osd.lua rename to awesome/src/modules/calendar_osd.lua index 66f8fba..30dae45 100644 --- a/awesome/theme/crylia/modules/calendar_osd.lua +++ b/awesome/src/modules/calendar_osd.lua @@ -8,36 +8,36 @@ local awful = require("awful") local wibox = require("wibox") local gears = require("gears") local dpi = require("beautiful").xresources.apply_dpi -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") return function(s) local styles = {} styles.month = { padding = 15, - bg_color = color.color["Grey900"], + bg_color = color["Grey900"], border_width = 1, shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end } styles.normal = { - fg_color = color.color["Grey900"], - font = user_vars.vars.font.extrabold, + fg_color = color["Grey900"], + font = user_vars.font.extrabold, shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end } styles.focus = { - fg_color = color.color["Grey900"], - bg_color = color.color["Purple200"], + fg_color = color["Grey900"], + bg_color = color["Purple200"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end } styles.header = { - fg_color = color.color["Grey900"], - bg_color = color.color["Teal200"], + fg_color = color["Grey900"], + bg_color = color["Teal200"], markup = function(t) return '' .. t .. '' end, shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) @@ -45,8 +45,8 @@ return function(s) } styles.weekday = { padding = 8, - fg_color = color.color["Grey900"], - bg_color = color.color["Teal200"], + fg_color = color["Grey900"], + bg_color = color["Teal200"], markup = function(t) return '' .. t .. '' end, shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) @@ -63,7 +63,7 @@ return function(s) -- Change bg color for weekends local d = { year = date.year, month = (date.month or 1), day = (date.day or 1) } local weekday = tonumber(os.date('%w', os.time(d))) - local default_bg = (weekday == 0 or weekday == 6) and color.color["Red200"] or color.color["White"] + local default_bg = (weekday == 0 or weekday == 6) and color["Red200"] or color["White"] local ret = wibox.widget { { widget, @@ -87,7 +87,7 @@ return function(s) date = os.date('*t'), fn_embed = decorate_cell, widget = wibox.widget.calendar.month, - font = user_vars.vars.font.extrabold, + font = user_vars.font.extrabold, spacing = dpi(10) } @@ -124,7 +124,7 @@ return function(s) screen = s, widget = wibox.container.background, ontop = true, - bg = color.color["Grey900"], + bg = color["Grey900"], stretch = false, visible = false, placement = function(c) awful.placement.top_right(c, { margins = { right = dpi(100), top = dpi(60) } }) end, diff --git a/awesome/theme/crylia/modules/powermenu.lua b/awesome/src/modules/powermenu.lua similarity index 88% rename from awesome/theme/crylia/modules/powermenu.lua rename to awesome/src/modules/powermenu.lua index 59eb2d4..f22c844 100644 --- a/awesome/theme/crylia/modules/powermenu.lua +++ b/awesome/src/modules/powermenu.lua @@ -4,14 +4,14 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/powermenu/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/powermenu/" return function(s) @@ -42,7 +42,7 @@ return function(s) awful.spawn.easy_async_with_shell( [=[ iconPath="/var/lib/AccountsService/icons/${USER}" - userIconPath="${HOME}/.config/awesome/theme/crylia/assets/userpfp/" + userIconPath="${HOME}/.config/awesome/src/assets/userpfp/" if [[ -f "${userIconPath}" ]]; then if [[ -f "${iconPath}" ]]; @@ -77,7 +77,7 @@ return function(s) update_profile_picture() -- Will determin the display style - local namestyle = user_vars.vars.namestyle + local namestyle = user_vars.namestyle -- Get the full username(if set) and the username + hostname local update_user_name = function() awful.spawn.easy_async_with_shell( @@ -97,7 +97,7 @@ return function(s) ]=], function(stdout) if stdout:gsub("\n", "") == "Rick Astley" then - profile_picture:set_image(awful.util.getdir("config") .. "theme/crylia/assets/userpfp/" .. "rickastley.jpg") + profile_picture:set_image(awful.util.getdir("config") .. "src/assets/userpfp/" .. "rickastley.jpg") end profile_name:set_text(stdout) end @@ -116,7 +116,7 @@ return function(s) -- TODO: using gears.color to recolor a SVG will make it look super low res -- currently I recolor it in the .svg file directly, but later implement -- a better way to recolor a SVG - -- image = gears.color.recolor_image(icon, color.color["Grey900"]), + -- image = gears.color.recolor_image(icon, color["Grey900"]), image = icon, resize = true, forced_height = dpi(30), @@ -139,7 +139,7 @@ return function(s) margins = dpi(10), widget = wibox.container.margin }, - fg = color.color["Grey900"], + fg = color["Grey900"], bg = bg_color, shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 10) @@ -163,7 +163,7 @@ return function(s) -- Create the power menu actions local suspend_command = function() - awful.spawn.easy_async_with_shell("dm-tool lock & systemctl suspend") + awful.spawn("dm-tool lock & systemctl suspend") awesome.emit_signal("module::powermenu:hide") end @@ -172,33 +172,33 @@ return function(s) end local lock_command = function() - awful.spawn.easy_async_with_shell("dm-tool lock") + awful.spawn("dm-tool lock") awesome.emit_signal("module::powermenu:hide") end local shutdown_command = function() - awful.spawn.easy_async_with_shell("shutdown now") + awful.spawn("shutdown now") awesome.emit_signal("module::powermenu:hide") end local reboot_command = function() - awful.spawn.easy_async_with_shell("reboot") + awful.spawn("reboot") awesome.emit_signal("module::powermenu:hide") end -- Create the buttons with their command and name etc - local shutdown_button = button("Shutdown", icondir .. "shutdown.svg", color.color["Blue200"], shutdown_command) - local reboot_button = button("Reboot", icondir .. "reboot.svg", color.color["Red200"], reboot_command) - local suspend_button = button("Suspend", icondir .. "suspend.svg", color.color["Yellow200"], suspend_command) - local logout_button = button("Logout", icondir .. "logout.svg", color.color["Green200"], logout_command) - local lock_button = button("Lock", icondir .. "lock.svg", color.color["Orange200"], lock_command) + local shutdown_button = button("Shutdown", icondir .. "shutdown.svg", color["Blue200"], shutdown_command) + local reboot_button = button("Reboot", icondir .. "reboot.svg", color["Red200"], reboot_command) + local suspend_button = button("Suspend", icondir .. "suspend.svg", color["Yellow200"], suspend_command) + local logout_button = button("Logout", icondir .. "logout.svg", color["Green200"], logout_command) + local lock_button = button("Lock", icondir .. "lock.svg", color["Orange200"], lock_command) -- Signals to change color on hover - Hover_signal(shutdown_button.background, color.color["Blue200"]) - Hover_signal(reboot_button.background, color.color["Red200"]) - Hover_signal(suspend_button.background, color.color["Yellow200"]) - Hover_signal(logout_button.background, color.color["Green200"]) - Hover_signal(lock_button.background, color.color["Orange200"]) + Hover_signal(shutdown_button.background, color["Blue200"]) + Hover_signal(reboot_button.background, color["Red200"]) + Hover_signal(suspend_button.background, color["Yellow200"]) + Hover_signal(logout_button.background, color["Green200"]) + Hover_signal(lock_button.background, color["Orange200"]) -- The powermenu widget local powermenu = wibox.widget { diff --git a/awesome/theme/crylia/modules/titlebar.lua b/awesome/src/modules/titlebar.lua similarity index 95% rename from awesome/theme/crylia/modules/titlebar.lua rename to awesome/src/modules/titlebar.lua index 6ef6580..3b39937 100644 --- a/awesome/theme/crylia/modules/titlebar.lua +++ b/awesome/src/modules/titlebar.lua @@ -4,14 +4,14 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/titlebar/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/titlebar/" awful.titlebar.enable_tooltip = true awful.titlebar.fallback_name = 'Client' @@ -86,7 +86,7 @@ local create_titlebar = function(c, bg, size) { awful.titlebar.widget.closebutton(c), widget = wibox.container.background, - bg = color.color["Red200"], + bg = color["Red200"], shape = function(cr, height, width) gears.shape.rounded_rect(cr, width, height, 4) end, @@ -95,7 +95,7 @@ local create_titlebar = function(c, bg, size) { awful.titlebar.widget.maximizedbutton(c), widget = wibox.container.background, - bg = color.color["Yellow200"], + bg = color["Yellow200"], shape = function(cr, height, width) gears.shape.rounded_rect(cr, width, height, 4) end, @@ -104,7 +104,7 @@ local create_titlebar = function(c, bg, size) { awful.titlebar.widget.minimizebutton(c), widget = wibox.container.background, - bg = color.color["Green200"], + bg = color["Green200"], shape = function(cr, height, width) gears.shape.rounded_rect(cr, width, height, 4) end, @@ -132,9 +132,9 @@ local create_titlebar = function(c, bg, size) layout = wibox.layout.align.vertical, id = "main" } - Hover_signal(titlebar.main.margin.spacing.closebutton, color.color["Red200"]) - Hover_signal(titlebar.main.margin.spacing.maximizebutton, color.color["Yellow200"]) - Hover_signal(titlebar.main.margin.spacing.minimizebutton, color.color["Green200"]) + Hover_signal(titlebar.main.margin.spacing.closebutton, color["Red200"]) + Hover_signal(titlebar.main.margin.spacing.maximizebutton, color["Yellow200"]) + Hover_signal(titlebar.main.margin.spacing.minimizebutton, color["Green200"]) end local create_titlebar_dialog = function(c, bg, size) @@ -150,7 +150,7 @@ local create_titlebar_dialog = function(c, bg, size) { awful.titlebar.widget.closebutton(c), widget = wibox.container.background, - bg = color.color["Red200"], + bg = color["Red200"], shape = function(cr, height, width) gears.shape.rounded_rect(cr, width, height, 4) end, @@ -159,7 +159,7 @@ local create_titlebar_dialog = function(c, bg, size) { awful.titlebar.widget.minimizebutton(c), widget = wibox.container.background, - bg = color.color["Green200"], + bg = color["Green200"], shape = function(cr, height, width) gears.shape.rounded_rect(cr, width, height, 4) end, @@ -187,8 +187,8 @@ local create_titlebar_dialog = function(c, bg, size) layout = wibox.layout.align.vertical, id = "main" } - Hover_signal(titlebar.main.margin.spacing.closebutton, color.color["Red200"]) - Hover_signal(titlebar.main.margin.spacing.minimizebutton, color.color["Green200"]) + Hover_signal(titlebar.main.margin.spacing.closebutton, color["Red200"]) + Hover_signal(titlebar.main.margin.spacing.minimizebutton, color["Green200"]) end local create_titlebar_borderhack = function(c, bg, position) diff --git a/awesome/theme/crylia/modules/volume_osd.lua b/awesome/src/modules/volume_osd.lua similarity index 95% rename from awesome/theme/crylia/modules/volume_osd.lua rename to awesome/src/modules/volume_osd.lua index 6935fd6..02a7cfd 100644 --- a/awesome/theme/crylia/modules/volume_osd.lua +++ b/awesome/src/modules/volume_osd.lua @@ -4,13 +4,13 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/audio/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/audio/" -- Returns the volume_osd return function(s) @@ -64,12 +64,12 @@ return function(s) id = "volume_slider", bar_shape = gears.shape.rounded_rect, bar_height = dpi(10), - bar_color = color.color["Grey800"] .. "88", + bar_color = color["Grey800"] .. "88", bar_active_color = "#ffffff", handle_color = "#ffffff", handle_shape = gears.shape.circle, handle_width = dpi(10), - handle_border_color = color.color["White"], + handle_border_color = color["White"], maximum = 100, widget = wibox.widget.slider }, @@ -89,7 +89,7 @@ return function(s) right = dpi(24), widget = wibox.container.margin }, - bg = color.color["Grey900"] .. '88', + bg = color["Grey900"] .. '88', widget = wibox.container.background, ontop = true, visible = true, @@ -181,7 +181,7 @@ echo $(pacmd list-sinks | awk '/^\s+name: /{indefault = $2 == "<'$SINK'>"} /^\s+ local volume_container = awful.popup { widget = wibox.container.background, ontop = true, - bg = color.color["Grey900"] .. "00", + bg = color["Grey900"] .. "00", stretch = false, visible = false, screen = s, diff --git a/awesome/theme/crylia/scripts/bt.sh b/awesome/src/scripts/bt.sh similarity index 100% rename from awesome/theme/crylia/scripts/bt.sh rename to awesome/src/scripts/bt.sh diff --git a/awesome/theme/crylia/colors.lua b/awesome/src/theme/colors.lua similarity index 99% rename from awesome/theme/crylia/colors.lua rename to awesome/src/theme/colors.lua index 39a1607..b956a83 100644 --- a/awesome/theme/crylia/colors.lua +++ b/awesome/src/theme/colors.lua @@ -1,9 +1,8 @@ ----------------------------------------------------- -- This is a table with almost all Material colors -- ----------------------------------------------------- -local _M = { } -_M.color = { +return { ['White'] = '#ffffffdd', ['Black'] = '#000000', @@ -194,5 +193,3 @@ _M.color = { ['BlueGrey800'] = '#37474F', ['BlueGrey900'] = '#263238' } - -return _M \ No newline at end of file diff --git a/awesome/theme/crylia/theme.lua b/awesome/src/theme/init.lua similarity index 57% rename from awesome/theme/crylia/theme.lua rename to awesome/src/theme/init.lua index 121b4a4..8c1ef8a 100644 --- a/awesome/theme/crylia/theme.lua +++ b/awesome/src/theme/init.lua @@ -7,14 +7,31 @@ -- ╚═════╝╚═╝ ╚═╝ ╚═╝ ╚══════╝╚═╝╚═╝ ╚═╝ -- -------------------------------------------------- local awful = require("awful") +local beautiful = require("beautiful") +local gears = require("gears") -Theme_path = awful.util.getdir("config") .. "/theme/crylia/" +Theme_path = awful.util.getdir("config") .. "/src/theme/" Theme = {} dofile(Theme_path .. "theme_variables.lua") -dofile(Theme_path .. "layouts.lua") -Theme.awesome_icon = Theme_path .. "assets/icons/ArchLogo.png" -Theme.awesome_subicon = Theme_path .. "assets/icons/ArchLogo.png" +Theme.awesome_icon = Theme_path .. "../assets/icons/ArchLogo.png" +Theme.awesome_subicon = Theme_path .. "../assets/icons/ArchLogo.png" -return Theme +-- Wallpaper +beautiful.wallpaper = user_vars.wallpaper +screen.connect_signal( + 'request::wallpaper', + function(s) + -- If wallpaper is a function, call it with the screen + if beautiful.wallpaper then + if type(beautiful.wallpaper) == 'string' then + gears.wallpaper.maximized(beautiful.wallpaper, s) + else + beautiful.wallpaper(s) + end + end + end +) + +beautiful.init(Theme) diff --git a/awesome/src/theme/theme_variables.lua b/awesome/src/theme/theme_variables.lua new file mode 100644 index 0000000..0b2f181 --- /dev/null +++ b/awesome/src/theme/theme_variables.lua @@ -0,0 +1,95 @@ +------------------------------------------------------------------------------------------ +-- This is the main themeing file, here are most colors changed -- +-- If you want to change individual widget colors you will need to edit them seperately -- +------------------------------------------------------------------------------------------ + +-- Awesome Libs +local color = require("src.theme.colors") +local dpi = require("beautiful.xresources").apply_dpi +local gears = require("gears") +local awful = require("awful") + +-- Icon directory path +local icondir = awful.util.getdir("config") .. "src/assets/icons/titlebar/" + +Theme.font = user_vars.font.bold + +Theme.bg_normal = color["Grey900"] +Theme.bg_focus = color["Grey900"] +Theme.bg_urgent = color["RedA200"] +Theme.bg_minimize = color["White"] +Theme.bg_systray = color["White"] + +Theme.fg_normal = color["White"] +Theme.fg_focus = color["White"] +Theme.fg_urgent = color["White"] +Theme.fg_minimize = color["White"] + +Theme.useless_gap = dpi(5) -- Change this to 0 if you dont like window gaps +Theme.border_width = dpi(0) -- Change this to 0 if you dont like borders +Theme.border_normal = color["Grey800"] +--Theme.border_focus = color["Red"] -- Doesnt work, no idea why; workaround is in signals.lua +Theme.border_marked = color["Red400"] + +--Theme.menu_submenu_icon = Theme_path .. "assets.ArchLogo.png" +Theme.menu_height = dpi(40) +Theme.menu_width = dpi(200) +Theme.menu_bg_normal = color["Grey900"] +Theme.menu_bg_focus = color["Grey800"] +Theme.menu_fg_focus = color["White"] +Theme.menu_border_color = color["Grey800"] +Theme.menu_border_width = dpi(0) +Theme.menu_shape = function(cr, width, heigth) + gears.shape.rounded_rect(cr, width, heigth, 5) +end + +Theme.taglist_fg_focus = color["Grey900"] +Theme.taglist_bg_focus = color["White"] + +Theme.tooltip_border_color = color["Grey900"] +Theme.tooltip_bg = color["Grey800"] +Theme.tooltip_fg = color["White"] +Theme.tooltip_border_width = dpi(0) +Theme.tooltip_shape = function(cr, width, heigth) + gears.shape.rounded_rect(cr, width, heigth, 5) +end + +Theme.notification_bg = color["Grey900"] +Theme.notification_fg = color["White"] +Theme.notification_border_width = dpi(0) +Theme.notification_border_color = color["Grey900"] +Theme.notification_shape = function(cr, width, heigth) + gears.shape.rounded_rect(cr, width, heigth, 10) +end +Theme.notification_margin = dpi(10) +Theme.notification_max_width = dpi(400) +Theme.notification_max_height = dpi(1000) +Theme.notification_icon_size = dpi(40) + +Theme.titlebar_close_button_normal = icondir .. "close.svg" +Theme.titlebar_maximized_button_normal = icondir .. "maximize.svg" +Theme.titlebar_minimize_button_normal = icondir .. "minimize.svg" +Theme.titlebar_maximized_button_active = icondir .. "maximize.svg" +Theme.titlebar_maximized_button_inactive = icondir .. "maximize.svg" + +Theme.bg_systray = color["BlueGrey800"] +Theme.systray_icon_spacing = dpi(10) + +Theme.hotkeys_bg = color["Grey900"] +Theme.hotkeys_fg = color["White"] +Theme.hotkeys_border_width = 0 +Theme.hotkeys_shape = function(cr, width, height) + gears.shape.rounded_rect(cr, width, height, 10) +end +Theme.hotkeys_description_font = user_vars.font.bold + +-- Icon directory path +local layout_path = Theme_path .. "../assets/layout/" + +-- Here are the icons for the layouts defined, if you want to add more layouts go to main/layouts.lua +Theme.layout_floating = gears.color.recolor_image(layout_path .. "floating.svg", color["Grey900"]) +Theme.layout_tile = gears.color.recolor_image(layout_path .. "tile.svg", color["Grey900"]) +--Theme.layout_dwindle = gears.color.recolor_image(layout_path .. "dwindle.svg", color["Grey900"]) +--Theme.layout_fairh = gears.color.recolor_image(layout_path .. "fairh.svg", color["Grey900"]) +--Theme.layout_fullscreen = gears.color.recolor_image(layout_path .. "fullscreen.svg", color["Grey900"]) +--Theme.layout_max = gears.color.recolor_image(layout_path .. "max.svg", color["Grey900"]) diff --git a/awesome/main/user_variables.lua b/awesome/src/theme/user_variables.lua similarity index 78% rename from awesome/main/user_variables.lua rename to awesome/src/theme/user_variables.lua index 20d226e..d166642 100644 --- a/awesome/main/user_variables.lua +++ b/awesome/src/theme/user_variables.lua @@ -1,19 +1,22 @@ ------------------------------------------- -- Uservariables are stored in this file -- ------------------------------------------- +local awful = require("awful") local dpi = require("beautiful").xresources.apply_dpi local home = os.getenv("HOME") -local function get_screen() - local screen = {} - for i, s in ipairs(screen) do - screen[i] = { screen.x, screen.y } - end - return screen -end - -- If you want different default programs, wallpaper path or modkey; edit this file. -local _M = { +user_vars = { + + -- Autotiling layouts + layouts = { + awful.layout.suit.tile, + awful.layout.suit.floating, + awful.layout.suit.fair, + }, + + -- Icon theme from /usr/share/icons + icon_theme = "Papirus-Dark", -- Write the terminal command to start anything here autostart = { @@ -45,7 +48,7 @@ local _M = { modkey = "Mod4", -- place your wallpaper at this path with this name, you could also try to change the path - wallpaper = home .. "/.config/awesome/theme/crylia/assets/fuji.jpg", + wallpaper = home .. "/.config/awesome/src/assets/fuji.jpg", -- Naming scheme for the powermenu, userhost = "user@hostname", fullname = "Firstname Surname", something else ... namestyle = "userhost", @@ -53,11 +56,8 @@ local _M = { -- List every Keyboard layout you use here comma seperated. (run localectl list-keymaps to list all averiable keymaps) kblayout = { "de", "ru" }, - -- Set to false if you dont have a controller - bluetooth = true, - -- Your filemanager that opens with super+e - file_manager = "thunar", + file_manager = "nemo", -- Screenshot program to make a screenshot when print is hit screenshot_program = "flameshot gui", @@ -69,19 +69,21 @@ local _M = { -- First entry has to be how you would start the program in the terminal (just try it if you dont know yahoo it) -- Second can be what ever the fuck you want it to be (will be the displayed name if you hover over it) -- For steam games please use this format {"394360", "Name", true} true will tell the func that it's a steam game + -- TODO: Add appimage support + -- Theoretically you can put the appimage path as the first argument and it *should* work dock_programs = { + { "alacritty", "Alacritty" }, { "firefox", "Firefox" }, { "discord", "Discord" }, - { "spotify", "Spotify" }, + { "flatpak run com.spotify.Client", "Spotify" }, { "code", "Visual Studio Code" }, { "arduino", "Arduino IDE" }, { "zoom", "Zoom" }, { "thunderbird", "Thunderbird" }, { "mattermost-desktop", "Mattermost" }, - { "blender", "Blender" } - }, - - screens_size = get_screen() + { "blender", "Blender" }, + { "steam", "Steams" }, + { "freecad", "Freecad" }, + { "nemo", "Dateien" } + } } - -return _M diff --git a/awesome/theme/crylia/tools/auto_starter.lua b/awesome/src/tools/auto_starter.lua similarity index 78% rename from awesome/theme/crylia/tools/auto_starter.lua rename to awesome/src/tools/auto_starter.lua index 5dd1e34..3dd73a5 100644 --- a/awesome/theme/crylia/tools/auto_starter.lua +++ b/awesome/src/tools/auto_starter.lua @@ -1,6 +1,6 @@ local awful = require("awful") -function Autostarter(table) +return function(table) for i, t in ipairs(table) do awful.spawn.with_shell(t); end diff --git a/awesome/theme/crylia/tools/icon_handler.lua b/awesome/src/tools/icon_handler.lua similarity index 85% rename from awesome/theme/crylia/tools/icon_handler.lua rename to awesome/src/tools/icon_handler.lua index 8517763..eae08ea 100644 --- a/awesome/theme/crylia/tools/icon_handler.lua +++ b/awesome/src/tools/icon_handler.lua @@ -7,15 +7,21 @@ local naughty = require("naughty") -- TODO: try with more icon themes function Get_icon(theme, c, is_steam) if theme ~= nil and c ~= nil then - local clientName = c.name - -- TODO: Access steamdb api to fetch the clienticon if there is no icon found in this theme + local clientName + if type(c) == "string" then + if c:match("com.*%a") ~= nil then + c = c:gsub("com.", ""):gsub(".Client", ""):gsub("flatpak", ""):gsub("run", ""):gsub(" ", "") + end + end if is_steam then clientName = "steam_icon_" .. tostring(c) .. ".svg" else if c.class ~= nil then clientName = string.lower(c.class) .. ".svg" - elseif clientName ~= nil then + elseif c.name ~= nil then clientName = string.lower(c.name) .. ".svg" + elseif type(c) == "string" then + clientName = c .. ".svg" else return end diff --git a/awesome/theme/crylia/widgets/audio.lua b/awesome/src/widgets/audio.lua similarity index 91% rename from awesome/theme/crylia/widgets/audio.lua rename to awesome/src/widgets/audio.lua index aa61a56..a1952c0 100644 --- a/awesome/theme/crylia/widgets/audio.lua +++ b/awesome/src/widgets/audio.lua @@ -4,14 +4,14 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/audio/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/audio/" -- Returns the audio widget return function() @@ -48,8 +48,8 @@ return function() right = dpi(8), widget = wibox.container.margin }, - bg = color.color["Yellow200"], - fg = color.color["Grey900"], + bg = color["Yellow200"], + fg = color["Grey900"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -81,7 +81,7 @@ echo $(pacmd list-sinks | awk '/^\s+name: /{indefault = $2 == "<'$SINK'>"} /^\s+ icon = icon .. "-high" end audio_widget.container.audio_layout.label:set_text(volume .. "%") - audio_widget.container.audio_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icon .. ".svg", color.color["Grey900"])) + audio_widget.container.audio_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icon .. ".svg", color["Grey900"])) end ) end @@ -93,7 +93,7 @@ echo $(pacmd list-sinks | awk '/^\s+name: /{indefault = $2 == "<'$SINK'>"} /^\s+ if stdout:match("yes") then audio_widget.container.audio_layout.label.visible = false audio_widget.container:set_right(0) - audio_widget.container.audio_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. "volume-mute" .. ".svg", color.color["Grey900"])) + audio_widget.container.audio_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. "volume-mute" .. ".svg", color["Grey900"])) else audio_widget.container:set_right(10) get_volume() @@ -103,7 +103,7 @@ echo $(pacmd list-sinks | awk '/^\s+name: /{indefault = $2 == "<'$SINK'>"} /^\s+ end -- Signals - Hover_signal(audio_widget, color.color["Yellow200"]) + Hover_signal(audio_widget, color["Yellow200"]) audio_widget:connect_signal( "button::press", diff --git a/awesome/theme/crylia/widgets/battery.lua b/awesome/src/widgets/battery.lua similarity index 96% rename from awesome/theme/crylia/widgets/battery.lua rename to awesome/src/widgets/battery.lua index 1048a6e..4ee54ea 100644 --- a/awesome/theme/crylia/widgets/battery.lua +++ b/awesome/src/widgets/battery.lua @@ -4,16 +4,16 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local naughty = require("naughty") local watch = awful.widget.watch local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/battery/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/battery/" -- Returns the battery widget return function() @@ -51,8 +51,8 @@ return function() right = dpi(8), widget = wibox.container.margin }, - bg = color.color["Purple200"], - fg = color.color["Grey900"], + bg = color["Purple200"], + fg = color["Grey900"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -97,7 +97,7 @@ return function() local battery_warning = function() naughty.notify({ - icon = gears.color.recolor_image(icondir .. "battery-alert.svg", color.color["White"]), + icon = gears.color.recolor_image(icondir .. "battery-alert.svg", color["White"]), app_name = "System notification", title = "Battery is low", message = "Battery is almost battery_labelempty", @@ -166,7 +166,7 @@ return function() ) end - Hover_signal(battery_widget, color.color["Purple200"]) + Hover_signal(battery_widget, color["Purple200"]) battery_widget:connect_signal( 'button::press', diff --git a/awesome/theme/crylia/widgets/bluetooth.lua b/awesome/src/widgets/bluetooth.lua similarity index 91% rename from awesome/theme/crylia/widgets/bluetooth.lua rename to awesome/src/widgets/bluetooth.lua index 5604aaa..07dc109 100644 --- a/awesome/theme/crylia/widgets/bluetooth.lua +++ b/awesome/src/widgets/bluetooth.lua @@ -4,15 +4,15 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local naughty = require("naughty") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/bluetooth/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/bluetooth/" -- Returns the bluetooth widget return function() @@ -33,8 +33,8 @@ return function() right = dpi(8), widget = wibox.container.margin }, - bg = color.color["Blue200"], - fg = color.color["Grey900"], + bg = color["Blue200"], + fg = color["Grey900"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -65,7 +65,7 @@ return function() icon = icon .. "-on" bluetooth_state = "on" awful.spawn.easy_async_with_shell( - './.config/awesome/theme/crylia/scripts/bt.sh', + './.config/awesome/src/scripts/bt.sh', function(stdout2) if stdout2 == nil or stdout2:gsub("\n", "") == "" then bluetooth_tooltip:set_text("Bluetooth is turned " .. bluetooth_state .. "\n" .. "You are currently not connected") @@ -76,13 +76,13 @@ return function() end ) end - bluetooth_widget.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icon .. ".svg", color.color["Grey900"])) + bluetooth_widget.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icon .. ".svg", color["Grey900"])) end, bluetooth_widget ) -- Signals - Hover_signal(bluetooth_widget, color.color["Blue200"]) + Hover_signal(bluetooth_widget, color["Blue200"]) bluetooth_widget:connect_signal( "button::press", diff --git a/awesome/theme/crylia/widgets/clock.lua b/awesome/src/widgets/clock.lua similarity index 86% rename from awesome/theme/crylia/widgets/clock.lua rename to awesome/src/widgets/clock.lua index 8c7d2a7..d6d173e 100644 --- a/awesome/theme/crylia/widgets/clock.lua +++ b/awesome/src/widgets/clock.lua @@ -4,14 +4,14 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/clock/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/clock/" -- Returns the clock widget return function() @@ -23,7 +23,7 @@ return function() { { id = "icon", - image = gears.color.recolor_image(icondir .. "clock.svg", color.color["Grey900"]), + image = gears.color.recolor_image(icondir .. "clock.svg", color["Grey900"]), widget = wibox.widget.imagebox, resize = false }, @@ -49,8 +49,8 @@ return function() right = dpi(8), widget = wibox.container.margin }, - bg = color.color["Orange200"], - fg = color.color["Grey900"], + bg = color["Orange200"], + fg = color["Grey900"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -72,7 +72,7 @@ return function() end } - Hover_signal(clock_widget, color.color["Orange200"]) + Hover_signal(clock_widget, color["Orange200"]) return clock_widget end diff --git a/awesome/theme/crylia/widgets/date.lua b/awesome/src/widgets/date.lua similarity index 87% rename from awesome/theme/crylia/widgets/date.lua rename to awesome/src/widgets/date.lua index e5b0fd4..2f142e6 100644 --- a/awesome/theme/crylia/widgets/date.lua +++ b/awesome/src/widgets/date.lua @@ -4,14 +4,14 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/date/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/date/" -- Returns the date widget return function() @@ -23,7 +23,7 @@ return function() { { id = "icon", - image = gears.color.recolor_image(icondir .. "calendar.svg", color.color["Grey900"]), + image = gears.color.recolor_image(icondir .. "calendar.svg", color["Grey900"]), widget = wibox.widget.imagebox, resize = false }, @@ -49,8 +49,8 @@ return function() right = dpi(8), widget = wibox.container.margin }, - bg = color.color["Teal200"], - fg = color.color["Grey900"], + bg = color["Teal200"], + fg = color["Grey900"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -72,7 +72,7 @@ return function() } -- Signals - Hover_signal(date_widget, color.color["Teal200"]) + Hover_signal(date_widget, color["Teal200"]) date_widget:connect_signal( "mouse::enter", diff --git a/awesome/theme/crylia/widgets/kblayout.lua b/awesome/src/widgets/kblayout.lua similarity index 91% rename from awesome/theme/crylia/widgets/kblayout.lua rename to awesome/src/widgets/kblayout.lua index da1d54a..b6d2378 100644 --- a/awesome/theme/crylia/widgets/kblayout.lua +++ b/awesome/src/widgets/kblayout.lua @@ -4,14 +4,14 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/kblayout/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/kblayout/" return function(s) local kblayout_widget = wibox.widget { @@ -23,7 +23,7 @@ return function(s) id = "icon", widget = wibox.widget.imagebox, resize = false, - image = gears.color.recolor_image(icondir .. "keyboard.svg", color.color["Grey900"]) + image = gears.color.recolor_image(icondir .. "keyboard.svg", color["Grey900"]) }, id = "icon_layout", widget = wibox.container.place @@ -47,8 +47,8 @@ return function(s) right = dpi(8), widget = wibox.container.margin }, - bg = color.color["Green200"], - fg = color.color["Grey900"], + bg = color["Green200"], + fg = color["Grey900"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -184,7 +184,7 @@ return function(s) { text = shortname, widget = wibox.widget.textbox, - font = user_vars.vars.font.extrabold, + font = user_vars.font.extrabold, id = "kbmapname" }, widget = wibox.container.margin, @@ -195,7 +195,7 @@ return function(s) { text = longname, widget = wibox.widget.textbox, - font = user_vars.vars.font.bold, + font = user_vars.font.bold, }, widget = wibox.container.margin @@ -211,15 +211,15 @@ return function(s) shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 10) end, - bg = color.color["Grey800"], - fg = color.color["White"], + bg = color["Grey800"], + fg = color["White"], widget = wibox.container.background, id = "background" }, margins = dpi(5), widget = wibox.container.margin } - Hover_signal(kb_layout_item.background, color.color["White"], color.color["Grey900"]) + Hover_signal(kb_layout_item.background, color["White"], color["Grey900"]) kb_layout_item:connect_signal( "button::press", function() @@ -239,7 +239,7 @@ return function(s) local kb_layout_items = { layout = wibox.layout.fixed.vertical } - for i, keymap in pairs(user_vars.vars.kblayout) do + for i, keymap in pairs(user_vars.kblayout) do kb_layout_items[i] = create_kb_layout_item(keymap) end return kb_layout_items @@ -251,8 +251,8 @@ return function(s) gears.shape.rounded_rect(cr, width, height, 5) end, widget = wibox.container.background, - bg = color.color["Grey900"], - fg = color.color["White"], + bg = color["Grey900"], + fg = color["White"], width = dpi(100), max_height = dpi(600), visible = false, @@ -268,18 +268,18 @@ return function(s) awful.spawn.easy_async_with_shell( "setxkbmap -query | grep layout: | awk '{print $2}'", function(stdout) - for j, n in ipairs(user_vars.vars.kblayout) do + for j, n in ipairs(user_vars.kblayout) do if stdout:match(n) then - if j == #user_vars.vars.kblayout then + if j == #user_vars.kblayout then awful.spawn.easy_async_with_shell( - "setxkbmap " .. user_vars.vars.kblayout[1], + "setxkbmap " .. user_vars.kblayout[1], function() get_kblayout() end ) else awful.spawn.easy_async_with_shell( - "setxkbmap " .. user_vars.vars.kblayout[j + 1], + "setxkbmap " .. user_vars.kblayout[j + 1], function() get_kblayout() end @@ -300,7 +300,7 @@ return function(s) --kb_menu_widget:move_next_to(mouse.current_widget_geometry) -- Signals - Hover_signal(kblayout_widget, color.color["Green200"]) + Hover_signal(kblayout_widget, color["Green200"]) local kblayout_keygrabber = awful.keygrabber { autostart = false, diff --git a/awesome/theme/crylia/widgets/layout_list.lua b/awesome/src/widgets/layout_list.lua similarity index 86% rename from awesome/theme/crylia/widgets/layout_list.lua rename to awesome/src/widgets/layout_list.lua index 0cd5b5f..e007c87 100644 --- a/awesome/theme/crylia/widgets/layout_list.lua +++ b/awesome/src/widgets/layout_list.lua @@ -4,11 +4,11 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Returns the layoutbox widget return function() @@ -25,7 +25,7 @@ return function() forced_width = dpi(40), widget = wibox.container.margin }, - bg = color.color["LightBlue200"], + bg = color["LightBlue200"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -33,7 +33,7 @@ return function() } -- Signals - Hover_signal(layout, color.color["LightBlue200"]) + Hover_signal(layout, color["LightBlue200"]) layout:connect_signal( "button::press", diff --git a/awesome/theme/crylia/widgets/network.lua b/awesome/src/widgets/network.lua similarity index 95% rename from awesome/theme/crylia/widgets/network.lua rename to awesome/src/widgets/network.lua index 0897ab8..3ebdf09 100644 --- a/awesome/theme/crylia/widgets/network.lua +++ b/awesome/src/widgets/network.lua @@ -4,20 +4,20 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local naughty = require("naughty") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/network/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/network/" -- Insert your interfaces here, get the from ip a local interfaces = { - wlan_interface = user_vars.vars.network.wlan, - lan_interface = user_vars.vars.network.ethernet + wlan_interface = user_vars.network.wlan, + lan_interface = user_vars.network.ethernet } local network_mode = nil @@ -34,7 +34,7 @@ return function() { { id = 'icon', - image = gears.color.recolor_image(icondir .. "no-internet" .. ".svg", color.color["Grey900"]), + image = gears.color.recolor_image(icondir .. "no-internet" .. ".svg", color["Grey900"]), widget = wibox.widget.imagebox, resize = false }, @@ -61,8 +61,8 @@ return function() right = dpi(8), widget = wibox.container.margin }, - bg = color.color["Red200"], - fg = color.color["Grey900"], + bg = color["Red200"], + fg = color["Grey900"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -111,7 +111,7 @@ return function() text = message, title = title, app_name = app_name, - icon = gears.color.recolor_image(icon, color.color["White"]), + icon = gears.color.recolor_image(icon, color["White"]), timeout = 3 }) end @@ -165,7 +165,7 @@ return function() update_wireless_data(false) end network_widget.container.network_layout.spacing = dpi(8) - network_widget.container.network_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. icon .. ".svg", color.color["Grey900"])) + network_widget.container.network_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. icon .. ".svg", color["Grey900"])) end ) end @@ -261,7 +261,7 @@ return function() network_widget.container.network_layout.label.visible = false update_tooltip("Network unreachable") network_widget.container.network_layout.spacing = dpi(0) - network_widget.container.network_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. icon .. ".svg", color.color["Grey900"])) + network_widget.container.network_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. icon .. ".svg", color["Grey900"])) end local check_network_mode = function() @@ -324,7 +324,7 @@ return function() } -- Signals - Hover_signal(network_widget, color.color["Red200"]) + Hover_signal(network_widget, color["Red200"]) network_widget:connect_signal( "button::press", diff --git a/awesome/theme/crylia/widgets/power.lua b/awesome/src/widgets/power.lua similarity index 82% rename from awesome/theme/crylia/widgets/power.lua rename to awesome/src/widgets/power.lua index 44bc609..958e271 100644 --- a/awesome/theme/crylia/widgets/power.lua +++ b/awesome/src/widgets/power.lua @@ -4,15 +4,15 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local naughty = require("naughty") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") -- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/power/" +local icondir = awful.util.getdir("config") .. "src/assets/icons/power/" return function() @@ -23,7 +23,7 @@ return function() { { id = "icon", - image = gears.color.recolor_image(icondir .. "power.svg", color.color["Grey900"]), + image = gears.color.recolor_image(icondir .. "power.svg", color["Grey900"]), widget = wibox.widget.imagebox, resize = false }, @@ -42,8 +42,8 @@ return function() right = dpi(8), widget = wibox.container.margin }, - bg = color.color["Red200"], - fg = color.color["Grey800"], + bg = color["Red200"], + fg = color["Grey800"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -51,7 +51,7 @@ return function() } -- Signals - Hover_signal(power_widget, color.color["Red200"]) + Hover_signal(power_widget, color["Red200"]) power_widget:connect_signal( "button::release", diff --git a/awesome/theme/crylia/widgets/systray.lua b/awesome/src/widgets/systray.lua similarity index 84% rename from awesome/theme/crylia/widgets/systray.lua rename to awesome/src/widgets/systray.lua index 7f2acda..c9dfb86 100644 --- a/awesome/theme/crylia/widgets/systray.lua +++ b/awesome/src/widgets/systray.lua @@ -4,11 +4,11 @@ -- Awesome Libs local awful = require("awful") -local color = require("theme.crylia.colors") +local color = require("src.theme.colors") local dpi = require("beautiful").xresources.apply_dpi local gears = require("gears") local wibox = require("wibox") -require("main.signals") +require("src.core.signals") return function(s) @@ -29,10 +29,10 @@ return function(s) shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, - bg = color.color["BlueGrey800"] + bg = color["BlueGrey800"] } -- Signals - Hover_signal(systray.container, color.color["Red200"]) + Hover_signal(systray.container, color["Red200"]) systray.container.st.widget:set_base_size(dpi(20)) diff --git a/awesome/theme/crylia/widgets/taglist.lua b/awesome/src/widgets/taglist.lua similarity index 93% rename from awesome/theme/crylia/widgets/taglist.lua rename to awesome/src/widgets/taglist.lua index 0a60490..4e90f25 100644 --- a/awesome/theme/crylia/widgets/taglist.lua +++ b/awesome/src/widgets/taglist.lua @@ -2,8 +2,8 @@ local wibox = require("wibox") local awful = require("awful") local gears = require("gears") local dpi = require("beautiful").xresources.apply_dpi -local color = require("theme.crylia.colors") -require("theme.crylia.tools.icon_handler") +local color = require("src.theme.colors") +require("src.tools.icon_handler") local list_update = function(widget, buttons, label, data, objects) widget:reset() @@ -33,7 +33,7 @@ local list_update = function(widget, buttons, label, data, objects) align = "center", valign = "center", visible = true, - font = user_vars.vars.font.extrabold, + font = user_vars.font.extrabold, forced_width = dpi(25), widget = wibox.widget.textbox } @@ -54,7 +54,7 @@ local list_update = function(widget, buttons, label, data, objects) layout = wibox.layout.fixed.horizontal }, - fg = color.color["White"], + fg = color["White"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -86,11 +86,11 @@ local list_update = function(widget, buttons, label, data, objects) local text, bg_color, bg_image, icon, args = label(object, tag_label) tag_label:set_text(object.index) if object.urgent == true then - tag_widget:set_bg(color.color["RedA200"]) - tag_widget:set_fg(color.color["Grey900"]) + tag_widget:set_bg(color["RedA200"]) + tag_widget:set_fg(color["Grey900"]) elseif object == awful.screen.focused().selected_tag then - tag_widget:set_bg(color.color["White"]) - tag_widget:set_fg(color.color["Grey900"]) + tag_widget:set_bg(color["White"]) + tag_widget:set_fg(color["Grey900"]) else tag_widget:set_bg("#3A475C") end @@ -113,7 +113,7 @@ local list_update = function(widget, buttons, label, data, objects) margins = dpi(6), widget = wibox.container.margin } - icon.icon_container.icon:set_image(Get_icon("Papirus-Dark", client)) + icon.icon_container.icon:set_image(Get_icon(user_vars.icon_theme, client)) tag_widget.container:setup({ icon, strategy = "exact", diff --git a/awesome/theme/crylia/widgets/tasklist.lua b/awesome/src/widgets/tasklist.lua similarity index 94% rename from awesome/theme/crylia/widgets/tasklist.lua rename to awesome/src/widgets/tasklist.lua index b8e87aa..671ee46 100644 --- a/awesome/theme/crylia/widgets/tasklist.lua +++ b/awesome/src/widgets/tasklist.lua @@ -2,7 +2,7 @@ local awful = require('awful') local wibox = require('wibox') local dpi = require('beautiful').xresources.apply_dpi local gears = require('gears') -local color = require('theme.crylia.colors') +local color = require('src.theme.colors') local list_update = function(widget, buttons, label, data, objects) widget:reset() @@ -45,8 +45,8 @@ local list_update = function(widget, buttons, label, data, objects) widget = wibox.container.margin, id = "container" }, - bg = color.color["White"], - fg = color.color["Grey900"], + bg = color["White"], + fg = color["Grey900"], shape = function(cr, width, height) gears.shape.rounded_rect(cr, width, height, 5) end, @@ -100,14 +100,14 @@ local list_update = function(widget, buttons, label, data, objects) task_tool_tip:remove_from_object(task_widget) end end - task_widget:set_bg(color.color["White"]) - task_widget:set_fg(color.color["Grey900"]) + task_widget:set_bg(color["White"]) + task_widget:set_fg(color["Grey900"]) task_widget.container.layout_it.title:set_text(text) else task_widget:set_bg("#3A475C") task_widget.container.layout_it.title:set_text('') end - task_widget.container.layout_it.margin.layout_icon.icon:set_image(Get_icon("Papirus-Dark", object)) + task_widget.container.layout_it.margin.layout_icon.icon:set_image(Get_icon(user_vars.icon_theme, object)) widget:add(task_widget) widget:set_spacing(dpi(6)) diff --git a/awesome/theme/crylia/layouts.lua b/awesome/theme/crylia/layouts.lua deleted file mode 100644 index 1033370..0000000 --- a/awesome/theme/crylia/layouts.lua +++ /dev/null @@ -1,14 +0,0 @@ ---Awesome Libs -local color = require("theme.crylia.colors") -local gears = require("gears") - --- Icon directory path -local layout_path = Theme_path .. "assets/layout/" - --- Here are the icons for the layouts defined, if you want to add more layouts go to main/layouts.lua -Theme.layout_floating = gears.color.recolor_image(layout_path .. "floating.svg", color.color["Grey900"]) -Theme.layout_tile = gears.color.recolor_image(layout_path .. "tile.svg", color.color["Grey900"]) ---Theme.layout_dwindle = gears.color.recolor_image(layout_path .. "dwindle.svg", color.color["Grey900"]) ---Theme.layout_fairh = gears.color.recolor_image(layout_path .. "fairh.svg", color.color["Grey900"]) ---Theme.layout_fullscreen = gears.color.recolor_image(layout_path .. "fullscreen.svg", color.color["Grey900"]) ---Theme.layout_max = gears.color.recolor_image(layout_path .. "max.svg", color.color["Grey900"]) \ No newline at end of file diff --git a/awesome/theme/crylia/theme_variables.lua b/awesome/theme/crylia/theme_variables.lua deleted file mode 100644 index a84131a..0000000 --- a/awesome/theme/crylia/theme_variables.lua +++ /dev/null @@ -1,81 +0,0 @@ ------------------------------------------------------------------------------------------- --- This is the main themeing file, here are most colors changed -- --- If you want to change individual widget colors you will need to edit them seperately -- ------------------------------------------------------------------------------------------- - --- Awesome Libs -local colors = require("theme.crylia.colors") -local dpi = require("beautiful.xresources").apply_dpi -local gears = require("gears") -local awful = require("awful") - --- Icon directory path -local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/titlebar/" - -Theme.font = user_vars.vars.font.bold - -Theme.bg_normal = colors.color["Grey900"] -Theme.bg_focus = colors.color["Grey900"] -Theme.bg_urgent = colors.color["RedA200"] -Theme.bg_minimize = colors.color["White"] -Theme.bg_systray = colors.color["White"] - -Theme.fg_normal = colors.color["White"] -Theme.fg_focus = colors.color["White"] -Theme.fg_urgent = colors.color["White"] -Theme.fg_minimize = colors.color["White"] - -Theme.useless_gap = dpi(5) -- Change this to 0 if you dont like window gaps -Theme.border_width = dpi(0) -- Change this to 0 if you dont like borders -Theme.border_normal = colors.color["Grey800"] ---Theme.border_focus = colors.color["Red"] -- Doesnt work, no idea why; workaround is in signals.lua -Theme.border_marked = colors.color["Red400"] - ---Theme.menu_submenu_icon = Theme_path .. "assets.ArchLogo.png" -Theme.menu_height = dpi(30) -Theme.menu_width = dpi(200) -Theme.menu_bg_normal = colors.color["Grey900"] -Theme.menu_bg_focus = colors.color["Grey800"] -Theme.menu_fg_focus = colors.color["White"] -Theme.menu_border_color = colors.color["Grey800"] -Theme.menu_border_width = dpi(0) - -Theme.taglist_fg_focus = colors.color["Grey900"] -Theme.taglist_bg_focus = colors.color["White"] - -Theme.tooltip_border_color = colors.color["Grey700"] -Theme.tooltip_bg = colors.color["Grey800"] -Theme.tooltip_fg = colors.color["White"] -Theme.tooltip_border_width = dpi(0) -Theme.tooltip_shape = function(cr, width, heigth) - gears.shape.rounded_rect(cr, width, heigth, 10) -end - -Theme.notification_bg = colors.color["Grey900"] -Theme.notification_fg = colors.color["White"] -Theme.notification_border_width = dpi(0) -Theme.notification_border_color = colors.color["Grey900"] -Theme.notification_shape = function(cr, width, heigth) - gears.shape.rounded_rect(cr, width, heigth, 10) -end -Theme.notification_margin = dpi(10) -Theme.notification_max_width = dpi(400) -Theme.notification_max_height = dpi(1000) -Theme.notification_icon_size = dpi(40) - -Theme.titlebar_close_button_normal = icondir .. "close.svg" -Theme.titlebar_maximized_button_normal = icondir .. "maximize.svg" -Theme.titlebar_minimize_button_normal = icondir .. "minimize.svg" -Theme.titlebar_maximized_button_active = icondir .. "maximize.svg" -Theme.titlebar_maximized_button_inactive = icondir .. "maximize.svg" - -Theme.bg_systray = colors.color["BlueGrey800"] -Theme.systray_icon_spacing = dpi(10) - -Theme.hotkeys_bg = colors.color["Grey900"] -Theme.hotkeys_fg = colors.color["White"] -Theme.hotkeys_border_width = 0 -Theme.hotkeys_shape = function(cr, width, height) - gears.shape.rounded_rect(cr, width, height, 10) -end -Theme.hotkeys_description_font = user_vars.vars.font.bold diff --git a/picom.conf b/picom.conf index 1b78a97..0802dbb 100644 --- a/picom.conf +++ b/picom.conf @@ -94,6 +94,7 @@ blur-background-fixed = true; blur-background-exclude = [ #"name *= 'polybar'", + "window_type = 'dock'", "_GTK_FRAME_EXTENTS@:c" ]; @@ -148,8 +149,8 @@ transparent-clipping = false; show-all-xerrors = true; wintypes: { - tooltip = { fade = true; shadow = false; focus = false; }; - normal = { shadow = true; }; - dock = { shadow = false; }; + tooltip = { fade = true; focus = false; }; + normal = { shadow = true; blur-background = false; }; + dock = { shadow = false; blur-background = false;}; desktop = { shadow = true; blur-background = false; }; };