ce7e15fbc0f26059447317d3fd60f99b09edbea8

Author
Pavle Portic <git@theedgeofrage.com>
Committer
Pavle Portic <git@theedgeofrage.com>
Date

Message

Fix i3-autoname issue with custom workspaces

Diff

 1diff --git a/dot_config/i3/i3-autoname-workspaces.py b/dot_config/i3/i3-autoname-workspaces.py
 2index 43fada05b5e23dfff77c8c925d9dd4384d3c173b..8175cbd41f0f7f141796f92894189763411ce3b2 100644
 3--- a/dot_config/i3/i3-autoname-workspaces.py
 4+++ b/dot_config/i3/i3-autoname-workspaces.py
 5@@ -138,7 +138,6 @@ def xprop(win_id, property):
 6             stderr=proc.DEVNULL,
 7         )
 8         prop = prop.decode('utf-8')
 9-        print(re.findall('"([^"]+)"', prop))
10         return re.findall('"([^"]+)"', prop)
11 
12     except proc.CalledProcessError:
13@@ -163,17 +162,18 @@ def icon_for_window(window):
14 def rename_workspaces(i3):
15     for workspace in i3.get_tree().workspaces():
16         if (
17-            '' not in workspace.name
18-            and '' not in workspace.name
19-            and '' not in workspace.name
20+            workspace.name == ''
21+            or workspace.name == ''
22+            or workspace.name == ''
23         ):
24-            name_parts = parse_workspace_name(workspace.name)
25-            name_parts['icons'] = ' '.join(
26-                icon_for_window(w) for w in workspace.leaves()
27-            )
28-            new_name = construct_workspace_name(name_parts)
29-            i3.command(f'rename workspace "{workspace.name}" to "{new_name}"')
30+            continue
31 
32+        name_parts = parse_workspace_name(workspace.name)
33+        name_parts['icons'] = ' '.join(
34+            icon_for_window(w) for w in workspace.leaves()
35+        )
36+        new_name = construct_workspace_name(name_parts)
37+        i3.command(f'rename workspace "{workspace.name}" to "{new_name}"')
38 
39 # rename workspaces to just numbers and shortnames.
40 # called on exit to indicate that this script is no longer running.
41diff --git a/dot_config/zsh/load_functions.zsh b/dot_config/zsh/load_functions.zsh
42index a63d8fde913133b1a11900293b3928e9838be4e8..3d5aae8fb502873c0c9b15bea4344afd5a4f1378 100644
43--- a/dot_config/zsh/load_functions.zsh
44+++ b/dot_config/zsh/load_functions.zsh
45@@ -1,2 +1 @@
46 autoload -Uz *
47-