fix gtk themes, and remove x11 wm configs

130 files changed, 0 insertions, 2307 deletions

diff --git a/.gitmodules b/.gitmodules
index b51913f..f477143 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,3 @@
 [submodule "qutebrowser/jmatrix"]
 	path = qutebrowser/jmatrix
 	url = https://gitlab.com/jgkamat/jmatrix.git
-[submodule "awesome/awesome-wm-widgets"]
-	path = awesome/awesome-wm-widgets
-	url = https://git.zachir.xyz/awesome-wm-widgets.git
-[submodule "awesome/bling"]
-	path = awesome/bling
-	url = https://github.com/BlingCorp/bling.git
diff --git a/X11/xinitrc b/X11/xinitrc
deleted file mode 100755
index 92cc3db..0000000
--- a/X11/xinitrc
+++ /dev/null
@@ -1,6 +0,0 @@
-xrdb ~/.Xresources
-sh -c ~/.xprofile &
-#runsvdir ~/.runit/runsvdir &
-[ -x ~/.screenlayout/layout_1.sh ] && ~/.screenlayout/layout_1.sh
-WM="$(~/.local/bin/scripts/crcparse 'WM')"
-exec $WM
diff --git a/X11/xprofile b/X11/xprofile
deleted file mode 100755
index 18647e2..0000000
--- a/X11/xprofile
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#layout.sh
-#tsoff
-#xrdb ~/.Xresources &
-setxkbmap -option "caps:escape" &
-#xwallpaper --center ~/background.jpg &
-#picom &
diff --git a/awesome/README.md b/awesome/README.md
deleted file mode 100644
index f32fc08..0000000
--- a/awesome/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Awesome Config
-
-My awesomewm config.
\ No newline at end of file
diff --git a/awesome/awesome-wm-widgets b/awesome/awesome-wm-widgets
deleted file mode 160000
-Subproject 69f87571a371794de1ede7d3d00f0282134ad04
diff --git a/awesome/bling b/awesome/bling
deleted file mode 160000
-Subproject 677917056d118d02feaa5c21ecf5a50375ef123
diff --git a/awesome/helper.sh b/awesome/helper.sh
deleted file mode 100755
index d51fbab..0000000
--- a/awesome/helper.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-ppid() {
-  printf "$(ps -o ppid= -p $1)" | xargs
-}
-
-gppid() {
-  PARENT=$(ps -o ppid= -p $1)
-  GRANDPARENT=$(ps -o ppid= -p $PARENT)
-  printf "$GRANDPARENT" | xargs
-}
-
-$@
diff --git a/awesome/rc.lua b/awesome/rc.lua
deleted file mode 100644
index 70f6329..0000000
--- a/awesome/rc.lua
+++ /dev/null
@@ -1,1121 +0,0 @@
--- If LuaRocks is installed, make sure that packages installed through it are
--- found (e.g. lgi). If LuaRocks is not installed, do nothing.
-pcall(require, "luarocks.loader")
-
--- Standard awesome library
-local gears = require("gears")
-local awful = require("awful")
-require("awful.autofocus")
--- Widget and layout library
-local wibox = require("wibox")
--- Theme handling library
-local beautiful = require("beautiful")
--- Notification library
-local naughty = require("naughty")
-package.loaded["naughty.dbus"] = {}
-local menubar = require("menubar")
-local hotkeys_popup = require("awful.hotkeys_popup")
--- Enable hotkeys help widget for VIM and other apps
--- when client with a matching name is opened:
-require("awful.hotkeys_popup.keys")
-
--- {{{ Error handling
--- Check if awesome encountered an error during startup and fell back to
--- another config (This code will only ever execute for the fallback config)
-if awesome.startup_errors then
-    naughty.notify({ preset = naughty.config.presets.critical,
-                     title = "Oops, there were errors during startup!",
-                     text = awesome.startup_errors })
-end
-
--- Handle runtime errors after startup
-do
-    local in_error = false
-    awesome.connect_signal("debug::error", function (err)
-        -- Make sure we don't go into an endless error loop
-        if in_error then return end
-        in_error = true
-
-        naughty.notify({ preset = naughty.config.presets.critical,
-                         title = "Oops, an error happened!",
-                         text = tostring(err) })
-        in_error = false
-    end)
-end
--- }}}
-
--- {{{ Variable definitions
--- Themes define colours, icons, font and wallpapers.
-local theme = {}
-theme.name = "default"
-if (os.getenv("XDG_CONFIG_HOME")) then
-  config_dir = os.getenv("XDG_CONFIG_HOME")
-else
-  config_dir = string.format("%s/.config", os.getenv("HOME"))
-end
-awesome_config_folder = config_dir .. "awesome"
-theme.dir = string.format("%s/awesome/themes/%s", config_dir, theme.name)
-beautiful.init(theme.dir .. "/theme.lua")
-beautiful.useless_gap = 5
-beautiful.wallpaper = awful.util.get_configuration_dir() .. "../../background.png"
-font = beautiful.font or "mononoki Nerd Font Mono 18"
-local bling = require("bling")
-
--- Widget definitions/initializations
-
-local battery_widget = require("awesome-wm-widgets.batteryarc-widget.batteryarc")
-local mpd_widget = require("awesome-wm-widgets.mpdarc-widget.mpdarc")
-local volume_widget = require("awesome-wm-widgets.volume-widget.volume")
-local ram_widget = require("awesome-wm-widgets.ram-widget.ram-widget")
-local cpu_widget = require("awesome-wm-widgets.cpu-widget.cpu-widget")
-local brightness_widget = require("awesome-wm-widgets.brightness-widget.brightness")
-local net_speed = require("awesome-wm-widgets.net-speed-widget.net-speed")
-
--- Disable keybindings
-
-local inertmode = false
-
--- Spawn windows at bottom of stack
-
-local spawnatbottom = false
-
-
--- Default modkey.
--- Usually, Mod4 is the key with a logo between Control and Alt.
--- If you do not like this or do not have such a key,
--- I suggest you to remap Mod4 to another key using xmodmap or other tools.
--- However, you can use another modifier like Mod1, but it may interact with others.
-modkey = "Mod1"
-
--- Table of layouts to cover with awful.layout.inc, order matters.
-awful.layout.layouts = {
-    --awful.layout.suit.floating,
-    awful.layout.suit.tile,
-    --awful.layout.suit.tile.left,
-    --awful.layout.suit.tile.bottom,
-    --awful.layout.suit.tile.top,
-    --awful.layout.suit.fair,
-    --awful.layout.suit.fair.horizontal,
-    --awful.layout.suit.spiral,
-    --awful.layout.suit.spiral.dwindle,
-    --awful.layout.suit.max,
-    --awful.layout.suit.max.fullscreen,
-    --awful.layout.suit.magnifier,
-    --awful.layout.suit.corner.nw,
-    -- awful.layout.suit.corner.ne,
-    -- awful.layout.suit.corner.sw,
-    -- awful.layout.suit.corner.se,
-}
--- }}}
-
--- Config function definitions {{{
-
-function crcparse(substr)
-  local file=assert(io.open(config_dir .. "/computerrc","r"))
-  local line = ""
-  repeat
-    line=file:read("*line")
-    if line and line:find(string.format("^%s=",substr)) then
-      return string.sub(line,#substr + 2,-1)
-    end
-  until not line
-end
-
-function terminal_sp_cmd (spc, cmd, geo)
-  if terminal == "st" then
-    cflag = "-c"
-    gflag = "-g"
-    xflag = "-e"
-  elseif terminal == "alacritty" then
-    cflag = "--class"
-    gflag = false
-    xflag = "-e"
-  end
-  if cflag and spc then
-    cl = " " .. cflag .. " " .. spc
-  else
-    cl = ""
-  end
-  if gflag and geo then
-    gl = " " .. gflag .. " " .. geo
-  else
-    gl = ""
-  end
-  if xflag and cmd then
-    xl = " " .. xflag .. " " .. cmd
-  else
-    xl = ""
-  end
-  return terminal .. cl .. gl .. xl
-end
-
--- }}}
-
--- {{{ crcparse Definitions
-
--- terminal
-terminal=crcparse("term")
-editor = os.getenv("EDITOR") or "nvim"
-editor_cmd = terminal .. " -e " .. editor
-
--- is linux
-function is_linux ()
-  return crcparse("OS") == "Linux"
-end
-
--- is openbsd
-function is_obsd ()
-  return crcparse("OS") == "OpenBSD"
-end
-
--- }}}
-
---{{{ bling scratchpad definitions
---{{{ sphtop
-local sphtop = bling.module.scratchpad {
-  command = terminal_sp_cmd("sphtop", "htop", nil),
-  rule = { class = "sphtop" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ spterm
-local spterm = bling.module.scratchpad {
-  command = terminal_sp_cmd("spterm", nil, nil),
-  rule = { class = "spterm" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ sppmxr
-local sppmxr = bling.module.scratchpad {
-  command = terminal_sp_cmd("sppmxr", "pulsemixer", nil),
-  rule = { class = "sppmxr" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ spblue
-local spblue = bling.module.scratchpad {
-  command = terminal_sp_cmd("spblue", "bluetoothctl", nil),
-  rule = { class = "spblue" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ spncmp
-local spncmp = bling.module.scratchpad {
-  command = terminal_sp_cmd("spncmp", "ncmpcpp", nil),
-  rule = { class = "spncmp" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ spmutt
-local spmutt = bling.module.scratchpad {
-  command = terminal_sp_cmd("spmutt", "neomutt", nil),
-  rule = { class = "spmutt" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ spprof
-local spprof = bling.module.scratchpad {
-  command = terminal_sp_cmd("spprof", "profanity", nil),
-  rule = { class = "spprof" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ spirss
-local spirss = bling.module.scratchpad {
-  command = terminal_sp_cmd("spirss", "irssi", nil),
-  rule = { class = "spirss" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ sptodo
-local sptodo = bling.module.scratchpad {
-  command = terminal_sp_cmd("sptodo", "todo", nil),
-  rule = { class = "sptodo" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ sptrem
-local sptrem = bling.module.scratchpad {
-  command = terminal_sp_cmd("sptrem", "tremc", nil),
-  rule = { class = "sptrem" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---{{{ qpwgraph
-local qpwgraph = bling.module.scratchpad {
-  command = "qpwgraph",
-  rule = { class = "qpwgraph" },
-  sticky = true,
-  autoclose = true,
-  floating = true,
-  geometry = { x = 575, y = 275, height = 530, width = 770 },
-  reapply = true,
-  dont_focus_before_close = false
-}
---}}}
---}}}
-
--- {{{ Menu
--- Create a launcher widget and a main menu
-myawesomemenu = {
-   { "hotkeys", function() hotkeys_popup.show_help(nil, awful.screen.focused()) end },
-   { "manual", terminal .. " -e man awesome" },
-   { "edit config", editor_cmd .. " " .. awesome.conffile },
-   { "restart", awesome.restart },
-   { "quit", function() awesome.quit() end },
-}
-
-mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon },
-                                    { "open terminal", terminal }
-                                  }
-                        })
-
-mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
-                                     menu = mymainmenu })
-
--- Menubar configuration
-menubar.utils.terminal = terminal -- Set the terminal for applications that require it
--- }}}
-
--- Keyboard map indicator and switcher
-mykeyboardlayout = awful.widget.keyboardlayout()
-
--- {{{ Wibar
--- Create a textclock widget
-mytextclock = wibox.widget.textclock()
-
--- Create a wibox for each screen and add it
-local taglist_buttons = gears.table.join(
-                    awful.button({ }, 1, function(t) t:view_only() end),
-                    awful.button({ modkey }, 1, function(t)
-                                              if client.focus then
-                                                  client.focus:move_to_tag(t)
-                                              end
-                                          end),
-                    awful.button({ }, 3, awful.tag.viewtoggle),
-                    awful.button({ modkey }, 3, function(t)
-                                              if client.focus then
-                                                  client.focus:toggle_tag(t)
-                                              end
-                                          end),
-                    awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end),
-                    awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end)
-                )
-
-local tasklist_buttons = gears.table.join(
-                     awful.button({ }, 1, function (c)
-                                              if c == client.focus then
-                                                  c.minimized = true
-                                              else
-                                                  c:emit_signal(
-                                                      "request::activate",
-                                                      "tasklist",
-                                                      {raise = true}
-                                                  )
-                                              end
-                                          end),
-                     awful.button({ }, 3, function()
-                                              awful.menu.client_list({ theme = { width = 250 } })
-                                          end),
-                     awful.button({ }, 4, function ()
-                                              awful.client.focus.byidx(1)
-                                          end),
-                     awful.button({ }, 5, function ()
-                                              awful.client.focus.byidx(-1)
-                                          end))
-
--- local function set_wallpaper(s)
-    -- -- Wallpaper
-    -- if beautiful.wallpaper then
-        -- local wallpaper = beautiful.wallpaper
-        -- -- If wallpaper is a function, call it with the screen
-        -- if type(wallpaper) == "function" then
-            -- wallpaper = wallpaper(s)
-        -- end
-        -- gears.wallpaper.maximized(wallpaper, s, true)
-    -- end
--- end
-
--- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
--- screen.connect_signal("property::geometry", set_wallpaper)
-
-awful.screen.connect_for_each_screen(function(s)
-    -- -- Wallpaper
-    -- set_wallpaper(s)
-
-    -- Each screen has its own tag table.
-    awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
-
-    -- Create a promptbox for each screen
-    s.mypromptbox = awful.widget.prompt()
-    -- Create an imagebox widget which will contain an icon indicating which layout we're using.
-    -- We need one layoutbox per screen.
-    s.mylayoutbox = awful.widget.layoutbox(s)
-    s.mylayoutbox:buttons(gears.table.join(
-                           awful.button({ }, 1, function () awful.layout.inc( 1) end),
-                           awful.button({ }, 3, function () awful.layout.inc(-1) end),
-                           awful.button({ }, 4, function () awful.layout.inc( 1) end),
-                           awful.button({ }, 5, function () awful.layout.inc(-1) end)))
-    -- Create a taglist widget
-    s.mytaglist = awful.widget.taglist {
-        screen  = s,
-        filter  = awful.widget.taglist.filter.all,
-        buttons = taglist_buttons
-    }
-
-    -- Create a tasklist widget
-    s.mytasklist = awful.widget.tasklist {
-        screen  = s,
-        filter  = awful.widget.tasklist.filter.focused,
-        buttons = tasklist_buttons
-    }
-
-    -- Create the wibox
-    s.mywibox = awful.wibar({ position = "top", screen = s, height = 36})
-
-    if (crcparse("snd") == "pipewire") or (crcparse("snd") == "pulseaudio") or (crcparse("snd") == "pulse") then
-      snd="pulse"
-    else
-      snd="default"
-    end
-
-    net = crcparse("inet")
-
-    batt = crcparse("batt")
-
-    light = crcparse("bl")
-
-    if batt == "y" then
-      battery = battery_widget {
-        font = font,
-        arc_thickness = 2,
-        show_current_level = false,
-        size = 18,
-        timeout = 10,
-        main_color = beautiful.fg_color,
-        bg_color = "#ffffff11",
-        low_level_color = "#e53935",
-        medium_level_color = "#c0ca33",
-        warning_msg_title = "Houston, we have a problem",
-        warning_msg_text = "Battery is dying",
-        warning_msg_position = "bottom_right", -- "bottom_right" is default, or top_right, top_left, bottom_left, bottom_right, top_middle, bottom_middle
-        warning_msg_icon = "~/.config/awesome/awesome-wm-widgets/batteryarc-widget/spaceman.jpg",
-        enable_battery_warning = true,
-        show_notification_mode = "on_click", -- "on_hover" is default, or "on_click" or "off"
-        notification_position = "top_right" -- "top_left is default, or top_right, top_left, bottom_left, bottom_right, top_middle, bottom_middle
-      }
-    else
-      battery = nil
-    end
-
-    if is_linux() then
-      -- Add widgets to the wibox
-      s.mywibox:setup {
-          layout = wibox.layout.align.horizontal,
-          { -- Left widgets
-              layout = wibox.layout.fixed.horizontal,
-              mylauncher,
-              s.mytaglist,
-              s.mypromptbox,
-          },
-          s.mytasklist, -- Middle widget
-          {
-              layout = wibox.layout.fixed.horizontal,
-              mpd_widget,
-              net_speed {
-                font = beautiful.font2,
-                interface = net
-              },
-              ram_widget({
-                color_used=beautiful.bg_focus,
-                color_free=beautiful.fg_normal,
-                color_buf=beautiful.bg_accent,
-                widget_height=32,
-                widget_width=32,
-                widget_show_buf=true,
-                timeout=1
-              }),
-              cpu_widget({
-                width=50,
-                step_width=2,
-                step_spacing=1,
-                color=beautiful.fg_normal,
-                enable_kill_button=false,
-                process_info_max_length=-1,
-                timeout=1
-              }),
-              brightness_widget {
-                type = "arc",
-                program = light,
-                step = 5,
-                base = 20,
-                path_to_icon = "/usr/share/icons/Paper/scalable/status/display-brightness-symbolic.svg", 
-                timeout = 1,
-                tooltip = false,
-                percentage = false
-              },
-              volume_widget {
-                path_to_icon = "/usr/share/icons/Paper/scalable/status/audio-volume-muted-symbolic.svg",
-                widget_type = "arc",
-                mute_color = "#ff111111",
-                device = snd,
-              },
-              battery,
-              mykeyboardlayout,
-              wibox.widget.systray(),
-              mytextclock,
-              s.mylayoutbox,
-          },
-      }
-    elseif is_obsd() then
-       -- Add widgets to the wibox
-      s.mywibox:setup {
-          layout = wibox.layout.align.horizontal,
-          { -- Left widgets
-              layout = wibox.layout.fixed.horizontal,
-              mylauncher,
-              s.mytaglist,
-              s.mypromptbox,
-          },
-          s.mytasklist, -- Middle widget
-          {
-              layout = wibox.layout.fixed.horizontal,
-              mpd_widget,
-              mykeyboardlayout,
-              wibox.widget.systray(),
-              mytextclock,
-              s.mylayoutbox,
-          },
-      }
-    end
-  end)
-  
--- }}}
-
--- {{{ Mouse bindings
-root.buttons(gears.table.join(
-    --[[
-    awful.button({ }, 3, function () mymainmenu:toggle() end),
-    awful.button({ }, 4, awful.tag.viewnext),
-    awful.button({ }, 5, awful.tag.viewprev)
-    --]]
-))
-
-client.connect_signal("mouse::enter", function(c)
-  c:emit_signal("request::activate", "mouse_enter", {raise = false})
-end)
--- }}}
-
--- {{{ Key bindings
-
-
-globalkeys = gears.table.join(
-    -- scratchpads
-    awful.key({ modkey, "Control" }, "z", function ()
-      sphtop:toggle()
-    end,
-              {description = "Toggle htop scratchpad"}),
-    awful.key({ modkey, "Control" }, "x", function ()
-      spterm:toggle()
-    end,
-              {description = "Toggle term scratchpad"}),
-    awful.key({ modkey, "Control" }, "c", function ()
-      sppmxr:toggle()
-    end,
-              {description = "Toggle pulsemixer scratchpad"}),
-    awful.key({ modkey, "Control" }, "v", function ()
-      spblue:toggle()
-    end,
-              {description = "Toggle bluetoothctl scratchpad"}),
-    awful.key({ modkey, "Control" }, "b", function ()
-      spncmp:toggle()
-    end,
-              {description = "Toggle ncmpcpp scratchpad"}),
-    awful.key({ modkey, "Control" }, "a", function ()
-      spmutt:toggle()
-    end,
-              {description = "Toggle neomutt scratchpad"}),
-    awful.key({ modkey, "Control" }, "s", function ()
-      spprof:toggle()
-    end,
-              {description = "Toggle profanity scratchpad"}),
-    awful.key({ modkey, "Control" }, "d", function ()
-      spirss:toggle()
-    end,
-              {description = "Toggle irssi scratchpad"}),
-    awful.key({ modkey, "Control" }, "f", function ()
-      sptodo:toggle()
-    end,
-              {description = "Toggle todo.txt scratchpad"}),
-    awful.key({ modkey, "Control" }, "g", function ()
-      sptrem:toggle()
-    end,
-              {description = "Toggle tremc scratchpad"}),
-    awful.key({ modkey, "Control" }, "q", function ()
-      qpwgraph:toggle()
-    end,
-              {description = "Toggle qpwgraph scratchpad"}),
-    awful.key({ modkey,           }, "a", function ()
-        spawnatbottom = not spawnatbottom
-    end,
-              {description = "toggle attach at bottom", group = "layout"}),
-    awful.key({ modkey,           }, "b", function ()
-      root.keys(inertkeys)
-    end,
-              {description = "turn inert mode on", group = "awesome"}),
-    --awful.key({ modkey,           }, "s", function () 
-        --hotkeys_popup.show_help()
-    --end,
-              --{description="show help", group="awesome"}),
-    --awful.key({ modkey,           }, "Left",   function () 
-        --awful.tag.viewprev()
-    --end,
-              --{description = "view previous", group = "tag"}),
-    --awful.key({ modkey,           }, "Right",  function () 
-        --awful.tag.viewnext()
-    --end,
-              --{description = "view next", group = "tag"}),
-    awful.key({modkey,            }, "Return", function ()
-        awful.spawn.with_shell(terminal)
-      end,
-              {description = "Spawn terminal", group = "spawn"}),
-    awful.key({ modkey,           }, "j",
-        function ()
-            awful.client.focus.byidx( 1)
-        end,
-        {description = "focus next by index", group = "client"}),
-    awful.key({ modkey,           }, "k",
-        function ()
-            awful.client.focus.byidx(-1)
-        end,
-        {description = "focus previous by index", group = "client"}),
-    awful.key({ modkey,           }, "w", function ()
-        mymainmenu:show()
-      end,
-              {description = "show main menu", group = "awesome"}),
-
-    -- Layout manipulation
-    awful.key({ modkey, "Shift"   }, "j", function () awful.client.swap.byidx(  1)    end,
-              {description = "swap with next client by index", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "k", function ()
-        awful.client.swap.byidx( -1)   
-      end,
-              {description = "swap with previous client by index", group = "client"}),
-    awful.key({ modkey, "Control" }, "j", function ()
-        awful.screen.focus_relative( 1)
-      end,
-              {description = "focus the next screen", group = "screen"}),
-    awful.key({ modkey, "Control" }, "k", function ()
-        awful.screen.focus_relative(-1)
-      end,
-              {description = "focus the previous screen", group = "screen"}),
-    -- awful.key({ modkey,           }, "u", function ()
-        -- awful.client.urgent.jumpto()
-    -- end,
-              -- {description = "jump to urgent client", group = "client"}),
-    awful.key({ modkey,           }, "Tab",
-        function ()
-            awful.client.focus.history.previous()
-            if client.focus then
-                client.focus:raise()
-            end
-        end,
-        {description = "go back", group = "client"}),
-
-    -- Standard program
---    awful.key({ modkey,           }, "Return", function ()
---    if (not inertmode) then
---    awful.spawn(terminal)
---    end
---    end,
---              {description = "open a terminal", group = "launcher"}),
-    awful.key({ modkey, "Shift"   }, "r", function ()
-        awesome.restart()
-    end,
-              {description = "reload awesome", group = "awesome"}),
-    awful.key({ modkey, "Shift"   }, "e", function ()
-        awesome.quit()
-    end,
-              {description = "quit awesome", group = "awesome"}),
-
-    awful.key({ modkey,           }, "l",     function ()
-        awful.tag.incmwfact( 0.05)
-    end,
-              {description = "increase master width factor", group = "layout"}),
-    awful.key({ modkey,           }, "h",     function ()
-        awful.tag.incmwfact(-0.05)
-    end,
-              {description = "decrease master width factor", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "h",     function ()
-        awful.tag.incnmaster( 1, nil, true)
-    end,
-              {description = "increase te number of master clients", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "l",     function ()
-        awful.tag.incnmaster(-1, nil, true)
-    end,
-              {description = "decrease the number of master clients", group = "layout"}),
-    awful.key({ modkey, "Control" }, "h",     function ()
-        awful.tag.incncol( 1, nil, true)   
-    end,
-              {description = "increase the number of columns", group = "layout"}),
-    awful.key({ modkey, "Control" }, "l",     function ()
-        awful.tag.incncol(-1, nil, true)   
-    end,
-              {description = "decrease the number of columns", group = "layout"}),
-    awful.key({ modkey,           }, "space", function ()
-    
-        awful.layout.inc( 1)               
-    end,
-              {description = "select next", group = "layout"}),
-    awful.key({ modkey, "Shift"   }, "space", function ()
-        awful.layout.inc(-1)               
-      end,
-              {description = "select previous", group = "layout"}),
-
-    awful.key({ modkey, "Control" }, "n",
-              function ()
-                  local c = awful.client.restore()
-                  -- Focus restored client
-                  if c then
-                    c:emit_signal(
-                        "request::activate", "key.unminimize", {raise = true}
-                    )
-                  end
-              end,
-              {description = "restore minimized", group = "client"}),
-
-    -- Prompt
---    awful.key({ modkey },            "r",     function () awful.screen.focused().mypromptbox:run() end,
---              {description = "run prompt", group = "launcher"}),
-
-    awful.key({ modkey }, "x",
-              function ()
-                  awful.prompt.run {
-                    prompt       = "Run Lua code: ",
-                    textbox      = awful.screen.focused().mypromptbox.widget,
-                    exe_callback = awful.util.eval,
-                    history_path = awful.util.get_cache_dir() .. "/history_eval"
-                  }
-              end,
-              {description = "lua execute prompt", group = "awesome"})
-    -- Menubar
---  awful.key({ modkey }, "p", function() menubar.show() end,
---            {description = "show the menubar", group = "launcher"})
-)
-
-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, "Shift"   }, "q",      function (c)
-        c:kill()
-    end,
-              {description = "close", group = "client"}),
-    awful.key({ modkey, "Control" }, "space",  function (c)
-        c.floating = not c.floating
-    end,
-              {description = "toggle floating", group = "client"}),
-    awful.key({ modkey, "Control" }, "Return", function (c)
-        c:swap(awful.client.getmaster())
-    end,
-              {description = "move to master", group = "client"}),
-    awful.key({ modkey,           }, "o",      function (c)
-        c:move_to_screen()
-    end,
-              {description = "move to screen", group = "client"}),
-    awful.key({ modkey,           }, "t",      function (c)
-        c.ontop = not c.ontop
-    end,
-              {description = "toggle keep on top", group = "client"}),
-    awful.key({ modkey,           }, "n",
-        function (c)
-            -- The client currently has the input focus, so it cannot be
-            -- minimized, since minimized clients can't have the focus.
-            c.minimized = true
-        end ,
-        {description = "minimize", group = "client"}),
-    awful.key({ modkey,           }, "m",
-        function (c)
-            c.maximized = not c.maximized
-            c:raise()
-        end ,
-        {description = "(un)maximize", group = "client"}),
-    awful.key({ modkey, "Control" }, "m",
-        function (c)
-            c.maximized_vertical = not c.maximized_vertical
-            c:raise()
-        end ,
-        {description = "(un)maximize vertically", group = "client"}),
-    awful.key({ modkey, "Shift"   }, "m",
-        function (c)
-            c.maximized_horizontal = not c.maximized_horizontal
-            c:raise()
-        end ,
-        {description = "(un)maximize horizontally", group = "client"})
-)
-
--- Bind all key numbers to tags.
--- Be careful: we use keycodes to make it work on any keyboard layout.
--- This should map on the top row of your keyboard, usually 1 to 9.
-for i = 1, 9 do
-    globalkeys = gears.table.join(globalkeys,
-        -- View tag only.
-        awful.key({ modkey }, "#" .. i + 9,
-                  function ()
-                        local screen = awful.screen.focused()
-                        local tag = screen.tags[i]
-                        if tag then
-                           tag:view_only()
-                        end
-                  end,
-                  {description = "view tag #"..i, group = "tag"}),
-        -- Toggle tag display.
-        awful.key({ modkey, "Control" }, "#" .. i + 9,
-                  function ()
-                      local screen = awful.screen.focused()
-                      local tag = screen.tags[i]
-                      if tag then
-                         awful.tag.viewtoggle(tag)
-                      end
-                  end,
-                  {description = "toggle tag #" .. i, group = "tag"}),
-        -- Move client to tag.
-        awful.key({ modkey, "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus then
-                          local tag = client.focus.screen.tags[i]
-                          if tag then
-                              client.focus:move_to_tag(tag)
-                          end
-                      end
-                  end,
-                  {description = "move focused client to tag #"..i, group = "tag"}),
-        -- Toggle tag on focused client.
-        awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
-                  function ()
-                      if client.focus then
-                          local tag = client.focus.screen.tags[i]
-                          if tag then
-                              client.focus:toggle_tag(tag)
-                          end
-                      end
-                  end,
-                  {description = "toggle focused client on tag #" .. i, group = "tag"})
-    )
-end
-
-clientbuttons = gears.table.join(
-    awful.button({ 0      }, 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)
-)
-
-inertkeys = gears.table.join(
-    awful.key({ modkey,           }, "b", function ()
-      root.keys(globalkeys)
-    end,
-              {description = "turn inert mode off", group = "awesome"})
-)
-
--- Set keys
-root.keys(globalkeys)
--- }}}
-
--- {{{ Rules
--- Rules to apply to new clients (through the "manage" signal).
-awful.rules.rules = {
-    -- All clients will match this rule.
-    { rule = { },
-      properties = { border_width = beautiful.border_width,
-                     border_color = beautiful.border_normal,
-                     focus = awful.client.focus.filter,
-                     raise = true,
-                     keys = clientkeys,
-                     buttons = clientbuttons,
-                     screen = awful.screen.preferred,
-                     placement = awful.placement.no_overlap+awful.placement.no_offscreen
-     }
-    },
-
-    { rule_any = {
-        class = {
-          "QjackCtl",
-          "Tk",
-          "gcr-prompter"
-        }
-      },
-      properties = { floating = true },
-      callback = function(c)
-        awful.placement.centered(c,nil)
-      end
-    },
-
-    -- Floating clients.
-    { rule_any = {
-        instance = {
-          "DTA",  -- Firefox addon DownThemAll.
-          "copyq",  -- Includes session name in class.
-          "pinentry",
-        },
-        class = {
-          --"mpv",
-          "ProtonMail Bridge",
-          "TheFiniteDemo",
-          "Arandr",
-          "Blueman-manager",
-          "Gpick",
-          "Kruler",
-          "MessageWin",  -- kalarm.
-          -- "Sxiv",
-          "Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
-          "Wpa_gui",
-          "veromix",
-          "xtightvncviewer"},
-
-        -- Note that the name property shown in xprop might be set slightly after creation of the client
-        -- and the name shown there might not match defined rules here.
-        name = {
-          "Event Tester",  -- xev.
-        },
-        role = {
-          "AlarmWindow",  -- Thunderbird's calendar.
-          "ConfigManager",  -- Thunderbird's about:config.
-          "pop-up",       -- e.g. Google Chrome's (detached) Developer Tools.
-        }
-      }, properties = { floating = true }},
-
-    -- Add titlebars to normal clients and dialogs
-    { rule_any = {type = { "normal", "dialog" }
-      }, properties = { titlebars_enabled = true }
-    },
-
-    -- These windows will be force resized to fit
-    { rule_any = {
-      class = {
-        "mpv",
-        "Lutris",
-        "polychromatic-controller"
-      },
-    }, properties = { size_hints_honor = false } },
-
-    -- Set Firefox to always map on the tag named "2" on screen 1.
-    -- { rule = { class = "Firefox" },
-    --   properties = { screen = 1, tag = "2" } },
-}
--- }}}
-
---{{{ bling window swallowing
-bling.module.window_swallowing.start()
---}}}
-
--- {{{ Window Swallowing functions OLD/DEPRECATED
---[[
-function is_terminal(c)
-    return (c.class and (c.class:match("St") or c.class:match("Alacritty"))) and true or false
-end
-
-function is_noswallow(c)
-  return false
-end
-
-function copy_size(c, parent_client)
-    if not c or not parent_client then
-        return
-    end
-    if not c.valid or not parent_client.valid then
-        return
-    end
-    c.x=parent_client.x;
-    c.y=parent_client.y;
-    c.width=parent_client.width;
-    c.height=parent_client.height;
-end
-function check_resize_client(c)
-    if(c.child_resize) then
-        copy_size(c.child_resize, c)
-    end
-end
-
-function get_parent_pid(child_ppid, callback)
-    local ppid_cmd = string.format("ps -o ppid= -p %s", child_ppid)
-    awful.spawn.easy_async(ppid_cmd, function(stdout, stderr, reason, exit_code)
-        -- primitive error checking
-        if stderr and stderr ~= "" then
-            callback(err, false)
-            return
-        end
-        local ppid = stdout:gsub(" ", ""):gsub("\n", "")
-        callback(nil, ppid)
-    end)
-end
-
-function if_client_and_parent(c1, c2, cl)
-  if c1 and cl and cl.pid and (c1:find('^' .. cl.pid) or c2) then
-    return true
-  end
-end
-
---]]
---[[ FULLY UNTESTED, UNVERIFIED. PLEASE DO NOT RUN.
-function incall(err, ppid, cl)
-  if err then
-    return
-  end
-  if ppid and cl and cl.pid and (ppid:find('^' .. cl.pid)) then
-    return true
-  end
-  if ppid ~= 1 then
-    get_parent_pid(ppid, incall)
-  else
-  end
-end
-
-function get_id_or_recurse(pid, err)
-  if pid == 1 then
-    return 1
-  else
-  end
-end
---]]
---[[
-client.connect_signal("property::size", check_resize_client)
-client.connect_signal("property::position", check_resize_client)
-client.connect_signal("manage", function(c)
-    if is_terminal(c) or is_noswallow(c) then
-        return
-    end
-    local procid = 0
-    while (procid ~= 1) do
-      
-    end
-    local parent_client=awful.client.focus.history.get(c.screen, 1)
-    get_parent_pid(c.pid, function(err, ppid)
-        if err then
-            --error(err)
-            return
-        end
-        parent_pid = ppid or false
-        get_parent_pid(parent_pid, function(err, gppid)
-            if err then
-                --error(err)
-                return
-            end
-            grand_parent_pid = gppid or false
-            get_parent_pid(grand_parent_pid, function(err, ggppid)
-                if err then
-                    --error(err)
-                    return
-                end
-                great_grand_parent_pid = ggppid or false
-                get_parent_pid(great_grand_parent_pid, function(err, gggppid)
-                    if err then
-                        --error(err)
-                        return
-                    end
-                    great_great_grand_parent_pid = gggppid or false
-                    --if parent_client and (parent_pid:find('^' .. parent_client.pid) or (grand_parent_pid and (grand_parent_pid:find('^' .. parent_client.pid) or (great_grand_parent_pid and great_grand_parent_pid:find('^' .. parent_client.pid))))) and is_terminal(parent_client) then
-                    if parent_client and if_client_and_parent(parent_pid, if_client_and_parent(grand_parent_pid, if_client_and_parent(great_grand_parent_pid, great_great_grand_parent_pid, parent_client),parent_client), parent_client) and is_terminal(parent_client) then
-                        parent_client.child_resize=c
-                        c.floating=true
-                        copy_size(c, parent_client)
-                    end
-                end)
-            end)
-        end)
-    end)
-end)
---]]
--- }}}
-
--- {{{ Autostart
--- awful.spawn.with_shell("/usr/bin/sxhkd")
-awful.spawn.with_shell(string.format("sh %s/autostart.sh &", config_dir))
--- }}}
-
--- {{{ Floating windows always on top
---[[
-client.connect_signal("property::floating", function(c)
-  if not c.fullscreen then
-    if c.floating then
-      c.ontop = true
-    else
-      c.ontop = false
-    end
-  end
-end)
---]]
--- }}}
-
--- spawn windows as slaves {{{
-client.connect_signal(
-    "manage",
-    function(c)
-        if not awesome.startup then
-          if spawnatbottom then
-            awful.client.setslave(c)
-          end
-        end
-    end
-)
--- }}}
diff --git a/awesome/themes/default/README b/awesome/themes/default/README
deleted file mode 100644
index 1ddb349..0000000
--- a/awesome/themes/default/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Background images:
-    Mikael Eriksson <mikael_eriksson@miffe.org>
-    Licensed under CC-BY-SA-3.0
diff --git a/awesome/themes/default/background.png b/awesome/themes/default/background.png
deleted file mode 100644
index 8f52b6b..0000000
--- a/awesome/themes/default/background.png
+++ /dev/null
diff --git a/awesome/themes/default/background_white.png b/awesome/themes/default/background_white.png
deleted file mode 100644
index bb0c5d0..0000000
--- a/awesome/themes/default/background_white.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/cornerne.png b/awesome/themes/default/layouts/cornerne.png
deleted file mode 100644
index c85bd56..0000000
--- a/awesome/themes/default/layouts/cornerne.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/cornernew.png b/awesome/themes/default/layouts/cornernew.png
deleted file mode 100644
index c3fd986..0000000
--- a/awesome/themes/default/layouts/cornernew.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/cornernw.png b/awesome/themes/default/layouts/cornernw.png
deleted file mode 100644
index dfe78b3..0000000
--- a/awesome/themes/default/layouts/cornernw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/cornernww.png b/awesome/themes/default/layouts/cornernww.png
deleted file mode 100644
index f489010..0000000
--- a/awesome/themes/default/layouts/cornernww.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/cornerse.png b/awesome/themes/default/layouts/cornerse.png
deleted file mode 100644
index 023ae79..0000000
--- a/awesome/themes/default/layouts/cornerse.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/cornersew.png b/awesome/themes/default/layouts/cornersew.png
deleted file mode 100644
index f7cfa1c..0000000
--- a/awesome/themes/default/layouts/cornersew.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/cornersw.png b/awesome/themes/default/layouts/cornersw.png
deleted file mode 100644
index c1453c9..0000000
--- a/awesome/themes/default/layouts/cornersw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/cornersww.png b/awesome/themes/default/layouts/cornersww.png
deleted file mode 100644
index a65a043..0000000
--- a/awesome/themes/default/layouts/cornersww.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/dwindle.png b/awesome/themes/default/layouts/dwindle.png
deleted file mode 100644
index 9902d22..0000000
--- a/awesome/themes/default/layouts/dwindle.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/dwindlew.png b/awesome/themes/default/layouts/dwindlew.png
deleted file mode 100644
index 9199049..0000000
--- a/awesome/themes/default/layouts/dwindlew.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/fairh.png b/awesome/themes/default/layouts/fairh.png
deleted file mode 100644
index d41deea..0000000
--- a/awesome/themes/default/layouts/fairh.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/fairhw.png b/awesome/themes/default/layouts/fairhw.png
deleted file mode 100644
index bb50e3a..0000000
--- a/awesome/themes/default/layouts/fairhw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/fairv.png b/awesome/themes/default/layouts/fairv.png
deleted file mode 100644
index f5f0288..0000000
--- a/awesome/themes/default/layouts/fairv.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/fairvw.png b/awesome/themes/default/layouts/fairvw.png
deleted file mode 100644
index 4f4ed52..0000000
--- a/awesome/themes/default/layouts/fairvw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/floating.png b/awesome/themes/default/layouts/floating.png
deleted file mode 100644
index b8061a0..0000000
--- a/awesome/themes/default/layouts/floating.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/floatingw.png b/awesome/themes/default/layouts/floatingw.png
deleted file mode 100644
index 4815894..0000000
--- a/awesome/themes/default/layouts/floatingw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/fullscreen.png b/awesome/themes/default/layouts/fullscreen.png
deleted file mode 100644
index d02f6fc..0000000
--- a/awesome/themes/default/layouts/fullscreen.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/fullscreenw.png b/awesome/themes/default/layouts/fullscreenw.png
deleted file mode 100644
index 5c35bfa..0000000
--- a/awesome/themes/default/layouts/fullscreenw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/magnifier.png b/awesome/themes/default/layouts/magnifier.png
deleted file mode 100644
index 2925414..0000000
--- a/awesome/themes/default/layouts/magnifier.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/magnifierw.png b/awesome/themes/default/layouts/magnifierw.png
deleted file mode 100644
index 6209556..0000000
--- a/awesome/themes/default/layouts/magnifierw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/max.png b/awesome/themes/default/layouts/max.png
deleted file mode 100644
index 8d20844..0000000
--- a/awesome/themes/default/layouts/max.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/maxw.png b/awesome/themes/default/layouts/maxw.png
deleted file mode 100644
index 85f5ce3..0000000
--- a/awesome/themes/default/layouts/maxw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/spiral.png b/awesome/themes/default/layouts/spiral.png
deleted file mode 100644
index d9434be..0000000
--- a/awesome/themes/default/layouts/spiral.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/spiralw.png b/awesome/themes/default/layouts/spiralw.png
deleted file mode 100644
index b78dd86..0000000
--- a/awesome/themes/default/layouts/spiralw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/tile.png b/awesome/themes/default/layouts/tile.png
deleted file mode 100644
index 3ede21e..0000000
--- a/awesome/themes/default/layouts/tile.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/tilebottom.png b/awesome/themes/default/layouts/tilebottom.png
deleted file mode 100644
index 6f8c257..0000000
--- a/awesome/themes/default/layouts/tilebottom.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/tilebottomw.png b/awesome/themes/default/layouts/tilebottomw.png
deleted file mode 100644
index a1de7b2..0000000
--- a/awesome/themes/default/layouts/tilebottomw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/tileleft.png b/awesome/themes/default/layouts/tileleft.png
deleted file mode 100644
index 31d6870..0000000
--- a/awesome/themes/default/layouts/tileleft.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/tileleftw.png b/awesome/themes/default/layouts/tileleftw.png
deleted file mode 100644
index cf14c25..0000000
--- a/awesome/themes/default/layouts/tileleftw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/tiletop.png b/awesome/themes/default/layouts/tiletop.png
deleted file mode 100644
index 98cade2..0000000
--- a/awesome/themes/default/layouts/tiletop.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/tiletopw.png b/awesome/themes/default/layouts/tiletopw.png
deleted file mode 100644
index d1d0872..0000000
--- a/awesome/themes/default/layouts/tiletopw.png
+++ /dev/null
diff --git a/awesome/themes/default/layouts/tilew.png b/awesome/themes/default/layouts/tilew.png
deleted file mode 100644
index fde2ca4..0000000
--- a/awesome/themes/default/layouts/tilew.png
+++ /dev/null
diff --git a/awesome/themes/default/submenu.png b/awesome/themes/default/submenu.png
deleted file mode 100644
index b2778e2..0000000
--- a/awesome/themes/default/submenu.png
+++ /dev/null
diff --git a/awesome/themes/default/taglist/squarefw.png b/awesome/themes/default/taglist/squarefw.png
deleted file mode 100644
index 2a86430..0000000
--- a/awesome/themes/default/taglist/squarefw.png
+++ /dev/null
diff --git a/awesome/themes/default/taglist/squarew.png b/awesome/themes/default/taglist/squarew.png
deleted file mode 100644
index 913f2ca..0000000
--- a/awesome/themes/default/taglist/squarew.png
+++ /dev/null
diff --git a/awesome/themes/default/theme.lua b/awesome/themes/default/theme.lua
deleted file mode 100644
index 9520893..0000000
--- a/awesome/themes/default/theme.lua
+++ /dev/null
@@ -1,241 +0,0 @@
----------------------------
--- Default awesome theme --
----------------------------
-
-local theme_assets = require("beautiful.theme_assets")
-local xresources = require("beautiful.xresources")
-local dpi = xresources.apply_dpi
-
-local gfs = require("gears.filesystem")
-local themes_path = gfs.get_themes_dir()
-
-local theme = {}
-
-theme.font          = "mononoki Nerd Font Mono 18"
-theme.font2         = "mononoki Nerd Font Mono 12"
-
-theme.bg_normal     = "#000000"
-theme.bg_focus      = "#198844"
-theme.bg_accent     = "#555555"
-theme.bg_urgent     = "#ff0000"
-theme.bg_minimize   = "#444444"
-theme.bg_systray    = theme.bg_focus
-
-theme.fg_normal     = "#aaaaaa"
-theme.fg_focus      = "#000000"
-theme.fg_urgent     = "#ffffff"
-theme.fg_minimize   = "#ffffff"
-
-theme.useless_gap   = dpi(0)
-theme.border_width  = dpi(1)
-theme.border_normal = "#000000"
-theme.border_focus  = "#535d6c"
-theme.border_marked = "#91231c"
-
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
--- tasklist_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- mouse_finder_[color|timeout|animate_timeout|radius|factor]
--- prompt_[fg|bg|fg_cursor|bg_cursor|font]
--- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font]
--- Example:
---theme.taglist_bg_focus = "#ff0000"
-
--- Generate taglist squares:
-local taglist_square_size = dpi(4)
-theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
-    taglist_square_size, theme.fg_normal
-)
-theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
-    taglist_square_size, theme.fg_normal
-)
-
--- Variables set for theming notifications:
--- notification_font
--- notification_[bg|fg]
--- notification_[width|height|margin]
--- notification_[border_color|border_width|shape|opacity]
-
--- Variables set for theming the menu:
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_submenu_icon = themes_path.."default/submenu.png"
-theme.menu_height = dpi(15)
-theme.menu_width  = dpi(100)
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---theme.bg_widget = "#cc0000"
-
--- Define the image to load
-theme.titlebar_close_button_normal = themes_path.."default/titlebar/close_normal.png"
-theme.titlebar_close_button_focus  = themes_path.."default/titlebar/close_focus.png"
-
-theme.titlebar_minimize_button_normal = themes_path.."default/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path.."default/titlebar/minimize_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = themes_path.."default/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = themes_path.."default/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path.."default/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active  = themes_path.."default/titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = themes_path.."default/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = themes_path.."default/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path.."default/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active  = themes_path.."default/titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = themes_path.."default/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = themes_path.."default/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path.."default/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active  = themes_path.."default/titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = themes_path.."default/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = themes_path.."default/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path.."default/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active  = themes_path.."default/titlebar/maximized_focus_active.png"
-
-theme.wallpaper = themes_path.."~/background.png"
-
--- You can use your own layout icons like this:
-theme.layout_fairh = themes_path.."default/layouts/fairhw.png"
-theme.layout_fairv = themes_path.."default/layouts/fairvw.png"
-theme.layout_floating  = themes_path.."default/layouts/floatingw.png"
-theme.layout_magnifier = themes_path.."default/layouts/magnifierw.png"
-theme.layout_max = themes_path.."default/layouts/maxw.png"
-theme.layout_fullscreen = themes_path.."default/layouts/fullscreenw.png"
-theme.layout_tilebottom = themes_path.."default/layouts/tilebottomw.png"
-theme.layout_tileleft   = themes_path.."default/layouts/tileleftw.png"
-theme.layout_tile = themes_path.."default/layouts/tilew.png"
-theme.layout_tiletop = themes_path.."default/layouts/tiletopw.png"
-theme.layout_spiral  = themes_path.."default/layouts/spiralw.png"
-theme.layout_dwindle = themes_path.."default/layouts/dwindlew.png"
-theme.layout_cornernw = themes_path.."default/layouts/cornernww.png"
-theme.layout_cornerne = themes_path.."default/layouts/cornernew.png"
-theme.layout_cornersw = themes_path.."default/layouts/cornersww.png"
-theme.layout_cornerse = themes_path.."default/layouts/cornersew.png"
-
--- Generate Awesome icon:
-theme.awesome_icon = theme_assets.awesome_icon(
-    theme.menu_height, theme.bg_focus, theme.fg_focus
-)
-
--- Define the icon theme for application icons. If not set then the icons
--- from /usr/share/icons and /usr/share/icons/hicolor will be used.
-theme.icon_theme = nil
-
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
---[[ Bling theme variables template
-
-This file has all theme variables of the bling module.
-Every variable has a small comment on what it does.
-You might just want to copy that whole part into your theme.lua and start adjusting from there.
-
---]]
--- LuaFormatter off
--- window swallowing
-theme.dont_swallow_classname_list = { "firefox", "Gimp", "Lutris", "REAPER", "VirtualBox Manager", "VirtualBox Machine", "xviix64.exe", "yabridge" } -- list of class names that should not be swallowed
-theme.dont_swallow_filter_activated = true -- whether the filter above should be active
-theme.parent_filter_list   = { "firefox", "Gimp", "Lutris", "REAPER", "obs", "LibreWolf", "xviix64.exe", "yabridge" } -- class names list of parents that should not be swallowed
-theme.child_filter_list    = { "Dragon", "REAPER", "yabridge" }        -- class names list that should not swallow their parents
-theme.swallowing_filter = true                   -- whether the filters above should be active
-
--- flash focus
-theme.flash_focus_start_opacity = 0.6 -- the starting opacity
-theme.flash_focus_step = 0.01 -- the step of animation
-
--- playerctl signal
-theme.playerctl_backend = "playerctl_cli" -- backend to use
-theme.playerctl_ignore = {} -- list of players to be ignored
-theme.playerctl_player = {} -- list of players to be used in priority order
-theme.playerctl_update_on_activity = true -- whether to prioritize the most recently active players or not
-theme.playerctl_position_update_interval = 1 -- the update interval for fetching the position from playerctl
-
--- tabbed
-theme.tabbed_spawn_in_tab = false -- whether a new client should spawn into the focused tabbing container
-
--- tabbar general
-theme.tabbar_disable = false -- disable the tab bar entirely
-theme.tabbar_ontop = false
-theme.tabbar_radius = 0 -- border radius of the tabbar
-theme.tabbar_style = "default" -- style of the tabbar ("default", "boxes" or "modern")
-theme.tabbar_font = "Sans 11" -- font of the tabbar
-theme.tabbar_size = 40 -- size of the tabbar
-theme.tabbar_position = "top" -- position of the tabbar
-theme.tabbar_bg_normal = "#000000" -- background color of the focused client on the tabbar
-theme.tabbar_fg_normal = "#ffffff" -- foreground color of the focused client on the tabbar
-theme.tabbar_bg_focus = "#1A2026" -- background color of unfocused clients on the tabbar
-theme.tabbar_fg_focus = "#ff0000" -- foreground color of unfocused clients on the tabbar
-theme.tabbar_bg_focus_inactive = nil -- background color of the focused client on the tabbar when inactive
-theme.tabbar_fg_focus_inactive = nil -- foreground color of the focused client on the tabbar when inactive
-theme.tabbar_bg_normal_inactive = nil -- background color of unfocused clients on the tabbar when inactive
-theme.tabbar_fg_normal_inactive = nil -- foreground color of unfocused clients on the tabbar when inactive
-
--- mstab
-theme.mstab_bar_disable = false -- disable the tabbar
-theme.mstab_bar_ontop = false -- whether you want to allow the bar to be ontop of clients
-theme.mstab_dont_resize_slaves = false -- whether the tabbed stack windows should be smaller than the
--- currently focused stack window (set it to true if you use
--- transparent terminals. False if you use shadows on solid ones
-theme.mstab_bar_padding = "default" -- how much padding there should be between clients and your tabbar
--- by default it will adjust based on your useless gaps.
--- If you want a custom value. Set it to the number of pixels (int)
-theme.mstab_border_radius = 0 -- border radius of the tabbar
-theme.mstab_bar_height = 40 -- height of the tabbar
-theme.mstab_tabbar_position = "top" -- position of the tabbar (mstab currently does not support left,right)
-theme.mstab_tabbar_style = "default" -- style of the tabbar ("default", "boxes" or "modern")
--- defaults to the tabbar_style so only change if you want a
--- different style for mstab and tabbed
-
--- the following variables are currently only for the "modern" tabbar style
-theme.tabbar_color_close = "#f9929b" -- changes the color of the close button
-theme.tabbar_color_min = "#fbdf90" -- changes the color of the minimize button
-theme.tabbar_color_float = "#ccaced" -- changes the color of the float button
-
--- tag preview widget
-theme.tag_preview_widget_border_radius = 0 -- Border radius of the widget (With AA)
-theme.tag_preview_client_border_radius = 0 -- Border radius of each client in the widget (With AA)
-theme.tag_preview_client_opacity = 0.5 -- Opacity of each client
-theme.tag_preview_client_bg = "#000000" -- The bg color of each client
-theme.tag_preview_client_border_color = "#ffffff" -- The border color of each client
-theme.tag_preview_client_border_width = 3 -- The border width of each client
-theme.tag_preview_widget_bg = "#000000" -- The bg color of the widget
-theme.tag_preview_widget_border_color = "#ffffff" -- The border color of the widget
-theme.tag_preview_widget_border_width = 3 -- The border width of the widget
-theme.tag_preview_widget_margin = 0 -- The margin of the widget
-
--- task preview widget
-theme.task_preview_widget_border_radius = 0 -- Border radius of the widget (With AA)
-theme.task_preview_widget_bg = "#000000" -- The bg color of the widget
-theme.task_preview_widget_border_color = "#ffffff" -- The border color of the widget
-theme.task_preview_widget_border_width = 3 -- The border width of the widget
-theme.task_preview_widget_margin = 0 -- The margin of the widget
-
--- window switcher
-theme.window_switcher_widget_bg = "#000000" -- The bg color of the widget
-theme.window_switcher_widget_border_width = 3 -- The border width of the widget
-theme.window_switcher_widget_border_radius = 0 -- The border radius of the widget
-theme.window_switcher_widget_border_color = "#ffffff" -- The border color of the widget
-theme.window_switcher_clients_spacing = 20 -- The space between each client item
-theme.window_switcher_client_icon_horizontal_spacing = 5 -- The space between client icon and text
-theme.window_switcher_client_width = 150 -- The width of one client widget
-theme.window_switcher_client_height = 250 -- The height of one client widget
-theme.window_switcher_client_margins = 10 -- The margin between the content and the border of the widget
-theme.window_switcher_thumbnail_margins = 10 -- The margin between one client thumbnail and the rest of the widget
-theme.thumbnail_scale = false -- If set to true, the thumbnails fit policy will be set to "fit" instead of "auto"
-theme.window_switcher_name_margins = 10 -- The margin of one clients title to the rest of the widget
-theme.window_switcher_name_valign = "center" -- How to vertically align one clients title
-theme.window_switcher_name_forced_width = 200 -- The width of one title
-theme.window_switcher_name_font = "Sans 11" -- The font of all titles
-theme.window_switcher_name_normal_color = "#ffffff" -- The color of one title if the client is unfocused
-theme.window_switcher_name_focus_color = "#ff0000" -- The color of one title if the client is focused
-theme.window_switcher_icon_valign = "center" -- How to vertically align the one icon
-theme.window_switcher_icon_width = 40 -- The width of one icon
-
--- LuaFormatter on
-return theme
-
diff --git a/awesome/themes/default/titlebar/close_focus.png b/awesome/themes/default/titlebar/close_focus.png
deleted file mode 100644
index 01ef825..0000000
--- a/awesome/themes/default/titlebar/close_focus.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/close_normal.png b/awesome/themes/default/titlebar/close_normal.png
deleted file mode 100644
index 5448ed8..0000000
--- a/awesome/themes/default/titlebar/close_normal.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/floating_focus_active.png b/awesome/themes/default/titlebar/floating_focus_active.png
deleted file mode 100644
index 82dcc7c..0000000
--- a/awesome/themes/default/titlebar/floating_focus_active.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/floating_focus_inactive.png b/awesome/themes/default/titlebar/floating_focus_inactive.png
deleted file mode 100644
index c19ba80..0000000
--- a/awesome/themes/default/titlebar/floating_focus_inactive.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/floating_normal_active.png b/awesome/themes/default/titlebar/floating_normal_active.png
deleted file mode 100644
index 62342d1..0000000
--- a/awesome/themes/default/titlebar/floating_normal_active.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/floating_normal_inactive.png b/awesome/themes/default/titlebar/floating_normal_inactive.png
deleted file mode 100644
index e2bbdfa..0000000
--- a/awesome/themes/default/titlebar/floating_normal_inactive.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/maximized_focus_active.png b/awesome/themes/default/titlebar/maximized_focus_active.png
deleted file mode 100644
index d7dffd7..0000000
--- a/awesome/themes/default/titlebar/maximized_focus_active.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/maximized_focus_inactive.png b/awesome/themes/default/titlebar/maximized_focus_inactive.png
deleted file mode 100644
index 844389f..0000000
--- a/awesome/themes/default/titlebar/maximized_focus_inactive.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/maximized_normal_active.png b/awesome/themes/default/titlebar/maximized_normal_active.png
deleted file mode 100644
index a705f81..0000000
--- a/awesome/themes/default/titlebar/maximized_normal_active.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/maximized_normal_inactive.png b/awesome/themes/default/titlebar/maximized_normal_inactive.png
deleted file mode 100644
index 4c1ab1f..0000000
--- a/awesome/themes/default/titlebar/maximized_normal_inactive.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/minimize_focus.png b/awesome/themes/default/titlebar/minimize_focus.png
deleted file mode 100644
index caaceb2..0000000
--- a/awesome/themes/default/titlebar/minimize_focus.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/minimize_normal.png b/awesome/themes/default/titlebar/minimize_normal.png
deleted file mode 100644
index 36621d0..0000000
--- a/awesome/themes/default/titlebar/minimize_normal.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/ontop_focus_active.png b/awesome/themes/default/titlebar/ontop_focus_active.png
deleted file mode 100644
index 312c00b..0000000
--- a/awesome/themes/default/titlebar/ontop_focus_active.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/ontop_focus_inactive.png b/awesome/themes/default/titlebar/ontop_focus_inactive.png
deleted file mode 100644
index a48e1c5..0000000
--- a/awesome/themes/default/titlebar/ontop_focus_inactive.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/ontop_normal_active.png b/awesome/themes/default/titlebar/ontop_normal_active.png
deleted file mode 100644
index 117a203..0000000
--- a/awesome/themes/default/titlebar/ontop_normal_active.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/ontop_normal_inactive.png b/awesome/themes/default/titlebar/ontop_normal_inactive.png
deleted file mode 100644
index d3a10c8..0000000
--- a/awesome/themes/default/titlebar/ontop_normal_inactive.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/sticky_focus_active.png b/awesome/themes/default/titlebar/sticky_focus_active.png
deleted file mode 100644
index 814499b..0000000
--- a/awesome/themes/default/titlebar/sticky_focus_active.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/sticky_focus_inactive.png b/awesome/themes/default/titlebar/sticky_focus_inactive.png
deleted file mode 100644
index 21b000d..0000000
--- a/awesome/themes/default/titlebar/sticky_focus_inactive.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/sticky_normal_active.png b/awesome/themes/default/titlebar/sticky_normal_active.png
deleted file mode 100644
index bdb5595..0000000
--- a/awesome/themes/default/titlebar/sticky_normal_active.png
+++ /dev/null
diff --git a/awesome/themes/default/titlebar/sticky_normal_inactive.png b/awesome/themes/default/titlebar/sticky_normal_inactive.png
deleted file mode 100644
index a96b9b1..0000000
--- a/awesome/themes/default/titlebar/sticky_normal_inactive.png
+++ /dev/null
diff --git a/awesome/themes/gtk/theme.lua b/awesome/themes/gtk/theme.lua
deleted file mode 100644
index bd9ffb2..0000000
--- a/awesome/themes/gtk/theme.lua
+++ /dev/null
@@ -1,352 +0,0 @@
-----------------------------------------------
--- Awesome theme which follows GTK+ 3 theme --
---   by Yauhen Kirylau                      --
-----------------------------------------------
-
-local theme_assets = require("beautiful.theme_assets")
-local dpi = require("beautiful.xresources").apply_dpi
-local gfs = require("gears.filesystem")
-local themes_path = gfs.get_themes_dir()
-local gears_shape = require("gears.shape")
-local wibox = require("wibox")
-local awful_widget_clienticon = require("awful.widget.clienticon")
-local gtk = require("beautiful.gtk")
-
-
--- Helper functions for modifying hex colors:
---
-local hex_color_match = "[a-fA-F0-9][a-fA-F0-9]"
-local function darker(color_value, darker_n)
-    local result = "#"
-    local channel_counter = 1
-    for s in color_value:gmatch(hex_color_match) do
-        local bg_numeric_value = tonumber("0x"..s)
-        if channel_counter <= 3 then
-            bg_numeric_value = bg_numeric_value - darker_n
-        end
-        if bg_numeric_value < 0 then bg_numeric_value = 0 end
-        if bg_numeric_value > 255 then bg_numeric_value = 255 end
-        result = result .. string.format("%02x", bg_numeric_value)
-        channel_counter = channel_counter + 1
-    end
-    return result
-end
-local function is_dark(color_value)
-    local bg_numeric_value = 0;
-    local channel_counter = 1
-    for s in color_value:gmatch(hex_color_match) do
-        bg_numeric_value = bg_numeric_value + tonumber("0x"..s);
-        if channel_counter == 3 then
-            break
-        end
-        channel_counter = channel_counter + 1
-    end
-    local is_dark_bg = (bg_numeric_value < 383)
-    return is_dark_bg
-end
-local function mix(color1, color2, ratio)
-    ratio = ratio or 0.5
-    local result = "#"
-    local channels1 = color1:gmatch(hex_color_match)
-    local channels2 = color2:gmatch(hex_color_match)
-    for _ = 1,3 do
-        local bg_numeric_value = math.ceil(
-          tonumber("0x"..channels1())*ratio +
-          tonumber("0x"..channels2())*(1-ratio)
-        )
-        if bg_numeric_value < 0 then bg_numeric_value = 0 end
-        if bg_numeric_value > 255 then bg_numeric_value = 255 end
-        result = result .. string.format("%02x", bg_numeric_value)
-    end
-    return result
-end
-local function reduce_contrast(color, ratio)
-    ratio = ratio or 50
-    return darker(color, is_dark(color) and -ratio or ratio)
-end
-
-local function choose_contrast_color(reference, candidate1, candidate2)  -- luacheck: no unused
-    if is_dark(reference) then
-        if not is_dark(candidate1) then
-            return candidate1
-        else
-            return candidate2
-        end
-    else
-        if is_dark(candidate1) then
-            return candidate1
-        else
-            return candidate2
-        end
-    end
-end
-
-
--- inherit xresources theme:
-local theme = dofile(themes_path.."xresources/theme.lua")
--- load and prepare for use gtk theme:
-theme.gtk = gtk.get_theme_variables()
-if not theme.gtk then
-    local gears_debug = require("gears.debug")
-    gears_debug.print_warning("Can't load GTK+3 theme. Using 'xresources' theme as a fallback.")
-    return theme
-end
-theme.gtk.button_border_radius = dpi(theme.gtk.button_border_radius or 0)
-theme.gtk.button_border_width = dpi(theme.gtk.button_border_width or 1)
-theme.gtk.bold_font = theme.gtk.font_family .. ' Bold ' .. theme.gtk.font_size
-theme.gtk.menubar_border_color = mix(
-    theme.gtk.menubar_bg_color,
-    theme.gtk.menubar_fg_color,
-    0.7
-)
-
-
-theme.font          = theme.gtk.font_family .. ' ' .. theme.gtk.font_size
-
-theme.bg_normal     = theme.gtk.bg_color
-theme.fg_normal     = theme.gtk.fg_color
-
-theme.wibar_bg      = theme.gtk.menubar_bg_color
-theme.wibar_fg      = theme.gtk.menubar_fg_color
-
-theme.bg_focus      = theme.gtk.selected_bg_color
-theme.fg_focus      = theme.gtk.selected_fg_color
-
-theme.bg_urgent     = theme.gtk.error_bg_color
-theme.fg_urgent     = theme.gtk.error_fg_color
-
-theme.bg_minimize   = mix(theme.wibar_fg, theme.wibar_bg, 0.3)
-theme.fg_minimize   = mix(theme.wibar_fg, theme.wibar_bg, 0.9)
-
-theme.bg_systray    = theme.wibar_bg
-
-theme.border_normal = theme.gtk.wm_border_unfocused_color
-theme.border_focus  = theme.gtk.wm_border_focused_color
-theme.border_marked = theme.gtk.success_color
-
-theme.border_width  = dpi(theme.gtk.button_border_width or 1)
-theme.border_radius = theme.gtk.button_border_radius
-
-theme.useless_gap   = dpi(3)
-
-local rounded_rect_shape = function(cr,w,h)
-    gears_shape.rounded_rect(
-        cr, w, h, theme.border_radius
-    )
-end
-
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- taglist_[bg|fg|shape|shape_border_color|shape_border_width]_[focus|urgent|occupied|empty|volatile]
--- tasklist_[bg|fg|shape|shape_border_color|shape_border_width]_[focus|urgent|minimized]
--- titlebar_[bg|fg]_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- mouse_finder_[color|timeout|animate_timeout|radius|factor]
-
-theme.tasklist_fg_normal = theme.wibar_fg
-theme.tasklist_bg_normal = theme.wibar_bg
-theme.tasklist_fg_focus = theme.tasklist_fg_normal
-theme.tasklist_bg_focus = theme.tasklist_bg_normal
-
-theme.tasklist_font_focus = theme.gtk.bold_font
-
-theme.tasklist_shape_minimized = rounded_rect_shape
-theme.tasklist_shape_border_color_minimized = mix(
-    theme.bg_minimize,
-    theme.fg_minimize,
-    0.85
-)
-theme.tasklist_shape_border_width_minimized = theme.gtk.button_border_width
-
-theme.tasklist_spacing = theme.gtk.button_border_width
-
---[[ Advanced taglist and tasklist styling: {{{
-
---- In order to get taglist and tasklist to follow GTK theme you need to
--- modify your rc.lua in the following way:
-
-diff --git a/rc.lua b/rc.lua
-index 231a2f68c..533a859d2 100644
---- a/rc.lua
-+++ b/rc.lua
-@@ -217,24 +217,12 @@ awful.screen.connect_for_each_screen(function(s)
-         filter  = awful.widget.taglist.filter.all,
-         buttons = taglist_buttons
-     }
-+    -- and apply shape to it
-+    if beautiful.taglist_shape_container then
-+        local background_shape_wrapper = wibox.container.background(s.mytaglist)
-+        background_shape_wrapper._do_taglist_update_now = s.mytaglist._do_taglist_update_now
-+        background_shape_wrapper._do_taglist_update = s.mytaglist._do_taglist_update
-+        background_shape_wrapper.shape = beautiful.taglist_shape_container
-+        background_shape_wrapper.shape_clip = beautiful.taglist_shape_clip_container
-+        background_shape_wrapper.shape_border_width = beautiful.taglist_shape_border_width_container
-+        background_shape_wrapper.shape_border_color = beautiful.taglist_shape_border_color_container
-+        s.mytaglist = background_shape_wrapper
-+    end
-
-     -- Create a tasklist widget
-     s.mytasklist = awful.widget.tasklist {
-         screen  = s,
-         filter  = awful.widget.tasklist.filter.currenttags,
-+        buttons = tasklist_buttons,
-+        widget_template = beautiful.tasklist_widget_template
--        buttons = tasklist_buttons
-     }
-
---]]
-theme.tasklist_widget_template = {
-    {
-        {
-            {
-                {
-                    id     = 'clienticon',
-                    widget = awful_widget_clienticon,
-                },
-                margins = dpi(4),
-                widget  = wibox.container.margin,
-            },
-            {
-                id     = 'text_role',
-                widget = wibox.widget.textbox,
-            },
-            layout = wibox.layout.fixed.horizontal,
-        },
-        left  = dpi(2),
-        right = dpi(4),
-        widget = wibox.container.margin
-    },
-    id     = 'background_role',
-    widget = wibox.container.background,
-    create_callback = function(self, c)
-        self:get_children_by_id('clienticon')[1].client = c
-    end,
-}
-
-theme.taglist_shape_container = rounded_rect_shape
-theme.taglist_shape_clip_container = true
-theme.taglist_shape_border_width_container = theme.gtk.button_border_width * 2
-theme.taglist_shape_border_color_container = theme.gtk.header_button_border_color
--- }}}
-
-theme.taglist_bg_occupied = theme.gtk.header_button_bg_color
-theme.taglist_fg_occupied = theme.gtk.header_button_fg_color
-
-theme.taglist_bg_empty = mix(
-    theme.gtk.menubar_bg_color,
-    theme.gtk.header_button_bg_color,
-    0.3
-)
-theme.taglist_fg_empty = mix(
-    theme.gtk.menubar_bg_color,
-    theme.gtk.header_button_fg_color
-)
-
-theme.titlebar_font_normal = theme.gtk.bold_font
-theme.titlebar_bg_normal = theme.gtk.wm_border_unfocused_color
-theme.titlebar_fg_normal = theme.gtk.wm_title_unfocused_color
---theme.titlebar_fg_normal = choose_contrast_color(
-    --theme.titlebar_bg_normal,
-    --theme.gtk.menubar_fg_color,
-    --theme.gtk.menubar_bg_color
---)
-
-theme.titlebar_font_focus = theme.gtk.bold_font
-theme.titlebar_bg_focus = theme.gtk.wm_border_focused_color
-theme.titlebar_fg_focus = theme.gtk.wm_title_focused_color
---theme.titlebar_fg_focus = choose_contrast_color(
-    --theme.titlebar_bg_focus,
-    --theme.gtk.menubar_fg_color,
-    --theme.gtk.menubar_bg_color
---)
-
-theme.tooltip_fg = theme.gtk.tooltip_fg_color
-theme.tooltip_bg = theme.gtk.tooltip_bg_color
-
--- Variables set for theming the menu:
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-
-theme.menu_border_width = theme.gtk.button_border_width
-theme.menu_border_color = theme.gtk.menubar_border_color
-theme.menu_bg_normal = theme.gtk.menubar_bg_color
-theme.menu_fg_normal = theme.gtk.menubar_fg_color
-
--- @TODO: get from gtk menu height
-theme.menu_height = dpi(24)
-theme.menu_width  = dpi(150)
-theme.menu_submenu_icon = nil
-theme.menu_submenu = "▸ "
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---theme.bg_widget = "#cc0000"
-
-
--- Recolor Layout icons:
-theme = theme_assets.recolor_layout(theme, theme.wibar_fg)
-
--- Recolor titlebar icons:
---
-theme = theme_assets.recolor_titlebar(
-    theme, theme.titlebar_fg_normal, "normal"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, reduce_contrast(theme.titlebar_fg_normal, 50), "normal", "hover"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, theme.gtk.error_bg_color, "normal", "press"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, theme.titlebar_fg_focus, "focus"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, reduce_contrast(theme.titlebar_fg_focus, 50), "focus", "hover"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, theme.gtk.error_bg_color, "focus", "press"
-)
-
--- Define the icon theme for application icons. If not set then the icons
--- from /usr/share/icons and /usr/share/icons/hicolor will be used.
-theme.icon_theme = nil
-
--- Generate Awesome icon:
-theme.awesome_icon = theme_assets.awesome_icon(
-    theme.menu_height, mix(theme.bg_focus, theme.fg_normal), theme.wibar_bg
-)
-
--- Generate taglist squares:
---local taglist_square_size = dpi(4)
---theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
-    --taglist_square_size, theme.gtk.header_button_border_color
---)
---theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
-    --taglist_square_size, theme.gtk.header_button_border_color
---)
--- Or disable them:
-theme.taglist_squares_sel = nil
-theme.taglist_squares_unsel = nil
-
--- Generate wallpaper:
-local wallpaper_bg = theme.gtk.base_color
-local wallpaper_fg = theme.gtk.bg_color
-local wallpaper_alt_fg = theme.gtk.selected_bg_color
-if not is_dark(theme.bg_normal) then
-    wallpaper_bg, wallpaper_fg = wallpaper_fg, wallpaper_bg
-end
-wallpaper_bg = reduce_contrast(wallpaper_bg, 50)
-wallpaper_fg = reduce_contrast(wallpaper_fg, 30)
-wallpaper_fg = mix(wallpaper_fg, wallpaper_bg, 0.4)
-wallpaper_alt_fg = mix(wallpaper_alt_fg, wallpaper_fg, 0.4)
--- theme.wallpaper = function(s)
---     return theme_assets.wallpaper(wallpaper_bg, wallpaper_fg, wallpaper_alt_fg, s)
--- end
-theme.wallpaper = "~/background.png"
-wallpaper_cmd = "nitrogen --restore"
-
-return theme
-
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80:foldmethod=marker
diff --git a/awesome/themes/sky/awesome-icon.png b/awesome/themes/sky/awesome-icon.png
deleted file mode 100644
index 551564e..0000000
--- a/awesome/themes/sky/awesome-icon.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/cornerne.png b/awesome/themes/sky/layouts/cornerne.png
deleted file mode 100644
index 221c4c8..0000000
--- a/awesome/themes/sky/layouts/cornerne.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/cornernw.png b/awesome/themes/sky/layouts/cornernw.png
deleted file mode 100644
index 1147e5a..0000000
--- a/awesome/themes/sky/layouts/cornernw.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/cornerse.png b/awesome/themes/sky/layouts/cornerse.png
deleted file mode 100644
index a0d23bc..0000000
--- a/awesome/themes/sky/layouts/cornerse.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/cornersw.png b/awesome/themes/sky/layouts/cornersw.png
deleted file mode 100644
index c608729..0000000
--- a/awesome/themes/sky/layouts/cornersw.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/dwindle.png b/awesome/themes/sky/layouts/dwindle.png
deleted file mode 100644
index c985335..0000000
--- a/awesome/themes/sky/layouts/dwindle.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/fairh.png b/awesome/themes/sky/layouts/fairh.png
deleted file mode 100644
index e8d7ddb..0000000
--- a/awesome/themes/sky/layouts/fairh.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/fairv.png b/awesome/themes/sky/layouts/fairv.png
deleted file mode 100644
index ef47f9f..0000000
--- a/awesome/themes/sky/layouts/fairv.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/floating.png b/awesome/themes/sky/layouts/floating.png
deleted file mode 100644
index 978f723..0000000
--- a/awesome/themes/sky/layouts/floating.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/fullscreen.png b/awesome/themes/sky/layouts/fullscreen.png
deleted file mode 100644
index b1de003..0000000
--- a/awesome/themes/sky/layouts/fullscreen.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/magnifier.png b/awesome/themes/sky/layouts/magnifier.png
deleted file mode 100644
index d69ac68..0000000
--- a/awesome/themes/sky/layouts/magnifier.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/max.png b/awesome/themes/sky/layouts/max.png
deleted file mode 100644
index 37491f9..0000000
--- a/awesome/themes/sky/layouts/max.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/spiral.png b/awesome/themes/sky/layouts/spiral.png
deleted file mode 100644
index f0a07ce..0000000
--- a/awesome/themes/sky/layouts/spiral.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/tile.png b/awesome/themes/sky/layouts/tile.png
deleted file mode 100644
index 550393a..0000000
--- a/awesome/themes/sky/layouts/tile.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/tilebottom.png b/awesome/themes/sky/layouts/tilebottom.png
deleted file mode 100644
index 1dcc227..0000000
--- a/awesome/themes/sky/layouts/tilebottom.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/tileleft.png b/awesome/themes/sky/layouts/tileleft.png
deleted file mode 100644
index 14e13f5..0000000
--- a/awesome/themes/sky/layouts/tileleft.png
+++ /dev/null
diff --git a/awesome/themes/sky/layouts/tiletop.png b/awesome/themes/sky/layouts/tiletop.png
deleted file mode 100644
index 2bcb161..0000000
--- a/awesome/themes/sky/layouts/tiletop.png
+++ /dev/null
diff --git a/awesome/themes/sky/sky-background.png b/awesome/themes/sky/sky-background.png
deleted file mode 100644
index bbc07cc..0000000
--- a/awesome/themes/sky/sky-background.png
+++ /dev/null
diff --git a/awesome/themes/sky/theme.lua b/awesome/themes/sky/theme.lua
deleted file mode 100644
index 0aa7d1b..0000000
--- a/awesome/themes/sky/theme.lua
+++ /dev/null
@@ -1,102 +0,0 @@
--------------------------------
---    "Sky" awesome theme    --
---  By Andrei "Garoth" Thorp --
--------------------------------
--- If you want SVGs and extras, get them from garoth.com/awesome/sky-theme
-
-local theme_assets = require("beautiful.theme_assets")
-local xresources = require("beautiful.xresources")
-local dpi = xresources.apply_dpi
-local themes_path = require("gears.filesystem").get_themes_dir()
-
-
--- BASICS
-local theme = {}
-theme.font          = "sans 8"
-
-theme.bg_focus      = "#e2eeea"
-theme.bg_normal     = "#729fcf"
-theme.bg_urgent     = "#fce94f"
-theme.bg_minimize   = "#0067ce"
-theme.bg_systray    = theme.bg_normal
-
-theme.fg_normal     = "#2e3436"
-theme.fg_focus      = "#2e3436"
-theme.fg_urgent     = "#2e3436"
-theme.fg_minimize   = "#2e3436"
-
-theme.useless_gap   = dpi(0)
-theme.border_width  = dpi(2)
-theme.border_normal = "#dae3e0"
-theme.border_focus  = "#729fcf"
-theme.border_marked = "#eeeeec"
-
--- IMAGES
-theme.layout_fairh           = themes_path .. "sky/layouts/fairh.png"
-theme.layout_fairv           = themes_path .. "sky/layouts/fairv.png"
-theme.layout_floating        = themes_path .. "sky/layouts/floating.png"
-theme.layout_magnifier       = themes_path .. "sky/layouts/magnifier.png"
-theme.layout_max             = themes_path .. "sky/layouts/max.png"
-theme.layout_fullscreen      = themes_path .. "sky/layouts/fullscreen.png"
-theme.layout_tilebottom      = themes_path .. "sky/layouts/tilebottom.png"
-theme.layout_tileleft        = themes_path .. "sky/layouts/tileleft.png"
-theme.layout_tile            = themes_path .. "sky/layouts/tile.png"
-theme.layout_tiletop         = themes_path .. "sky/layouts/tiletop.png"
-theme.layout_spiral          = themes_path .. "sky/layouts/spiral.png"
-theme.layout_dwindle         = themes_path .. "sky/layouts/dwindle.png"
-theme.layout_cornernw        = themes_path .. "sky/layouts/cornernw.png"
-theme.layout_cornerne        = themes_path .. "sky/layouts/cornerne.png"
-theme.layout_cornersw        = themes_path .. "sky/layouts/cornersw.png"
-theme.layout_cornerse        = themes_path .. "sky/layouts/cornerse.png"
-
-theme.awesome_icon           = themes_path .. "sky/awesome-icon.png"
-
--- from default for now...
-theme.menu_submenu_icon     = themes_path .. "default/submenu.png"
-
--- Generate taglist squares:
-local taglist_square_size = dpi(4)
-theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
-    taglist_square_size, theme.fg_normal
-)
-theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
-    taglist_square_size, theme.fg_normal
-)
-
--- MISC
-theme.wallpaper             = themes_path .. "sky/sky-background.png"
-theme.taglist_squares       = "true"
-theme.titlebar_close_button = "true"
-theme.menu_height = dpi(15)
-theme.menu_width  = dpi(100)
-
--- Define the image to load
-theme.titlebar_close_button_normal = themes_path .. "default/titlebar/close_normal.png"
-theme.titlebar_close_button_focus = themes_path .. "default/titlebar/close_focus.png"
-
-theme.titlebar_minimize_button_normal = themes_path .. "default/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path .. "default/titlebar/minimize_focus.png"
-
-theme.titlebar_ontop_button_normal_inactive = themes_path .. "default/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive = themes_path .. "default/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active = themes_path .. "default/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active = themes_path .. "default/titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = themes_path .. "default/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive = themes_path .. "default/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active = themes_path .. "default/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active = themes_path .. "default/titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = themes_path .. "default/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive = themes_path .. "default/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active = themes_path .. "default/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active = themes_path .. "default/titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = themes_path .. "default/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive = themes_path .. "default/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active = themes_path .. "default/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active = themes_path .. "default/titlebar/maximized_focus_active.png"
-
-return theme
-
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/awesome/themes/xresources/assets.lua b/awesome/themes/xresources/assets.lua
deleted file mode 100644
index 4fb307a..0000000
--- a/awesome/themes/xresources/assets.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-require("gears.debug").deprecate("Use beautiful.theme_assets instead.", {raw=true})
-return require("beautiful.theme_assets")
diff --git a/awesome/themes/xresources/theme.lua b/awesome/themes/xresources/theme.lua
deleted file mode 100644
index ce7c84f..0000000
--- a/awesome/themes/xresources/theme.lua
+++ /dev/null
@@ -1,134 +0,0 @@
----------------------------------------------
--- Awesome theme which follows xrdb config --
---   by Yauhen Kirylau                    --
----------------------------------------------
-
-local theme_assets = require("beautiful.theme_assets")
-local xresources = require("beautiful.xresources")
-local dpi = xresources.apply_dpi
-local xrdb = xresources.get_current_theme()
-local gfs = require("gears.filesystem")
-local themes_path = gfs.get_themes_dir()
-
--- inherit default theme
-local theme = dofile(themes_path.."default/theme.lua")
--- load vector assets' generators for this theme
-
-theme.font          = "mononoki Nerd Font Mono 10"
-
-theme.bg_normal     = xrdb.color0
-theme.bg_focus      = xrdb.color2
-theme.bg_urgent     = xrdb.color13
-theme.bg_minimize   = xrdb.color8
-theme.bg_systray    = theme.bg_normal
-
-theme.fg_normal     = xrdb.foreground
-theme.fg_focus      = xrdb.foreground
-theme.fg_urgent     = xrdb.foreground
-theme.fg_minimize   = xrdb.cikir7
-
-theme.useless_gap   = dpi(3)
-theme.border_width  = dpi(2)
-theme.border_normal = xrdb.color0
-theme.border_focus  = xrdb.color9
-theme.border_marked = xrdb.color10
-
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
--- tasklist_[bg|fg]_[focus|urgent]
--- titlebar_[bg|fg]_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- mouse_finder_[color|timeout|animate_timeout|radius|factor]
--- Example:
---theme.taglist_bg_focus = "#ff0000"
-
-theme.tooltip_fg = theme.fg_normal
-theme.tooltip_bg = theme.bg_normal
-
--- Variables set for theming the menu:
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_submenu_icon = themes_path.."default/submenu.png"
-theme.menu_height = dpi(16)
-theme.menu_width  = dpi(100)
-
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---theme.bg_widget = "#cc0000"
-
--- Recolor Layout icons:
-theme = theme_assets.recolor_layout(theme, theme.fg_normal)
-
--- Recolor titlebar icons:
---
-local function darker(color_value, darker_n)
-    local result = "#"
-    for s in color_value:gmatch("[a-fA-F0-9][a-fA-F0-9]") do
-        local bg_numeric_value = tonumber("0x"..s) - darker_n
-        if bg_numeric_value < 0 then bg_numeric_value = 0 end
-        if bg_numeric_value > 255 then bg_numeric_value = 255 end
-        result = result .. string.format("%2.2x", bg_numeric_value)
-    end
-    return result
-end
-theme = theme_assets.recolor_titlebar(
-    theme, theme.fg_normal, "normal"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, darker(theme.fg_normal, -60), "normal", "hover"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, xrdb.color1, "normal", "press"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, theme.fg_focus, "focus"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, darker(theme.fg_focus, -60), "focus", "hover"
-)
-theme = theme_assets.recolor_titlebar(
-    theme, xrdb.color1, "focus", "press"
-)
-
--- Define the icon theme for application icons. If not set then the icons
--- from /usr/share/icons and /usr/share/icons/hicolor will be used.
-theme.icon_theme = nil
-
--- Generate Awesome icon:
-theme.awesome_icon = theme_assets.awesome_icon(
-    theme.menu_height, theme.bg_focus, theme.fg_focus
-)
-
--- Generate taglist squares:
-local taglist_square_size = dpi(4)
-theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
-    taglist_square_size, theme.fg_normal
-)
-theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
-    taglist_square_size, theme.fg_normal
-)
-
--- Try to determine if we are running light or dark colorscheme:
-local bg_numberic_value = 0;
-for s in theme.bg_normal:gmatch("[a-fA-F0-9][a-fA-F0-9]") do
-    bg_numberic_value = bg_numberic_value + tonumber("0x"..s);
-end
-local is_dark_bg = (bg_numberic_value < 383)
-
--- Generate wallpaper:
-local wallpaper_bg = xrdb.color8
-local wallpaper_fg = xrdb.color7
-local wallpaper_alt_fg = xrdb.color12
-if not is_dark_bg then
-    wallpaper_bg, wallpaper_fg = wallpaper_fg, wallpaper_bg
-end
-theme.wallpaper = function(s)
-    return theme_assets.wallpaper(wallpaper_bg, wallpaper_fg, wallpaper_alt_fg, s)
-end
-
-return theme
-
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/awesome/themes/zenburn/awesome-icon.png b/awesome/themes/zenburn/awesome-icon.png
deleted file mode 100644
index 70978d3..0000000
--- a/awesome/themes/zenburn/awesome-icon.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/cornerne.png b/awesome/themes/zenburn/layouts/cornerne.png
deleted file mode 100644
index d541a43..0000000
--- a/awesome/themes/zenburn/layouts/cornerne.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/cornernw.png b/awesome/themes/zenburn/layouts/cornernw.png
deleted file mode 100644
index 78fa394..0000000
--- a/awesome/themes/zenburn/layouts/cornernw.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/cornerse.png b/awesome/themes/zenburn/layouts/cornerse.png
deleted file mode 100644
index 19b85c3..0000000
--- a/awesome/themes/zenburn/layouts/cornerse.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/cornersw.png b/awesome/themes/zenburn/layouts/cornersw.png
deleted file mode 100644
index a35c476..0000000
--- a/awesome/themes/zenburn/layouts/cornersw.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/dwindle.png b/awesome/themes/zenburn/layouts/dwindle.png
deleted file mode 100644
index 1aa4bf2..0000000
--- a/awesome/themes/zenburn/layouts/dwindle.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/fairh.png b/awesome/themes/zenburn/layouts/fairh.png
deleted file mode 100644
index e176bb3..0000000
--- a/awesome/themes/zenburn/layouts/fairh.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/fairv.png b/awesome/themes/zenburn/layouts/fairv.png
deleted file mode 100644
index 7c0a92c..0000000
--- a/awesome/themes/zenburn/layouts/fairv.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/floating.png b/awesome/themes/zenburn/layouts/floating.png
deleted file mode 100644
index a399092..0000000
--- a/awesome/themes/zenburn/layouts/floating.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/fullscreen.png b/awesome/themes/zenburn/layouts/fullscreen.png
deleted file mode 100644
index a0c795c..0000000
--- a/awesome/themes/zenburn/layouts/fullscreen.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/magnifier.png b/awesome/themes/zenburn/layouts/magnifier.png
deleted file mode 100644
index bca6db9..0000000
--- a/awesome/themes/zenburn/layouts/magnifier.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/max.png b/awesome/themes/zenburn/layouts/max.png
deleted file mode 100644
index a24900c..0000000
--- a/awesome/themes/zenburn/layouts/max.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/spiral.png b/awesome/themes/zenburn/layouts/spiral.png
deleted file mode 100644
index 8f5aeed..0000000
--- a/awesome/themes/zenburn/layouts/spiral.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/tile.png b/awesome/themes/zenburn/layouts/tile.png
deleted file mode 100644
index 3fcc904..0000000
--- a/awesome/themes/zenburn/layouts/tile.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/tilebottom.png b/awesome/themes/zenburn/layouts/tilebottom.png
deleted file mode 100644
index dfe7832..0000000
--- a/awesome/themes/zenburn/layouts/tilebottom.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/tileleft.png b/awesome/themes/zenburn/layouts/tileleft.png
deleted file mode 100644
index c5decfd..0000000
--- a/awesome/themes/zenburn/layouts/tileleft.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/layouts/tiletop.png b/awesome/themes/zenburn/layouts/tiletop.png
deleted file mode 100644
index b251661..0000000
--- a/awesome/themes/zenburn/layouts/tiletop.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/taglist/squarefz.png b/awesome/themes/zenburn/taglist/squarefz.png
deleted file mode 100644
index 0927720..0000000
--- a/awesome/themes/zenburn/taglist/squarefz.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/taglist/squarez.png b/awesome/themes/zenburn/taglist/squarez.png
deleted file mode 100644
index 9b41c26..0000000
--- a/awesome/themes/zenburn/taglist/squarez.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/theme.lua b/awesome/themes/zenburn/theme.lua
deleted file mode 100644
index 2b6fa08..0000000
--- a/awesome/themes/zenburn/theme.lua
+++ /dev/null
@@ -1,136 +0,0 @@
--------------------------------
---  "Zenburn" awesome theme  --
---    By Adrian C. (anrxc)   --
--------------------------------
-
-local themes_path = require("gears.filesystem").get_themes_dir()
-local dpi = require("beautiful.xresources").apply_dpi
-
--- {{{ Main
-local theme = {}
-theme.wallpaper = themes_path .. "zenburn/zenburn-background.png"
--- }}}
-
--- {{{ Styles
-theme.font      = "sans 8"
-
--- {{{ Colors
-theme.fg_normal  = "#DCDCCC"
-theme.fg_focus   = "#F0DFAF"
-theme.fg_urgent  = "#CC9393"
-theme.bg_normal  = "#3F3F3F"
-theme.bg_focus   = "#1E2320"
-theme.bg_urgent  = "#3F3F3F"
-theme.bg_systray = theme.bg_normal
--- }}}
-
--- {{{ Borders
-theme.useless_gap   = dpi(0)
-theme.border_width  = dpi(2)
-theme.border_normal = "#3F3F3F"
-theme.border_focus  = "#6F6F6F"
-theme.border_marked = "#CC9393"
--- }}}
-
--- {{{ Titlebars
-theme.titlebar_bg_focus  = "#3F3F3F"
-theme.titlebar_bg_normal = "#3F3F3F"
--- }}}
-
--- There are other variable sets
--- overriding the default one when
--- defined, the sets are:
--- [taglist|tasklist]_[bg|fg]_[focus|urgent|occupied|empty|volatile]
--- titlebar_[normal|focus]
--- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
--- Example:
---theme.taglist_bg_focus = "#CC9393"
--- }}}
-
--- {{{ Widgets
--- You can add as many variables as
--- you wish and access them by using
--- beautiful.variable in your rc.lua
---theme.fg_widget        = "#AECF96"
---theme.fg_center_widget = "#88A175"
---theme.fg_end_widget    = "#FF5656"
---theme.bg_widget        = "#494B4F"
---theme.border_widget    = "#3F3F3F"
--- }}}
-
--- {{{ Mouse finder
-theme.mouse_finder_color = "#CC9393"
--- mouse_finder_[timeout|animate_timeout|radius|factor]
--- }}}
-
--- {{{ Menu
--- Variables set for theming the menu:
--- menu_[bg|fg]_[normal|focus]
--- menu_[border_color|border_width]
-theme.menu_height = dpi(15)
-theme.menu_width  = dpi(100)
--- }}}
-
--- {{{ Icons
--- {{{ Taglist
-theme.taglist_squares_sel   = themes_path .. "zenburn/taglist/squarefz.png"
-theme.taglist_squares_unsel = themes_path .. "zenburn/taglist/squarez.png"
---theme.taglist_squares_resize = "false"
--- }}}
-
--- {{{ Misc
-theme.awesome_icon           = themes_path .. "zenburn/awesome-icon.png"
-theme.menu_submenu_icon      = themes_path .. "default/submenu.png"
--- }}}
-
--- {{{ Layout
-theme.layout_tile       = themes_path .. "zenburn/layouts/tile.png"
-theme.layout_tileleft   = themes_path .. "zenburn/layouts/tileleft.png"
-theme.layout_tilebottom = themes_path .. "zenburn/layouts/tilebottom.png"
-theme.layout_tiletop    = themes_path .. "zenburn/layouts/tiletop.png"
-theme.layout_fairv      = themes_path .. "zenburn/layouts/fairv.png"
-theme.layout_fairh      = themes_path .. "zenburn/layouts/fairh.png"
-theme.layout_spiral     = themes_path .. "zenburn/layouts/spiral.png"
-theme.layout_dwindle    = themes_path .. "zenburn/layouts/dwindle.png"
-theme.layout_max        = themes_path .. "zenburn/layouts/max.png"
-theme.layout_fullscreen = themes_path .. "zenburn/layouts/fullscreen.png"
-theme.layout_magnifier  = themes_path .. "zenburn/layouts/magnifier.png"
-theme.layout_floating   = themes_path .. "zenburn/layouts/floating.png"
-theme.layout_cornernw   = themes_path .. "zenburn/layouts/cornernw.png"
-theme.layout_cornerne   = themes_path .. "zenburn/layouts/cornerne.png"
-theme.layout_cornersw   = themes_path .. "zenburn/layouts/cornersw.png"
-theme.layout_cornerse   = themes_path .. "zenburn/layouts/cornerse.png"
--- }}}
-
--- {{{ Titlebar
-theme.titlebar_close_button_focus  = themes_path .. "zenburn/titlebar/close_focus.png"
-theme.titlebar_close_button_normal = themes_path .. "zenburn/titlebar/close_normal.png"
-
-theme.titlebar_minimize_button_normal = themes_path .. "default/titlebar/minimize_normal.png"
-theme.titlebar_minimize_button_focus  = themes_path .. "default/titlebar/minimize_focus.png"
-
-theme.titlebar_ontop_button_focus_active  = themes_path .. "zenburn/titlebar/ontop_focus_active.png"
-theme.titlebar_ontop_button_normal_active = themes_path .. "zenburn/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_inactive  = themes_path .. "zenburn/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_inactive = themes_path .. "zenburn/titlebar/ontop_normal_inactive.png"
-
-theme.titlebar_sticky_button_focus_active  = themes_path .. "zenburn/titlebar/sticky_focus_active.png"
-theme.titlebar_sticky_button_normal_active = themes_path .. "zenburn/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_inactive  = themes_path .. "zenburn/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_inactive = themes_path .. "zenburn/titlebar/sticky_normal_inactive.png"
-
-theme.titlebar_floating_button_focus_active  = themes_path .. "zenburn/titlebar/floating_focus_active.png"
-theme.titlebar_floating_button_normal_active = themes_path .. "zenburn/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_inactive  = themes_path .. "zenburn/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_inactive = themes_path .. "zenburn/titlebar/floating_normal_inactive.png"
-
-theme.titlebar_maximized_button_focus_active  = themes_path .. "zenburn/titlebar/maximized_focus_active.png"
-theme.titlebar_maximized_button_normal_active = themes_path .. "zenburn/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_inactive  = themes_path .. "zenburn/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_inactive = themes_path .. "zenburn/titlebar/maximized_normal_inactive.png"
--- }}}
--- }}}
-
-return theme
-
--- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/awesome/themes/zenburn/titlebar/close_focus.png b/awesome/themes/zenburn/titlebar/close_focus.png
deleted file mode 100644
index cccbadc..0000000
--- a/awesome/themes/zenburn/titlebar/close_focus.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/close_normal.png b/awesome/themes/zenburn/titlebar/close_normal.png
deleted file mode 100644
index 6e6b645..0000000
--- a/awesome/themes/zenburn/titlebar/close_normal.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/floating_focus_active.png b/awesome/themes/zenburn/titlebar/floating_focus_active.png
deleted file mode 100644
index 77ea127..0000000
--- a/awesome/themes/zenburn/titlebar/floating_focus_active.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/floating_focus_inactive.png b/awesome/themes/zenburn/titlebar/floating_focus_inactive.png
deleted file mode 100644
index 94b0360..0000000
--- a/awesome/themes/zenburn/titlebar/floating_focus_inactive.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/floating_normal_active.png b/awesome/themes/zenburn/titlebar/floating_normal_active.png
deleted file mode 100644
index 878a9fb..0000000
--- a/awesome/themes/zenburn/titlebar/floating_normal_active.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/floating_normal_inactive.png b/awesome/themes/zenburn/titlebar/floating_normal_inactive.png
deleted file mode 100644
index 4147c7d..0000000
--- a/awesome/themes/zenburn/titlebar/floating_normal_inactive.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/maximized_focus_active.png b/awesome/themes/zenburn/titlebar/maximized_focus_active.png
deleted file mode 100644
index 9fc0483..0000000
--- a/awesome/themes/zenburn/titlebar/maximized_focus_active.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/maximized_focus_inactive.png b/awesome/themes/zenburn/titlebar/maximized_focus_inactive.png
deleted file mode 100644
index 298751c..0000000
--- a/awesome/themes/zenburn/titlebar/maximized_focus_inactive.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/maximized_normal_active.png b/awesome/themes/zenburn/titlebar/maximized_normal_active.png
deleted file mode 100644
index 1dca071..0000000
--- a/awesome/themes/zenburn/titlebar/maximized_normal_active.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/maximized_normal_inactive.png b/awesome/themes/zenburn/titlebar/maximized_normal_inactive.png
deleted file mode 100644
index f943ac7..0000000
--- a/awesome/themes/zenburn/titlebar/maximized_normal_inactive.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/ontop_focus_active.png b/awesome/themes/zenburn/titlebar/ontop_focus_active.png
deleted file mode 100644
index 86e61b7..0000000
--- a/awesome/themes/zenburn/titlebar/ontop_focus_active.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/ontop_focus_inactive.png b/awesome/themes/zenburn/titlebar/ontop_focus_inactive.png
deleted file mode 100644
index 04bc63a..0000000
--- a/awesome/themes/zenburn/titlebar/ontop_focus_inactive.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/ontop_normal_active.png b/awesome/themes/zenburn/titlebar/ontop_normal_active.png
deleted file mode 100644
index 8d9cb5b..0000000
--- a/awesome/themes/zenburn/titlebar/ontop_normal_active.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/ontop_normal_inactive.png b/awesome/themes/zenburn/titlebar/ontop_normal_inactive.png
deleted file mode 100644
index d383c77..0000000
--- a/awesome/themes/zenburn/titlebar/ontop_normal_inactive.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/sticky_focus_active.png b/awesome/themes/zenburn/titlebar/sticky_focus_active.png
deleted file mode 100644
index 5af45c1..0000000
--- a/awesome/themes/zenburn/titlebar/sticky_focus_active.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/sticky_focus_inactive.png b/awesome/themes/zenburn/titlebar/sticky_focus_inactive.png
deleted file mode 100644
index 1a0c481..0000000
--- a/awesome/themes/zenburn/titlebar/sticky_focus_inactive.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/sticky_normal_active.png b/awesome/themes/zenburn/titlebar/sticky_normal_active.png
deleted file mode 100644
index 50a6d2b..0000000
--- a/awesome/themes/zenburn/titlebar/sticky_normal_active.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/titlebar/sticky_normal_inactive.png b/awesome/themes/zenburn/titlebar/sticky_normal_inactive.png
deleted file mode 100644
index ea09406..0000000
--- a/awesome/themes/zenburn/titlebar/sticky_normal_inactive.png
+++ /dev/null
diff --git a/awesome/themes/zenburn/zenburn-background.png b/awesome/themes/zenburn/zenburn-background.png
deleted file mode 100644
index b2c14d9..0000000
--- a/awesome/themes/zenburn/zenburn-background.png
+++ /dev/null
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
deleted file mode 100755
index 6919d3d..0000000
--- a/sxhkd/sxhkdrc
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# wm independent hotkeys
-#
-
-# reload sxhkd config
-alt + Escape
-        pkill -USR1 -x sxhkd
-
-#
-# dmenu interfaces
-#
-
-# program launcher
-alt + d
-        dmenu_run
-
-# desktop application launcher
-alt + r
-        j4-dmenu-desktop --dmenu="dmenu -i -l 15"
-
-# dmenu prompt for recording
-alt + control + r
-        dmenurecord
-
-# run dmenu interface for keepassxc
-alt + p
-        dmenu_keepass -H 24
-
-# run dmenu interface for pass
-alt + super + p
-        passmenu
-
-# run dmenu interface for mpv
-alt + v
-        dmpv
-
-# get xprop
-alt + grave
-        notifyprop
-
-# run dmenu interface for ytfzf
-alt + y
-        ytfzf-launcher -D 'dmenu -l 15'
-
-# run dmenu interface to spawn browsers
-alt + super + 1
-        browser
-
-# run dmenu interface for qutebrowser profile chooser
-alt + super + q
-        qbc -x
-	#qbpm choose
-
-# run dmenu interface for librewolf profile chooser
-alt + super + w
-        lwc -x
-
-# run dmenu interface for librewolf profile chooser
-alt + super + e
-        fdc -x
-
-# run dmenu interface to open book
-alt + super + b
-        dmenu_books -x
-
-# run dmenu interface for mpris
-alt + super + u
-        mprisctl -x
-
-# run dmenu interface for monattach
-alt + super + m
-        monattach right
-
-# run dmenu interface for mondetach
-alt + super + n
-        mondetach
-
-# run dmenu interface for mount
-alt + super + comma
-        dmount -x
-
-# run dmenu interface for umount
-alt + super + period
-        dmenuumount -x
-
-#run dmenu prompt for unicode chars
-alt + super + u
-        dmenuunicode -x
-
-#
-# utilities
-#
-
-# toggle x idle state
-alt + c
-        xidletog
-
-# warp cursor to left or right monitor
-alt + {Left,Right}
-        mwarp.py {left,right}
-
-# lock the screen
-alt + q
-	loginctl lock-session self
-
-# restart dwmblocks
-alt + super + 9
-        toggle dwmblocks
-
-# signal all dwmblocks modules
-alt + super + 0
-        sigdwmb all
-
-# spawn file manager
-alt + super + f
-        $TERMINAL -e lfrun
-
-# toggle touchpad
-alt + super + t
-        toggletouchpad
-
-# notify-send firewall rules
-alt + super + f
-        notify-iptables
-
-# mute volume
-alt + super + m
-        volsv -t
-
-# mute microphone
-alt + super + shift + m
-        volsv -m
-
-# load nsxiv for backgrounds
-alt + super + x
-        nsxiv ~/.local/src/wallpapers
-
-# xkill
-alt + x
-	xkill
-
-# pause mpd
-super + p
-        playerctl play-pause
-
-# toggle picom
-alt + super + c
-        t -t picom
-
-#
-# xf86 keys
-#
-
-# manipulate audio stream
-XF86Audio{Prev,Next,Play,Stop}
-	mpc {prev,next,toggle,stop}
-
-# turn the brightness up
-XF86MonBrightnessUp
-        bl -i 1
-
-# turn the brightness down
-XF86MonBrightnessDown
-        bl -d 1
-
-# raise the volume
-XF86AudioRaiseVolume
-	volsv -i
-
-# lower the volume
-XF86AudioLowerVolume
-	volsv -d
-
-# toggle mute
-XF86AudioMute
-	volsv -t
-
-# mute mic
-XF86AudioMicMute
-	volsv -m
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 45d92ad..228d6f8 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -52,7 +52,6 @@ export GDK_DPI_SCALE=1
 
 # Theming
 export QT_QPA_PLATFORMTHEME=qt5ct
-[ -n "$WAYLAND_DISPLAY" ] && export GTK_THEME=Plata-Noir-Compact
 
 # Configure apps
 export BEMENU_OPTS="-H 36 --fn \"mononoki Nerd Font Mono 24\" --nb \"#000000\" --nf \"#c5c8c6\" --hb \"#39c1ed\" --hf \"#000000\" --cb \"#000000\" --cf \"#000000\" --tf \"#000000\" --tb \"#39c1ed\" --fb \"#000000\" --ff \"#c5c8c6\" --fbb \"#39c1ed\" --fbf \"#198844\""