idk anymore

1 files changed, 149 insertions, 158 deletions

diff --git a/.config/awesome/ui/statusbar/widgets/keyboardlayout.lua b/.config/awesome/ui/statusbar/widgets/keyboardlayout.lua
index 0bbbf14..d9302ff 100644
--- a/.config/awesome/ui/statusbar/widgets/keyboardlayout.lua
+++ b/.config/awesome/ui/statusbar/widgets/keyboardlayout.lua
@@ -10,12 +10,12 @@
 -- @supermodule wibox.widget.base
 ---------------------------------------------------------------------------
 
-local capi = {awesome = awesome}
+local capi = { awesome = awesome }
 local setmetatable = setmetatable
-local textbox = require("wibox.widget.textbox")
-local button = require("awful.button")
-local widget_base = require("wibox.widget.base")
-local gdebug = require("gears.debug")
+local button = require "awful.button"
+local gdebug = require "gears.debug"
+local textbox = require "wibox.widget.textbox"
+local widget_base = require "wibox.widget.base"
 
 --- Keyboard Layout widget.
 -- awful.widget.keyboardlayout
@@ -24,109 +24,109 @@ local keyboardlayout = { mt = {} }
 -- As to the country-code-like symbols below, refer to the names of XKB's
 -- data files in /.../xkb/symbols/*.
 keyboardlayout.xkeyboard_country_code = {
-    ["ad"] = true,    -- Andorra
-    ["af"] = true,    -- Afganistan
-    ["al"] = true,    -- Albania
-    ["am"] = true,    -- Armenia
-    ["ara"] = true,   -- Arabic
-    ["at"] = true,    -- Austria
-    ["az"] = true,    -- Azerbaijan
-    ["ba"] = true,    -- Bosnia and Herzegovina
-    ["bd"] = true,    -- Bangladesh
-    ["be"] = true,    -- Belgium
-    ["bg"] = true,    -- Bulgaria
-    ["br"] = true,    -- Brazil
-    ["bt"] = true,    -- Bhutan
-    ["bw"] = true,    -- Botswana
-    ["by"] = true,    -- Belarus
-    ["ca"] = true,    -- Canada
-    ["cd"] = true,    -- Congo
-    ["ch"] = true,    -- Switzerland
-    ["cm"] = true,    -- Cameroon
-    ["cn"] = true,    -- China
-    ["cz"] = true,    -- Czechia
-    ["de"] = true,    -- Germany
-    ["dk"] = true,    -- Denmark
-    ["ee"] = true,    -- Estonia
-    ["epo"] = true,   -- Esperanto
-    ["es"] = true,    -- Spain
-    ["et"] = true,    -- Ethiopia
-    ["eu"] = true,    -- EurKey
-    ["fi"] = true,    -- Finland
-    ["fo"] = true,    -- Faroe Islands
-    ["fr"] = true,    -- France
-    ["gb"] = true,    -- United Kingdom
-    ["ge"] = true,    -- Georgia
-    ["gh"] = true,    -- Ghana
-    ["gn"] = true,    -- Guinea
-    ["gr"] = true,    -- Greece
-    ["hr"] = true,    -- Croatia
-    ["hu"] = true,    -- Hungary
-    ["ie"] = true,    -- Ireland
-    ["il"] = true,    -- Israel
-    ["in"] = true,    -- India
-    ["iq"] = true,    -- Iraq
-    ["ir"] = true,    -- Iran
-    ["is"] = true,    -- Iceland
-    ["it"] = true,    -- Italy
-    ["jp"] = true,    -- Japan
-    ["ke"] = true,    -- Kenya
-    ["kg"] = true,    -- Kyrgyzstan
-    ["kh"] = true,    -- Cambodia
-    ["kr"] = true,    -- Korea
-    ["kz"] = true,    -- Kazakhstan
-    ["la"] = true,    -- Laos
+    ["ad"] = true, -- Andorra
+    ["af"] = true, -- Afganistan
+    ["al"] = true, -- Albania
+    ["am"] = true, -- Armenia
+    ["ara"] = true, -- Arabic
+    ["at"] = true, -- Austria
+    ["az"] = true, -- Azerbaijan
+    ["ba"] = true, -- Bosnia and Herzegovina
+    ["bd"] = true, -- Bangladesh
+    ["be"] = true, -- Belgium
+    ["bg"] = true, -- Bulgaria
+    ["br"] = true, -- Brazil
+    ["bt"] = true, -- Bhutan
+    ["bw"] = true, -- Botswana
+    ["by"] = true, -- Belarus
+    ["ca"] = true, -- Canada
+    ["cd"] = true, -- Congo
+    ["ch"] = true, -- Switzerland
+    ["cm"] = true, -- Cameroon
+    ["cn"] = true, -- China
+    ["cz"] = true, -- Czechia
+    ["de"] = true, -- Germany
+    ["dk"] = true, -- Denmark
+    ["ee"] = true, -- Estonia
+    ["epo"] = true, -- Esperanto
+    ["es"] = true, -- Spain
+    ["et"] = true, -- Ethiopia
+    ["eu"] = true, -- EurKey
+    ["fi"] = true, -- Finland
+    ["fo"] = true, -- Faroe Islands
+    ["fr"] = true, -- France
+    ["gb"] = true, -- United Kingdom
+    ["ge"] = true, -- Georgia
+    ["gh"] = true, -- Ghana
+    ["gn"] = true, -- Guinea
+    ["gr"] = true, -- Greece
+    ["hr"] = true, -- Croatia
+    ["hu"] = true, -- Hungary
+    ["ie"] = true, -- Ireland
+    ["il"] = true, -- Israel
+    ["in"] = true, -- India
+    ["iq"] = true, -- Iraq
+    ["ir"] = true, -- Iran
+    ["is"] = true, -- Iceland
+    ["it"] = true, -- Italy
+    ["jp"] = true, -- Japan
+    ["ke"] = true, -- Kenya
+    ["kg"] = true, -- Kyrgyzstan
+    ["kh"] = true, -- Cambodia
+    ["kr"] = true, -- Korea
+    ["kz"] = true, -- Kazakhstan
+    ["la"] = true, -- Laos
     ["latam"] = true, -- Latin America
     ["latin"] = true, -- Latin
-    ["lk"] = true,    -- Sri Lanka
-    ["lt"] = true,    -- Lithuania
-    ["lv"] = true,    -- Latvia
-    ["ma"] = true,    -- Morocco
-    ["mao"] = true,   -- Maori
-    ["me"] = true,    -- Montenegro
-    ["mk"] = true,    -- Macedonia
-    ["ml"] = true,    -- Mali
-    ["mm"] = true,    -- Myanmar
-    ["mn"] = true,    -- Mongolia
-    ["mt"] = true,    -- Malta
-    ["mv"] = true,    -- Maldives
-    ["ng"] = true,    -- Nigeria
-    ["nl"] = true,    -- Netherlands
-    ["no"] = true,    -- Norway
-    ["np"] = true,    -- Nepal
-    ["ph"] = true,    -- Philippines
-    ["pk"] = true,    -- Pakistan
-    ["pl"] = true,    -- Poland
-    ["pt"] = true,    -- Portugal
-    ["ro"] = true,    -- Romania
-    ["rs"] = true,    -- Serbia
-    ["ru"] = true,    -- Russia
-    ["se"] = true,    -- Sweden
-    ["si"] = true,    -- Slovenia
-    ["sk"] = true,    -- Slovakia
-    ["sn"] = true,    -- Senegal
-    ["sy"] = true,    -- Syria
-    ["th"] = true,    -- Thailand
-    ["tj"] = true,    -- Tajikistan
-    ["tm"] = true,    -- Turkmenistan
-    ["tr"] = true,    -- Turkey
-    ["tw"] = true,    -- Taiwan
-    ["tz"] = true,    -- Tanzania
-    ["ua"] = true,    -- Ukraine
-    ["us"] = true,    -- USA
-    ["uz"] = true,    -- Uzbekistan
-    ["vn"] = true,    -- Vietnam
-    ["za"] = true,    -- South Africa
+    ["lk"] = true, -- Sri Lanka
+    ["lt"] = true, -- Lithuania
+    ["lv"] = true, -- Latvia
+    ["ma"] = true, -- Morocco
+    ["mao"] = true, -- Maori
+    ["me"] = true, -- Montenegro
+    ["mk"] = true, -- Macedonia
+    ["ml"] = true, -- Mali
+    ["mm"] = true, -- Myanmar
+    ["mn"] = true, -- Mongolia
+    ["mt"] = true, -- Malta
+    ["mv"] = true, -- Maldives
+    ["ng"] = true, -- Nigeria
+    ["nl"] = true, -- Netherlands
+    ["no"] = true, -- Norway
+    ["np"] = true, -- Nepal
+    ["ph"] = true, -- Philippines
+    ["pk"] = true, -- Pakistan
+    ["pl"] = true, -- Poland
+    ["pt"] = true, -- Portugal
+    ["ro"] = true, -- Romania
+    ["rs"] = true, -- Serbia
+    ["ru"] = true, -- Russia
+    ["se"] = true, -- Sweden
+    ["si"] = true, -- Slovenia
+    ["sk"] = true, -- Slovakia
+    ["sn"] = true, -- Senegal
+    ["sy"] = true, -- Syria
+    ["th"] = true, -- Thailand
+    ["tj"] = true, -- Tajikistan
+    ["tm"] = true, -- Turkmenistan
+    ["tr"] = true, -- Turkey
+    ["tw"] = true, -- Taiwan
+    ["tz"] = true, -- Tanzania
+    ["ua"] = true, -- Ukraine
+    ["us"] = true, -- USA
+    ["uz"] = true, -- Uzbekistan
+    ["vn"] = true, -- Vietnam
+    ["za"] = true, -- South Africa
 }
 
 -- Callback for updating current layout.
-local function update_status (self)
+local function update_status(self)
     self._current = awesome.xkb_get_layout_group()
     local text = ""
     if #self._layout > 0 then
         -- Please note that the group number reported by xkb_get_layout_group
         -- is lower by one than the group numbers reported by xkb_get_group_names.
-        local name = self._layout[self._current+1]
+        local name = self._layout[self._current + 1]
         if name then
             text = name
         end
@@ -155,53 +155,45 @@ function keyboardlayout.get_groups_from_group_names(group_names)
     -- pattern.
     local pattern_and_callback_pairs = {
         -- vendor/file(section):group_idx
-        ["^" .. word_pat .. "/" .. word_pat .. sec_pat .. idx_pat .. "$"]
-            = function(token, pattern)
-                local vendor, file, section, group_idx = string.match(token, pattern)
-                return vendor, file, section, group_idx
-            end,
+        ["^" .. word_pat .. "/" .. word_pat .. sec_pat .. idx_pat .. "$"] = function(token, pattern)
+            local vendor, file, section, group_idx = string.match(token, pattern)
+            return vendor, file, section, group_idx
+        end,
         -- vendor/file(section)
-        ["^" .. word_pat .. "/" .. word_pat .. sec_pat .. "$"]
-            = function(token, pattern)
-                local vendor, file, section = string.match(token, pattern)
-                return vendor, file, section, 1
-            end,
+        ["^" .. word_pat .. "/" .. word_pat .. sec_pat .. "$"] = function(token, pattern)
+            local vendor, file, section = string.match(token, pattern)
+            return vendor, file, section, 1
+        end,
         -- vendor/file:group_idx
-        ["^" .. word_pat .. "/" .. word_pat .. idx_pat .. "$"]
-            = function(token, pattern)
-                local vendor, file, group_idx = string.match(token, pattern)
-                return vendor, file, nil, group_idx
-            end,
+        ["^" .. word_pat .. "/" .. word_pat .. idx_pat .. "$"] = function(token, pattern)
+            local vendor, file, group_idx = string.match(token, pattern)
+            return vendor, file, nil, group_idx
+        end,
         -- vendor/file
-        ["^" .. word_pat .. "/" .. word_pat .. "$"]
-            = function(token, pattern)
-                local vendor, file = string.match(token, pattern)
-                return vendor, file, nil, 1
-            end,
+        ["^" .. word_pat .. "/" .. word_pat .. "$"] = function(token, pattern)
+            local vendor, file = string.match(token, pattern)
+            return vendor, file, nil, 1
+        end,
         --  file(section):group_idx
-        ["^" .. word_pat .. sec_pat .. idx_pat .. "$"]
-            = function(token, pattern)
-                local file, section, group_idx = string.match(token, pattern)
-                return nil, file, section, group_idx
-            end,
+        ["^" .. word_pat .. sec_pat .. idx_pat .. "$"] = function(token, pattern)
+            local file, section, group_idx = string.match(token, pattern)
+            return nil, file, section, group_idx
+        end,
         -- file(section)
-        ["^" .. word_pat .. sec_pat .. "$"]
-            = function(token, pattern)
-                local file, section = string.match(token, pattern)
-                return nil, file, section, 1
-            end,
+        ["^" .. word_pat .. sec_pat .. "$"] = function(token, pattern)
+            local file, section = string.match(token, pattern)
+            return nil, file, section, 1
+        end,
         -- file:group_idx
-        ["^" .. word_pat .. idx_pat .. "$"]
-            = function(token, pattern)
-                local file, group_idx = string.match(token, pattern)
-                return nil, file, nil, group_idx
-            end,
+        ["^" .. word_pat .. idx_pat .. "$"] = function(token, pattern)
+            local file, group_idx = string.match(token, pattern)
+            return nil, file, nil, group_idx
+        end,
         -- file
-        ["^" .. word_pat .. "$"]
-            = function(token, pattern)
-                local file = string.match(token, pattern)
-                return nil, file, nil, 1
-            end
+        ["^" .. word_pat .. "$"] = function(token, pattern)
+            local file = string.match(token, pattern)
+            return nil, file, nil, 1
+        end,
     }
 
     -- Split 'group_names' into 'tokens'.  The separator is "+".
@@ -229,10 +221,10 @@ function keyboardlayout.get_groups_from_group_names(group_names)
                     section = string.gsub(section, "%(([%w-_]+)%)", "%1")
                 end
 
-                table.insert(layout_groups, { vendor = vendor,
-                                              file = file,
-                                              section = section,
-                                              group_idx = tonumber(group_idx) })
+                table.insert(
+                    layout_groups,
+                    { vendor = vendor, file = file, section = section, group_idx = tonumber(group_idx) }
+                )
                 break
             end
         end
@@ -243,10 +235,10 @@ end
 
 -- Callback for updating list of layouts
 local function update_layout(self)
-    self._layout = {};
+    self._layout = {}
     local layouts = keyboardlayout.get_groups_from_group_names(awesome.xkb_get_group_names())
     if layouts == nil or layouts[1] == nil then
-        gdebug.print_error("Failed to get list of keyboard groups")
+        gdebug.print_error "Failed to get list of keyboard groups"
         return
     end
     if #layouts == 1 then
@@ -270,7 +262,7 @@ end
 -- @treturn awful.widget.keyboardlayout A keyboard layout widget.
 function keyboardlayout.new()
     local widget = textbox()
-    local self = widget_base.make_widget(widget, nil, {enable_properties=true})
+    local self = widget_base.make_widget(widget, nil, { enable_properties = true })
 
     self.widget = widget
 
@@ -288,30 +280,31 @@ function keyboardlayout.new()
 
     self.set_layout = function(group_number)
         if (0 > group_number) or (group_number > #self._layout) then
-            error("Invalid group number: " .. group_number ..
-                    "expected number from 0 to " .. #self._layout)
-            return;
+            error("Invalid group number: " .. group_number .. "expected number from 0 to " .. #self._layout)
+            return
         end
-        awesome.xkb_set_layout_group(group_number);
+        awesome.xkb_set_layout_group(group_number)
     end
 
-    update_layout(self);
+    update_layout(self)
 
     -- callback for processing layout changes
-    capi.awesome.connect_signal("xkb::map_changed",
-                                function () update_layout(self) end)
-    capi.awesome.connect_signal("xkb::group_changed",
-                                function () update_status(self) end);
+    capi.awesome.connect_signal("xkb::map_changed", function()
+        update_layout(self)
+    end)
+    capi.awesome.connect_signal("xkb::group_changed", function()
+        update_status(self)
+    end)
 
     -- Mouse bindings
     self.buttons = {
-        button({ }, 1, self.next_layout)
+        button({}, 1, self.next_layout),
     }
 
     return self
 end
 
-local _instance = nil;
+local _instance = nil
 
 function keyboardlayout.mt:__call(...)
     if _instance == nil then
@@ -320,8 +313,6 @@ function keyboardlayout.mt:__call(...)
     return _instance
 end
 
-
 return setmetatable(keyboardlayout, keyboardlayout.mt)
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
-