From 791daad8410292de0b05c6aff6cfa8a056514694 Mon Sep 17 00:00:00 2001 From: Sean Date: Thu, 19 Dec 2024 10:10:17 -0500 Subject: [PATCH] Add qtile images --- .github/workflows/build.yml | 6 + files/system/qtile/etc/environment | 2 + .../qtile/etc/skel/.config/xfce4/helpers.rc | 1 + files/system/qtile/usr/bin/startqtile | 15 ++ files/system/qtile/usr/etc/qtile/config.py | 227 ++++++++++++++++++ .../usr/share/wayland-sessions/qtile.desktop | 6 + recipes/common/qtile-modules.yml | 16 ++ recipes/recipe-qtile-gdm.yml | 13 + recipes/recipe-qtile-nvidia-gdm.yml | 14 ++ recipes/recipe-qtile-nvidia-open-gdm.yml | 14 ++ recipes/recipe-qtile-nvidia-open.yml | 14 ++ recipes/recipe-qtile-nvidia.yml | 14 ++ recipes/recipe-qtile.yml | 13 + 13 files changed, 355 insertions(+) create mode 100644 files/system/qtile/etc/environment create mode 100644 files/system/qtile/etc/skel/.config/xfce4/helpers.rc create mode 100755 files/system/qtile/usr/bin/startqtile create mode 100644 files/system/qtile/usr/etc/qtile/config.py create mode 100644 files/system/qtile/usr/share/wayland-sessions/qtile.desktop create mode 100644 recipes/common/qtile-modules.yml create mode 100644 recipes/recipe-qtile-gdm.yml create mode 100644 recipes/recipe-qtile-nvidia-gdm.yml create mode 100644 recipes/recipe-qtile-nvidia-open-gdm.yml create mode 100644 recipes/recipe-qtile-nvidia-open.yml create mode 100644 recipes/recipe-qtile-nvidia.yml create mode 100644 recipes/recipe-qtile.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2dc20d58..224a15ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,9 @@ jobs: - recipe-wayfire.yml - recipe-wayfire-nvidia.yml - recipe-wayfire-nvidia-open.yml + - recipe-qtile.yml + - recipe-qtile-nvidia.yml + - recipe-qtile-nvidia-open.yml - recipe-sway-gdm.yml - recipe-sway-nvidia-gdm.yml - recipe-sway-nvidia-open-gdm.yml @@ -44,6 +47,9 @@ jobs: - recipe-wayfire-gdm.yml - recipe-wayfire-nvidia-gdm.yml - recipe-wayfire-nvidia-open-gdm.yml + - recipe-qtile-gdm.yml + - recipe-qtile-nvidia-gdm.yml + - recipe-qtile-nvidia-open-gdm.yml steps: - name: Checkout repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/files/system/qtile/etc/environment b/files/system/qtile/etc/environment new file mode 100644 index 00000000..600c6f6d --- /dev/null +++ b/files/system/qtile/etc/environment @@ -0,0 +1,2 @@ +GTK_THEME=Adwaita:dark +QT_STYLE_OVERRIDE=adwaita-dark diff --git a/files/system/qtile/etc/skel/.config/xfce4/helpers.rc b/files/system/qtile/etc/skel/.config/xfce4/helpers.rc new file mode 100644 index 00000000..e074ab87 --- /dev/null +++ b/files/system/qtile/etc/skel/.config/xfce4/helpers.rc @@ -0,0 +1 @@ +TerminalEmulator=foot diff --git a/files/system/qtile/usr/bin/startqtile b/files/system/qtile/usr/bin/startqtile new file mode 100755 index 00000000..45507107 --- /dev/null +++ b/files/system/qtile/usr/bin/startqtile @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +# Tell this script to exit if there are any errors. +# You should have this in every custom script, to ensure that your completed +# builds actually ran successfully without any errors! +set -oue pipefail + + +qtile_conf="$HOME/.config/qtile/config.py" + +if [ -f "$qtile_conf" ]; then + qtile start -b wayland +else + XDG_CONFIG_HOME=/usr/etc/ qtile start -b wayland +fi diff --git a/files/system/qtile/usr/etc/qtile/config.py b/files/system/qtile/usr/etc/qtile/config.py new file mode 100644 index 00000000..77cd5e34 --- /dev/null +++ b/files/system/qtile/usr/etc/qtile/config.py @@ -0,0 +1,227 @@ +# Copyright (c) 2010 Aldo Cortesi +# Copyright (c) 2010, 2014 dequis +# Copyright (c) 2012 Randall Ma +# Copyright (c) 2012-2014 Tycho Andersen +# Copyright (c) 2012 Craig Barnes +# Copyright (c) 2013 horsik +# Copyright (c) 2013 Tao Sauvage +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +from libqtile import bar, layout, qtile, widget +from libqtile.config import Click, Drag, Group, Key, Match, Screen +from libqtile.lazy import lazy +from libqtile.utils import guess_terminal + +mod = "mod4" +terminal = guess_terminal() + +keys = [ + # A list of available commands that can be bound to keys can be found + # at https://docs.qtile.org/en/latest/manual/config/lazy.html + # Switch between windows + Key([mod], "h", lazy.layout.left(), desc="Move focus to left"), + Key([mod], "l", lazy.layout.right(), desc="Move focus to right"), + Key([mod], "j", lazy.layout.down(), desc="Move focus down"), + Key([mod], "k", lazy.layout.up(), desc="Move focus up"), + Key([mod], "space", lazy.layout.next(), desc="Move window focus to other window"), + # Move windows between left/right columns or move up/down in current stack. + # Moving out of range in Columns layout will create new column. + Key([mod, "shift"], "h", lazy.layout.shuffle_left(), desc="Move window to the left"), + Key([mod, "shift"], "l", lazy.layout.shuffle_right(), desc="Move window to the right"), + Key([mod, "shift"], "j", lazy.layout.shuffle_down(), desc="Move window down"), + Key([mod, "shift"], "k", lazy.layout.shuffle_up(), desc="Move window up"), + # Grow windows. If current window is on the edge of screen and direction + # will be to screen edge - window would shrink. + Key([mod, "control"], "h", lazy.layout.grow_left(), desc="Grow window to the left"), + Key([mod, "control"], "l", lazy.layout.grow_right(), desc="Grow window to the right"), + Key([mod, "control"], "j", lazy.layout.grow_down(), desc="Grow window down"), + Key([mod, "control"], "k", lazy.layout.grow_up(), desc="Grow window up"), + Key([mod], "n", lazy.layout.normalize(), desc="Reset all window sizes"), + # Toggle between split and unsplit sides of stack. + # Split = all windows displayed + # Unsplit = 1 window displayed, like Max layout, but still with + # multiple stack panes + Key( + [mod, "shift"], + "Return", + lazy.layout.toggle_split(), + desc="Toggle between split and unsplit sides of stack", + ), + Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"), + # Toggle between different layouts as defined below + Key([mod], "Tab", lazy.next_layout(), desc="Toggle between layouts"), + Key([mod], "w", lazy.window.kill(), desc="Kill focused window"), + Key( + [mod], + "f", + lazy.window.toggle_fullscreen(), + desc="Toggle fullscreen on the focused window", + ), + Key([mod], "t", lazy.window.toggle_floating(), desc="Toggle floating on the focused window"), + Key([mod, "control"], "r", lazy.reload_config(), desc="Reload the config"), + Key([mod, "control"], "q", lazy.shutdown(), desc="Shutdown Qtile"), + Key([mod], "r", lazy.spawncmd(), desc="Spawn a command using a prompt widget"), +] + +# Add key bindings to switch VTs in Wayland. +# We can't check qtile.core.name in default config as it is loaded before qtile is started +# We therefore defer the check until the key binding is run by using .when(func=...) +for vt in range(1, 8): + keys.append( + Key( + ["control", "mod1"], + f"f{vt}", + lazy.core.change_vt(vt).when(func=lambda: qtile.core.name == "wayland"), + desc=f"Switch to VT{vt}", + ) + ) + + +groups = [Group(i) for i in "123456789"] + +for i in groups: + keys.extend( + [ + # mod + group number = switch to group + Key( + [mod], + i.name, + lazy.group[i.name].toscreen(), + desc=f"Switch to group {i.name}", + ), + # mod + shift + group number = switch to & move focused window to group + Key( + [mod, "shift"], + i.name, + lazy.window.togroup(i.name, switch_group=True), + desc=f"Switch to & move focused window to group {i.name}", + ), + # Or, use below if you prefer not to switch to that group. + # # mod + shift + group number = move focused window to group + # Key([mod, "shift"], i.name, lazy.window.togroup(i.name), + # desc="move focused window to group {}".format(i.name)), + ] + ) + +layouts = [ + layout.Columns(border_focus_stack=["#d75f5f", "#8f3d3d"], border_width=4), + layout.Max(), + # Try more layouts by unleashing below layouts. + # layout.Stack(num_stacks=2), + # layout.Bsp(), + # layout.Matrix(), + # layout.MonadTall(), + # layout.MonadWide(), + # layout.RatioTile(), + # layout.Tile(), + # layout.TreeTab(), + # layout.VerticalTile(), + # layout.Zoomy(), +] + +widget_defaults = dict( + font="sans", + fontsize=12, + padding=3, +) +extension_defaults = widget_defaults.copy() + +screens = [ + Screen( + bottom=bar.Bar( + [ + widget.CurrentLayout(), + widget.GroupBox(), + widget.Prompt(), + widget.WindowName(), + widget.Chord( + chords_colors={ + "launch": ("#ff0000", "#ffffff"), + }, + name_transform=lambda name: name.upper(), + ), + widget.TextBox("default config", name="default"), + widget.TextBox("Press <M-r> to spawn", foreground="#d75f5f"), + # NB Systray is incompatible with Wayland, consider using StatusNotifier instead + # widget.StatusNotifier(), + widget.Systray(), + widget.Clock(format="%Y-%m-%d %a %I:%M %p"), + widget.QuickExit(), + ], + 24, + # border_width=[2, 0, 2, 0], # Draw top and bottom borders + # border_color=["ff00ff", "000000", "ff00ff", "000000"] # Borders are magenta + ), + # You can uncomment this variable if you see that on X11 floating resize/moving is laggy + # By default we handle these events delayed to already improve performance, however your system might still be struggling + # This variable is set to None (no cap) by default, but you can set it to 60 to indicate that you limit it to 60 events per second + # x11_drag_polling_rate = 60, + ), +] + +# Drag floating layouts. +mouse = [ + Drag([mod], "Button1", lazy.window.set_position_floating(), start=lazy.window.get_position()), + Drag([mod], "Button3", lazy.window.set_size_floating(), start=lazy.window.get_size()), + Click([mod], "Button2", lazy.window.bring_to_front()), +] + +dgroups_key_binder = None +dgroups_app_rules = [] # type: list +follow_mouse_focus = True +bring_front_click = False +floats_kept_above = True +cursor_warp = False +floating_layout = layout.Floating( + float_rules=[ + # Run the utility of `xprop` to see the wm class and name of an X client. + *layout.Floating.default_float_rules, + Match(wm_class="confirmreset"), # gitk + Match(wm_class="makebranch"), # gitk + Match(wm_class="maketag"), # gitk + Match(wm_class="ssh-askpass"), # ssh-askpass + Match(title="branchdialog"), # gitk + Match(title="pinentry"), # GPG key password entry + ] +) +auto_fullscreen = True +focus_on_window_activation = "smart" +reconfigure_screens = True + +# If things like steam games want to auto-minimize themselves when losing +# focus, should we respect this or not? +auto_minimize = True + +# When using the Wayland backend, this can be used to configure input devices. +wl_input_rules = None + +# xcursor theme (string or None) and size (integer) for Wayland backend +wl_xcursor_theme = None +wl_xcursor_size = 24 + +# XXX: Gasp! We're lying here. In fact, nobody really uses or cares about this +# string besides java UI toolkits; you can see several discussions on the +# mailing lists, GitHub issues, and other WM documentation that suggest setting +# this string if your java app doesn't work correctly. We may as well just lie +# and say that we're a working one by default. +# +# We choose LG3D to maximize irony: it is a 3D non-reparenting WM written in +# java that happens to be on java's whitelist. +wmname = "LG3D" diff --git a/files/system/qtile/usr/share/wayland-sessions/qtile.desktop b/files/system/qtile/usr/share/wayland-sessions/qtile.desktop new file mode 100644 index 00000000..1f740dc1 --- /dev/null +++ b/files/system/qtile/usr/share/wayland-sessions/qtile.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Qtile +Comment=A dynamic tiling wayland compositor +DesktopNames=qtile +Exec=/usr/bin/startqtile +Type=Application diff --git a/recipes/common/qtile-modules.yml b/recipes/common/qtile-modules.yml new file mode 100644 index 00000000..09aa5f89 --- /dev/null +++ b/recipes/common/qtile-modules.yml @@ -0,0 +1,16 @@ +modules: + - type: rpm-ostree + install: + - qtile + - xdg-desktop-portal-wlr + - xdg-desktop-portal-gtk + - foot + - swaylock + - swayidle + - python3-pywlroots + - python3-mypy + + - type: files + files: + - source: system/qtile + destination: / diff --git a/recipes/recipe-qtile-gdm.yml b/recipes/recipe-qtile-gdm.yml new file mode 100644 index 00000000..4d75659a --- /dev/null +++ b/recipes/recipe-qtile-gdm.yml @@ -0,0 +1,13 @@ +name: qtile-gdm + +description: ublue images for wayland compositors + +base-image: quay.io/fedora-ostree-desktops/base-atomic + +image-version: 41 + +modules: + - from-file: common/common-modules.yml + - from-file: common/gdm-modules.yml + - from-file: common/qtile-modules.yml + - from-file: common/final-modules.yml diff --git a/recipes/recipe-qtile-nvidia-gdm.yml b/recipes/recipe-qtile-nvidia-gdm.yml new file mode 100644 index 00000000..01bec552 --- /dev/null +++ b/recipes/recipe-qtile-nvidia-gdm.yml @@ -0,0 +1,14 @@ +name: qtile-nvidia-gdm + +description: ublue images for wayland compositors + +base-image: quay.io/fedora-ostree-desktops/base-atomic + +image-version: 41 + +modules: + - from-file: common/common-modules.yml + - from-file: common/nvidia-modules.yml + - from-file: common/gdm-modules.yml + - from-file: common/qtile-modules.yml + - from-file: common/final-modules.yml diff --git a/recipes/recipe-qtile-nvidia-open-gdm.yml b/recipes/recipe-qtile-nvidia-open-gdm.yml new file mode 100644 index 00000000..3a599994 --- /dev/null +++ b/recipes/recipe-qtile-nvidia-open-gdm.yml @@ -0,0 +1,14 @@ +name: qtile-nvidia-open-gdm + +description: ublue images for wayland compositors + +base-image: quay.io/fedora-ostree-desktops/base-atomic + +image-version: 41 + +modules: + - from-file: common/common-modules.yml + - from-file: common/nvidia-open-modules.yml + - from-file: common/gdm-modules.yml + - from-file: common/qtile-modules.yml + - from-file: common/final-modules.yml diff --git a/recipes/recipe-qtile-nvidia-open.yml b/recipes/recipe-qtile-nvidia-open.yml new file mode 100644 index 00000000..497a8c50 --- /dev/null +++ b/recipes/recipe-qtile-nvidia-open.yml @@ -0,0 +1,14 @@ +name: qtile-nvidia-open + +description: ublue images for wayland compositors + +base-image: quay.io/fedora-ostree-desktops/base-atomic + +image-version: 41 + +modules: + - from-file: common/sddm-modules.yml + - from-file: common/common-modules.yml + - from-file: common/nvidia-open-modules.yml + - from-file: common/qtile-modules.yml + - from-file: common/final-modules.yml diff --git a/recipes/recipe-qtile-nvidia.yml b/recipes/recipe-qtile-nvidia.yml new file mode 100644 index 00000000..f60a3ed4 --- /dev/null +++ b/recipes/recipe-qtile-nvidia.yml @@ -0,0 +1,14 @@ +name: qtile-nvidia + +description: ublue images for wayland compositors + +base-image: quay.io/fedora-ostree-desktops/base-atomic + +image-version: 41 + +modules: + - from-file: common/sddm-modules.yml + - from-file: common/common-modules.yml + - from-file: common/nvidia-modules.yml + - from-file: common/qtile-modules.yml + - from-file: common/final-modules.yml diff --git a/recipes/recipe-qtile.yml b/recipes/recipe-qtile.yml new file mode 100644 index 00000000..c48db28d --- /dev/null +++ b/recipes/recipe-qtile.yml @@ -0,0 +1,13 @@ +name: qtile + +description: ublue images for wayland compositors + +base-image: quay.io/fedora-ostree-desktops/base-atomic + +image-version: 41 + +modules: + - from-file: common/sddm-modules.yml + - from-file: common/common-modules.yml + - from-file: common/qtile-modules.yml + - from-file: common/final-modules.yml