diff --git a/kuro/config.py b/kuro/config.py index f70166c..9939081 100644 --- a/kuro/config.py +++ b/kuro/config.py @@ -17,14 +17,15 @@ class Config(BaseConfig): # Predefined commands cmd_brightness_up = "sudo /usr/bin/xbacklight -inc 10" cmd_brightness_down = "sudo /usr/bin/xbacklight -dec 10" - cmd_screenshot = "xfce4-screenshooter -r -c -d 1" - cmd_alt_screenshot = "xfce4-screenshooter -w -c -d 0" + cmd_screenshot = "/home/kevin/bin/screenshot.sh" + cmd_alt_screenshot = "/home/kevin/bin/screenshot.sh" app_terminal = "terminator" web_browser = "firefox" file_manager = "thunar" - app_launcher = "ulauncher-toggle --no-window-shadow" + app_launcher = "wofi --show drun,run" lock_command = "bash /home/kevin/bin/lock.sh" + cliphistory_command = "/home/kevin/bin/cliphistory.sh" # Autostart applications apps_autostart_group = [ @@ -36,7 +37,7 @@ class Config(BaseConfig): {'group': "", 'command': ["spotify"]}, ] apps_autostart = [ - ["ulauncher", "--hide-window", "--no-window-shadow"], # App launcher background daemon + # ["ulauncher", "--hide-window", "--no-window-shadow"], # App launcher background daemon ["mako"], # Notification daemon ["kanshi"], # Display hotplug ["wl-paste", "--watch", "cliphist", "store"], # Clipboard manager diff --git a/kuro/theme.py b/kuro/theme.py index b9d4e66..25c5356 100644 --- a/kuro/theme.py +++ b/kuro/theme.py @@ -87,6 +87,13 @@ class Kuro(BaseTheme): Match(title='branchdialog'), # gitk Match(title='pinentry'), # GPG key password entry Match(title='origin.exe', wm_class='Wine'), # Wine Origin game launcher + + # Homebank popups + Match(title='Add transaction', wm_class='homebank'), + Match(title='Edit transaction', wm_class='homebank'), + Match(title='Inherit transaction', wm_class='homebank'), + Match(title='Multiple edit transactions', wm_class='homebank'), + Match(title='Transaction splits', wm_class='homebank'), ] ) @@ -175,6 +182,9 @@ class Kuro(BaseTheme): # Alt screenshot Key([self.mod], "Print", lazy.spawn(Config.get('cmd_alt_screenshot', 'xfce4-screenshooter'))), + # Copy from clipboard history + Key([self.mod, "control"], "c", lazy.spawn(Config.get('cliphistory_command', 'true'))), + # Toggle between different layouts as defined below Key([self.mod], "Tab", lazy.next_layout()), @@ -192,7 +202,7 @@ class Kuro(BaseTheme): lazy.function(self.set_random_wallpaper), lazy.function(self.update_colorscheme)), # Reload screen configuration - Key([self.mod, "control"], "s", lazy.function(Config.get('cmd_reconfigure_screens', 'true'))), + Key([self.mod, "control"], "s", lazy.spawn(Config.get('cmd_reconfigure_screens', 'true'))), # Reload colorscheme Key([self.mod, "control"], "t", lazy.function(self.update_colorscheme)), @@ -204,7 +214,7 @@ class Kuro(BaseTheme): ## # Debug keyboard shortcuts ## - Key([self.mod, "control"], "c", lazy.function(display_wm_class)), + Key([self.mod, "control"], "w", lazy.function(display_wm_class)), # Show extensive window info Key([self.mod, "shift", "control"], "i", lazy.function(self.show_window_info)), @@ -355,7 +365,7 @@ class Kuro(BaseTheme): def build_bar_for_screen(self, screen_num): widgets = [ # Workspaces - widget.GroupBox( + kuro.utils.widgets.KuroGroupBox( active=Config.get('colour_groupbox_icon_active', '#ffffff'), borderwidth=Config.get('width_groupbox_border', 1), disable_drag=Config.get('bool_groupbox_disable_drag', False), diff --git a/kuro/utils/general.py b/kuro/utils/general.py index 0a2b225..c8d6a8c 100644 --- a/kuro/utils/general.py +++ b/kuro/utils/general.py @@ -195,7 +195,7 @@ def test_popups(qtile): def display_wm_class(qtile): - window = qtile.currentWindow if qtile else None + window = qtile.current_window if qtile else None if window: wm_class = window.get_wm_class() or None diff --git a/kuro/utils/widgets.py b/kuro/utils/widgets.py index e7aadce..a27249a 100644 --- a/kuro/utils/widgets.py +++ b/kuro/utils/widgets.py @@ -13,6 +13,7 @@ from libqtile.widget import base from libqtile.widget.base import ORIENTATION_HORIZONTAL from libqtile.widget.battery import default_icon_path, load_battery, BatteryState from libqtile.widget.wlan import get_status +from libqtile.widget.groupbox import GroupBox from libqtile.command.base import expose_command from kuro.utils.general import notify, BUTTON_LEFT, BUTTON_MIDDLE, BUTTON_RIGHT, BUTTON_DOWN, BUTTON_UP, BUTTON_MUTE, \ @@ -944,3 +945,16 @@ class VolumeInfoWidget(DualPaneTextboxBase): def run_app(self): # Emulate button press. self.button_press(0, 0, BUTTON_RIGHT) + + +class KuroGroupBox(GroupBox): + @property + def length(self): + try: + return super(KuroGroupBox, self).length + except AttributeError: + return 1 + + @length.setter + def length(self, length): + logger.warning(f"Setting groupbox length to {length}")