Compare commits

..

20 Commits

Author SHA1 Message Date
23301aec85 default config: update lock command for i3lock-color update 2021-05-31 10:50:27 +02:00
7c6162d51a Make sure fullscreen clients get a correct fullscreen geometry
Co-authored-by: Mițca Dumitru <dumitru0mitca@gmail.com>
2021-05-15 20:04:34 +02:00
a0024216e8 Disable titlebars 2021-04-08 12:44:51 +02:00
6db061641d Make clock more readable 2021-04-08 12:44:29 +02:00
034462f8f8 keyboard_layout.lua: quote command argument 2021-04-08 12:43:56 +02:00
0bda31d908 media_control.lua: make volume management fully async 2021-04-08 12:42:13 +02:00
e8a91d98ce Don't ignore wallpaper aspect ratio 2021-02-21 19:30:44 +01:00
55ff9a842d Add hotkey to manually toggle titlebar
Co-authored-by: Arkhist <peyrille.benjamin@gmail.com>
2021-02-17 11:38:02 +01:00
dcaf31a930 Fix hotkey collision 2021-02-17 11:37:32 +01:00
66c0c041c1 Update author name and README.md todo list
Co-authored-by: Arkhist <peyrille.benjamin@gmail.com>
2021-02-17 11:29:06 +01:00
4d0173f7e6 Hide titlebar for clients that request so
Co-authored-by: Arkhist <peyrille.benjamin@gmail.com>
2021-02-17 11:26:16 +01:00
2ff77572ff Revert "Disable titlebars on dialogs"
This reverts commit e689f17a56.
2021-02-17 11:23:51 +01:00
6e975df154 Merge remote-tracking branch 'origin/arisu-edits' into arisu-edits 2021-02-17 11:22:48 +01:00
4b7ab5f5ff Force set default keyboard layout 2021-02-17 11:14:39 +01:00
0873d1719d Power menu: add sleep, hybrid sleep and hibernate buttons 2020-12-31 13:29:58 +01:00
cd1f142003 Add theme.lua contents 2020-12-27 08:29:41 +01:00
1d1cd0550a Add config.lua contents 2020-12-27 08:28:43 +01:00
b5ca1e485c Add trailing new line to config.lua and theme.lua 2020-12-27 08:24:44 +01:00
a6b0a8b02a Remove tags UI 2020-12-27 08:21:18 +01:00
b5f391f3b8 Customize clock format 2020-12-27 08:21:02 +01:00
5 changed files with 187 additions and 178 deletions

View File

@ -1,3 +1,61 @@
local config = require("default_config")
local awful = require("awful")
local gears = require("gears")
config.awesome.tiling.layouts = {
awful.layout.suit.tile,
awful.layout.suit.floating,
awful.layout.suit.tile.left,
awful.layout.suit.tile.bottom,
awful.layout.suit.tile.top,
-- awful.layout.suit.fair,
-- awful.layout.suit.fair.horizontal,
-- awful.layout.suit.spiral,
-- awful.layout.suit.spiral.dwindle,
-- awful.layout.suit.max,
-- awful.layout.suit.max.fullscreen,
-- awful.layout.suit.magnifier,
-- awful.layout.suit.corner.nw,
-- awful.layout.suit.corner.ne,
-- awful.layout.suit.corner.sw,
-- awful.layout.suit.corner.se,
}
config.autostart = gears.table.join(config.autostart,
{
"nextcloud",
"discord-canary",
"/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1",
"tabs-app",
"/usr/lib/kdeconnectd",
"kdeconnect-indicator",
}
)
config.widgets.system_resources.bars.screens = { 1, 2, 3 }
config.keys.custom_keys = {
{
hotkey = {
{ config.keys.modkey, },
"e"
},
action = function()
awful.spawn('pcmanfm')
end,
identity = { description = "pcmanfm", group = "utilities" }
},
{
hotkey = {
{ config.keys.modkey, },
'Print'
},
action = function()
awful.spawn('sh -c ~/scripts/flameshot_upload.sh')
end,
identity = { description = "Upload screeshot", group = "utilities" }
}
};
return config

