diff --git a/.gitmodules b/.gitmodules index 07e25da..ce5de56 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,9 @@ [submodule "common/.config/awesome/plugins/nide"] path = common/.config/awesome/plugins/nice/ url = https://github.com/AlphaKeks/awesome-wm-nice +[submodule "common/.config/awesome/awesome-wm-widgets"] + path = common/.config/awesome/awesome-wm-widgets + url = https://github.com/streetturtle/awesome-wm-widgets/ +[submodule "common/.config/awesome/plugins/rubato"] + path = common/.config/awesome/plugins/rubato + url = https://github.com/andOrlando/rubato diff --git a/arch.os b/arch.os index 48f8c4c..c17dedd 100755 --- a/arch.os +++ b/arch.os @@ -4,8 +4,10 @@ yay -S neovim-git nvm wezterm ranger ripgrep zsh curl exa sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" -# Manjaro/i3 visuals with Yay -yay -S ttf-twemoji xotf-nerd-fonts-monacob-mono xidlehook sysstat i3blocks mpris-ctl flameshot perl rofi alternating-layouts-git +# WM Deps +yay -S awesome-git +yay -S picom-pijulis-git +yay -S ttf-twemoji xorg-xbacklight xidlehook sysstat i3blocks mpris-ctl flameshot perl rofi mkdir -p ~/.local/share/fonts cd ~/.local/share/fonts @@ -17,6 +19,6 @@ yay -S tmux git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm tmux source ~/.tmux.conf -# Manjaro/i3 audio with Yay +# Audio yay -S pulseaudio-equalizer-ladspa mpris-ctl diff --git a/common/.config/awesome/awesome-wm-widgets b/common/.config/awesome/awesome-wm-widgets new file mode 160000 index 0000000..c8388f4 --- /dev/null +++ b/common/.config/awesome/awesome-wm-widgets @@ -0,0 +1 @@ +Subproject commit c8388f484e72c8eaef2d9562b2dc1ff293518782 diff --git a/common/.config/awesome/ben/autostart.lua b/common/.config/awesome/ben/autostart.lua index eea7e53..b9281d0 100644 --- a/common/.config/awesome/ben/autostart.lua +++ b/common/.config/awesome/ben/autostart.lua @@ -1,7 +1,7 @@ local awful = require("awful") local autostart = { - ["picom"] = "/usr/bin/picom -b", + ["picom"] = "/usr/bin/picom -b --config /home/$USER/.config/awesome/config/picom.conf", ["volumeicon"] = "/usr/bin/volumeicon", ["xdilehook"] = "/usr/bin/xidlehook --not-when-fullscreen --not-when-audio --timer 600 'blurlock' ''", ["nm-applet"] = "/usr/bin/nm-applet", diff --git a/common/.config/awesome/ben/battery.lua b/common/.config/awesome/ben/battery.lua deleted file mode 100644 index 1c79181..0000000 --- a/common/.config/awesome/ben/battery.lua +++ /dev/null @@ -1,131 +0,0 @@ - --- =================================================================== --- Initialization --- =================================================================== - - -local awful = require("awful") -local watch = require("awful.widget.watch") -local wibox = require("wibox") -local clickable_container = require("ben.clickable-container") -local gears = require("gears") -local dpi = require("beautiful").xresources.apply_dpi - -local icon_dir = gears.filesystem.get_configuration_dir() .. "/icons/battery/" - - --- =================================================================== --- Widget Creation --- =================================================================== - - -local widget = wibox.widget { - { - id = "icon", - widget = wibox.widget.imagebox, - resize = true - }, - layout = wibox.layout.fixed.horizontal -} - -local widget_button = clickable_container(wibox.container.margin(widget, dpi(6), dpi(6), dpi(6), dpi(7))) -widget_button:buttons( - gears.table.join( - awful.button({}, 1, nil, - function() - awful.spawn(apps.power_manager) - end - ) - ) -) --- Alternative to naughty.notify - tooltip. You can compare both and choose the preferred one -local battery_popup = awful.tooltip({ - objects = {widget_button}, - mode = "outside", - align = "left", - referred_positions = {"right", "left", "top", "bottom"}, - margin_leftright = dpi(12), - margin_topbottom = dpi(8) -}) - -local function show_battery_warning() - naughty.notify { - icon = icon_dir .. "battery-alert.svg", - icon_size = dpi(48), - text = "Battery is running low", - title = "Battery is dying", - timeout = 5, - hover_timeout = 0.5, - position = "top_right", - bg = "#d32f2f", - fg = "#EEE9EF", - width = 248 - } -end - -local last_battery_check = os.time() - --- update every 5 seconds -watch("acpi -i", 5, - function(_, stdout) - local battery_info = {} - local capacities = {} - for s in stdout:gmatch("[^\r\n]+") do - local status, charge_str, time = string.match(s, ".+: (%a+), (%d?%d?%d)%%,?.*") - if status ~= nil then - table.insert(battery_info, {status = status, charge = tonumber(charge_str)}) - else - local cap_str = string.match(s, ".+:.+last full capacity (%d+)") - table.insert(capacities, tonumber(cap_str)) - end - end - - local capacity = 0 - for _, cap in ipairs(capacities) do - capacity = capacity + cap - end - - local charge = 0 - local status - for i, batt in ipairs(battery_info) do - if batt.charge >= charge then - status = batt.status -- use most charged battery status - -- this is arbitrary, and maybe another metric should be used - end - - charge = charge + batt.charge * capacities[i] - end - charge = charge / capacity - - if (charge >= 0 and charge < 15) then - if status ~= "Charging" and os.difftime(os.time(), last_battery_check) > 300 then - -- if 5 minutes have elapsed since the last warning - last_battery_check = time() - - show_battery_warning() - end - end - - local battery_icon_name = "battery" - - if status == "Charging" or status == "Full" then - battery_icon_name = battery_icon_name .. "-charging" - end - - local rounded_charge = math.floor(charge / 10) * 10 - - if (rounded_charge == 0) then - battery_icon_name = battery_icon_name .. "-outline" - elseif (rounded_charge ~= 100) then - battery_icon_name = battery_icon_name .. "-" .. rounded_charge - end - - widget.icon:set_image(icon_dir .. battery_icon_name .. ".svg") - -- Update popup text - battery_popup.text = string.gsub(stdout, "\n$", "") - collectgarbage("collect") - end, - widget -) - -return widget_button diff --git a/common/.config/awesome/ben/bluetooth.lua b/common/.config/awesome/ben/bluetooth.lua deleted file mode 100644 index 46ceb8b..0000000 --- a/common/.config/awesome/ben/bluetooth.lua +++ /dev/null @@ -1,77 +0,0 @@ - --- =================================================================== --- Initialization --- =================================================================== - - -local awful = require("awful") -local watch = require("awful.widget.watch") -local wibox = require("wibox") -local clickable_container = require("ben.clickable-container") -local gears = require("gears") -local dpi = require("beautiful").xresources.apply_dpi - -local icon_dir = gears.filesystem.get_configuration_dir() .. "/icons/bluetooth/" - -local checker - - --- =================================================================== --- Initialization --- =================================================================== - - -local widget = wibox.widget { - { - id = "icon", - widget = wibox.widget.imagebox, - resize = true - }, - layout = wibox.layout.align.horizontal -} - -local widget_button = clickable_container(wibox.container.margin(widget, dpi(6), dpi(6), dpi(6), dpi(6))) -widget_button:buttons( - gears.table.join( - awful.button({}, 1, nil, - function() - awful.spawn(apps.bluetooth_manager) - end - ) - ) -) - -awful.tooltip( - { - objects = {widget_button}, - mode = "outside", - align = "right", - timer_function = function() - if checker ~= nil then - return "Bluetooth is on" - else - return "Bluetooth is off" - end - end, - preferred_positions = {"right", "left", "top", "bottom"} - } -) - -local last_bluetooth_check = os.time() -watch("bluetoothctl --monitor list", 5, - function(_, stdout) - -- Check if there bluetooth - checker = stdout:match("Controller") -- If 'Controller' string is detected on stdout - local widget_icon_name = "loading" - if (checker ~= nil) then - widget_icon_name = "bluetooth" - else - widget_icon_name = "bluetooth-off" - end - widget.icon:set_image(icon_dir .. widget_icon_name .. ".svg") - collectgarbage("collect") - end, - widget -) - -return widget_button diff --git a/common/.config/awesome/ben/widgets.lua b/common/.config/awesome/ben/widgets.lua index 7542072..a8ea728 100644 --- a/common/.config/awesome/ben/widgets.lua +++ b/common/.config/awesome/ben/widgets.lua @@ -38,7 +38,4 @@ widgets.separator = wibox.widget.separator() widgets.systray = wibox.widget.systray() widgets.systray:set_base_size(16) -widgets.bluetooth = require("ben.bluetooth") -widgets.battery = require("ben.battery") - return widgets diff --git a/common/.config/awesome/config/picom.conf b/common/.config/awesome/config/picom.conf new file mode 100644 index 0000000..fe85999 --- /dev/null +++ b/common/.config/awesome/config/picom.conf @@ -0,0 +1,499 @@ +################################# +# Animations # +################################# + +# Animations (requires pijulius) +animations = true; +animation-clamping = true; +animation-delta = 12; +animation-dampening = 30.0; +animation-stiffness = 500.0; +animation-for-open-window = "zoom"; +animation-for-menu-window = "slide-down"; +animation-for-transient-window = "zoom"; +animation-for-workspace-switch-in = "zoom"; +animation-for-workspace-switch-out = "zoom"; + +################################## +# Corners # +################################# +# requires: https://github.com/sdhand/compton or https://github.com/jonaburg/picom +corner-radius = 10.0; +rounded-corners-exclude = [ + #"window_type = 'normal'", + "class_g = 'awesome'", + "class_g = 'wezterm'", + "class_g = 'XTerm'", + "class_g = 'kitty'", + "class_g = 'Alacritty'", + "class_g = 'Polybar'", + "class_g = 'rofi'", +]; +round-borders = 1; +round-borders-exclude = [ + #"class_g = 'TelegramDesktop'", +]; + +################################# +# Shadows # +################################# + + +# Enabled client-side shadows on windows. Note desktop windows +# (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow, +# unless explicitly requested using the wintypes option. +# +# shadow = false +shadow = true; + +# The blur radius for shadows, in pixels. (defaults to 12) +# shadow-radius = 12 +shadow-radius = 7; + +# The opacity of shadows. (0.0 - 1.0, defaults to 0.75) +# shadow-opacity = .75 + +# The left offset for shadows, in pixels. (defaults to -15) +# shadow-offset-x = -15 +shadow-offset-x = -7; + +# The top offset for shadows, in pixels. (defaults to -15) +# shadow-offset-y = -15 +shadow-offset-y = -7; + +# Avoid drawing shadows on dock/panel windows. This option is deprecated, +# you should use the *wintypes* option in your config file instead. +# +# no-dock-shadow = false + +# Don't draw shadows on drag-and-drop windows. This option is deprecated, +# you should use the *wintypes* option in your config file instead. +# +# no-dnd-shadow = false + +# Red color value of shadow (0.0 - 1.0, defaults to 0). +# shadow-red = 0 + +# Green color value of shadow (0.0 - 1.0, defaults to 0). +# shadow-green = 0 + +# Blue color value of shadow (0.0 - 1.0, defaults to 0). +# shadow-blue = 0 + +# Do not paint shadows on shaped windows. Note shaped windows +# here means windows setting its shape through X Shape extension. +# Those using ARGB background is beyond our control. +# Deprecated, use +# shadow-exclude = 'bounding_shaped' +# or +# shadow-exclude = 'bounding_shaped && !rounded_corners' +# instead. +# +# shadow-ignore-shaped = '' + +# Specify a list of conditions of windows that should have no shadow. +# +# examples: +# shadow-exclude = "n:e:Notification"; +# +# shadow-exclude = [] +shadow-exclude = [ + "name = 'Notification'", + "class_g = 'Conky'", + "class_g ?= 'Notify-osd'", + "class_g = 'Cairo-clock'", + "class_g = 'slop'", + "class_g = 'Polybar'", + "_GTK_FRAME_EXTENTS@:c" +]; + +# Specify a X geometry that describes the region in which shadow should not +# be painted in, such as a dock window region. Use +# shadow-exclude-reg = "x10+0+0" +# for example, if the 10 pixels on the bottom of the screen should not have shadows painted on. +# +# shadow-exclude-reg = "" + +# Crop shadow of a window fully on a particular Xinerama screen to the screen. +# xinerama-shadow-crop = false + + +################################# +# Fading # +################################# + + +# Fade windows in/out when opening/closing and when opacity changes, +# unless no-fading-openclose is used. +# fading = false +fading = true; + +# Opacity change between steps while fading in. (0.01 - 1.0, defaults to 0.028) +# fade-in-step = 0.028 +fade-in-step = 0.03; + +# Opacity change between steps while fading out. (0.01 - 1.0, defaults to 0.03) +# fade-out-step = 0.03 +fade-out-step = 0.03; + +# The time between steps in fade step, in milliseconds. (> 0, defaults to 10) +# fade-delta = 10 + +# Specify a list of conditions of windows that should not be faded. +# don't need this, we disable fading for all normal windows with wintypes: {} +fade-exclude = [ + "class_g = 'slop'" # maim +] + +# Do not fade on window open/close. +# no-fading-openclose = false + +# Do not fade destroyed ARGB windows with WM frame. Workaround of bugs in Openbox, Fluxbox, etc. +# no-fading-destroyed-argb = false + + +################################# +# Transparency / Opacity # +################################# + + +# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0) +# inactive-opacity = 1 +inactive-opacity = 0.95; + +# Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default) +# frame-opacity = 1.0 +frame-opacity = 0.7; + +# Default opacity for dropdown menus and popup menus. (0.0 - 1.0, defaults to 1.0) +# menu-opacity = 1.0 +# menu-opacity is depreciated use dropdown-menu and popup-menu instead. + +#If using these 2 below change their values in line 510 & 511 aswell +popup_menu = { opacity = 0.8; } +dropdown_menu = { opacity = 0.8; } + + +# Let inactive opacity set by -i override the '_NET_WM_OPACITY' values of windows. +# inactive-opacity-override = true +inactive-opacity-override = false; + +# Default opacity for active windows. (0.0 - 1.0, defaults to 1.0) +active-opacity = 1.0; + +# Dim inactive windows. (0.0 - 1.0, defaults to 0.0) +# inactive-dim = 0.0 + +# Specify a list of conditions of windows that should always be considered focused. +# focus-exclude = [] +focus-exclude = [ + "class_g = 'Cairo-clock'", + "class_g = 'Bar'", # lemonbar + "class_g = 'slop'" # maim +]; + +# Use fixed inactive dim value, instead of adjusting according to window opacity. +# inactive-dim-fixed = 1.0 + +# Specify a list of opacity rules, in the format `PERCENT:PATTERN`, +# like `50:name *= "Firefox"`. picom-trans is recommended over this. +# Note we don't make any guarantee about possible conflicts with other +# programs that set '_NET_WM_WINDOW_OPACITY' on frame or client windows. +# example: +# opacity-rule = [ "80:class_g = 'URxvt'" ]; +# +# opacity-rule = [] +opacity-rule = [ +]; + + +################################# +# Background-Blurring # +################################# + + +# Parameters for background blurring, see the *BLUR* section for more information. +# blur-method = +# blur-size = 12 +# +# blur-deviation = false + +# Blur background of semi-transparent / ARGB windows. +# Bad in performance, with driver-dependent behavior. +# The name of the switch may change without prior notifications. +# +# blur-background = true; + +# Blur background of windows when the window frame is not opaque. +# Implies: +# blur-background +# Bad in performance, with driver-dependent behavior. The name may change. +# +# blur-background-frame = false; + + +# Use fixed blur strength rather than adjusting according to window opacity. +# blur-background-fixed = false; + + +# Specify the blur convolution kernel, with the following format: +# example: +# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"; +# +# blur-kern = '' +# blur-kern = "3x3box"; + +blur: { + # requires: https://github.com/ibhagwan/picom + method = "kawase"; + #method = "kernel"; + strength = 7; + # deviation = 1.0; + # kernel = "11x11gaussian"; + background = false; + background-frame = false; + background-fixed = false; + kern = "3x3box"; +} + +# Exclude conditions for background blur. +blur-background-exclude = [ + #"window_type = 'dock'", + #"window_type = 'desktop'", + #"class_g = 'URxvt'", + # + # prevents picom from blurring the background + # when taking selection screenshot with `main` + # https://github.com/naelstrof/maim/issues/130 + "class_g = 'slop'", + "_GTK_FRAME_EXTENTS@:c" +]; + + +################################# +# General Settings # +################################# + +# Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers. +# daemon = false + +# Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`. +# `xrender` is the default one. +# +experimental-backends = true; +backend = "glx"; +#backend = "xrender"; + + +# Enable/disable VSync. +# vsync = false +vsync = true + +# Enable remote control via D-Bus. See the *D-BUS API* section below for more details. +# dbus = false + +# Try to detect WM windows (a non-override-redirect window with no +# child that has 'WM_STATE') and mark them as active. +# +# mark-wmwin-focused = false +mark-wmwin-focused = true; + +# Mark override-redirect windows that doesn't have a child window with 'WM_STATE' focused. +# mark-ovredir-focused = false +mark-ovredir-focused = true; + +# Try to detect windows with rounded corners and don't consider them +# shaped windows. The accuracy is not very high, unfortunately. +# +# detect-rounded-corners = false +detect-rounded-corners = true; + +# Detect '_NET_WM_OPACITY' on client windows, useful for window managers +# not passing '_NET_WM_OPACITY' of client windows to frame windows. +# +# detect-client-opacity = false +detect-client-opacity = true; + +# Specify refresh rate of the screen. If not specified or 0, picom will +# try detecting this with X RandR extension. +# +# refresh-rate = 60 +refresh-rate = 0 + +# Limit picom to repaint at most once every 1 / 'refresh_rate' second to +# boost performance. This should not be used with +# vsync drm/opengl/opengl-oml +# as they essentially does sw-opti's job already, +# unless you wish to specify a lower refresh rate than the actual value. +# +# sw-opti = + +# Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, +# rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, +# provided that the WM supports it. +# +# use-ewmh-active-win = false + +# Unredirect all windows if a full-screen opaque window is detected, +# to maximize performance for full-screen windows. Known to cause flickering +# when redirecting/unredirecting windows. paint-on-overlay may make the flickering less obvious. +# +# unredir-if-possible = false + +# Delay before unredirecting the window, in milliseconds. Defaults to 0. +# unredir-if-possible-delay = 0 + +# Conditions of windows that shouldn't be considered full-screen for unredirecting screen. +# unredir-if-possible-exclude = [] + +# Use 'WM_TRANSIENT_FOR' to group windows, and consider windows +# in the same group focused at the same time. +# +# detect-transient = false +detect-transient = true + +# Use 'WM_CLIENT_LEADER' to group windows, and consider windows in the same +# group focused at the same time. 'WM_TRANSIENT_FOR' has higher priority if +# detect-transient is enabled, too. +# +# detect-client-leader = false +detect-client-leader = true + +# Resize damaged region by a specific number of pixels. +# A positive value enlarges it while a negative one shrinks it. +# If the value is positive, those additional pixels will not be actually painted +# to screen, only used in blur calculation, and such. (Due to technical limitations, +# with use-damage, those pixels will still be incorrectly painted to screen.) +# Primarily used to fix the line corruption issues of blur, +# in which case you should use the blur radius value here +# (e.g. with a 3x3 kernel, you should use `--resize-damage 1`, +# with a 5x5 one you use `--resize-damage 2`, and so on). +# May or may not work with *--glx-no-stencil*. Shrinking doesn't function correctly. +# +# resize-damage = 1 + +# Specify a list of conditions of windows that should be painted with inverted color. +# Resource-hogging, and is not well tested. +# +# invert-color-include = [] + +# GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. +# Might cause incorrect opacity when rendering transparent content (but never +# practically happened) and may not work with blur-background. +# My tests show a 15% performance boost. Recommended. +# +# glx-no-stencil = false + +# GLX backend: Avoid rebinding pixmap on window damage. +# Probably could improve performance on rapid window content changes, +# but is known to break things on some drivers (LLVMpipe, xf86-video-intel, etc.). +# Recommended if it works. +# +# glx-no-rebind-pixmap = false + +# Disable the use of damage information. +# This cause the whole screen to be redrawn everytime, instead of the part of the screen +# has actually changed. Potentially degrades the performance, but might fix some artifacts. +# The opposing option is use-damage +# +# no-use-damage = false +#use-damage = true (Causing Weird Black semi opaque rectangles when terminal is opened) +#Changing use-damage to false fixes the problem +use-damage = false + +# Use X Sync fence to sync clients' draw calls, to make sure all draw +# calls are finished before picom starts drawing. Needed on nvidia-drivers +# with GLX backend for some users. +# +# xrender-sync-fence = false + +# GLX backend: Use specified GLSL fragment shader for rendering window contents. +# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl` +# in the source tree for examples. +# +# glx-fshader-win = '' + +# Force all windows to be painted with blending. Useful if you +# have a glx-fshader-win that could turn opaque pixels transparent. +# +# force-win-blend = false + +# Do not use EWMH to detect fullscreen windows. +# Reverts to checking if a window is fullscreen based only on its size and coordinates. +# +# no-ewmh-fullscreen = false + +# Dimming bright windows so their brightness doesn't exceed this set value. +# Brightness of a window is estimated by averaging all pixels in the window, +# so this could comes with a performance hit. +# Setting this to 1.0 disables this behaviour. Requires --use-damage to be disabled. (default: 1.0) +# +# max-brightness = 1.0 + +# Make transparent windows clip other windows like non-transparent windows do, +# instead of blending on top of them. +# +# transparent-clipping = false + +# Set the log level. Possible values are: +# "trace", "debug", "info", "warn", "error" +# in increasing level of importance. Case doesn't matter. +# If using the "TRACE" log level, it's better to log into a file +# using *--log-file*, since it can generate a huge stream of logs. +# +# log-level = "debug" +log-level = "info"; + +# Set the log file. +# If *--log-file* is never specified, logs will be written to stderr. +# Otherwise, logs will to written to the given file, though some of the early +# logs might still be written to the stderr. +# When setting this option from the config file, it is recommended to use an absolute path. +# +# log-file = '/path/to/your/log/file' + +# Show all X errors (for debugging) +# show-all-xerrors = false + +# Write process ID to a file. +# write-pid-path = '/path/to/your/log/file' + +# Window type settings +# +# 'WINDOW_TYPE' is one of the 15 window types defined in EWMH standard: +# "unknown", "desktop", "dock", "toolbar", "menu", "utility", +# "splash", "dialog", "normal", "dropdown_menu", "popup_menu", +# "tooltip", "notification", "combo", and "dnd". +# +# Following per window-type options are available: :: +# +# fade, shadow::: +# Controls window-type-specific shadow and fade settings. +# +# opacity::: +# Controls default opacity of the window type. +# +# focus::: +# Controls whether the window of this type is to be always considered focused. +# (By default, all window types except "normal" and "dialog" has this on.) +# +# full-shadow::: +# Controls whether shadow is drawn under the parts of the window that you +# normally won't be able to see. Useful when the window has parts of it +# transparent, and you want shadows in those areas. +# +# redir-ignore::: +# Controls whether this type of windows should cause screen to become +# redirected again after been unredirected. If you have unredir-if-possible +# set, and doesn't want certain window to cause unnecessary screen redirection, +# you can set this to `true`. +# +wintypes: +{ + normal = { fade = false; shadow = false; } + tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; + dock = { shadow = false; } + dnd = { shadow = false; } + popup_menu = { opacity = 0.8; } + dropdown_menu = { opacity = 0.8; } +}; diff --git a/common/.config/awesome/core/bars.lua b/common/.config/awesome/core/bars.lua index c1662c6..dac97f0 100644 --- a/common/.config/awesome/core/bars.lua +++ b/common/.config/awesome/core/bars.lua @@ -4,6 +4,8 @@ local wibox = require("wibox") local create_tags = require("core.tags").create_tags local widgets = require("ben.widgets") +local batteryarc_widget = require("awesome-wm-widgets.batteryarc-widget.batteryarc") + awful.screen.connect_for_each_screen(function(screen) local tags = create_tags(screen) @@ -32,8 +34,15 @@ awful.screen.connect_for_each_screen(function(screen) { layout = wibox.layout.fixed.horizontal, widgets.systray, - widgets.bluetooth, - widgets.battery, + batteryarc_widget({ + font = Ben.fonts.normal, + show_current_level = true, + charging_color = Ben.colors.green, + low_level_color = Ben.colors.red, + medium_level_color = Ben.colors.yellow, + notification_position = "bottom_right", + warning_msg_title = "Battery is dying", + }), widgets.clock, widgets.launcher, }, diff --git a/common/.config/awesome/helpers.lua b/common/.config/awesome/helpers.lua new file mode 100644 index 0000000..7e5b422 --- /dev/null +++ b/common/.config/awesome/helpers.lua @@ -0,0 +1,52 @@ +local beautiful = require("beautiful") +local gears = require("gears") +local wibox = require("wibox") +local rubato = require("plugins.rubato") + +local helpers = {} + +helpers.rrect = function(rad) + return function(cr,w,h) + gears.shape.rounded_rect(cr,w,h,rad) + end +end + +helpers.prrect = function(rad,tl,tr,br,bl) + return function(cr,w,h) + gears.shape.partially_rounded_rect(cr,w,h,tl,tr,br,bl,rad) + end +end + +helpers.contains = function(t, i) + for _, v in pairs(t) do + if v == i then + return true + end + end + return false +end + +helpers.join = function(t, d) + local d = d or " " + local out + for _, v in ipairs(t) do + if not out then + out = tostring(v) + else + out = out .. d .. tostring(v) + end + end + return out +end + +helpers.combine = function(img1,col1,img2,col2,w,h) + local w = w or 64 + local h = h or 64 + return wibox.widget.draw_to_image_surface (wibox.widget { + wibox.widget.imagebox(gears.color.recolor_image(img1,col1)), + wibox.widget.imagebox(gears.color.recolor_image(img2,col2)), + layout = wibox.layout.stack }, + w,h) +end + +return helpers diff --git a/common/.config/awesome/plugins/rubato b/common/.config/awesome/plugins/rubato new file mode 160000 index 0000000..a918170 --- /dev/null +++ b/common/.config/awesome/plugins/rubato @@ -0,0 +1 @@ +Subproject commit a9181708863265eb4a36c722f664978ee50fe8a0