mirror/vincentbernat.i3wm-configuration
1
0
Fork 0
mirror of https://github.com/vincentbernat/i3wm-configuration.git synced 2025-06-24 18:58:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

i3-companion: partially revert layout indicator

Browse source 
Ideally, it should be per output, but then it is a bit complicated to
know which polybar is on which output. While this seems a cool hack to
have, I don't think that's really useful. Keeping some of
the (unrelated) changes.
This commit is contained in:
Vincent Bernat 2021-08-03 16:00:28 +02:00
parent 41705ca492
commit 7264c2ead5
3 changed files with 5 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

21
bin/i3-companion
View file

@ -80,10 +80,6 @@ icons = {
"headset": icon(2, ""), "headset": icon(2, ""),
"keyboard": icon(2, "⌨"), "keyboard": icon(2, "⌨"),
"laptop": icon(2, "💻"), "laptop": icon(2, "💻"),
"layout-splith": icon(2, ""),
"layout-splitv": icon(2, ""),
"layout-stacking": icon(2, ""),
"layout-tabbed": icon(2, ""),
"loudspeaker": icon(2, ""), "loudspeaker": icon(2, ""),
"microphone": icon(2, ""), "microphone": icon(2, ""),
"mouse": icon(2, ""), "mouse": icon(2, ""),
@ -239,7 +235,7 @@ def debounce(sleep, *, unless=None):
return decorator return decorator
def polybar(module, silent=False): def polybar(module):
"""Use returned string to update polybar module""" """Use returned string to update polybar module"""
def decorator(fn): def decorator(fn):
@ -263,8 +259,7 @@ def polybar(module, silent=False):
if e.errno != errno.ENXIO: if e.errno != errno.ENXIO:
raise raise
log = logger.debug if silent else logger.info logger.info(f"polybar/{module}: content updated")
log("polybar/%s: content updated", module)
cache[module] = content cache[module] = content
return content return content
@ -592,18 +587,6 @@ async def workspace_info(i3, event):
workspace_info.last_id = result[0] workspace_info.last_id = result[0]
@on(I3Event.WINDOW_FOCUS, CommandEvent("layout-changed"), StartEvent)
@polybar("i3layout", silent=True)
async def layout_update(i3, event):
"""Display layout of the current focused container."""
tree = await i3.get_tree()
focused = tree.find_focused()
if not focused:
return ""
layout = focused.parent.layout
return icons.get(f"layout-{layout}", icons['unknown'])
@on(I3Event.OUTPUT, StartEvent) @on(I3Event.OUTPUT, StartEvent)
@static(last_setup=None) @static(last_setup=None)
@debounce(2) @debounce(2)

4
config
View file

@ -73,8 +73,8 @@ bindsym $mod+f fullscreen toggle
bindsym $mod+Shift+f fullscreen toggle global bindsym $mod+Shift+f fullscreen toggle global
# change container layout (tabbed, toggle split) # change container layout (tabbed, toggle split)
bindsym $mod+w layout toggle splitv splith tabbed; nop "layout-changed" bindsym $mod+w layout toggle splitv splith tabbed
bindsym $mod+v split toggle; nop "layout-changed" bindsym $mod+v split toggle
# toggle tiling / floating # toggle tiling / floating
bindsym $mod+Shift+space floating toggle bindsym $mod+Shift+space floating toggle

8
dotfiles/polybar.conf
View file

@ -30,7 +30,7 @@ font-0 = Iosevka Aile:style=Regular:size=10;2
font-1 = Font Awesome 6 Pro:style=Solid:size=10;2 font-1 = Font Awesome 6 Pro:style=Solid:size=10;2
font-2 = Font Awesome 6 Brands:style=Regular:size=10;2 font-2 = Font Awesome 6 Brands:style=Regular:size=10;2
modules-left = i3 i3layout modules-left = i3
modules-center = date modules-center = date
[bar/alone] [bar/alone]
@ -67,12 +67,6 @@ label-urgent = %name%
label-urgent-background = #a00000 label-urgent-background = #a00000
label-urgent-padding = 1 label-urgent-padding = 1
[module/i3layout]
type = custom/ipc
hook-0 = cat $XDG_RUNTIME_DIR/i3/i3layout.txt 2> /dev/null
format-foreground = ${colors.focused}
initial = 1
# This needs 3.6+ # This needs 3.6+
[module/disk] [module/disk]
type = internal/fs type = internal/fs