Added stylua config and ran it

This commit is contained in:
Mutzi 2023-01-21 16:34:13 +01:00
parent f0a0ff2855
commit 58d2046ff9
4 changed files with 878 additions and 821 deletions

View File

@ -6,12 +6,14 @@ local naughty = require('naughty')
local state = {
client = nil,
signals = {}
signals = {},
}
local function notify(msg, keep) -- {{{1
local timeout = 3
if keep then timeout = 0 end
if keep then
timeout = 0
end
naughty.notify({ text = msg, timeout = timeout })
end
@ -64,10 +66,10 @@ end
local function release() -- {{{1
disconnect()
root.disconnect_signal("mouse::move", reposition)
root.disconnect_signal("mouse::leave", reposition)
root.disconnect_signal('mouse::move', reposition)
root.disconnect_signal('mouse::leave', reposition)
notify("Mouse released")
notify('Mouse released')
state.client = nil
end
@ -75,20 +77,22 @@ end
local function constrain(c) -- {{{1
state.client = c or mouse.current_client
if state.client == nil then return end
if state.client == nil then
return
end
set_bounds()
notify("Constrainging mouse to " .. state.client.name)
notify('Constrainging mouse to ' .. state.client.name)
root.connect_signal("mouse::move", reposition)
root.connect_signal("mouse::leave", reposition)
root.connect_signal('mouse::move', reposition)
root.connect_signal('mouse::leave', reposition)
connect("mouse::move", reposition)
connect("mouse::leave", reposition)
connect("property::size", set_bounds)
connect("property::position", set_bounds)
connect("unmanage", release)
connect('mouse::move', reposition)
connect('mouse::leave', reposition)
connect('property::size', set_bounds)
connect('property::position', set_bounds)
connect('unmanage', release)
end
-- public interface -- {{{1
@ -101,5 +105,5 @@ return {
else
constrain(c)
end
end
end,
}

File diff suppressed because it is too large Load Diff

2
awesome/stylua.toml Normal file
View File

@ -0,0 +1,2 @@
quote_style = "AutoPreferSingle"

View File

@ -5,136 +5,142 @@
--]]
local gears = require("gears")
local lain = require("lain")
local awful = require("awful")
local wibox = require("wibox")
local dpi = require("beautiful.xresources").apply_dpi
local gears = require('gears')
local lain = require('lain')
local awful = require('awful')
local wibox = require('wibox')
local dpi = require('beautiful.xresources').apply_dpi
local os = os
local my_table = awful.util.table or gears.table -- 4.{0,1} compatibility
local theme = {}
theme.confdir = os.getenv("HOME") .. "/.config/awesome/"
theme.wallpaper = os.getenv("HOME") .. "/.config/awesome/wall.png"
theme.font = "Terminus 8"
theme.menu_bg_normal = "#000000"
theme.menu_bg_focus = "#000000"
theme.bg_normal = "#000000"
theme.bg_focus = "#000000"
theme.bg_urgent = "#000000"
theme.fg_normal = "#aaaaaa"
theme.fg_focus = "#ff8c00"
theme.fg_urgent = "#af1d18"
theme.fg_minimize = "#ffffff"
theme.confdir = os.getenv('HOME') .. '/.config/awesome/'
theme.wallpaper = os.getenv('HOME') .. '/.config/awesome/wall.png'
theme.font = 'Terminus 8'
theme.menu_bg_normal = '#000000'
theme.menu_bg_focus = '#000000'
theme.bg_normal = '#000000'
theme.bg_focus = '#000000'
theme.bg_urgent = '#000000'
theme.fg_normal = '#aaaaaa'
theme.fg_focus = '#ff8c00'
theme.fg_urgent = '#af1d18'
theme.fg_minimize = '#ffffff'
theme.border_width = dpi(1)
theme.border_normal = "#1c2022"
theme.border_focus = "#606060"
theme.border_marked = "#3ca4d8"
theme.border_normal = '#1c2022'
theme.border_focus = '#606060'
theme.border_marked = '#3ca4d8'
theme.menu_border_width = 0
theme.menu_width = dpi(130)
theme.menu_submenu_icon = theme.confdir .. "/icons/submenu.png"
theme.menu_fg_normal = "#aaaaaa"
theme.menu_fg_focus = "#ff8c00"
theme.menu_bg_normal = "#050505dd"
theme.menu_bg_focus = "#050505dd"
theme.widget_temp = theme.confdir .. "/icons/temp.png"
theme.widget_uptime = theme.confdir .. "/icons/ac.png"
theme.widget_cpu = theme.confdir .. "/icons/cpu.png"
theme.widget_weather = theme.confdir .. "/icons/dish.png"
theme.widget_fs = theme.confdir .. "/icons/fs.png"
theme.widget_mem = theme.confdir .. "/icons/mem.png"
theme.widget_note = theme.confdir .. "/icons/note.png"
theme.widget_note_on = theme.confdir .. "/icons/note_on.png"
theme.widget_netdown = theme.confdir .. "/icons/net_down.png"
theme.widget_netup = theme.confdir .. "/icons/net_up.png"
theme.widget_mail = theme.confdir .. "/icons/mail.png"
theme.widget_batt = theme.confdir .. "/icons/bat.png"
theme.widget_clock = theme.confdir .. "/icons/clock.png"
theme.widget_vol = theme.confdir .. "/icons/spkr.png"
theme.taglist_squares_sel = theme.confdir .. "/icons/square_a.png"
theme.taglist_squares_unsel = theme.confdir .. "/icons/square_b.png"
theme.menu_submenu_icon = theme.confdir .. '/icons/submenu.png'
theme.menu_fg_normal = '#aaaaaa'
theme.menu_fg_focus = '#ff8c00'
theme.menu_bg_normal = '#050505dd'
theme.menu_bg_focus = '#050505dd'
theme.widget_temp = theme.confdir .. '/icons/temp.png'
theme.widget_uptime = theme.confdir .. '/icons/ac.png'
theme.widget_cpu = theme.confdir .. '/icons/cpu.png'
theme.widget_weather = theme.confdir .. '/icons/dish.png'
theme.widget_fs = theme.confdir .. '/icons/fs.png'
theme.widget_mem = theme.confdir .. '/icons/mem.png'
theme.widget_note = theme.confdir .. '/icons/note.png'
theme.widget_note_on = theme.confdir .. '/icons/note_on.png'
theme.widget_netdown = theme.confdir .. '/icons/net_down.png'
theme.widget_netup = theme.confdir .. '/icons/net_up.png'
theme.widget_mail = theme.confdir .. '/icons/mail.png'
theme.widget_batt = theme.confdir .. '/icons/bat.png'
theme.widget_clock = theme.confdir .. '/icons/clock.png'
theme.widget_vol = theme.confdir .. '/icons/spkr.png'
theme.taglist_squares_sel = theme.confdir .. '/icons/square_a.png'
theme.taglist_squares_unsel = theme.confdir .. '/icons/square_b.png'
theme.tasklist_plain_task_name = true
theme.tasklist_disable_icon = true
theme.useless_gap = 0
theme.layout_tile = theme.confdir .. "/icons/tile.png"
theme.layout_tilegaps = theme.confdir .. "/icons/tilegaps.png"
theme.layout_tileleft = theme.confdir .. "/icons/tileleft.png"
theme.layout_tilebottom = theme.confdir .. "/icons/tilebottom.png"
theme.layout_tiletop = theme.confdir .. "/icons/tiletop.png"
theme.layout_fairv = theme.confdir .. "/icons/fairv.png"
theme.layout_fairh = theme.confdir .. "/icons/fairh.png"
theme.layout_spiral = theme.confdir .. "/icons/spiral.png"
theme.layout_dwindle = theme.confdir .. "/icons/dwindle.png"
theme.layout_max = theme.confdir .. "/icons/max.png"
theme.layout_fullscreen = theme.confdir .. "/icons/fullscreen.png"
theme.layout_magnifier = theme.confdir .. "/icons/magnifier.png"
theme.layout_floating = theme.confdir .. "/icons/floating.png"
theme.titlebar_close_button_normal = theme.confdir .. "/icons/titlebar/close_normal.png"
theme.titlebar_close_button_focus = theme.confdir .. "/icons/titlebar/close_focus.png"
theme.titlebar_minimize_button_normal = theme.confdir .. "/icons/titlebar/minimize_normal.png"
theme.titlebar_minimize_button_focus = theme.confdir .. "/icons/titlebar/minimize_focus.png"
theme.titlebar_ontop_button_normal_inactive = theme.confdir .. "/icons/titlebar/ontop_normal_inactive.png"
theme.titlebar_ontop_button_focus_inactive = theme.confdir .. "/icons/titlebar/ontop_focus_inactive.png"
theme.titlebar_ontop_button_normal_active = theme.confdir .. "/icons/titlebar/ontop_normal_active.png"
theme.titlebar_ontop_button_focus_active = theme.confdir .. "/icons/titlebar/ontop_focus_active.png"
theme.titlebar_sticky_button_normal_inactive = theme.confdir .. "/icons/titlebar/sticky_normal_inactive.png"
theme.titlebar_sticky_button_focus_inactive = theme.confdir .. "/icons/titlebar/sticky_focus_inactive.png"
theme.titlebar_sticky_button_normal_active = theme.confdir .. "/icons/titlebar/sticky_normal_active.png"
theme.titlebar_sticky_button_focus_active = theme.confdir .. "/icons/titlebar/sticky_focus_active.png"
theme.titlebar_floating_button_normal_inactive = theme.confdir .. "/icons/titlebar/floating_normal_inactive.png"
theme.titlebar_floating_button_focus_inactive = theme.confdir .. "/icons/titlebar/floating_focus_inactive.png"
theme.titlebar_floating_button_normal_active = theme.confdir .. "/icons/titlebar/floating_normal_active.png"
theme.titlebar_floating_button_focus_active = theme.confdir .. "/icons/titlebar/floating_focus_active.png"
theme.titlebar_maximized_button_normal_inactive = theme.confdir .. "/icons/titlebar/maximized_normal_inactive.png"
theme.titlebar_maximized_button_focus_inactive = theme.confdir .. "/icons/titlebar/maximized_focus_inactive.png"
theme.titlebar_maximized_button_normal_active = theme.confdir .. "/icons/titlebar/maximized_normal_active.png"
theme.titlebar_maximized_button_focus_active = theme.confdir .. "/icons/titlebar/maximized_focus_active.png"
theme.layout_tile = theme.confdir .. '/icons/tile.png'
theme.layout_tilegaps = theme.confdir .. '/icons/tilegaps.png'
theme.layout_tileleft = theme.confdir .. '/icons/tileleft.png'
theme.layout_tilebottom = theme.confdir .. '/icons/tilebottom.png'
theme.layout_tiletop = theme.confdir .. '/icons/tiletop.png'
theme.layout_fairv = theme.confdir .. '/icons/fairv.png'
theme.layout_fairh = theme.confdir .. '/icons/fairh.png'
theme.layout_spiral = theme.confdir .. '/icons/spiral.png'
theme.layout_dwindle = theme.confdir .. '/icons/dwindle.png'
theme.layout_max = theme.confdir .. '/icons/max.png'
theme.layout_fullscreen = theme.confdir .. '/icons/fullscreen.png'
theme.layout_magnifier = theme.confdir .. '/icons/magnifier.png'
theme.layout_floating = theme.confdir .. '/icons/floating.png'
theme.titlebar_close_button_normal = theme.confdir .. '/icons/titlebar/close_normal.png'
theme.titlebar_close_button_focus = theme.confdir .. '/icons/titlebar/close_focus.png'
theme.titlebar_minimize_button_normal = theme.confdir .. '/icons/titlebar/minimize_normal.png'
theme.titlebar_minimize_button_focus = theme.confdir .. '/icons/titlebar/minimize_focus.png'
theme.titlebar_ontop_button_normal_inactive = theme.confdir .. '/icons/titlebar/ontop_normal_inactive.png'
theme.titlebar_ontop_button_focus_inactive = theme.confdir .. '/icons/titlebar/ontop_focus_inactive.png'
theme.titlebar_ontop_button_normal_active = theme.confdir .. '/icons/titlebar/ontop_normal_active.png'
theme.titlebar_ontop_button_focus_active = theme.confdir .. '/icons/titlebar/ontop_focus_active.png'
theme.titlebar_sticky_button_normal_inactive = theme.confdir .. '/icons/titlebar/sticky_normal_inactive.png'
theme.titlebar_sticky_button_focus_inactive = theme.confdir .. '/icons/titlebar/sticky_focus_inactive.png'
theme.titlebar_sticky_button_normal_active = theme.confdir .. '/icons/titlebar/sticky_normal_active.png'
theme.titlebar_sticky_button_focus_active = theme.confdir .. '/icons/titlebar/sticky_focus_active.png'
theme.titlebar_floating_button_normal_inactive = theme.confdir .. '/icons/titlebar/floating_normal_inactive.png'
theme.titlebar_floating_button_focus_inactive = theme.confdir .. '/icons/titlebar/floating_focus_inactive.png'
theme.titlebar_floating_button_normal_active = theme.confdir .. '/icons/titlebar/floating_normal_active.png'
theme.titlebar_floating_button_focus_active = theme.confdir .. '/icons/titlebar/floating_focus_active.png'
theme.titlebar_maximized_button_normal_inactive = theme.confdir .. '/icons/titlebar/maximized_normal_inactive.png'
theme.titlebar_maximized_button_focus_inactive = theme.confdir .. '/icons/titlebar/maximized_focus_inactive.png'
theme.titlebar_maximized_button_normal_active = theme.confdir .. '/icons/titlebar/maximized_normal_active.png'
theme.titlebar_maximized_button_focus_active = theme.confdir .. '/icons/titlebar/maximized_focus_active.png'
local markup = lain.util.markup
-- Textclock
os.setlocale(os.getenv("LANG")) -- to localize the clock
os.setlocale(os.getenv('LANG')) -- to localize the clock
local clockicon = wibox.widget.imagebox(theme.widget_clock)
local mytextclock = wibox.widget.textclock(
markup("#7788af", "%A %d %B ") .. markup("#ab7367", ">") .. markup("#de5e1e", " %H:%M ")
)
local mytextclock =
wibox.widget.textclock(markup('#7788af', '%A %d %B ') .. markup('#ab7367', '>') .. markup('#de5e1e', ' %H:%M '))
mytextclock.font = theme.font
-- Calendar
theme.cal = lain.widget.cal({
attach_to = { mytextclock },
notification_preset = {
font = "Monospace 10",
font = 'Monospace 10',
fg = theme.fg_normal,
bg = theme.bg_normal
}
bg = theme.bg_normal,
},
})
-- / fs
local fsicon = wibox.widget.imagebox(theme.widget_fs)
theme.fs = lain.widget.fs({
notification_preset = { font = "Monospace 10", fg = theme.fg_normal },
notification_preset = { font = 'Monospace 10', fg = theme.fg_normal },
settings = function()
-- luacheck: max line length 150, globals widget fs_now
widget:set_markup(markup.fontfg(theme.font, "#80d9d8",
fs_now["/"].percentage .. "% (" .. string.format("%.3f", fs_now["/"].free) .. " " .. fs_now["/"].units .. " left)")
widget:set_markup(
markup.fontfg(
theme.font,
'#80d9d8',
fs_now['/'].percentage
.. '% ('
.. string.format('%.3f', fs_now['/'].free)
.. ' '
.. fs_now['/'].units
.. ' left)'
)
end
)
end,
})
theme.fs.widget:buttons(gears.table.join(
awful.button({}, 1, function()
awful.spawn("Thunar")
end)
))
theme.fs.widget:buttons(gears.table.join(awful.button({}, 1, function()
awful.spawn('Thunar')
end)))
-- CPU
local cpuicon = wibox.widget.imagebox(theme.widget_cpu)
local cpu = lain.widget.cpu({
settings = function()
-- luacheck: globals widget cpu_now
widget:set_markup(markup.fontfg(theme.font, "#e33a6e", cpu_now.usage .. "% "))
end
widget:set_markup(markup.fontfg(theme.font, '#e33a6e', cpu_now.usage .. '% '))
end,
})
-- Coretemp
@ -143,7 +149,8 @@ local temp = lain.widget.temp({
settings = function()
widget:set_markup(markup.fontfg(theme.font, "#f1af5f", coretemp_now .. "°C "))
end
})]]--
})]]
--
-- Battery
--[[local baticon = wibox.widget.imagebox(theme.widget_batt)
@ -157,27 +164,28 @@ local bat = lain.widget.bat({
widget:set_markup(markup.fontfg(theme.font, theme.fg_normal, perc .. " "))
end
})]]--
})]]
--
-- ALSA volume
local volicon = wibox.widget.imagebox(theme.widget_vol)
theme.volume = lain.widget.alsa({
settings = function()
-- luacheck: globals widget volume_now
if volume_now.status == "off" then
volume_now.level = volume_now.level .. "M"
if volume_now.status == 'off' then
volume_now.level = volume_now.level .. 'M'
end
widget:set_markup(markup.fontfg(theme.font, "#7493d2", volume_now.level .. "% "))
end
widget:set_markup(markup.fontfg(theme.font, '#7493d2', volume_now.level .. '% '))
end,
})
theme.volume.widget:buttons(awful.util.table.join(
awful.button({}, 4, function()
os.execute(string.format("%s set %s 1%%+", theme.volume.cmd, theme.volume.channel))
os.execute(string.format('%s set %s 1%%+', theme.volume.cmd, theme.volume.channel))
theme.volume.update()
end),
awful.button({}, 5, function()
os.execute(string.format("%s set %s 1%%-", theme.volume.cmd, theme.volume.channel))
os.execute(string.format('%s set %s 1%%-', theme.volume.cmd, theme.volume.channel))
theme.volume.update()
end)
))
@ -189,9 +197,9 @@ local netupicon = wibox.widget.imagebox(theme.widget_netup)
local netupinfo = lain.widget.net({
settings = function()
-- luacheck: globals widget net_now
widget:set_markup(markup.fontfg(theme.font, "#e54c62", net_now.sent .. " "))
netdowninfo:set_markup(markup.fontfg(theme.font, "#87af5f", net_now.received .. " "))
end
widget:set_markup(markup.fontfg(theme.font, '#e54c62', net_now.sent .. ' '))
netdowninfo:set_markup(markup.fontfg(theme.font, '#87af5f', net_now.received .. ' '))
end,
})
-- MEM
@ -199,8 +207,8 @@ local memicon = wibox.widget.imagebox(theme.widget_mem)
local memory = lain.widget.mem({
settings = function()
-- luacheck: globals widget mem_now
widget:set_markup(markup.fontfg(theme.font, "#e0da37", mem_now.used .. "M "))
end
widget:set_markup(markup.fontfg(theme.font, '#e0da37', mem_now.used .. 'M '))
end,
})
-- MPD
@ -231,7 +239,8 @@ theme.mpd = lain.widget.mpd({
widget:set_markup(markup.fontfg(theme.font, "#e54c62", artist) .. markup.fontfg(theme.font, "#b2b2b2", title))
end
})
]]--
]]
--
function theme.at_screen_connect(s)
-- Quake application
@ -239,7 +248,7 @@ function theme.at_screen_connect(s)
-- If wallpaper is a function, call it with the screen
local wallpaper = theme.wallpaper
if type(wallpaper) == "function" then
if type(wallpaper) == 'function' then
wallpaper = wallpaper(s)
end
gears.wallpaper.maximized(wallpaper, s, true)
@ -253,11 +262,22 @@ function theme.at_screen_connect(s)
-- We need one layoutbox per screen.
s.mylayoutbox = awful.widget.layoutbox(s)
s.mylayoutbox:buttons(my_table.join(
awful.button({}, 1, function () awful.layout.inc( 1) end),
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[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)))
awful.button({}, 1, function()
awful.layout.inc(1)
end),
awful.button({}, 2, function()
awful.layout.set(awful.layout.layouts[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(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
@ -265,12 +285,11 @@ function theme.at_screen_connect(s)
s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, awful.util.tasklist_buttons)
-- Create the wibox
s.mywibox = awful.wibar(
{ position = "top", screen = s, height = dpi(19), bg = theme.bg_normal, fg = theme.fg_normal }
)
s.mywibox =
awful.wibar({ position = 'top', screen = s, height = dpi(19), bg = theme.bg_normal, fg = theme.fg_normal })
-- Add widgets to the wibox
s.mywibox:setup {
s.mywibox:setup({
layout = wibox.layout.align.horizontal,
{ -- Left widgets
layout = wibox.layout.fixed.horizontal,
@ -308,7 +327,7 @@ function theme.at_screen_connect(s)
clockicon,
mytextclock,
},
}
})
end
return theme