change awful.utils.get_dir to gears.filesystem.configuration_dir

This commit is contained in:
Rene Kievits
2022-09-22 18:37:48 +02:00
parent 6cdda097c1
commit 747b8a9787
35 changed files with 49 additions and 40 deletions

View File

@@ -254,7 +254,7 @@ return gears.table.join(
awful.spawn.easy_async_with_shell( awful.spawn.easy_async_with_shell(
"pkexec xfpm-power-backlight-helper --get-brightness", "pkexec xfpm-power-backlight-helper --get-brightness",
function(stdout) function(stdout)
awful.spawn(awful.util.getdir("config") .. awful.spawn(gears.filesystem.get_configuration_dir() ..
"src/scripts/backlight.sh set " .. tostring(tonumber(stdout) + BACKLIGHT_SEPS)) "src/scripts/backlight.sh set " .. tostring(tonumber(stdout) + BACKLIGHT_SEPS))
capi.awesome.emit_signal("brightness::update") capi.awesome.emit_signal("brightness::update")
end end
@@ -269,7 +269,7 @@ return gears.table.join(
awful.spawn.easy_async_with_shell( awful.spawn.easy_async_with_shell(
"pkexec xfpm-power-backlight-helper --get-brightness", "pkexec xfpm-power-backlight-helper --get-brightness",
function(stdout) function(stdout)
awful.spawn(awful.util.getdir("config") .. awful.spawn(gears.filesystem.get_configuration_dir() ..
"src/scripts/backlight.sh set " .. tostring(tonumber(stdout) - BACKLIGHT_SEPS)) "src/scripts/backlight.sh set " .. tostring(tonumber(stdout) - BACKLIGHT_SEPS))
capi.awesome.emit_signal("brightness::update") capi.awesome.emit_signal("brightness::update")
end end

View File

@@ -16,7 +16,7 @@ local capi = {
screen = screen, screen = screen,
} }
local icondir = awful.util.getdir("config") .. "src/assets/icons/notifications/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/notifications/"
naughty.config.defaults.ontop = true naughty.config.defaults.ontop = true
naughty.config.defaults.icon_size = dpi(80) naughty.config.defaults.icon_size = dpi(80)

View File

@@ -19,7 +19,7 @@ local json = require("src.lib.json-lua.json-lua")
local cm = require("src.modules.context_menu") local cm = require("src.modules.context_menu")
local icondir = awful.util.getdir("config") .. "src/assets/icons/context_menu/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/context_menu/"
return function(s) return function(s)
@@ -122,7 +122,7 @@ return function(s)
name = "Pin to dock", name = "Pin to dock",
icon = gears.color.recolor_image(icondir .. "pin.svg", Theme_config.context_menu.icon_color), icon = gears.color.recolor_image(icondir .. "pin.svg", Theme_config.context_menu.icon_color),
callback = function() callback = function()
local dir = awful.util.getdir("config") .. "src/config" local dir = gears.filesystem.get_configuration_dir() .. "src/config"
gfilesystem.make_directories(dir) gfilesystem.make_directories(dir)
if not gfilesystem.file_readable(dir) then if not gfilesystem.file_readable(dir) then
os.execute("touch " .. dir .. "/dock.json") os.execute("touch " .. dir .. "/dock.json")

View File

@@ -15,7 +15,7 @@ local capi = {
mouse = mouse, mouse = mouse,
} }
local icondir = awful.util.getdir("config") .. "src/assets/icons/application_launcher/searchbar/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/application_launcher/searchbar/"
local kgrabber local kgrabber

View File

@@ -9,13 +9,14 @@ local gobject = require("gears").object
local gtable = require("gears").table local gtable = require("gears").table
local gcolor = require("gears").color local gcolor = require("gears").color
local gshape = require("gears").shape local gshape = require("gears").shape
local gfilesystem = require("gears").filesystem
local wibox = require("wibox") local wibox = require("wibox")
local capi = { local capi = {
awesome = awesome, awesome = awesome,
} }
local icondir = awful.util.getdir("config") .. "src/assets/icons/bluetooth/" local icondir = gfilesystem.get_configuration_dir() .. "src/assets/icons/bluetooth/"
local device = { mt = {} } local device = { mt = {} }

View File

@@ -9,13 +9,14 @@ local gobject = require("gears").object
local gtable = require("gears").table local gtable = require("gears").table
local gcolor = require("gears").color local gcolor = require("gears").color
local gshape = require("gears").shape local gshape = require("gears").shape
local gfilesystem = require("gears").filesystem
local wibox = require("wibox") local wibox = require("wibox")
local bt_device = require("src.modules.bluetooth.device") local bt_device = require("src.modules.bluetooth.device")
local rubato = require("src.lib.rubato") local rubato = require("src.lib.rubato")
local icondir = awful.util.getdir("config") .. "src/assets/icons/bluetooth/" local icondir = gfilesystem.get_configuration_dir() .. "src/assets/icons/bluetooth/"
local capi = { local capi = {
awesome = awesome, awesome = awesome,

View File

@@ -14,7 +14,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/brightness/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/brightness/"
return function(s) return function(s)

View File

@@ -14,7 +14,7 @@ local capi = {
mouse = mouse, mouse = mouse,
} }
local icondir = awful.util.getdir("config") .. "src/assets/icons/calendar/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/calendar/"
--- Month name lookup table --- Month name lookup table
local months_table = { local months_table = {

View File

@@ -5,6 +5,7 @@ local gtable = require("gears.table")
local gobject = require("gears.object") local gobject = require("gears.object")
local gshape = require("gears.shape") local gshape = require("gears.shape")
local gcolor = require("gears.color") local gcolor = require("gears.color")
local gfilesystem = require("gears").filesystem
local wibox = require("wibox") local wibox = require("wibox")
local capi = { local capi = {
@@ -15,7 +16,7 @@ local capi = {
local ical_parser = require("src.tools.ical_parser")() local ical_parser = require("src.tools.ical_parser")()
--local task_info = require("src.modules.calendar.task_info") --local task_info = require("src.modules.calendar.task_info")
local icondir = awful.util.getdir("config") .. "src/assets/icons/calendar/" local icondir = gfilesystem.get_configuration_dir() .. "src/assets/icons/calendar/"
local calendar = { mt = {} } local calendar = { mt = {} }
calendar.tasks = {} calendar.tasks = {}

View File

@@ -5,13 +5,14 @@ local gcolor = require("gears.color")
local gtable = require("gears.table") local gtable = require("gears.table")
local gshape = require("gears.shape") local gshape = require("gears.shape")
local gobject = require("gears.object") local gobject = require("gears.object")
local gfilesystem = require("gears").filesystem
local wibox = require("wibox") local wibox = require("wibox")
local capi = { local capi = {
mouse = mouse, mouse = mouse,
} }
local icondir = awful.util.getdir("config") .. "src/assets/icons/calendar/" local icondir = gfilesystem.get_configuration_dir() .. "src/assets/icons/calendar/"
local task_info = { mt = {} } local task_info = { mt = {} }
task_info._private = {} task_info._private = {}

View File

@@ -16,7 +16,7 @@ local capi = {
local json = require("src.lib.json-lua.json-lua") local json = require("src.lib.json-lua.json-lua")
local icondir = awful.util.getdir("config") .. "src/assets/icons/context_menu/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/context_menu/"
local cm = require("src.modules.context_menu") local cm = require("src.modules.context_menu")

View File

@@ -10,7 +10,7 @@ local wibox = require("wibox")
local rubato = require("src.lib.rubato") local rubato = require("src.lib.rubato")
local icondir = awful.util.getdir("config") .. "src/assets/icons/network/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/network/"
return function(s) return function(s)

View File

@@ -15,7 +15,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/notifications/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/notifications/"
return function(s) return function(s)

View File

@@ -14,7 +14,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/notifications/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/notifications/"
local nl = {} local nl = {}

View File

@@ -9,7 +9,7 @@ local gears = require("gears")
local wibox = require("wibox") local wibox = require("wibox")
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/profile/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/profile/"
return function() return function()
@@ -20,7 +20,8 @@ return function()
{ {
{ {
{ {
image = gears.surface.load_uncached(awful.util.getdir("config") .. "src/assets/userpfp/crylia.png"), image = gears.surface.load_uncached(gears.filesystem.get_configuration_dir() ..
"src/assets/userpfp/crylia.png"),
id = "icon", id = "icon",
valign = "center", valign = "center",
halign = "center", halign = "center",

View File

@@ -14,7 +14,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/notifications/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/notifications/"
return function(s) return function(s)

View File

@@ -15,7 +15,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/"
--- Signal bars widget for the notification-center --- Signal bars widget for the notification-center
---@diagnostic disable-next-line: undefined-doc-name ---@diagnostic disable-next-line: undefined-doc-name

View File

@@ -12,7 +12,7 @@ local naughty = require("naughty")
local json_lua = require("src.lib.json-lua.json-lua") local json_lua = require("src.lib.json-lua.json-lua")
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/weather/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/weather/"
return function() return function()

View File

@@ -14,7 +14,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/powermenu/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/powermenu/"
return function(s) return function(s)
@@ -63,7 +63,7 @@ return function(s)
"./.config/awesome/src/scripts/pfp.sh 'userName' '" .. User_config.namestyle .. "'", "./.config/awesome/src/scripts/pfp.sh 'userName' '" .. User_config.namestyle .. "'",
function(stdout) function(stdout)
if stdout:gsub("\n", "") == "Rick Astley" then if stdout:gsub("\n", "") == "Rick Astley" then
profile_picture:set_image(awful.util.getdir("config") .. "src/assets/userpfp/" .. "rickastley.jpg") profile_picture:set_image(gears.filesystem.get_configuration_dir() .. "src/assets/userpfp/" .. "rickastley.jpg")
end end
profile_name:set_text(stdout) profile_name:set_text(stdout)
end end

View File

@@ -14,7 +14,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/titlebar/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/titlebar/"
awful.titlebar.enable_tooltip = true awful.titlebar.enable_tooltip = true
awful.titlebar.fallback_name = 'Client' awful.titlebar.fallback_name = 'Client'

View File

@@ -16,7 +16,7 @@ local capi = {
local rubato = require("src.lib.rubato") local rubato = require("src.lib.rubato")
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/audio/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/audio/"
-- Returns the volume controller -- Returns the volume controller
return function(s) return function(s)

View File

@@ -14,7 +14,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/audio/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/audio/"
-- Returns the volume_osd -- Returns the volume_osd
return function(s) return function(s)

View File

@@ -17,7 +17,7 @@ local capi = {
require("src.theme.user_config") require("src.theme.user_config")
require("src.theme.theme_config") require("src.theme.theme_config")
Theme_path = awful.util.getdir("config") .. "/src/theme/" Theme_path = gears.filesystem.get_configuration_dir() .. "/src/theme/"
Theme = {} Theme = {}
-- Default font, change it in user_config, not here. -- Default font, change it in user_config, not here.

View File

@@ -18,7 +18,11 @@ User_config = {
]] -- ]] --
autostart = { autostart = {
"picom --experimental-backends", "picom --experimental-backends",
"xfce4-power-manager" "xfce4-power-manager",
"light-locker --lock-on-suspend --lock-on-lid &",
"/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1",
"setxkbmap -option caps:swapescape",
"/home/crylia/.screenlayout/single.sh"
}, },
--[[ --[[
@@ -237,7 +241,7 @@ User_config = {
weather_secrets = { weather_secrets = {
key = "", key = "",
city_id = "", city_id = "",
unit = "" unit = "metric"
}, },
--[[ --[[

View File

@@ -12,7 +12,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/audio/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/audio/"
-- Returns the audio widget -- Returns the audio widget
return function(s) return function(s)

View File

@@ -16,7 +16,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/battery/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/battery/"
---Returns the battery widget ---Returns the battery widget
---@return wibox.widget ---@return wibox.widget

View File

@@ -13,7 +13,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/bluetooth/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/bluetooth/"
-- Returns the bluetooth widget -- Returns the bluetooth widget
return function(s) return function(s)

View File

@@ -9,7 +9,7 @@ local gears = require("gears")
local wibox = require("wibox") local wibox = require("wibox")
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/clock/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/clock/"
-- Returns the clock widget -- Returns the clock widget
return function() return function()

View File

@@ -15,7 +15,7 @@ local capi = {
awesome = awesome, awesome = awesome,
} }
local icon_dir = awful.util.getdir("config") .. "src/assets/icons/cpu/" local icon_dir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/cpu/"
--TODO: Add tooltip with more CPU and per core information --TODO: Add tooltip with more CPU and per core information
return function(widget, _) return function(widget, _)

View File

@@ -14,7 +14,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/date/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/date/"
-- Returns the date widget -- Returns the date widget
return function() return function()

View File

@@ -15,7 +15,7 @@ local capi = {
awesome = awesome, awesome = awesome,
} }
local icon_dir = awful.util.getdir("config") .. "src/assets/icons/cpu/" local icon_dir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/cpu/"
return function(widget) return function(widget)
local gpu_usage_widget = wibox.widget { local gpu_usage_widget = wibox.widget {

View File

@@ -14,7 +14,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/kblayout/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/kblayout/"
return function(s) return function(s)
local kblayout_widget = wibox.widget { local kblayout_widget = wibox.widget {

View File

@@ -14,7 +14,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/network/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/network/"
-- Insert your interfaces here, get the from ip a -- Insert your interfaces here, get the from ip a
local interfaces = { local interfaces = {

View File

@@ -13,7 +13,7 @@ local capi = {
} }
-- Icon directory path -- Icon directory path
local icondir = awful.util.getdir("config") .. "src/assets/icons/power/" local icondir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/power/"
return function() return function()

View File

@@ -13,7 +13,7 @@ local capi = {
awesome = awesome, awesome = awesome,
} }
local icon_dir = awful.util.getdir("config") .. "src/assets/icons/cpu/" local icon_dir = gears.filesystem.get_configuration_dir() .. "src/assets/icons/cpu/"
return function() return function()
local ram_widget = wibox.widget { local ram_widget = wibox.widget {