From ea1bdf6585caed2c0ba8669ca5c3b3b92232281a Mon Sep 17 00:00:00 2001 From: delta Date: Wed, 12 Apr 2023 00:44:52 +0200 Subject: [PATCH] sort all require statements --- .config/awesome/.old-luarc.json | 14 ------------- .config/awesome/assets/phosphor/init.lua | 2 +- .config/awesome/misc/keys.lua | 14 ++++++------- .config/awesome/misc/rules.lua | 4 ++-- .config/awesome/prismite.lua | 6 ++---- .config/awesome/signals/naughty.lua | 4 ++-- .config/awesome/ui/conductor/init.lua | 2 +- .config/awesome/ui/decorations/titlebar.lua | 8 ++++---- .config/awesome/ui/decorations/wallpaper.lua | 6 +++--- .config/awesome/ui/flashy/init.lua | 10 +++++----- .config/awesome/ui/fresnel/init.lua | 20 +++++++++---------- .config/awesome/ui/insightful/init.lua | 12 +++++------ .config/awesome/ui/statusbar/init.lua | 14 ++++++------- .config/awesome/ui/statusbar/panel/init.lua | 2 +- .../statusbar/panel/widgets/battery_bar.lua | 4 ++-- .../panel/widgets/brightness_bar.lua | 4 ++-- .../awesome/ui/statusbar/widgets/battery.lua | 6 +++--- .../ui/statusbar/widgets/brightness.lua | 6 +++--- .../awesome/ui/statusbar/widgets/taglist.lua | 4 ++-- .config/awesome/ui/statusbar/widgets/wifi.lua | 6 +++--- .config/awesome/ui/wicked/init.lua | 8 ++++---- 21 files changed, 70 insertions(+), 86 deletions(-) delete mode 100644 .config/awesome/.old-luarc.json diff --git a/.config/awesome/.old-luarc.json b/.config/awesome/.old-luarc.json deleted file mode 100644 index b62f876..0000000 --- a/.config/awesome/.old-luarc.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "diagnostics.globals": [ - "awesome", - "client", - "mouse", - "mousegrabber", - "root", - "screen", - "tag" - ], - "workspace.library": [ - "/usr/share/awesome/lib" - ] -} diff --git a/.config/awesome/assets/phosphor/init.lua b/.config/awesome/assets/phosphor/init.lua index 0df3958..c6a7eec 100644 --- a/.config/awesome/assets/phosphor/init.lua +++ b/.config/awesome/assets/phosphor/init.lua @@ -1,6 +1,6 @@ -local qfs = require "quarrel.fs" local gfs = require "gears.filesystem" local gsurface = require "gears.surface" +local qfs = require "quarrel.fs" local icons = {} local phosphor_dir = gfs.get_configuration_dir() .. "assets/phosphor/" diff --git a/.config/awesome/misc/keys.lua b/.config/awesome/misc/keys.lua index 3040657..bc5fdb6 100644 --- a/.config/awesome/misc/keys.lua +++ b/.config/awesome/misc/keys.lua @@ -1,12 +1,12 @@ -local awful = require "awful" -local gtimer = require "gears.timer" -local naughty = require "naughty" -local cfg = require "misc.cfg" -local qbind = require "quarrel.bind" -local insightful = require "ui.insightful" local archaic = require "ui.archaic" -local fresnel = require "ui.fresnel" +local awful = require "awful" +local cfg = require "misc.cfg" local flashy = require "ui.flashy" +local fresnel = require "ui.fresnel" +local gtimer = require "gears.timer" +local insightful = require "ui.insightful" +local naughty = require "naughty" +local qbind = require "quarrel.bind" local qvars = require "quarrel.vars" local recording = { false, "" } diff --git a/.config/awesome/misc/rules.lua b/.config/awesome/misc/rules.lua index b777ae8..005b248 100644 --- a/.config/awesome/misc/rules.lua +++ b/.config/awesome/misc/rules.lua @@ -1,6 +1,6 @@ -local ruled = require "ruled" -local beautiful = require "beautiful" local awful = require "awful" +local beautiful = require "beautiful" +local ruled = require "ruled" ruled.client.connect_signal("request::rules", function() ruled.client.append_rule({ diff --git a/.config/awesome/prismite.lua b/.config/awesome/prismite.lua index 14c6987..72701b6 100644 --- a/.config/awesome/prismite.lua +++ b/.config/awesome/prismite.lua @@ -1,10 +1,8 @@ +local naughty = require "naughty" +local qvars = require "quarrel.vars" local xresources = require "beautiful.xresources" local dpi = xresources.apply_dpi -local naughty = require("naughty") - -local qvars = require "quarrel.vars" - local theme = {} theme.font = qvars.font diff --git a/.config/awesome/signals/naughty.lua b/.config/awesome/signals/naughty.lua index 49187c0..90594c1 100644 --- a/.config/awesome/signals/naughty.lua +++ b/.config/awesome/signals/naughty.lua @@ -1,8 +1,8 @@ -local naughty = require "naughty" local awful = require "awful" local beautiful = require "beautiful" -local wibox = require "wibox" +local naughty = require "naughty" local qvars = require "quarrel.vars" +local wibox = require "wibox" naughty.connect_signal("request::display", function(n) naughty.layout.box { diff --git a/.config/awesome/ui/conductor/init.lua b/.config/awesome/ui/conductor/init.lua index 1790d0d..b5ac82b 100644 --- a/.config/awesome/ui/conductor/init.lua +++ b/.config/awesome/ui/conductor/init.lua @@ -1,6 +1,6 @@ local awful = require "awful" -local qui = require "quarrel.ui" local q = require "quarrel" +local qui = require "quarrel.ui" local qvars = require "quarrel.vars" awful.keygrabber { diff --git a/.config/awesome/ui/decorations/titlebar.lua b/.config/awesome/ui/decorations/titlebar.lua index 9463dbc..ab96457 100644 --- a/.config/awesome/ui/decorations/titlebar.lua +++ b/.config/awesome/ui/decorations/titlebar.lua @@ -1,9 +1,9 @@ local awful = require "awful" -local qvars = require "quarrel.vars" -local gears = require "gears" -local wibox = require "wibox" -local rubato = require "lib.rubato" local cfg = require "misc.cfg" +local gears = require "gears" +local qvars = require "quarrel.vars" +local rubato = require "lib.rubato" +local wibox = require "wibox" local function button(color, color_focus, callback) local widget = wibox.widget { diff --git a/.config/awesome/ui/decorations/wallpaper.lua b/.config/awesome/ui/decorations/wallpaper.lua index fc2aa79..e1323b8 100644 --- a/.config/awesome/ui/decorations/wallpaper.lua +++ b/.config/awesome/ui/decorations/wallpaper.lua @@ -1,8 +1,8 @@ +-- local gfs = require "gears.filesystem" +local qui = require "quarrel.ui" +local qvars = require "quarrel.vars" local wallpaper = require "awful.wallpaper" local wibox = require "wibox" --- local gfs = require "gears.filesystem" -local qvars = require "quarrel.vars" -local qui = require "quarrel.ui" screen.connect_signal("request::wallpaper", function(s) wallpaper { diff --git a/.config/awesome/ui/flashy/init.lua b/.config/awesome/ui/flashy/init.lua index 65f7518..68f1e13 100644 --- a/.config/awesome/ui/flashy/init.lua +++ b/.config/awesome/ui/flashy/init.lua @@ -1,13 +1,13 @@ local awful = require "awful" -local gtable = require "gears.table" -local gdebug = require "gears.debug" +local beautiful = require "beautiful" local gcolor = require "gears.color" +local gdebug = require "gears.debug" +local gtable = require "gears.table" +local phosphor = require "assets.phosphor" local qui = require "quarrel.ui" local qvars = require "quarrel.vars" -local wibox = require "wibox" -local phosphor = require "assets.phosphor" -local beautiful = require "beautiful" local rubato = require "lib.rubato" +local wibox = require "wibox" local flashy = {} flashy._timeout_timer = {} diff --git a/.config/awesome/ui/fresnel/init.lua b/.config/awesome/ui/fresnel/init.lua index 242603f..29ead63 100644 --- a/.config/awesome/ui/fresnel/init.lua +++ b/.config/awesome/ui/fresnel/init.lua @@ -1,14 +1,14 @@ -local awful = require "awful" -local gtable = require "gears.table" -local qui = require "quarrel.ui" -local qtable = require "quarrel.table" -local qnative = require "quarrel.native" -local cfg = require "misc.cfg" -local qvars = require "quarrel.vars" -local wibox = require "wibox" -local beautiful = require "beautiful" -local rubato = require "lib.rubato" local al_prompt = require "lib.bling.widget.app_launcher.prompt" +local awful = require "awful" +local beautiful = require "beautiful" +local cfg = require "misc.cfg" +local gtable = require "gears.table" +local qnative = require "quarrel.native" +local qtable = require "quarrel.table" +local qui = require "quarrel.ui" +local qvars = require "quarrel.vars" +local rubato = require "lib.rubato" +local wibox = require "wibox" local btn = awful.button.names local max_entries = 10 diff --git a/.config/awesome/ui/insightful/init.lua b/.config/awesome/ui/insightful/init.lua index 1e61046..7b3e537 100644 --- a/.config/awesome/ui/insightful/init.lua +++ b/.config/awesome/ui/insightful/init.lua @@ -1,11 +1,11 @@ local awful = require "awful" -local gtable = require "gears.table" -local qui = require "quarrel.ui" -local qtable = require "quarrel.table" -local qvars = require "quarrel.vars" -local wibox = require "wibox" -local rubato = require "lib.rubato" local beautiful = require "beautiful" +local gtable = require "gears.table" +local qtable = require "quarrel.table" +local qui = require "quarrel.ui" +local qvars = require "quarrel.vars" +local rubato = require "lib.rubato" +local wibox = require "wibox" local btn = awful.button.names local first_time = true diff --git a/.config/awesome/ui/statusbar/init.lua b/.config/awesome/ui/statusbar/init.lua index 2851b73..e923473 100644 --- a/.config/awesome/ui/statusbar/init.lua +++ b/.config/awesome/ui/statusbar/init.lua @@ -1,20 +1,20 @@ local awful = require "awful" local beautiful = require "beautiful" -local qvars = require "quarrel.vars" -local wibox = require "wibox" -local qui = require "quarrel.ui" local gcolor = require "gears.color" +local panel = require "ui.statusbar.panel" local phosphor = require "assets.phosphor" local qbind = require "quarrel.bind" +local qui = require "quarrel.ui" +local qvars = require "quarrel.vars" local rubato = require "lib.rubato" -local panel = require "ui.statusbar.panel" +local wibox = require "wibox" -local taglist = require "ui.statusbar.widgets.taglist" -local clock = require "ui.statusbar.widgets.clock" -local wifi = require "ui.statusbar.widgets.wifi" local battery = require "ui.statusbar.widgets.battery" local brightness = require "ui.statusbar.widgets.brightness" +local clock = require "ui.statusbar.widgets.clock" local keyboardlayout = require "ui.statusbar.widgets.keyboardlayout" +local taglist = require "ui.statusbar.widgets.taglist" +local wifi = require "ui.statusbar.widgets.wifi" screen.connect_signal("request::desktop_decoration", function(s) local expand_button = wibox.widget { diff --git a/.config/awesome/ui/statusbar/panel/init.lua b/.config/awesome/ui/statusbar/panel/init.lua index bbdbaee..fe66789 100644 --- a/.config/awesome/ui/statusbar/panel/init.lua +++ b/.config/awesome/ui/statusbar/panel/init.lua @@ -1,5 +1,5 @@ -local wibox = require "wibox" local qvars = require "quarrel.vars" +local wibox = require "wibox" local battery_bar = require "ui.statusbar.panel.widgets.battery_bar" local brightness_bar = require "ui.statusbar.panel.widgets.brightness_bar" diff --git a/.config/awesome/ui/statusbar/panel/widgets/battery_bar.lua b/.config/awesome/ui/statusbar/panel/widgets/battery_bar.lua index b504330..c1466f4 100644 --- a/.config/awesome/ui/statusbar/panel/widgets/battery_bar.lua +++ b/.config/awesome/ui/statusbar/panel/widgets/battery_bar.lua @@ -1,6 +1,6 @@ -local wibox = require "wibox" -local qvars = require "quarrel.vars" local qmath = require "quarrel.math" +local qvars = require "quarrel.vars" +local wibox = require "wibox" local battery_bar = wibox.widget { widget = wibox.container.place, diff --git a/.config/awesome/ui/statusbar/panel/widgets/brightness_bar.lua b/.config/awesome/ui/statusbar/panel/widgets/brightness_bar.lua index 2db03dc..7d3e5f0 100644 --- a/.config/awesome/ui/statusbar/panel/widgets/brightness_bar.lua +++ b/.config/awesome/ui/statusbar/panel/widgets/brightness_bar.lua @@ -1,6 +1,6 @@ -local wibox = require "wibox" -local qvars = require "quarrel.vars" local qmath = require "quarrel.math" +local qvars = require "quarrel.vars" +local wibox = require "wibox" local brightness_bar = wibox.widget { widget = wibox.container.place, diff --git a/.config/awesome/ui/statusbar/widgets/battery.lua b/.config/awesome/ui/statusbar/widgets/battery.lua index dab98ca..98af803 100644 --- a/.config/awesome/ui/statusbar/widgets/battery.lua +++ b/.config/awesome/ui/statusbar/widgets/battery.lua @@ -1,8 +1,8 @@ -local qvars = require "quarrel.vars" -local wibox = require "wibox" -local qmath = require "quarrel.math" local gcolor = require "gears.color" local phosphor = require "assets.phosphor" +local qmath = require "quarrel.math" +local qvars = require "quarrel.vars" +local wibox = require "wibox" local battery = wibox.widget { widget = wibox.container.place, diff --git a/.config/awesome/ui/statusbar/widgets/brightness.lua b/.config/awesome/ui/statusbar/widgets/brightness.lua index f8f6c17..5c1cb16 100644 --- a/.config/awesome/ui/statusbar/widgets/brightness.lua +++ b/.config/awesome/ui/statusbar/widgets/brightness.lua @@ -1,8 +1,8 @@ -local qvars = require "quarrel.vars" -local wibox = require "wibox" -local qmath = require "quarrel.math" local gcolor = require "gears.color" local phosphor = require "assets.phosphor" +local qmath = require "quarrel.math" +local qvars = require "quarrel.vars" +local wibox = require "wibox" local brightness = wibox.widget { widget = wibox.container.place, diff --git a/.config/awesome/ui/statusbar/widgets/taglist.lua b/.config/awesome/ui/statusbar/widgets/taglist.lua index 89eaf2f..5b479bc 100644 --- a/.config/awesome/ui/statusbar/widgets/taglist.lua +++ b/.config/awesome/ui/statusbar/widgets/taglist.lua @@ -1,9 +1,9 @@ local awful = require "awful" -local qvars = require "quarrel.vars" -local wibox = require "wibox" local gcolor = require "gears.color" local phosphor = require "assets.phosphor" local qbind = require "quarrel.bind" +local qvars = require "quarrel.vars" +local wibox = require "wibox" return awful.widget.taglist { screen = screen[1], diff --git a/.config/awesome/ui/statusbar/widgets/wifi.lua b/.config/awesome/ui/statusbar/widgets/wifi.lua index 5f131b3..ec5b72c 100644 --- a/.config/awesome/ui/statusbar/widgets/wifi.lua +++ b/.config/awesome/ui/statusbar/widgets/wifi.lua @@ -1,8 +1,8 @@ -local qvars = require "quarrel.vars" -local wibox = require "wibox" -local qmath = require "quarrel.math" local gcolor = require "gears.color" local phosphor = require "assets.phosphor" +local qmath = require "quarrel.math" +local qvars = require "quarrel.vars" +local wibox = require "wibox" local wifi = wibox.widget { widget = wibox.container.place, diff --git a/.config/awesome/ui/wicked/init.lua b/.config/awesome/ui/wicked/init.lua index 5bd36be..76d77cf 100644 --- a/.config/awesome/ui/wicked/init.lua +++ b/.config/awesome/ui/wicked/init.lua @@ -1,12 +1,12 @@ local awful = require "awful" -local qvars = require "quarrel.vars" -local wibox = require "wibox" local debug = require "gears.debug" +local default = require "ui.wicked._default" local gtimer = require "gears.timer" local naughty = require "naughty" --- local rubato = require "lib.rubato" -local default = require "ui.wicked._default" local qui = require "quarrel.ui" +local qvars = require "quarrel.vars" +-- local rubato = require "lib.rubato" +local wibox = require "wibox" local wicked = {}