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

2022-09-22 18:37:48 +02:00
parent 6cdda097c1
commit 747b8a9787
35 changed files with 49 additions and 40 deletions
--- a/awesome/src/bindings/global_keys.lua
+++ b/awesome/src/bindings/global_keys.lua
@@ -254,7 +254,7 @@ return gears.table.join(
      awful.spawn.easy_async_with_shell(
        "pkexec xfpm-power-backlight-helper --get-brightness",
        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))
          capi.awesome.emit_signal("brightness::update")
        end
@@ -269,7 +269,7 @@ return gears.table.join(
      awful.spawn.easy_async_with_shell(
        "pkexec xfpm-power-backlight-helper --get-brightness",
        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))
          capi.awesome.emit_signal("brightness::update")
        end
--- a/awesome/src/core/notifications.lua
+++ b/awesome/src/core/notifications.lua
@@ -16,7 +16,7 @@ local capi = {
  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.icon_size = dpi(80)
--- a/awesome/src/modules/application_launcher/application.lua
+++ b/awesome/src/modules/application_launcher/application.lua
@@ -19,7 +19,7 @@ local json = require("src.lib.json-lua.json-lua")

 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)

@@ -122,7 +122,7 @@ return function(s)
              name = "Pin to dock",
              icon = gears.color.recolor_image(icondir .. "pin.svg", Theme_config.context_menu.icon_color),
              callback = function()
-                local dir = awful.util.getdir("config") .. "src/config"
+                local dir = gears.filesystem.get_configuration_dir() .. "src/config"
                gfilesystem.make_directories(dir)
                if not gfilesystem.file_readable(dir) then
                  os.execute("touch " .. dir .. "/dock.json")
