Move tmux sections into wk.ui

scripts/wk/__init__.py

@@ -17,7 +17,6 @@ from . import os
 from . import repairs
 from . import setup
 from . import std
-from . import tmux
 from . import ui
 
 

scripts/wk/clone/ddrescue.py

@@ -20,7 +20,7 @@ from docopt import docopt
 import psutil
 import pytz
 
-from wk import cfg, debug, exe, io, log, net, std, tmux
+from wk import cfg, debug, exe, io, log, net, std
 from wk.cfg.ddrescue import (
   DDRESCUE_MAP_TEMPLATE,
   DDRESCUE_SETTINGS,
@@ -34,6 +34,7 @@ from wk.hw.smart import (
   update_smart_details,
   )
 from wk.ui import cli as ui # TODO: This is lazy
+from wk.ui import tmux
 
 
 # STATIC VARIABLES

scripts/wk/hw/cpu.py

@@ -11,12 +11,12 @@ from wk import exe
 from wk.cfg.hw import CPU_FAILURE_TEMP
 from wk.os.mac import set_fans as macos_set_fans
 from wk.std import PLATFORM
-from wk.tmux import respawn_pane as tmux_respawn_pane
 from wk.ui.cli import ( # TODO: This is lazy
   color_string,
   print_error,
   print_warning,
   )
+from wk.ui.tmux import respawn_pane as tmux_respawn_pane
 
 
 # STATIC VARIABLES

scripts/wk/hw/diags.py

@@ -10,7 +10,7 @@ import time
 
 from docopt import docopt
 
-from wk import cfg, debug, exe, log, std, tmux
+from wk import cfg, debug, exe, log, std
 from wk.cfg.hw import STATUS_COLORS
 from wk.hw import benchmark as hw_benchmark
 from wk.hw import cpu as hw_cpu
@@ -26,6 +26,7 @@ from wk.hw.screensavers import screensaver
 from wk.hw.test import Test, TestGroup
 
 from wk.ui import cli as ui # TODO: This is lazy
+from wk.ui import tmux
 
 
 # STATIC VARIABLES

scripts/wk/hw/screensavers.py

@@ -6,7 +6,7 @@ import logging
 from subprocess import PIPE
 
 from wk.exe import run_program
-from wk.tmux import zoom_pane as tmux_zoom_pane
+from wk.ui import tmux
 
 
 # STATIC VARIABLES
@@ -31,9 +31,9 @@ def screensaver(name) -> None:
       ]
 
   # Switch pane to fullscreen and start screensaver
-  tmux_zoom_pane()
+  tmux.zoom_pane()
   run_program(cmd, check=False, pipe=False, stderr=PIPE)
-  tmux_zoom_pane()
+  tmux.zoom_pane()
 
 
 if __name__ == '__main__':

scripts/wk/ui/__init__.py

@@ -1,3 +1,4 @@
 """WizardKit: ui module init"""
 
 from . import cli
+from . import tmux