added more widgets, rewritten folder structure

2021-11-28 14:58:07 +01:00
parent 7f28224bf1
commit 32ba8ff3a8
65 changed files with 832 additions and 1873 deletions
--- a/awesome/theme/crylia/widgets/audio.lua
+++ b/awesome/theme/crylia/widgets/audio.lua
@@ -8,7 +8,7 @@ local color = require("theme.crylia.colors")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
-require("Main.Signals")
+require("main.signals")

 -- Icon directory path
 local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/audio/"
@@ -58,7 +58,7 @@ return function ()

    local get_volume = function ()
        awful.spawn.easy_async_with_shell(
-            [[ awk -F"[][]" '/dB/ { print $2 }' <(amixer sget Master) ]],
+            [[ pacmd list-sinks | grep "volume: front" | awk '{print $5}' ]],
            function (stdout)
                local icon = icondir .. "volume"
                stdout = stdout:gsub("%%", "")
@@ -84,9 +84,9 @@ return function ()

    local check_muted = function ()
        awful.spawn.easy_async_with_shell(
-            [[ awk -F"[][]" '/dB/ { print $6 }' <(amixer sget Master) ]],
+            [[ pacmd list-sinks | grep "muted" ]],
            function (stdout)
-                if stdout:match("off") then
+                if stdout:match("yes") then
                    audio_widget.container.audio_layout.label.visible = false
                    audio_widget.container:set_right(0)
                    audio_widget.container.audio_layout.icon_margin.icon_layout.icon:set_image(gears.color.recolor_image(icondir .. "volume-mute" .. ".svg", color.color["Grey900"]))
--- a/awesome/theme/crylia/widgets/battery.lua
+++ b/awesome/theme/crylia/widgets/battery.lua
@@ -10,7 +10,7 @@ local gears = require("gears")
 local naughty = require("naughty")
 local watch = awful.widget.watch
 local wibox = require("wibox")
-require("Main.Signals")
+require("main.signals")

 -- Icon directory path
 local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/battery/"
--- a/awesome/theme/crylia/widgets/bluetooth.lua
+++ b/awesome/theme/crylia/widgets/bluetooth.lua
@@ -8,7 +8,7 @@ local color = require("theme.crylia.colors")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
-require("Main.Signals")
+require("main.signals")

 -- Icon directory path
 local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/bluetooth/"
@@ -86,7 +86,14 @@ return function ()
        autostart = true,
        call_now = true,
        callback = function ()
-            get_bluetooth_information()
+            awful.spawn.easy_async_with_shell(
+                "bluetoothctl list",
+                function (stdout)
+                    if stdout ~= nil or stdout:gsub("\n", ""):match("") then
+                        get_bluetooth_information()
+                    end
+                end
+            )
        end
    }

--- a/awesome/theme/crylia/widgets/clock.lua
+++ b/awesome/theme/crylia/widgets/clock.lua
@@ -8,7 +8,7 @@ local color = require("theme.crylia.colors")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
-require("Main.Signals")
+require("main.signals")

 -- Icon directory path
 local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/clock/"
--- a/awesome/theme/crylia/widgets/date.lua
+++ b/awesome/theme/crylia/widgets/date.lua
@@ -8,7 +8,7 @@ local color = require("theme.crylia.colors")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
-require("Main.Signals")
+require("main.signals")

 -- Icon directory path
 local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/date/"
--- a/awesome/theme/crylia/widgets/kblayout.lua
+++ b/awesome/theme/crylia/widgets/kblayout.lua
@@ -8,7 +8,7 @@ local color = require("theme.crylia.colors")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
-require("Main.Signals")
+require("main.signals")

 -- Icon directory path
 local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/kblayout/"
@@ -54,6 +54,7 @@ return function ()
        end,
        widget = wibox.widget.background
    }
