diff --git a/packages/tos-desktop-wm/PKGBUILD b/packages/tos-desktop-wm/PKGBUILD index bfab6a5..6fdebdd 100644 --- a/packages/tos-desktop-wm/PKGBUILD +++ b/packages/tos-desktop-wm/PKGBUILD @@ -4,11 +4,11 @@ arch=('any') url='https://git.tipragot.fr/tipragot/tos' license=('MIT') -pkgver='0.1.2' +pkgver='0.1.3' pkgrel='1' depends=('tos-desktop-core' 'tos-desktop-terminal' 'lightdm' 'qtile') source=('lightdm.conf' 'config.py') -cksums=('3328682318' '1855556536') +cksums=('SKIP' 'SKIP') package() { mkdir -p ${pkgdir}/etc/lightdm/lightdm.conf.d diff --git a/packages/tos-desktop-wm/config.py b/packages/tos-desktop-wm/config.py index 0fa7f9e..389b0f0 100644 --- a/packages/tos-desktop-wm/config.py +++ b/packages/tos-desktop-wm/config.py @@ -1,33 +1,6 @@ -# 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, widget -from libqtile.config import Click, Drag, Group, Key, Match, Screen +from libqtile.config import Click, Drag, Group, Key, Screen from libqtile.lazy import lazy -from libqtile.utils import guess_terminal +from libqtile import layout # ============== # # === GROUPS === # @@ -43,6 +16,7 @@ groups = [Group(name) for name in group_names] MOD = "mod4" SHIFT = "shift" CTRL = "control" +ALT = "mod1" keys = [ # Actions @@ -56,20 +30,20 @@ keys = [ Key([MOD], "i", lazy.layout.up(), desc="Move focus up"), # Move windows - Key([MOD, SHIFT], "n", lazy.layout.shuffle_left(), desc="Move window left"), - Key([MOD, SHIFT], "o", lazy.layout.shuffle_right(), desc="Move window right"), - Key([MOD, SHIFT], "e", lazy.layout.shuffle_down(), desc="Move window down"), - Key([MOD, SHIFT], "i", lazy.layout.shuffle_up(), desc="Move window up"), + Key([CTRL, MOD], "n", lazy.layout.shuffle_left(), desc="Move window left"), + Key([CTRL, MOD], "o", lazy.layout.shuffle_right(), desc="Move window right"), + Key([CTRL, MOD], "e", lazy.layout.shuffle_down(), desc="Move window down"), + Key([CTRL, MOD], "i", lazy.layout.shuffle_up(), desc="Move window up"), # Grow windows - Key([MOD, CTRL], "n", lazy.layout.grow_left(), desc="Grow window left"), - Key([MOD, CTRL], "o", lazy.layout.grow_right(), desc="Grow window right"), - Key([MOD, CTRL], "e", lazy.layout.grow_down(), desc="Grow window down"), - Key([MOD, CTRL], "i", lazy.layout.grow_up(), desc="Grow window up"), - Key([MOD, CTRL], "m", lazy.layout.normalize(), desc="Reset all window sizes"), + Key([MOD, ALT], "n", lazy.layout.grow_left(), desc="Grow window left"), + Key([MOD, ALT], "o", lazy.layout.grow_right(), desc="Grow window right"), + Key([MOD, ALT], "e", lazy.layout.grow_down(), desc="Grow window down"), + Key([MOD, ALT], "i", lazy.layout.grow_up(), desc="Grow window up"), + Key([MOD, ALT], "m", lazy.layout.normalize(), desc="Reset all window sizes"), # Launch applications - Key([MOD], "Return", lazy.spawn("alacritty"), desc="Launch terminal"), + Key([MOD], "t", lazy.spawn("alacritty"), desc="Launch terminal"), ] # Group keys diff --git a/packages/tos-desktop-wm/lightdm.conf b/packages/tos-desktop-wm/lightdm.conf index ed47fe7..6550248 100644 --- a/packages/tos-desktop-wm/lightdm.conf +++ b/packages/tos-desktop-wm/lightdm.conf @@ -1,163 +1,4 @@ -# -# General configuration -# -# start-default-seat = True to always start one seat if none are defined in the configuration -# greeter-user = User to run greeter as -# minimum-display-number = Minimum display number to use for X servers -# minimum-vt = First VT to run displays on -# lock-memory = True to prevent memory from being paged to disk -# user-authority-in-system-dir = True if session authority should be in the system location -# guest-account-script = Script to be run to setup guest account -# logind-check-graphical = True to on start seats that are marked as graphical by logind -# log-directory = Directory to log information to -# run-directory = Directory to put running state in -# cache-directory = Directory to cache to -# sessions-directory = Directory to find sessions -# remote-sessions-directory = Directory to find remote sessions -# greeters-directory = Directory to find greeters -# backup-logs = True to move add a .old suffix to old log files when opening new ones -# dbus-service = True if LightDM provides a D-Bus service to control it -# -[LightDM] -#start-default-seat=true -#greeter-user=lightdm -#minimum-display-number=0 -#minimum-vt=7 -#lock-memory=true -#user-authority-in-system-dir=false -#guest-account-script=guest-account -#logind-check-graphical=true -#log-directory=/var/log/lightdm -#run-directory=/var/run/lightdm -#cache-directory=/var/cache/lightdm -#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions -#remote-sessions-directory=/usr/share/lightdm/remote-sessions -#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters -#backup-logs=true -#dbus-service=true - -# -# Seat configuration -# -# Seat configuration is matched against the seat name glob in the section, for example: -# [Seat:*] matches all seats and is applied first. -# [Seat:seat0] matches the seat named "seat0". -# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client". -# -# type = Seat type (local, xremote) -# pam-service = PAM service to use for login -# pam-autologin-service = PAM service to use for autologin -# pam-greeter-service = PAM service to use for greeters -# xserver-command = X server command to run (can also contain arguments e.g. X -special-option) -# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option) -# xserver-config = Config file to pass to X server -# xserver-layout = Layout to pass to X server -# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server -# xserver-share = True if the X server is shared for both greeter and session -# xserver-hostname = Hostname of X server (only for type=xremote) -# xserver-display-number = Display number of X server (only for type=xremote) -# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true) -# xdmcp-port = XDMCP UDP/IP port to communicate on -# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf) -# greeter-session = Session to load for greeter -# greeter-hide-users = True to hide the user list -# greeter-allow-guest = True if the greeter should show a guest login option -# greeter-show-manual-login = True if the greeter should offer a manual login option -# greeter-show-remote-login = True if the greeter should offer a remote login option -# user-session = Session to load for users -# allow-user-switching = True if allowed to switch users -# allow-guest = True if guest login is allowed -# guest-session = Session to load for guests (overrides user-session) -# session-wrapper = Wrapper script to run session with -# greeter-wrapper = Wrapper script to run greeter with -# guest-wrapper = Wrapper script to run guest sessions with -# display-setup-script = Script to run when starting a greeter session (runs as root) -# display-stopped-script = Script to run after stopping the display server (runs as root) -# greeter-setup-script = Script to run when starting a greeter (runs as root) -# session-setup-script = Script to run when starting a user session (runs as root) -# session-cleanup-script = Script to run when quitting a user session (runs as root) -# autologin-guest = True to log in as guest by default -# autologin-user = User to log in with by default (overrides autologin-guest) -# autologin-user-timeout = Number of seconds to wait before loading default user -# autologin-session = Session to load for automatic login (overrides user-session) -# autologin-in-background = True if autologin session should not be immediately activated -# exit-on-failure = True if the daemon should exit if this seat fails -# [Seat:*] -#type=local -#pam-service=lightdm -#pam-autologin-service=lightdm-autologin -#pam-greeter-service=lightdm-greeter -#xserver-command=X -#xmir-command=Xmir -#xserver-config= -#xserver-layout= -#xserver-allow-tcp=false -#xserver-share=true -#xserver-hostname= -#xserver-display-number= -#xdmcp-manager= -#xdmcp-port=177 -#xdmcp-key= -#greeter-session=example-gtk-gnome -#greeter-hide-users=false -#greeter-allow-guest=true -#greeter-show-manual-login=false -#greeter-show-remote-login=true -#user-session=default -#allow-user-switching=true -#allow-guest=true -#guest-session= -#session-wrapper=lightdm-session -#greeter-wrapper= -#guest-wrapper= -#display-setup-script= -#display-stopped-script= -#greeter-setup-script= -#session-setup-script= -#session-cleanup-script= -#autologin-guest=false autologin-user=me -#autologin-user-timeout=0 -#autologin-in-background=false autologin-session=qtile -exit-on-failure=true - -# -# XDMCP Server configuration -# -# enabled = True if XDMCP connections should be allowed -# port = UDP/IP port to listen for connections on -# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present) -# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf) -# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset) -# -# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn. Alternatively -# it can be a word and the first 7 characters are used as the key. -# -[XDMCPServer] -#enabled=false -#port=177 -#listen-address= -#key= -#hostname= - -# -# VNC Server configuration -# -# enabled = True if VNC connections should be allowed -# command = Command to run Xvnc server with -# port = TCP/IP port to listen for connections on -# listen-address = Host/address to listen for VNC connections (use all addresses if not present) -# width = Width of display to use -# height = Height of display to use -# depth = Color depth of display to use -# -[VNCServer] -#enabled=false -#command=Xvnc -#port=5900 -#listen-address= -#width=1024 -#height=768 -#depth=24 +exit-on-failure=true \ No newline at end of file diff --git a/repository/tos-desktop-wm-0.1.2-1-any.pkg.tar.zst b/repository/tos-desktop-wm-0.1.2-1-any.pkg.tar.zst deleted file mode 100644 index ca5c742..0000000 Binary files a/repository/tos-desktop-wm-0.1.2-1-any.pkg.tar.zst and /dev/null differ diff --git a/repository/tos-desktop-wm-0.1.3-1-any.pkg.tar.zst b/repository/tos-desktop-wm-0.1.3-1-any.pkg.tar.zst new file mode 100644 index 0000000..f14f297 Binary files /dev/null and b/repository/tos-desktop-wm-0.1.3-1-any.pkg.tar.zst differ diff --git a/repository/tos.db b/repository/tos.db index 452020a..76c4d66 100644 Binary files a/repository/tos.db and b/repository/tos.db differ diff --git a/repository/tos.files b/repository/tos.files index c872485..c9609ff 100644 Binary files a/repository/tos.files and b/repository/tos.files differ