From 26179e82ba77b025c4a8765589c7594c7a9bb4b0 Mon Sep 17 00:00:00 2001 From: punkfairie <23287005+punkfairie@users.noreply.github.com> Date: Mon, 19 Feb 2024 19:51:44 -0800 Subject: [PATCH] =?UTF-8?q?=E2=9A=B0=EF=B8=8F=20refactor:=20Migrate=20user?= =?UTF-8?q?=5Fvars=20->=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/awesome/signals/disk.lua | 4 ++-- .config/awesome/signals/mic.lua | 4 ++-- .config/awesome/ui/info-panel/weather/init.lua | 10 +++++----- .config/awesome/ui/notif-panel/widgets/mic_slider.lua | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.config/awesome/signals/disk.lua b/.config/awesome/signals/disk.lua index 9c5cf50..af7ce76 100644 --- a/.config/awesome/signals/disk.lua +++ b/.config/awesome/signals/disk.lua @@ -1,8 +1,8 @@ local awful = require("awful") local gears = require("gears") -local user_vars = require("user_variables") -local which_disk = user_vars.widget.disk.name +local config = require("config") +local which_disk = config.widget.disk.name local function get_disk() local script = [[ diff --git a/.config/awesome/signals/mic.lua b/.config/awesome/signals/mic.lua index 463f451..7432dde 100644 --- a/.config/awesome/signals/mic.lua +++ b/.config/awesome/signals/mic.lua @@ -1,7 +1,7 @@ local awful = require("awful") -local user_vars = require("user_variables") -local microphone = user_vars.widget.mic.name +local config = require("config") +local microphone = config.widget.mic.name local vol_sc = "pamixer --source " .. microphone .. " --get-volume" local mute_sc = "pamixer --source " .. microphone .. " --get-mute" diff --git a/.config/awesome/ui/info-panel/weather/init.lua b/.config/awesome/ui/info-panel/weather/init.lua index e6a8e20..d91dee7 100644 --- a/.config/awesome/ui/info-panel/weather/init.lua +++ b/.config/awesome/ui/info-panel/weather/init.lua @@ -5,7 +5,7 @@ local beautiful = require("beautiful") local dpi = beautiful.xresources.apply_dpi local filesystem = gears.filesystem local json = require("lib.json") -local user_vars = require("user_variables") +local config = require("config") local icon_dir = filesystem.get_configuration_dir() .. "ui/info-panel/weather/icons/" --- Weather Widget @@ -165,8 +165,8 @@ local weather_widget = wibox.widget({ layout = wibox.layout.fixed.vertical, }) -local api_key = user_vars.widget.weather.key -local coordinates = user_vars.widget.weather.coordinates +local api_key = config.widget.weather.api_key +local coordinates = config.widget.weather.coordinates local show_hourly_forecast = true local show_daily_forecast = true @@ -175,9 +175,9 @@ local units = "imperial" local url = ( "https://api.openweathermap.org/data/2.5/onecall" .. "?lat=" - .. coordinates[1] + .. coordinates.lat .. "&lon=" - .. coordinates[2] + .. coordinates.lon .. "&appid=" .. api_key .. "&units=" diff --git a/.config/awesome/ui/notif-panel/widgets/mic_slider.lua b/.config/awesome/ui/notif-panel/widgets/mic_slider.lua index 9b584d4..ad0e093 100644 --- a/.config/awesome/ui/notif-panel/widgets/mic_slider.lua +++ b/.config/awesome/ui/notif-panel/widgets/mic_slider.lua @@ -5,8 +5,8 @@ local beautiful = require("beautiful") local helpers = require("helpers") local dpi = beautiful.xresources.apply_dpi -local user_vars = require("user_variables") -local microphone = user_vars.widget.mic.name +local config = require("config") +local microphone = config.widget.mic.name local slider = wibox.widget({ bar_shape = helpers.ui.rrect(9),