+
    local layout = "";
    local get_kblayout = function ()
        awful.spawn.easy_async_with_shell(
@@ -67,25 +68,271 @@ return function ()
        return layout
    end

-    local set_kblayout = function (kblayout)
-        kblayout = "de"
-        if get_kblayout():gsub("\n", "") == "de" then
-            kblayout = "ru"
+
+    local function create_kb_layout_item (keymap)
+        -- TODO: Add more, too lazy rn
+        local longname, shortname
+
+        local xkeyboard_country_code = {
+            {"ad", "", "AND"},    -- Andorra
+            {"af", "", "AFG"},    -- Afganistan
+            {"al", "", "ALB"},    -- Albania
+            {"am", "", "ARM"},    -- Armenia
+            {"ara", "", "ARB"},   -- Arabic
+            {"at", "", "AUT"},    -- Austria
+            {"az", "", "AZE"},    -- Azerbaijan
+            {"ba", "", "BIH"},    -- Bosnia and Herzegovina
+            {"bd", "", "BGD"},    -- Bangladesh
+            {"be", "", "BEL"},    -- Belgium
+            {"bg", "", "BGR"},    -- Bulgaria
+            {"br", "", "BRA"},    -- Brazil
+            {"bt", "", "BTN"},    -- Bhutan
+            {"bw", "", "BWA"},    -- Botswana
+            {"by", "", "BLR"},    -- Belarus
+            {"ca", "", "CAN"},    -- Canada
+            {"cd", "", "COD"},    -- Congo
+            {"ch", "", "CHE"},    -- Switzerland
+            {"cm", "", "CMR"},    -- Cameroon
+            {"cn", "", "CHN"},    -- China
+            {"cz", "", "CZE"},    -- Czechia
+            {"de", "Deutsch (Germany)", "GER"},    -- Germany
+            {"dk", "", "DNK"},    -- Denmark
+            {"ee", "", "EST"},    -- Estonia
+            {"es", "", "ESP"},    -- Spain
+            {"et", "", "ETH"},    -- Ethiopia
+            {"eu", "?", "?"},    -- EurKey
+            {"fi", "", "FIN"},    -- Finland
+            {"fo", "", "FRO"},    -- Faroe Islands
+            {"fr", "", "FRA"},    -- France
+            {"gb", "English (Bri'ish)", "ENG"},    -- United Kingdom
+            {"ge", "", "GEO"},    -- Georgia
+            {"gh", "", "GHA"},    -- Ghana
+            {"gn", "", "GIN"},    -- Guinea
+            {"gr", "", "GRC"},    -- Greece
+            {"hr", "", "HRV"},    -- Croatia
+            {"hu", "", "HUN"},    -- Hungary
+            {"ie", "", "IRL"},    -- Ireland
+            {"il", "", "ISR"},    -- Israel
+            {"in", "", "IND"},    -- India
+            {"iq", "", "IRQ"},    -- Iraq
+            {"ir", "", "IRN"},    -- Iran
+            {"is", "", "ISL"},    -- Iceland
+            {"it", "", "ITA"},    -- Italy
+            {"jp", "", "JPN"},    -- Japan
+            {"ke", "", "KEN"},    -- Kenya
+            {"kg", "", "KGZ"},    -- Kyrgyzstan
+            {"kh", "", "KHM"},    -- Cambodia
+            {"kr", "", "KOR"},    -- Korea
+            {"kz", "", "KAZ"},    -- Kazakhstan
+            {"la", "", "LAO"},    -- Laos
+            {"latam", "?", "?"}, -- Latin America
+            {"latin", "?", "?"}, -- Latin
+            {"lk", "", "LKA"},    -- Sri Lanka
+            {"lt", "", "LTU"},    -- Lithuania
+            {"lv", "", "LVA"},    -- Latvia
+            {"ma", "", "MAR"},    -- Morocco
+            {"mao", "?", "?"},   -- Maori
+            {"me", "", "MNE"},    -- Montenegro
+            {"mk", "", "MKD"},    -- Macedonia
+            {"ml", "", "MLI"},    -- Mali
+            {"mm", "", "MMR"},    -- Myanmar
+            {"mn", "", "MNG"},    -- Mongolia
+            {"mt", "", "MLT"},    -- Malta
+            {"mv", "", "MDV"},    -- Maldives
+            {"ng", "", "NGA"},    -- Nigeria
+            {"nl", "", "NLD"},    -- Netherlands
+            {"no", "", "NOR"},    -- Norway
+            {"np", "", "NRL"},    -- Nepal
+            {"ph", "", "PHL"},    -- Philippines
+            {"pk", "", "PAK"},    -- Pakistan
+            {"pl", "", "POL"},    -- Poland
+            {"pt", "", "PRT"},    -- Portugal
+            {"ro", "", "ROU"},    -- Romania
+            {"rs", "", "SRB"},    -- Serbia
+            {"ru", "Русски (Russia)", "RUS"},    -- Russia
+            {"se", "", "SWE"},    -- Sweden
+            {"si", "", "SVN"},    -- Slovenia
+            {"sk", "", "SVK"},    -- Slovakia
+            {"sn", "", "SEN"},    -- Senegal
+            {"sy", "", "SYR"},    -- Syria
+            {"th", "", "THA"},    -- Thailand
+            {"tj", "", "TJK"},    -- Tajikistan
+            {"tm", "", "TKM"},    -- Turkmenistan
+            {"tr", "", "TUR"},    -- Turkey
+            {"tw", "", "TWN"},    -- Taiwan
+            {"tz", "", "TZA"},    -- Tanzania
+            {"ua", "", "UKR"},    -- Ukraine
+            {"us", "English (United States)", "USA"},    -- USA
+            {"uz", "", "UZB"},    -- Uzbekistan
+            {"vn", "", "VNM"},    -- Vietnam
+            {"za", "", "ZAF"}     -- South Africa
+        }
+
+        for i, c in ipairs(xkeyboard_country_code) do
+            if c[1] == keymap then
+                longname = c[2]
+                shortname = c[3]
+            end
        end
-        awful.spawn.easy_async_with_shell("setxkbmap -layout " .. kblayout)
-        get_kblayout()
+
+        local kb_layout_item = wibox.widget{
+            {
+                {
+                    {
+                        -- Short name e.g. GER, ENG, RUS
+                        {
+                            {
+                                text = shortname,
+                                widget = wibox.widget.textbox,
+                                font = "JetBrains Mono ExtraBold, 12",
+                                id = "kbmapname"
+                            },
+                            widget = wibox.container.margin,
+                            id = "margin2"
+                        },
+                        nil,
+                        {
+                            {
+                                text = longname,
+                                widget = wibox.widget.textbox,
+                                font = "JetBrains Mono Bold, 12",
+
+                            },
+                            widget = wibox.container.margin
+                        },
+                        spacing = dpi(15),
+                        layout = wibox.layout.fixed.horizontal,
+                        id = "container"
+                    },
+                    margins = dpi(10),
+                    widget = wibox.container.margin,
+                    id = "margin"
+                },
+                shape = function (cr, width, height)
+                    gears.shape.rounded_rect(cr, width, height, 10)
+                end,
+                bg = color.color["Grey800"],
+                fg = color.color["White"],
+                widget = wibox.container.background,
+                id = "background"
+            },
+            margins = dpi(5),
+            widget = wibox.container.margin
+        }
+        hover_signal(kb_layout_item.background, color.color["White"], color.color["Grey900"])
+        kb_layout_item:connect_signal(
+            "button::press",
+            function ()
+                awful.spawn.easy_async_with_shell(
+                    "setxkbmap " .. keymap,
+                    function (stdout)
+                        awesome.emit_signal("kblayout::hide:kbmenu")
+                        get_kblayout()
+                    end
+                )
+            end
+        )
+        return kb_layout_item
    end

+    local function get_kblist()
+        local kb_layout_items = {
+            layout = wibox.layout.fixed.vertical
+        }
+        for i, keymap in pairs(user_vars.vars.kblayout) do
+            kb_layout_items[i] = create_kb_layout_item(keymap)
+        end
+        return kb_layout_items
+    end
+
+    local kb_menu_widget = awful.popup{
+        shape = function (cr, width, height)
+            gears.shape.rounded_rect(cr, width, height, 5)
+        end,
+        widget = wibox.container.background,
+        bg = color.color["Grey900"],
+        fg = color.color["White"],
+        width = dpi(100),
+        max_height = dpi(600),
+        visible = false,
+        ontop = true,
+        placement = function (c) awful.placement.align(c, {position = "top_right", margins = {right = dpi(255), top = dpi(60)}}) end
+    }
+
+    kb_menu_widget:setup(
+        get_kblist()
+    )
+
+    local function toggle_kb_layout()
+        awful.spawn.easy_async_with_shell(
+            "setxkbmap -query | grep layout: | awk '{print $2}'",
+            function (stdout)
+                for j, n in ipairs(user_vars.vars.kblayout) do
+                    if stdout:match(n) then
+                        if j == #user_vars.vars.kblayout then
+                            awful.spawn.easy_async_with_shell(
+                                "setxkbmap " .. user_vars.vars.kblayout[1],
+                                function ()
+                                    get_kblayout()
+                                end
+                            )
+                        else
+                            awful.spawn.easy_async_with_shell(
+                                "setxkbmap " .. user_vars.vars.kblayout[j + 1],
+                                function ()
+                                    get_kblayout()
+                                end
+                            )
+                        end
+                    end
+                end
+            end
+        )
+    end
+
+    awesome.connect_signal(
+        "kblayout::toggle",
+        function ()
+            toggle_kb_layout()
+        end
+    )
+
+    --kb_menu_widget:move_next_to(mouse.current_widget_geometry)
    -- Signals
    hover_signal(kblayout_widget, color.color["Green200"])

+    local kblayout_keygrabber = awful.keygrabber{
+        autostart = false,
+        stop_event = 'release',
+        keypressed_callback = function (self, mod, key, command)
+            if key == 'Escape' then
+                awesome.emit_signal("kblayout::hide:kbmenu")
+            end
+        end
+    }
+
    kblayout_widget:connect_signal(
        "button::press",
        function ()
-            set_kblayout()
+            if kb_menu_widget.visible then
+                kb_menu_widget.visible = false
+                kblayout_keygrabber:stop()
+            else
+                kb_menu_widget.visible = true
+                kblayout_keygrabber:start()
+            end
+        end
+    )
+
+    awesome.connect_signal(
+        "kblayout::hide:kbmenu",
+        function ()
+            kb_menu_widget.visible = false
+            kblayout_keygrabber:stop()
        end
    )

    get_kblayout()
+    kb_menu_widget.visible = false
    return kblayout_widget
 end
--- a/awesome/theme/crylia/widgets/layout_list.lua
+++ b/awesome/theme/crylia/widgets/layout_list.lua
@@ -8,7 +8,7 @@ local color = require("theme.crylia.colors")
 local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local wibox = require("wibox")
-require("Main.Signals")
+require("main.signals")

 -- Returns the layoutbox widget
 return function ()
--- a/awesome/theme/crylia/widgets/network.lua
+++ b/awesome/theme/crylia/widgets/network.lua
@@ -9,7 +9,7 @@ local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local naughty = require("naughty")
 local wibox = require("wibox")
-require("Main.Signals")
+require("main.signals")

 -- Icon directory path
 local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/network/"
@@ -180,7 +180,7 @@ return function ()
                    wifi_strength = tonumber(stdout)
                    network_widget.container.network_layout.spacing = dpi(8)
                    network_widget.container.network_layout.label.visible = true
-                    network_widget.container.network_layout.label:set_text(tostring(wifi_strength))
+                    network_widget.container.network_layout.label:set_text(tostring(wifi_strength .. "%"))
                    local wifi_strength_rounded = math.floor(wifi_strength / 25 + 0.5)
                    update_wireless_icon(wifi_strength_rounded)
                end
--- a/awesome/theme/crylia/widgets/power.lua
+++ b/awesome/theme/crylia/widgets/power.lua
@@ -9,7 +9,7 @@ local dpi = require("beautiful").xresources.apply_dpi
 local gears = require("gears")
 local naughty = require("naughty")
 local wibox = require("wibox")
-require("Main.Signals")
+require("main.signals")

 -- Icon directory path
 local icondir = awful.util.getdir("config") .. "theme/crylia/assets/icons/power/"
--- a/awesome/theme/crylia/widgets/systray.lua
+++ b/awesome/theme/crylia/widgets/systray.lua
@@ -0,0 +1,40 @@
+--------------------------------
+-- This is the power widget --
+--------------------------------
+
+-- Awesome Libs
+local awful = require("awful")
+local color = require("theme.crylia.colors")
+local dpi = require("beautiful").xresources.apply_dpi
+local gears = require("gears")
+local wibox = require("wibox")
+require("main.signals")
+
+
+return function (s)
+
+    local systray = wibox.widget{
+        {
+            {
+                wibox.widget.systray,
+                top = dpi(6),
+                bottom = dpi(6),
+                left = dpi(6),
+                right = dpi(6),
+                widget = wibox.container.margin
+            },
+            width = dpi(100),
+            strategy = "exact",
+            layout = wibox.container.constraint,
+        },
+        widget = wibox.container.background,
+        shape = function (cr, width, height)
+            gears.shape.rounded_rect(cr, width, height, 5)
+        end,
+        bg = color.color["BlueGrey800"]
+    }
+    -- Signals
+    --hover_signal(systray, color.color["Red200"])
+
+    return systray
+end
--- a/awesome/theme/crylia/widgets/taglist.lua
+++ b/awesome/theme/crylia/widgets/taglist.lua
@@ -3,8 +3,7 @@ local awful = require("awful")
 local gears = require("gears")
 local dpi = require("beautiful").xresources.apply_dpi
 local color = require("theme.crylia.colors")
-local naughty =require("naughty")
-require("theme.crylia.Tools.IconHandler")
+require("theme.crylia.tools.icon_handler")

 local list_update = function (widget, buttons, label, data, objects)
    widget:reset()
@@ -52,7 +51,6 @@ local list_update = function (widget, buttons, label, data, objects)
                {
                    id = "container",
                    tag_label_margin,
-                    --tag_icon_margin,
                    layout = wibox.layout.fixed.horizontal
 				},
 				margins = dpi(0),
@@ -114,12 +112,12 @@ local list_update = function (widget, buttons, label, data, objects)
                    },
                    widget = wibox.container.place
                },
-                tag_icon,
+                tag_icon_margin,
 			    forced_width = dpi(33),
 			    margins = dpi(6),
 			    widget = wibox.container.margin
            }
-            icon.icon_container.icon:set_image(GetIcon("Papirus", client))
+            icon.icon_container.icon:set_image(Get_icon("Papirus-Dark", client))
            tag_widget.widget_margin.container:setup({
                icon,
                layout = wibox.layout.align.horizontal
--- a/awesome/theme/crylia/widgets/tasklist.lua
+++ b/awesome/theme/crylia/widgets/tasklist.lua
@@ -109,9 +109,7 @@ local list_update = function (widget, buttons, label, data, objects)
 			task_widget:set_bg("#3A475C")
 			task_title:set_text('')
 		end
-
-		task_icon.icon:set_image(GetIcon("Papirus", object))
-
+		task_icon.icon:set_image(Get_icon("Papirus-Dark", object))
 		widget:add(task_widget)
 		widget:set_spacing(dpi(6))