From 010967f80eb4a68cb3e5986fc9a3d95ea3243d1b Mon Sep 17 00:00:00 2001 From: Mark Date: Sat, 16 Jul 2022 12:33:59 -0700 Subject: [PATCH] Moved theme assets --- {theme/resources => assets}/icons.lua | 107 +++++++++--------- {theme/resources => assets}/icons/arch.png | Bin {theme/resources => assets}/icons/arch.svg | 0 .../icons/battery/caution-charging.svg | 0 .../icons/battery/caution.svg | 0 .../icons/battery/empty-charging.svg | 0 .../icons/battery/empty.svg | 0 .../icons/battery/full-charging.svg | 0 .../icons/battery/full.svg | 0 .../icons/battery/good-charging.svg | 0 .../icons/battery/good.svg | 0 .../icons/battery/low-charging.svg | 0 .../icons/battery/low.svg | 0 .../icons/battery/missing.svg | 0 .../brightness/clockwise/brightness-0.svg | 0 .../brightness/clockwise/brightness-1.svg | 0 .../brightness/clockwise/brightness-2.svg | 0 .../brightness/clockwise/brightness-3.svg | 0 .../brightness/clockwise/brightness-4.svg | 0 .../brightness/clockwise/brightness-5.svg | 0 .../brightness/clockwise/brightness-6.svg | 0 .../brightness/clockwise/brightness-7.svg | 0 .../brightness/clockwise/brightness-8.svg | 0 .../counterclockwise/brightness-0.svg | 0 .../counterclockwise/brightness-1.svg | 0 .../counterclockwise/brightness-2.svg | 0 .../counterclockwise/brightness-3.svg | 0 .../counterclockwise/brightness-4.svg | 0 .../counterclockwise/brightness-5.svg | 0 .../counterclockwise/brightness-6.svg | 0 .../counterclockwise/brightness-7.svg | 0 .../counterclockwise/brightness-8.svg | 0 .../icons/layout/cornerne.svg | 0 .../icons/layout/cornernw.svg | 0 .../icons/layout/cornerse.svg | 0 .../icons/layout/cornersw.svg | 0 .../icons/layout/dwindle.svg | 0 .../icons/layout/fairh.svg | 0 .../icons/layout/fairv.svg | 0 .../icons/layout/floating.svg | 0 .../icons/layout/fullscreen.svg | 0 .../icons/layout/magnifier.svg | 0 .../resources => assets}/icons/layout/max.svg | 0 .../icons/layout/spiral.svg | 0 .../icons/layout/tile.svg | 0 .../icons/layout/tilebottom.svg | 0 .../icons/layout/tileleft.svg | 0 .../icons/layout/tiletop.svg | 0 .../icons/music/pause-blue.svg | 0 .../icons/music/pause-grey.svg | 0 .../icons/music/play-blue.svg | 0 .../icons/music/play-grey.svg | 0 .../icons/music/stop-blue.svg | 0 .../icons/music/stop-grey.svg | 0 .../icons/raid/degraded-recover.svg | 0 .../icons/raid/degraded.svg | 0 .../icons/raid/healthy-recover.svg | 0 .../icons/raid/healthy.svg | 0 .../icons/titlebar/hover/close.svg | 0 .../icons/titlebar/hover/float.svg | 0 .../icons/titlebar/hover/maximize.svg | 0 .../icons/titlebar/hover/minimize.svg | 0 .../icons/titlebar/hover/ontop.svg | 0 .../icons/titlebar/hover/stick.svg | 0 .../icons/titlebar/regular/close.svg | 0 .../icons/titlebar/regular/float.svg | 0 .../icons/titlebar/regular/maximize.svg | 0 .../icons/titlebar/regular/minimize.svg | 0 .../icons/titlebar/regular/ontop.svg | 0 .../icons/titlebar/regular/stick.svg | 0 .../icons/volume/error.svg | 0 .../icons/volume/high.svg | 0 .../resources => assets}/icons/volume/low.svg | 0 .../icons/volume/medium.svg | 0 .../icons/volume/mute-red.svg | 0 .../icons/volume/mute.svg | 0 .../resources => assets}/icons/volume/off.svg | 0 {theme/resources => assets}/init.lua | 13 ++- assets/sounds.lua | 7 ++ {theme/resources => assets}/sounds/accept.ogg | Bin {theme/resources => assets}/sounds/hover.ogg | Bin .../resources => assets}/sounds/request.ogg | Bin {theme/resources => assets}/sounds/send.ogg | Bin {theme/resources => assets}/sounds/type.ogg | Bin .../sounds/volumedown-click.mp3 | Bin .../sounds/volumeup-click.mp3 | Bin bin/configs/compton.conf | 79 ------------- theme/init.lua | 5 +- theme/resources/sounds.lua | 4 - 89 files changed, 75 insertions(+), 140 deletions(-) rename {theme/resources => assets}/icons.lua (50%) rename {theme/resources => assets}/icons/arch.png (100%) rename {theme/resources => assets}/icons/arch.svg (100%) rename {theme/resources => assets}/icons/battery/caution-charging.svg (100%) rename {theme/resources => assets}/icons/battery/caution.svg (100%) rename {theme/resources => assets}/icons/battery/empty-charging.svg (100%) rename {theme/resources => assets}/icons/battery/empty.svg (100%) rename {theme/resources => assets}/icons/battery/full-charging.svg (100%) rename {theme/resources => assets}/icons/battery/full.svg (100%) rename {theme/resources => assets}/icons/battery/good-charging.svg (100%) rename {theme/resources => assets}/icons/battery/good.svg (100%) rename {theme/resources => assets}/icons/battery/low-charging.svg (100%) rename {theme/resources => assets}/icons/battery/low.svg (100%) rename {theme/resources => assets}/icons/battery/missing.svg (100%) rename {theme/resources => assets}/icons/brightness/clockwise/brightness-0.svg (100%) rename {theme/resources => assets}/icons/brightness/clockwise/brightness-1.svg (100%) rename {theme/resources => assets}/icons/brightness/clockwise/brightness-2.svg (100%) rename {theme/resources => assets}/icons/brightness/clockwise/brightness-3.svg (100%) rename {theme/resources => assets}/icons/brightness/clockwise/brightness-4.svg (100%) rename {theme/resources => assets}/icons/brightness/clockwise/brightness-5.svg (100%) rename {theme/resources => assets}/icons/brightness/clockwise/brightness-6.svg (100%) rename {theme/resources => assets}/icons/brightness/clockwise/brightness-7.svg (100%) rename {theme/resources => assets}/icons/brightness/clockwise/brightness-8.svg (100%) rename {theme/resources => assets}/icons/brightness/counterclockwise/brightness-0.svg (100%) rename {theme/resources => assets}/icons/brightness/counterclockwise/brightness-1.svg (100%) rename {theme/resources => assets}/icons/brightness/counterclockwise/brightness-2.svg (100%) rename {theme/resources => assets}/icons/brightness/counterclockwise/brightness-3.svg (100%) rename {theme/resources => assets}/icons/brightness/counterclockwise/brightness-4.svg (100%) rename {theme/resources => assets}/icons/brightness/counterclockwise/brightness-5.svg (100%) rename {theme/resources => assets}/icons/brightness/counterclockwise/brightness-6.svg (100%) rename {theme/resources => assets}/icons/brightness/counterclockwise/brightness-7.svg (100%) rename {theme/resources => assets}/icons/brightness/counterclockwise/brightness-8.svg (100%) rename {theme/resources => assets}/icons/layout/cornerne.svg (100%) rename {theme/resources => assets}/icons/layout/cornernw.svg (100%) rename {theme/resources => assets}/icons/layout/cornerse.svg (100%) rename {theme/resources => assets}/icons/layout/cornersw.svg (100%) rename {theme/resources => assets}/icons/layout/dwindle.svg (100%) rename {theme/resources => assets}/icons/layout/fairh.svg (100%) rename {theme/resources => assets}/icons/layout/fairv.svg (100%) rename {theme/resources => assets}/icons/layout/floating.svg (100%) rename {theme/resources => assets}/icons/layout/fullscreen.svg (100%) rename {theme/resources => assets}/icons/layout/magnifier.svg (100%) rename {theme/resources => assets}/icons/layout/max.svg (100%) rename {theme/resources => assets}/icons/layout/spiral.svg (100%) rename {theme/resources => assets}/icons/layout/tile.svg (100%) rename {theme/resources => assets}/icons/layout/tilebottom.svg (100%) rename {theme/resources => assets}/icons/layout/tileleft.svg (100%) rename {theme/resources => assets}/icons/layout/tiletop.svg (100%) rename {theme/resources => assets}/icons/music/pause-blue.svg (100%) rename {theme/resources => assets}/icons/music/pause-grey.svg (100%) rename {theme/resources => assets}/icons/music/play-blue.svg (100%) rename {theme/resources => assets}/icons/music/play-grey.svg (100%) rename {theme/resources => assets}/icons/music/stop-blue.svg (100%) rename {theme/resources => assets}/icons/music/stop-grey.svg (100%) rename {theme/resources => assets}/icons/raid/degraded-recover.svg (100%) rename {theme/resources => assets}/icons/raid/degraded.svg (100%) rename {theme/resources => assets}/icons/raid/healthy-recover.svg (100%) rename {theme/resources => assets}/icons/raid/healthy.svg (100%) rename {theme/resources => assets}/icons/titlebar/hover/close.svg (100%) rename {theme/resources => assets}/icons/titlebar/hover/float.svg (100%) rename {theme/resources => assets}/icons/titlebar/hover/maximize.svg (100%) rename {theme/resources => assets}/icons/titlebar/hover/minimize.svg (100%) rename {theme/resources => assets}/icons/titlebar/hover/ontop.svg (100%) rename {theme/resources => assets}/icons/titlebar/hover/stick.svg (100%) rename {theme/resources => assets}/icons/titlebar/regular/close.svg (100%) rename {theme/resources => assets}/icons/titlebar/regular/float.svg (100%) rename {theme/resources => assets}/icons/titlebar/regular/maximize.svg (100%) rename {theme/resources => assets}/icons/titlebar/regular/minimize.svg (100%) rename {theme/resources => assets}/icons/titlebar/regular/ontop.svg (100%) rename {theme/resources => assets}/icons/titlebar/regular/stick.svg (100%) rename {theme/resources => assets}/icons/volume/error.svg (100%) rename {theme/resources => assets}/icons/volume/high.svg (100%) rename {theme/resources => assets}/icons/volume/low.svg (100%) rename {theme/resources => assets}/icons/volume/medium.svg (100%) rename {theme/resources => assets}/icons/volume/mute-red.svg (100%) rename {theme/resources => assets}/icons/volume/mute.svg (100%) rename {theme/resources => assets}/icons/volume/off.svg (100%) rename {theme/resources => assets}/init.lua (93%) create mode 100755 assets/sounds.lua rename {theme/resources => assets}/sounds/accept.ogg (100%) rename {theme/resources => assets}/sounds/hover.ogg (100%) rename {theme/resources => assets}/sounds/request.ogg (100%) rename {theme/resources => assets}/sounds/send.ogg (100%) rename {theme/resources => assets}/sounds/type.ogg (100%) rename {theme/resources => assets}/sounds/volumedown-click.mp3 (100%) rename {theme/resources => assets}/sounds/volumeup-click.mp3 (100%) delete mode 100755 bin/configs/compton.conf delete mode 100755 theme/resources/sounds.lua diff --git a/theme/resources/icons.lua b/assets/icons.lua similarity index 50% rename from theme/resources/icons.lua rename to assets/icons.lua index 3e3e66b..456554c 100755 --- a/theme/resources/icons.lua +++ b/assets/icons.lua @@ -1,78 +1,79 @@ -local brightnessdir = conf.icon_dir .. "brightness/clockwise/" -local layoutdir = conf.icon_dir .. "layout/" -local batterydir = conf.icon_dir .. "battery/" -local volumedir = conf.icon_dir .. "volume/" -local tagdir = conf.icon_dir .. "tags/" -local titlebardir = conf.icon_dir .. "titlebar/" +local gears = require("gears") +local conf_dir = gears.filesystem.get_configuration_dir() + +-- Some subdir variables, +-- to make switching icon sets easy. +local brightnessdir = conf_dir .. "assets/icons/brightness/clockwise/" +local titlebardir = conf_dir .. "assets/icons/titlebar/" return { - submenu = conf.icon_dir .. "submenu.svg", - launcher = conf.icon_dir .. "arch.svg", + submenu = conf_dir .. "assets/icons/submenu.svg", + launcher = conf_dir .. "assets/icons/arch.svg", - -- must be a png for i3lock - lockicon = conf.icon_dir .. "arch.png", + -- Used for i3lock, MUST be a png. + lockicon = conf_dir .. "assets/icons/arch.png", music = { grey = { - playing = conf.icon_dir .. "music/pause-grey.svg", - paused = conf.icon_dir .. "music/play-grey.svg", - stopped = conf.icon_dir .. "music/stop-grey.svg" + playing = conf_dir .. "assets/icons/music/pause-grey.svg", + paused = conf_dir .. "assets/icons/music/play-grey.svg", + stopped = conf_dir .. "assets/icons/music/stop-grey.svg" }, blue = { - playing = conf.icon_dir .. "music/pause-blue.svg", - paused = conf.icon_dir .. "music/play-blue.svg", - stopped = conf.icon_dir .. "music/stop-blue.svg" + playing = conf_dir .. "assets/icons/music/pause-blue.svg", + paused = conf_dir .. "assets/icons/music/play-blue.svg", + stopped = conf_dir .. "assets/icons/music/stop-blue.svg" } }, -- Layout icons layout = { - cornerne = layoutdir .. "cornerne.svg", - cornernw = layoutdir .. "cornernw.svg", - cornerse = layoutdir .. "cornerse.svg", - cornersw = layoutdir .. "cornersw.svg", - dwindle = layoutdir .. "dwindle.svg", - fairh = layoutdir .. "fairh.svg", - fairv = layoutdir .. "fairv.svg", - floating = layoutdir .. "floating.svg", - fullscreen = layoutdir .. "fullscreen.svg", - magnifier = layoutdir .. "magnifier.svg", - max = layoutdir .. "max.svg", - spiral = layoutdir .. "spiral.svg", - tile = layoutdir .. "tile.svg", - tilebottom = layoutdir .. "tilebottom.svg", - tileleft = layoutdir .. "tileleft.svg", - tiletop = layoutdir .. "tiletop.svg" + cornerne = conf_dir .. "assets/icons/layout/cornerne.svg", + cornernw = conf_dir .. "assets/icons/layout/cornernw.svg", + cornerse = conf_dir .. "assets/icons/layout/cornerse.svg", + cornersw = conf_dir .. "assets/icons/layout/cornersw.svg", + dwindle = conf_dir .. "assets/icons/layout/dwindle.svg", + fairh = conf_dir .. "assets/icons/layout/fairh.svg", + fairv = conf_dir .. "assets/icons/layout/fairv.svg", + floating = conf_dir .. "assets/icons/layout/floating.svg", + fullscreen = conf_dir .. "assets/icons/layout/fullscreen.svg", + magnifier = conf_dir .. "assets/icons/layout/magnifier.svg", + max = conf_dir .. "assets/icons/layout/max.svg", + spiral = conf_dir .. "assets/icons/layout/spiral.svg", + tile = conf_dir .. "assets/icons/layout/tile.svg", + tilebottom = conf_dir .. "assets/icons/layout/tilebottom.svg", + tileleft = conf_dir .. "assets/icons/layout/tileleft.svg", + tiletop = conf_dir .. "assets/icons/layout/tiletop.svg" }, -- Battery icons battery = { - missing = batterydir .. "missing.svg", + missing = conf_dir .. "assets/icons/battery/missing.svg", charging = { - full = batterydir .. "full-charging.svg", - good = batterydir .. "good-charging.svg", - low = batterydir .. "low-charging.svg", - caution = batterydir .. "caution-charging.svg", - empty = batterydir .. "empty-charging.svg" + full = conf_dir .. "assets/icons/battery/full-charging.svg", + good = conf_dir .. "assets/icons/battery/good-charging.svg", + low = conf_dir .. "assets/icons/battery/low-charging.svg", + caution = conf_dir .. "assets/icons/battery/caution-charging.svg", + empty = conf_dir .. "assets/icons/battery/empty-charging.svg" }, - full = batterydir .. "full.svg", - good = batterydir .. "good.svg", - low = batterydir .. "low.svg", - caution = batterydir .. "caution.svg", - empty = batterydir .. "empty.svg" + full = conf_dir .. "assets/icons/battery/full.svg", + good = conf_dir .. "assets/icons/battery/good.svg", + low = conf_dir .. "assets/icons/battery/low.svg", + caution = conf_dir .. "assets/icons/battery/caution.svg", + empty = conf_dir .. "assets/icons/battery/empty.svg" }, -- Volume indicator volume = { - high = volumedir .. "high.svg", - medium = volumedir .. "medium.svg", - low = volumedir .. "low.svg", - off = volumedir .. "off.svg", - mute = volumedir .. "mute-red.svg", - error = volumedir .. "error.svg" + high = conf_dir .. "assets/icons/volume/high.svg", + medium = conf_dir .. "assets/icons/volume/medium.svg", + low = conf_dir .. "assets/icons/volume/low.svg", + off = conf_dir .. "assets/icons/volume/off.svg", + mute = conf_dir .. "assets/icons/volume/mute-red.svg", + error = conf_dir .. "assets/icons/volume/error.svg" }, -- Brightness icons @@ -91,12 +92,12 @@ return { -- RAID status raid = { healthy = { - normal = conf.icon_dir .. "raid/healthy.svg", - recover = conf.icon_dir .. "raid/healthy-recover.svg" + normal = conf_dir .. "assets/icons/raid/healthy.svg", + recover = conf_dir .. "assets/icons/raid/healthy-recover.svg" }, degraded = { - normal = conf.icon_dir .. "raid/degraded.svg", - recover = conf.icon_dir .. "raid/degraded-recover.svg" + normal = conf_dir .. "assets/icons/raid/degraded.svg", + recover = conf_dir .. "assets/icons/raid/degraded-recover.svg" } }, diff --git a/theme/resources/icons/arch.png b/assets/icons/arch.png similarity index 100% rename from theme/resources/icons/arch.png rename to assets/icons/arch.png diff --git a/theme/resources/icons/arch.svg b/assets/icons/arch.svg similarity index 100% rename from theme/resources/icons/arch.svg rename to assets/icons/arch.svg diff --git a/theme/resources/icons/battery/caution-charging.svg b/assets/icons/battery/caution-charging.svg similarity index 100% rename from theme/resources/icons/battery/caution-charging.svg rename to assets/icons/battery/caution-charging.svg diff --git a/theme/resources/icons/battery/caution.svg b/assets/icons/battery/caution.svg similarity index 100% rename from theme/resources/icons/battery/caution.svg rename to assets/icons/battery/caution.svg diff --git a/theme/resources/icons/battery/empty-charging.svg b/assets/icons/battery/empty-charging.svg similarity index 100% rename from theme/resources/icons/battery/empty-charging.svg rename to assets/icons/battery/empty-charging.svg diff --git a/theme/resources/icons/battery/empty.svg b/assets/icons/battery/empty.svg similarity index 100% rename from theme/resources/icons/battery/empty.svg rename to assets/icons/battery/empty.svg diff --git a/theme/resources/icons/battery/full-charging.svg b/assets/icons/battery/full-charging.svg similarity index 100% rename from theme/resources/icons/battery/full-charging.svg rename to assets/icons/battery/full-charging.svg diff --git a/theme/resources/icons/battery/full.svg b/assets/icons/battery/full.svg similarity index 100% rename from theme/resources/icons/battery/full.svg rename to assets/icons/battery/full.svg diff --git a/theme/resources/icons/battery/good-charging.svg b/assets/icons/battery/good-charging.svg similarity index 100% rename from theme/resources/icons/battery/good-charging.svg rename to assets/icons/battery/good-charging.svg diff --git a/theme/resources/icons/battery/good.svg b/assets/icons/battery/good.svg similarity index 100% rename from theme/resources/icons/battery/good.svg rename to assets/icons/battery/good.svg diff --git a/theme/resources/icons/battery/low-charging.svg b/assets/icons/battery/low-charging.svg similarity index 100% rename from theme/resources/icons/battery/low-charging.svg rename to assets/icons/battery/low-charging.svg diff --git a/theme/resources/icons/battery/low.svg b/assets/icons/battery/low.svg similarity index 100% rename from theme/resources/icons/battery/low.svg rename to assets/icons/battery/low.svg diff --git a/theme/resources/icons/battery/missing.svg b/assets/icons/battery/missing.svg similarity index 100% rename from theme/resources/icons/battery/missing.svg rename to assets/icons/battery/missing.svg diff --git a/theme/resources/icons/brightness/clockwise/brightness-0.svg b/assets/icons/brightness/clockwise/brightness-0.svg similarity index 100% rename from theme/resources/icons/brightness/clockwise/brightness-0.svg rename to assets/icons/brightness/clockwise/brightness-0.svg diff --git a/theme/resources/icons/brightness/clockwise/brightness-1.svg b/assets/icons/brightness/clockwise/brightness-1.svg similarity index 100% rename from theme/resources/icons/brightness/clockwise/brightness-1.svg rename to assets/icons/brightness/clockwise/brightness-1.svg diff --git a/theme/resources/icons/brightness/clockwise/brightness-2.svg b/assets/icons/brightness/clockwise/brightness-2.svg similarity index 100% rename from theme/resources/icons/brightness/clockwise/brightness-2.svg rename to assets/icons/brightness/clockwise/brightness-2.svg diff --git a/theme/resources/icons/brightness/clockwise/brightness-3.svg b/assets/icons/brightness/clockwise/brightness-3.svg similarity index 100% rename from theme/resources/icons/brightness/clockwise/brightness-3.svg rename to assets/icons/brightness/clockwise/brightness-3.svg diff --git a/theme/resources/icons/brightness/clockwise/brightness-4.svg b/assets/icons/brightness/clockwise/brightness-4.svg similarity index 100% rename from theme/resources/icons/brightness/clockwise/brightness-4.svg rename to assets/icons/brightness/clockwise/brightness-4.svg diff --git a/theme/resources/icons/brightness/clockwise/brightness-5.svg b/assets/icons/brightness/clockwise/brightness-5.svg similarity index 100% rename from theme/resources/icons/brightness/clockwise/brightness-5.svg rename to assets/icons/brightness/clockwise/brightness-5.svg diff --git a/theme/resources/icons/brightness/clockwise/brightness-6.svg b/assets/icons/brightness/clockwise/brightness-6.svg similarity index 100% rename from theme/resources/icons/brightness/clockwise/brightness-6.svg rename to assets/icons/brightness/clockwise/brightness-6.svg diff --git a/theme/resources/icons/brightness/clockwise/brightness-7.svg b/assets/icons/brightness/clockwise/brightness-7.svg similarity index 100% rename from theme/resources/icons/brightness/clockwise/brightness-7.svg rename to assets/icons/brightness/clockwise/brightness-7.svg diff --git a/theme/resources/icons/brightness/clockwise/brightness-8.svg b/assets/icons/brightness/clockwise/brightness-8.svg similarity index 100% rename from theme/resources/icons/brightness/clockwise/brightness-8.svg rename to assets/icons/brightness/clockwise/brightness-8.svg diff --git a/theme/resources/icons/brightness/counterclockwise/brightness-0.svg b/assets/icons/brightness/counterclockwise/brightness-0.svg similarity index 100% rename from theme/resources/icons/brightness/counterclockwise/brightness-0.svg rename to assets/icons/brightness/counterclockwise/brightness-0.svg diff --git a/theme/resources/icons/brightness/counterclockwise/brightness-1.svg b/assets/icons/brightness/counterclockwise/brightness-1.svg similarity index 100% rename from theme/resources/icons/brightness/counterclockwise/brightness-1.svg rename to assets/icons/brightness/counterclockwise/brightness-1.svg diff --git a/theme/resources/icons/brightness/counterclockwise/brightness-2.svg b/assets/icons/brightness/counterclockwise/brightness-2.svg similarity index 100% rename from theme/resources/icons/brightness/counterclockwise/brightness-2.svg rename to assets/icons/brightness/counterclockwise/brightness-2.svg diff --git a/theme/resources/icons/brightness/counterclockwise/brightness-3.svg b/assets/icons/brightness/counterclockwise/brightness-3.svg similarity index 100% rename from theme/resources/icons/brightness/counterclockwise/brightness-3.svg rename to assets/icons/brightness/counterclockwise/brightness-3.svg diff --git a/theme/resources/icons/brightness/counterclockwise/brightness-4.svg b/assets/icons/brightness/counterclockwise/brightness-4.svg similarity index 100% rename from theme/resources/icons/brightness/counterclockwise/brightness-4.svg rename to assets/icons/brightness/counterclockwise/brightness-4.svg diff --git a/theme/resources/icons/brightness/counterclockwise/brightness-5.svg b/assets/icons/brightness/counterclockwise/brightness-5.svg similarity index 100% rename from theme/resources/icons/brightness/counterclockwise/brightness-5.svg rename to assets/icons/brightness/counterclockwise/brightness-5.svg diff --git a/theme/resources/icons/brightness/counterclockwise/brightness-6.svg b/assets/icons/brightness/counterclockwise/brightness-6.svg similarity index 100% rename from theme/resources/icons/brightness/counterclockwise/brightness-6.svg rename to assets/icons/brightness/counterclockwise/brightness-6.svg diff --git a/theme/resources/icons/brightness/counterclockwise/brightness-7.svg b/assets/icons/brightness/counterclockwise/brightness-7.svg similarity index 100% rename from theme/resources/icons/brightness/counterclockwise/brightness-7.svg rename to assets/icons/brightness/counterclockwise/brightness-7.svg diff --git a/theme/resources/icons/brightness/counterclockwise/brightness-8.svg b/assets/icons/brightness/counterclockwise/brightness-8.svg similarity index 100% rename from theme/resources/icons/brightness/counterclockwise/brightness-8.svg rename to assets/icons/brightness/counterclockwise/brightness-8.svg diff --git a/theme/resources/icons/layout/cornerne.svg b/assets/icons/layout/cornerne.svg similarity index 100% rename from theme/resources/icons/layout/cornerne.svg rename to assets/icons/layout/cornerne.svg diff --git a/theme/resources/icons/layout/cornernw.svg b/assets/icons/layout/cornernw.svg similarity index 100% rename from theme/resources/icons/layout/cornernw.svg rename to assets/icons/layout/cornernw.svg diff --git a/theme/resources/icons/layout/cornerse.svg b/assets/icons/layout/cornerse.svg similarity index 100% rename from theme/resources/icons/layout/cornerse.svg rename to assets/icons/layout/cornerse.svg diff --git a/theme/resources/icons/layout/cornersw.svg b/assets/icons/layout/cornersw.svg similarity index 100% rename from theme/resources/icons/layout/cornersw.svg rename to assets/icons/layout/cornersw.svg diff --git a/theme/resources/icons/layout/dwindle.svg b/assets/icons/layout/dwindle.svg similarity index 100% rename from theme/resources/icons/layout/dwindle.svg rename to assets/icons/layout/dwindle.svg diff --git a/theme/resources/icons/layout/fairh.svg b/assets/icons/layout/fairh.svg similarity index 100% rename from theme/resources/icons/layout/fairh.svg rename to assets/icons/layout/fairh.svg diff --git a/theme/resources/icons/layout/fairv.svg b/assets/icons/layout/fairv.svg similarity index 100% rename from theme/resources/icons/layout/fairv.svg rename to assets/icons/layout/fairv.svg diff --git a/theme/resources/icons/layout/floating.svg b/assets/icons/layout/floating.svg similarity index 100% rename from theme/resources/icons/layout/floating.svg rename to assets/icons/layout/floating.svg diff --git a/theme/resources/icons/layout/fullscreen.svg b/assets/icons/layout/fullscreen.svg similarity index 100% rename from theme/resources/icons/layout/fullscreen.svg rename to assets/icons/layout/fullscreen.svg diff --git a/theme/resources/icons/layout/magnifier.svg b/assets/icons/layout/magnifier.svg similarity index 100% rename from theme/resources/icons/layout/magnifier.svg rename to assets/icons/layout/magnifier.svg diff --git a/theme/resources/icons/layout/max.svg b/assets/icons/layout/max.svg similarity index 100% rename from theme/resources/icons/layout/max.svg rename to assets/icons/layout/max.svg diff --git a/theme/resources/icons/layout/spiral.svg b/assets/icons/layout/spiral.svg similarity index 100% rename from theme/resources/icons/layout/spiral.svg rename to assets/icons/layout/spiral.svg diff --git a/theme/resources/icons/layout/tile.svg b/assets/icons/layout/tile.svg similarity index 100% rename from theme/resources/icons/layout/tile.svg rename to assets/icons/layout/tile.svg diff --git a/theme/resources/icons/layout/tilebottom.svg b/assets/icons/layout/tilebottom.svg similarity index 100% rename from theme/resources/icons/layout/tilebottom.svg rename to assets/icons/layout/tilebottom.svg diff --git a/theme/resources/icons/layout/tileleft.svg b/assets/icons/layout/tileleft.svg similarity index 100% rename from theme/resources/icons/layout/tileleft.svg rename to assets/icons/layout/tileleft.svg diff --git a/theme/resources/icons/layout/tiletop.svg b/assets/icons/layout/tiletop.svg similarity index 100% rename from theme/resources/icons/layout/tiletop.svg rename to assets/icons/layout/tiletop.svg diff --git a/theme/resources/icons/music/pause-blue.svg b/assets/icons/music/pause-blue.svg similarity index 100% rename from theme/resources/icons/music/pause-blue.svg rename to assets/icons/music/pause-blue.svg diff --git a/theme/resources/icons/music/pause-grey.svg b/assets/icons/music/pause-grey.svg similarity index 100% rename from theme/resources/icons/music/pause-grey.svg rename to assets/icons/music/pause-grey.svg diff --git a/theme/resources/icons/music/play-blue.svg b/assets/icons/music/play-blue.svg similarity index 100% rename from theme/resources/icons/music/play-blue.svg rename to assets/icons/music/play-blue.svg diff --git a/theme/resources/icons/music/play-grey.svg b/assets/icons/music/play-grey.svg similarity index 100% rename from theme/resources/icons/music/play-grey.svg rename to assets/icons/music/play-grey.svg diff --git a/theme/resources/icons/music/stop-blue.svg b/assets/icons/music/stop-blue.svg similarity index 100% rename from theme/resources/icons/music/stop-blue.svg rename to assets/icons/music/stop-blue.svg diff --git a/theme/resources/icons/music/stop-grey.svg b/assets/icons/music/stop-grey.svg similarity index 100% rename from theme/resources/icons/music/stop-grey.svg rename to assets/icons/music/stop-grey.svg diff --git a/theme/resources/icons/raid/degraded-recover.svg b/assets/icons/raid/degraded-recover.svg similarity index 100% rename from theme/resources/icons/raid/degraded-recover.svg rename to assets/icons/raid/degraded-recover.svg diff --git a/theme/resources/icons/raid/degraded.svg b/assets/icons/raid/degraded.svg similarity index 100% rename from theme/resources/icons/raid/degraded.svg rename to assets/icons/raid/degraded.svg diff --git a/theme/resources/icons/raid/healthy-recover.svg b/assets/icons/raid/healthy-recover.svg similarity index 100% rename from theme/resources/icons/raid/healthy-recover.svg rename to assets/icons/raid/healthy-recover.svg diff --git a/theme/resources/icons/raid/healthy.svg b/assets/icons/raid/healthy.svg similarity index 100% rename from theme/resources/icons/raid/healthy.svg rename to assets/icons/raid/healthy.svg diff --git a/theme/resources/icons/titlebar/hover/close.svg b/assets/icons/titlebar/hover/close.svg similarity index 100% rename from theme/resources/icons/titlebar/hover/close.svg rename to assets/icons/titlebar/hover/close.svg diff --git a/theme/resources/icons/titlebar/hover/float.svg b/assets/icons/titlebar/hover/float.svg similarity index 100% rename from theme/resources/icons/titlebar/hover/float.svg rename to assets/icons/titlebar/hover/float.svg diff --git a/theme/resources/icons/titlebar/hover/maximize.svg b/assets/icons/titlebar/hover/maximize.svg similarity index 100% rename from theme/resources/icons/titlebar/hover/maximize.svg rename to assets/icons/titlebar/hover/maximize.svg diff --git a/theme/resources/icons/titlebar/hover/minimize.svg b/assets/icons/titlebar/hover/minimize.svg similarity index 100% rename from theme/resources/icons/titlebar/hover/minimize.svg rename to assets/icons/titlebar/hover/minimize.svg diff --git a/theme/resources/icons/titlebar/hover/ontop.svg b/assets/icons/titlebar/hover/ontop.svg similarity index 100% rename from theme/resources/icons/titlebar/hover/ontop.svg rename to assets/icons/titlebar/hover/ontop.svg diff --git a/theme/resources/icons/titlebar/hover/stick.svg b/assets/icons/titlebar/hover/stick.svg similarity index 100% rename from theme/resources/icons/titlebar/hover/stick.svg rename to assets/icons/titlebar/hover/stick.svg diff --git a/theme/resources/icons/titlebar/regular/close.svg b/assets/icons/titlebar/regular/close.svg similarity index 100% rename from theme/resources/icons/titlebar/regular/close.svg rename to assets/icons/titlebar/regular/close.svg diff --git a/theme/resources/icons/titlebar/regular/float.svg b/assets/icons/titlebar/regular/float.svg similarity index 100% rename from theme/resources/icons/titlebar/regular/float.svg rename to assets/icons/titlebar/regular/float.svg diff --git a/theme/resources/icons/titlebar/regular/maximize.svg b/assets/icons/titlebar/regular/maximize.svg similarity index 100% rename from theme/resources/icons/titlebar/regular/maximize.svg rename to assets/icons/titlebar/regular/maximize.svg diff --git a/theme/resources/icons/titlebar/regular/minimize.svg b/assets/icons/titlebar/regular/minimize.svg similarity index 100% rename from theme/resources/icons/titlebar/regular/minimize.svg rename to assets/icons/titlebar/regular/minimize.svg diff --git a/theme/resources/icons/titlebar/regular/ontop.svg b/assets/icons/titlebar/regular/ontop.svg similarity index 100% rename from theme/resources/icons/titlebar/regular/ontop.svg rename to assets/icons/titlebar/regular/ontop.svg diff --git a/theme/resources/icons/titlebar/regular/stick.svg b/assets/icons/titlebar/regular/stick.svg similarity index 100% rename from theme/resources/icons/titlebar/regular/stick.svg rename to assets/icons/titlebar/regular/stick.svg diff --git a/theme/resources/icons/volume/error.svg b/assets/icons/volume/error.svg similarity index 100% rename from theme/resources/icons/volume/error.svg rename to assets/icons/volume/error.svg diff --git a/theme/resources/icons/volume/high.svg b/assets/icons/volume/high.svg similarity index 100% rename from theme/resources/icons/volume/high.svg rename to assets/icons/volume/high.svg diff --git a/theme/resources/icons/volume/low.svg b/assets/icons/volume/low.svg similarity index 100% rename from theme/resources/icons/volume/low.svg rename to assets/icons/volume/low.svg diff --git a/theme/resources/icons/volume/medium.svg b/assets/icons/volume/medium.svg similarity index 100% rename from theme/resources/icons/volume/medium.svg rename to assets/icons/volume/medium.svg diff --git a/theme/resources/icons/volume/mute-red.svg b/assets/icons/volume/mute-red.svg similarity index 100% rename from theme/resources/icons/volume/mute-red.svg rename to assets/icons/volume/mute-red.svg diff --git a/theme/resources/icons/volume/mute.svg b/assets/icons/volume/mute.svg similarity index 100% rename from theme/resources/icons/volume/mute.svg rename to assets/icons/volume/mute.svg diff --git a/theme/resources/icons/volume/off.svg b/assets/icons/volume/off.svg similarity index 100% rename from theme/resources/icons/volume/off.svg rename to assets/icons/volume/off.svg diff --git a/theme/resources/init.lua b/assets/init.lua similarity index 93% rename from theme/resources/init.lua rename to assets/init.lua index 7021d7b..cefe540 100755 --- a/theme/resources/init.lua +++ b/assets/init.lua @@ -1,5 +1,14 @@ -local sounds = require("theme.resources.sounds") -local icons = require("theme.resources.icons") +-- DESKTOP ASSETS +-- +-- This directory contains all media files used by awesome, +-- and this script configures their paths. +-- +-- Raw file paths should NEVER be referenced anywhere else. +-- Use the `assets.*` table. + +local sounds = require("assets.sounds") +local icons = require("assets.icons") + local overrides = function(theme) theme.sounds = sounds diff --git a/assets/sounds.lua b/assets/sounds.lua new file mode 100755 index 0000000..6c2c945 --- /dev/null +++ b/assets/sounds.lua @@ -0,0 +1,7 @@ +local gears = require("gears") +local conf_dir = gears.filesystem.get_configuration_dir() + +return { + volume_up = conf_dir .. "assets/sounds/volumeup-click.mp3", + volume_down = conf_dir .. "assets/sounds/volumedown-click.mp3" +} diff --git a/theme/resources/sounds/accept.ogg b/assets/sounds/accept.ogg similarity index 100% rename from theme/resources/sounds/accept.ogg rename to assets/sounds/accept.ogg diff --git a/theme/resources/sounds/hover.ogg b/assets/sounds/hover.ogg similarity index 100% rename from theme/resources/sounds/hover.ogg rename to assets/sounds/hover.ogg diff --git a/theme/resources/sounds/request.ogg b/assets/sounds/request.ogg similarity index 100% rename from theme/resources/sounds/request.ogg rename to assets/sounds/request.ogg diff --git a/theme/resources/sounds/send.ogg b/assets/sounds/send.ogg similarity index 100% rename from theme/resources/sounds/send.ogg rename to assets/sounds/send.ogg diff --git a/theme/resources/sounds/type.ogg b/assets/sounds/type.ogg similarity index 100% rename from theme/resources/sounds/type.ogg rename to assets/sounds/type.ogg diff --git a/theme/resources/sounds/volumedown-click.mp3 b/assets/sounds/volumedown-click.mp3 similarity index 100% rename from theme/resources/sounds/volumedown-click.mp3 rename to assets/sounds/volumedown-click.mp3 diff --git a/theme/resources/sounds/volumeup-click.mp3 b/assets/sounds/volumeup-click.mp3 similarity index 100% rename from theme/resources/sounds/volumeup-click.mp3 rename to assets/sounds/volumeup-click.mp3 diff --git a/bin/configs/compton.conf b/bin/configs/compton.conf deleted file mode 100755 index 24b4716..0000000 --- a/bin/configs/compton.conf +++ /dev/null @@ -1,79 +0,0 @@ -backend = "glx"; -mark-wmwin-focused = true; -mark-ovredir-focused = true; -detect-rounded-corners = true; -detect-client-opacity = true; -refresh-rate = 0; -vsync = "none"; -dbe = false; -paint-on-overlay = true; - -focus-exclude = [ - "class_g = 'Firefox Developer Edition'", - "class_g = 'Firefox-esr'" -]; - -detect-transient = true; -detect-client-leader = true; -invert-color-include = [ ]; -glx-copy-from-front = false; -glx-swap-method = "undefined"; - -wintypes: -{ - tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; }; -}; - - - -shadow = true; -no-dnd-shadow = true; -no-dock-shadow = false; -clear-shadow = true; -shadow-radius = 10; -shadow-offset-x = -7; -shadow-offset-y = -7; -shadow-opacity = 0.3; -shadow-exclude = [ - #"!(class_g = 'kitty-noblur')" -]; - - - -fading = true; -fade-in-step=0.02; -fade-out-step=0.03; -fade-delta=5; -fade-exclude = [ - "(!class_g = 'awesome') && (!class_g = 'Rofi')" -] - - -opacity = false -active-opacity = 1; -inactive-opacity = 1; -frame-opacity = 1; - -opacity-rule = [ - # Kitty already has a transparent background. - # 99% opacity to make text opaque - "99:class_g = 'kitty'" -]; - - - -## blur -blur-background = true; -blur-background-frame = false; -blur-background-fixed = false; -blur-kern = "3x3box"; -blur-method = "kawase"; -blur-strength = 16; - -blur-background-exclude = [ - "window_type = 'desktop'", - "name = 'awesome'", - "name = 'Zoom Meeting'", - #"(class_g = 'awesome') && !(window_type = 'normal')", - "class_g = 'kitty-noblur'" -]; diff --git a/theme/init.lua b/theme/init.lua index 4b33ff8..338692f 100755 --- a/theme/init.lua +++ b/theme/init.lua @@ -5,7 +5,7 @@ local bar = require("theme.bar") local clients = require("theme.clients") -local resources = require("theme.resources") +local assets = require("assets") local notifications = require("theme.notifications") local theme = {} @@ -13,7 +13,8 @@ theme.dpi = beautiful.xresources.apply_dpi theme.color = require("theme.color") -- Execute overrides -local theme = resources(theme) -- Must be first! +-- `assets` override MUST be first! +local theme = assets(theme) local theme = bar(theme) local theme = clients(theme) local theme = notifications(theme) diff --git a/theme/resources/sounds.lua b/theme/resources/sounds.lua deleted file mode 100755 index ca8eb5a..0000000 --- a/theme/resources/sounds.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - volume_up = conf.sound_dir .. "volumeup-click.mp3", - volume_down = conf.sound_dir .. "volumedown-click.mp3" -}