View File

@ -171,8 +171,7 @@ config.widgets = {
battery = {
enabled = true,
screens = { 1, 2 },
refresh_interval = 15, -- In seconds
list_refresh_interval = 2, -- In seconds
refresh_interval = 30, -- In seconds
precision = 0, -- How many decimals
},
},

View File

@ -132,6 +132,9 @@ if config.widgets.keyboard_layout.enabled then
end
hotkey.registerKeys(keyboard_layout.getKeys(config.keys.global_keys.keyboard_layout))
-- Force set default keyboard layout
awful.spawn(config.widgets.keyboard_layout.layout_switch_command .. ' ' .. config.widgets.keyboard_layout.layouts[1])
--
-- Auto start
@ -197,23 +200,24 @@ os_menu = awful.widget.launcher({
-- {{{ Wibar
-- Create a textclock widget
mytextclock = wibox.widget.textclock()
main_clock = wibox.widget.textclock(" %F · %R ")
utc_clock = wibox.widget.textclock(" %T UTC ¤ ", 1, "Z")
-- Create a wibox for each screen and add it
local taglist_buttons = gears.table.join(awful.button({}, 1, function(t) t:view_only() end),
awful.button({ config.keys.modkey }, 1, function(t)
if client.focus then
client.focus:move_to_tag(t)
end
end),
awful.button({}, 3, awful.tag.viewtoggle),
awful.button({ config.keys.modkey }, 3, function(t)
if client.focus then
client.focus:toggle_tag(t)
end
end),
awful.button({}, 4, function(t) awful.tag.viewnext(t.screen) end),
awful.button({}, 5, function(t) awful.tag.viewprev(t.screen) end))
-- local taglist_buttons = gears.table.join(awful.button({}, 1, function(t) t:view_only() end),
-- awful.button({ config.keys.modkey }, 1, function(t)
-- if client.focus then
-- client.focus:move_to_tag(t)
-- end
-- end),
-- awful.button({}, 3, awful.tag.viewtoggle),
-- awful.button({ config.keys.modkey }, 3, function(t)
-- if client.focus then
-- client.focus:toggle_tag(t)
-- end
-- end),
-- awful.button({}, 4, function(t) awful.tag.viewnext(t.screen) end),
-- awful.button({}, 5, function(t) awful.tag.viewprev(t.screen) end))
local tasklist_buttons = gears.table.join(awful.button({}, 1, function(c)
if c == client.focus then
@ -266,11 +270,11 @@ awful.screen.connect_for_each_screen(function(s)
awful.button({}, 4, function() awful.layout.inc(1) end),
awful.button({}, 5, function() awful.layout.inc(-1) end)))
-- Create a taglist widget
s.mytaglist = awful.widget.taglist {
screen = s,
filter = awful.widget.taglist.filter.all,
buttons = taglist_buttons
}
-- s.mytaglist = awful.widget.taglist {
-- screen = s,
-- filter = awful.widget.taglist.filter.all,
-- buttons = taglist_buttons
-- }
-- Create a tasklist widget
s.mytasklist = awful.widget.tasklist {
@ -330,7 +334,7 @@ awful.screen.connect_for_each_screen(function(s)
-- Left widgets
layout = wibox.layout.fixed.horizontal,
launcher,
s.mytaglist,
-- s.mytaglist,
s.mypromptbox,
},
s.mytasklist, -- Middle widget
@ -341,7 +345,8 @@ awful.screen.connect_for_each_screen(function(s)
matchesScreen(config.widgets.system_resources.battery.screens) and system_resources_widget.battery or nil,
keyboard_layout_widget,
wibox.widget.systray(),
mytextclock,
utc_clock,
main_clock,
s.mylayoutbox,
os_menu,
},
@ -546,50 +551,50 @@ clientkeys = gears.table.join(-- tiling
-- Bind all key numbers to tags.
-- Be careful: we use keycodes to make it work on any keyboard layout.
-- This should map on the top row of your keyboard, usually 1 to 9.
for i = 1, 9 do
hotkey.registerKeys(-- View tag only.
awful.key({ config.keys.modkey }, "#" .. i + 9,
function()
local screen = awful.screen.focused()
local tag = screen.tags[i]
if tag then
tag:view_only()
end
end,
{ description = "view tag #" .. i, group = "tag" }),
-- Toggle tag display.
awful.key({ config.keys.modkey, "Control" }, "#" .. i + 9,
function()
local screen = awful.screen.focused()
local tag = screen.tags[i]
if tag then
awful.tag.viewtoggle(tag)
end
end,
{ description = "toggle tag #" .. i, group = "tag" }),
-- Move client to tag.
awful.key({ config.keys.modkey, "Shift" }, "#" .. i + 9,
function()
if client.focus then
local tag = client.focus.screen.tags[i]
if tag then
client.focus:move_to_tag(tag)
end
end
end,
{ description = "move focused client to tag #" .. i, group = "tag" }),
-- Toggle tag on focused client.
awful.key({ config.keys.modkey, "Control", "Shift" }, "#" .. i + 9,
function()
if client.focus then
local tag = client.focus.screen.tags[i]
if tag then
client.focus:toggle_tag(tag)
end
end
end,
{ description = "toggle focused client on tag #" .. i, group = "tag" }))
end
-- for i = 1, 9 do
-- hotkey.registerKeys(-- View tag only.
-- awful.key({ config.keys.modkey }, "#" .. i + 9,
-- function()
-- local screen = awful.screen.focused()
-- local tag = screen.tags[i]
-- if tag then
-- tag:view_only()
-- end
-- end,
-- { description = "view tag #" .. i, group = "tag" }),
-- -- Toggle tag display.
-- awful.key({ config.keys.modkey, "Control" }, "#" .. i + 9,
-- function()
-- local screen = awful.screen.focused()
-- local tag = screen.tags[i]
-- if tag then
-- awful.tag.viewtoggle(tag)
-- end
-- end,
-- { description = "toggle tag #" .. i, group = "tag" }),
-- -- Move client to tag.
-- awful.key({ config.keys.modkey, "Shift" }, "#" .. i + 9,
-- function()
-- if client.focus then
-- local tag = client.focus.screen.tags[i]
-- if tag then
-- client.focus:move_to_tag(tag)
-- end
-- end
-- end,
-- { description = "move focused client to tag #" .. i, group = "tag" }),
-- -- Toggle tag on focused client.
-- awful.key({ config.keys.modkey, "Control", "Shift" }, "#" .. i + 9,
-- function()
-- if client.focus then
-- local tag = client.focus.screen.tags[i]
-- if tag then
-- client.focus:toggle_tag(tag)
-- end
-- end
-- end,
-- { description = "toggle focused client on tag #" .. i, group = "tag" }))
-- end
clientbuttons = gears.table.join(awful.button({}, 1, function(c)
c:emit_signal("request::activate", "mouse_click", { raise = true })
@ -669,7 +674,7 @@ awful.rules.rules = {
rule_any = {
type = { "normal", "dialog" }
},
properties = { titlebars_enabled = true }
properties = { titlebars_enabled = false }
},
-- Set Firefox to always map on the tag named "2" on screen 1.

View File

@ -1,4 +1,3 @@
local awful = require("awful")
local beautiful = require("beautiful")
local gears = require("gears")
local naughty = require("naughty")
@ -35,15 +34,6 @@ local bars = wibox.widget {
layout = wibox.layout.flex.horizontal
}
function fileExists(name)
local f = io.open(name, "r")
if f ~= nil then
io.close(f)
return true
end
return false
end
function readCommand(command)
local handle = io.popen(command, "r")
local r = handle:read("*a")
@ -51,13 +41,6 @@ function readCommand(command)
return r
end
function readFile(file)
local handle = io.open(file, "r")
local r = handle:read("*a")
handle:close()
return r
end
local cpuBar = bars:get_children()[1]:get_children()[1]:get_children()[1]
function getCpuData()
@ -139,106 +122,67 @@ gears.timer {
---
--- Batteries
---
rawBatteries = {}
function refreshRawBatteries()
rawBatteries = readCommand("ls -A1 /sys/class/power_supply")
local battery = wibox.widget {
{
markup = "-- %",
align = "center",
valign = "center",
widget = wibox.widget.textbox,
},
margins = beautiful.system_resources_widget_battery_margin,
widget = wibox.container.margin,
}
local batteryText = battery:get_children()[1]
local rawBatteries = readCommand("ls -A1 /sys/class/power_supply")
function getBatteries()
return rawBatteries:gmatch("([^\n]+)")
end
function getBatteryLevel(battery)
function hasBattery()
return rawBatteries:len() > 0
end
function getBatteryCapacity()
local charge = 0
local capacity = 0
if fileExists(battery .. "/energy_now") then
charge = charge + readFile(battery .. "/energy_now")
capacity = capacity + readFile(battery .. "/energy_full")
elseif fileExists(battery .. "/charge_now") then
charge = charge + readFile(battery .. "/charge_now")
capacity = capacity + readFile(battery .. "/charge_full")
elseif fileExists(battery .. "/capacity_level") then
return readFile(battery .. "/capacity_level")
else
return "Unsupported"
for b in getBatteries() do
if b:sub(1,3) ~= 'hid' and readCommand("cat /sys/class/power_supply/" .. b .. "/type"):match("Battery") then
charge = charge + readCommand("cat /sys/class/power_supply/" .. b .. "/energy_now")
capacity = capacity + readCommand("cat /sys/class/power_supply/" .. b .. "/energy_full")
end
end
return string.format("%." .. config.battery.precision .. "f", (charge / capacity) * 100) .. "%"
return charge / capacity
end
function isCharging(battery)
return readFile(battery .. "/status") == "Charging\n"
end
local batteryContainer = wibox.widget {
layout = wibox.layout.fixed.horizontal
}
local timers = {}
function refreshBatteries()
-- refresh raw batteries and check for change
local oldBatteries = rawBatteries
refreshRawBatteries()
if rawBatteries == oldBatteries then
return
end
-- clear timers
for i,v in ipairs(timers) do
v:stop()
end
timers = {};
-- clear layout
batteryContainer:set_children({})
for battery in rawBatteries:gmatch("([^\n]+)") do
local path = "/sys/class/power_supply/" .. battery
if readFile(path .. "/type"):match("Battery") then
-- widget
local widget = wibox.widget {
{
markup = "-- %",
align = "center",
valign = "center",
widget = wibox.widget.textbox,
},
margins = beautiful.system_resources_widget_battery_margin,
widget = wibox.container.margin,
}
-- tooltip
local name = readFile(path .. "/model_name")
local tooltip = awful.tooltip {
text = name
}
tooltip:add_to_object(widget)
-- update battery level
local batteryText = widget:get_children()[1]
local timer = gears.timer {
timeout = config.battery.refresh_interval,
call_now = true,
autostart = true,
callback = function()
batteryText.markup = (isCharging(path) and "+" or "") .. getBatteryLevel(path)
end
}
table.insert(timers, timer)
batteryContainer:add(widget)
end
end
end
gears.timer {
timeout = config.battery.list_refresh_interval,
call_now = true,
autostart = true,
callback = function()
refreshBatteries()
function isCharging()
for b in getBatteries() do
if readCommand("cat /sys/class/power_supply/" .. b .. "/type"):match("Battery") then
return readCommand("cat /sys/class/power_supply/" .. b .. "/status") ~= "Discharging"
end
end
}
return nil
end
if hasBattery() then
gears.timer {
timeout = config.battery.refresh_interval,
call_now = true,
autostart = true,
callback = function()
batteryText.markup = string.format("%." .. config.battery.precision .. "f", getBatteryCapacity() * 100) .. "%"
end
}
else
battery = nil
end
return {
bars = bars,
battery = batteryContainer,
battery = battery,
}

View File

@ -1,3 +1,6 @@
local theme = require("default_theme")
theme.useless_gap = 4
theme.border_width = 0
return theme