--- a/awesome/src/modules/application_launcher/searchbar.lua
+++ b/awesome/src/modules/application_launcher/searchbar.lua
@@ -15,7 +15,7 @@ local capi = {
  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

--- a/awesome/src/modules/bluetooth/device.lua
+++ b/awesome/src/modules/bluetooth/device.lua
@@ -9,13 +9,14 @@ local gobject = require("gears").object
 local gtable = require("gears").table
 local gcolor = require("gears").color
 local gshape = require("gears").shape
+local gfilesystem = require("gears").filesystem
 local wibox = require("wibox")

 local capi = {
  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 = {} }

--- a/awesome/src/modules/bluetooth/init.lua
+++ b/awesome/src/modules/bluetooth/init.lua
@@ -9,13 +9,14 @@ local gobject = require("gears").object
 local gtable = require("gears").table
 local gcolor = require("gears").color
 local gshape = require("gears").shape
+local gfilesystem = require("gears").filesystem
 local wibox = require("wibox")

 local bt_device = require("src.modules.bluetooth.device")

 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 = {
  awesome = awesome,
--- a/awesome/src/modules/brightness_osd.lua
+++ b/awesome/src/modules/brightness_osd.lua
@@ -14,7 +14,7 @@ local capi = {
 }

 -- 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)

--- a/awesome/src/modules/calendar/calendar.lua
+++ b/awesome/src/modules/calendar/calendar.lua
@@ -14,7 +14,7 @@ local capi = {
  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
 local months_table = {
--- a/awesome/src/modules/calendar/init.lua
+++ b/awesome/src/modules/calendar/init.lua
@@ -5,6 +5,7 @@ local gtable = require("gears.table")
 local gobject = require("gears.object")
 local gshape = require("gears.shape")
 local gcolor = require("gears.color")
+local gfilesystem = require("gears").filesystem
 local wibox = require("wibox")

 local capi = {
@@ -15,7 +16,7 @@ local capi = {
 local ical_parser = require("src.tools.ical_parser")()
 --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 = {} }
 calendar.tasks = {}
--- a/awesome/src/modules/calendar/task_info.lua
+++ b/awesome/src/modules/calendar/task_info.lua
@@ -5,13 +5,14 @@ local gcolor = require("gears.color")
 local gtable = require("gears.table")
 local gshape = require("gears.shape")
 local gobject = require("gears.object")
+local gfilesystem = require("gears").filesystem
 local wibox = require("wibox")

 local capi = {
  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 = {} }
 task_info._private = {}
--- a/awesome/src/modules/crylia_bar/dock.lua
+++ b/awesome/src/modules/crylia_bar/dock.lua
@@ -16,7 +16,7 @@ local capi = {

 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")

--- a/awesome/src/modules/network_controller/init.lua
+++ b/awesome/src/modules/network_controller/init.lua
@@ -10,7 +10,7 @@ local wibox = require("wibox")

 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)

--- a/awesome/src/modules/notification-center/init.lua
+++ b/awesome/src/modules/notification-center/init.lua
@@ -15,7 +15,7 @@ local capi = {
 }

 -- 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)

--- a/awesome/src/modules/notification-center/notification_list.lua
+++ b/awesome/src/modules/notification-center/notification_list.lua
@@ -14,7 +14,7 @@ local capi = {
 }

 -- 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 = {}

--- a/awesome/src/modules/notification-center/profile.lua
+++ b/awesome/src/modules/notification-center/profile.lua
@@ -9,7 +9,7 @@ local gears = require("gears")
 local wibox = require("wibox")

 -- 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()

@@ -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",
                valign = "center",
                halign = "center",
--- a/awesome/src/modules/notification-center/song_info.lua
+++ b/awesome/src/modules/notification-center/song_info.lua
@@ -14,7 +14,7 @@ local capi = {
 }

 -- 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)

--- a/awesome/src/modules/notification-center/status_bars.lua
+++ b/awesome/src/modules/notification-center/status_bars.lua
@@ -15,7 +15,7 @@ local capi = {
 }

 -- 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
 ---@diagnostic disable-next-line: undefined-doc-name
--- a/awesome/src/modules/notification-center/weather.lua
+++ b/awesome/src/modules/notification-center/weather.lua
@@ -12,7 +12,7 @@ local naughty = require("naughty")
 local json_lua = require("src.lib.json-lua.json-lua")

 -- 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()

--- a/awesome/src/modules/powermenu.lua
+++ b/awesome/src/modules/powermenu.lua
@@ -14,7 +14,7 @@ local capi = {
 }

 -- 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)

@@ -63,7 +63,7 @@ return function(s)
      "./.config/awesome/src/scripts/pfp.sh 'userName' '" .. User_config.namestyle .. "'",
      function(stdout)
        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
        profile_name:set_text(stdout)
      end
--- a/awesome/src/modules/titlebar.lua
+++ b/awesome/src/modules/titlebar.lua
@@ -14,7 +14,7 @@ local capi = {
 }

 -- 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.fallback_name = 'Client'
--- a/awesome/src/modules/volume_controller.lua
+++ b/awesome/src/modules/volume_controller.lua
@@ -16,7 +16,7 @@ local capi = {
 local rubato = require("src.lib.rubato")

 -- 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
 return function(s)
--- a/awesome/src/modules/volume_osd.lua
+++ b/awesome/src/modules/volume_osd.lua
@@ -14,7 +14,7 @@ local capi = {
 }

 -- 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
 return function(s)
--- a/awesome/src/theme/init.lua
+++ b/awesome/src/theme/init.lua
@@ -17,7 +17,7 @@ local capi = {
 require("src.theme.user_config")
 require("src.theme.theme_config")

-Theme_path = awful.util.getdir("config") .. "/src/theme/"
+Theme_path = gears.filesystem.get_configuration_dir() .. "/src/theme/"
 Theme = {}

 -- Default font, change it in user_config, not here.
--- a/awesome/src/theme/user_config.lua
+++ b/awesome/src/theme/user_config.lua
@@ -18,7 +18,11 @@ User_config = {
  ]] --
  autostart = {
    "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 = {
    key = "",
    city_id = "",
-    unit = ""
+    unit = "metric"
  },

  --[[
--- a/awesome/src/widgets/audio.lua
+++ b/awesome/src/widgets/audio.lua
@@ -12,7 +12,7 @@ local capi = {
 }

 -- 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
 return function(s)
--- a/awesome/src/widgets/battery.lua
+++ b/awesome/src/widgets/battery.lua
@@ -16,7 +16,7 @@ local capi = {
 }

 -- 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
 ---@return wibox.widget
--- a/awesome/src/widgets/bluetooth.lua
+++ b/awesome/src/widgets/bluetooth.lua
@@ -13,7 +13,7 @@ local capi = {
 }

 -- 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
 return function(s)
--- a/awesome/src/widgets/clock.lua
+++ b/awesome/src/widgets/clock.lua
@@ -9,7 +9,7 @@ local gears = require("gears")
 local wibox = require("wibox")

 -- 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
 return function()
--- a/awesome/src/widgets/cpu_info.lua
+++ b/awesome/src/widgets/cpu_info.lua
@@ -15,7 +15,7 @@ local capi = {
  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
 return function(widget, _)
--- a/awesome/src/widgets/date.lua
+++ b/awesome/src/widgets/date.lua
@@ -14,7 +14,7 @@ local capi = {
 }

 -- 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
 return function()
--- a/awesome/src/widgets/gpu_info.lua
+++ b/awesome/src/widgets/gpu_info.lua
@@ -15,7 +15,7 @@ local capi = {
  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)
  local gpu_usage_widget = wibox.widget {
--- a/awesome/src/widgets/kblayout.lua
+++ b/awesome/src/widgets/kblayout.lua
@@ -14,7 +14,7 @@ local capi = {
 }

 -- 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)
  local kblayout_widget = wibox.widget {
--- a/awesome/src/widgets/network.lua
+++ b/awesome/src/widgets/network.lua
@@ -14,7 +14,7 @@ local capi = {
 }

 -- 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
 local interfaces = {
--- a/awesome/src/widgets/power.lua
+++ b/awesome/src/widgets/power.lua
@@ -13,7 +13,7 @@ local capi = {
 }

 -- 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()

--- a/awesome/src/widgets/ram_info.lua
+++ b/awesome/src/widgets/ram_info.lua
@@ -13,7 +13,7 @@ local capi = {
  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()
  local ram_widget = wibox.widget {