From 1ca280b6016f8f762411a44f53c44981bb9246c5 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 22 Jul 2024 16:53:31 +0200 Subject: .. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- python@australis | 1 + python@borealis | 1 + python@east | 1 + python@hades | 1 + python@heaven | 1 + python@hyperion | 1 + python@miniaurora | 1 + python@nadir | 1 + python@north | 1 + python@selene | 1 + python@south | 1 + python@west | 1 + xorg-xrandr/resolution-changed | 14 +++++++++++--- xorg-xrandr/setres/__main__.py.gpp | 10 ++++++++++ xpybar/config/xmonad-monitor.gpp | 4 +++- 15 files changed, 36 insertions(+), 4 deletions(-) create mode 120000 python@australis create mode 120000 python@borealis create mode 120000 python@east create mode 120000 python@hades create mode 120000 python@heaven create mode 120000 python@hyperion create mode 120000 python@miniaurora create mode 120000 python@nadir create mode 120000 python@north create mode 120000 python@selene create mode 120000 python@south create mode 120000 python@west diff --git a/python@australis b/python@australis new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@australis @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@borealis b/python@borealis new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@borealis @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@east b/python@east new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@east @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@hades b/python@hades new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@hades @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@heaven b/python@heaven new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@heaven @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@hyperion b/python@hyperion new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@hyperion @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@miniaurora b/python@miniaurora new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@miniaurora @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@nadir b/python@nadir new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@nadir @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@north b/python@north new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@north @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@selene b/python@selene new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@selene @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@south b/python@south new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@south @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/python@west b/python@west new file mode 120000 index 0000000..ffded53 --- /dev/null +++ b/python@west @@ -0,0 +1 @@ +python@zenith \ No newline at end of file diff --git a/xorg-xrandr/resolution-changed b/xorg-xrandr/resolution-changed index e1457ce..4e8856f 100755 --- a/xorg-xrandr/resolution-changed +++ b/xorg-xrandr/resolution-changed @@ -1,15 +1,23 @@ #!/bin/dash reset_wallpaper_twice=0 +hostname="$(hostname | tr 'A-Z' 'a-z')" -if ! test "$(hostname | tr '[A-Z]' '[a-z]')" = zenith; then +if ! test "${hostname}" = zenith; then ## TODO how about the other east,north,hades,hyperion? # Reset rat size in case DPI change modified scaling xsetroot -cursor_name left_ptr || : # Reset rat speed in case DPI changed if test "${DESKTOP_SESSION}" = xmonad && test ! "${NO_MATE}" = y; then - msd=/usr/lib/mate-settings-daemon/mate-settings-daemon - if ! test -x "$msd"; then + if test -x /usr/lib/mate-settings-daemon/mate-settings-daemon; then + msd=/usr/lib/mate-settings-daemon/mate-settings-daemon + elif test -x /usr/bin/mate-settings-daemon; then + msd=/usr/bin/mate-settings-daemon + elif test -x /usr/libexec/mate-settings-daemon; then + msd=/usr/libexec/mate-settings-daemon + elif test -x /usr/libexec/mate-settings-daemon/mate-settings-daemon; then + msd=/usr/libexec/mate-settings-daemon/mate-settings-daemon + else msd=mate-settings-daemon fi (exec $msd --replace &) || : diff --git a/xorg-xrandr/setres/__main__.py.gpp b/xorg-xrandr/setres/__main__.py.gpp index 3a79328..b25f9d6 100755 --- a/xorg-xrandr/setres/__main__.py.gpp +++ b/xorg-xrandr/setres/__main__.py.gpp @@ -60,6 +60,16 @@ elif hostname == 'hades': embed.want_mode = '1920x1280' +elif hostname == 'north': + prime = None + sec = None + embed = screen['eDP1'] + + prime_alt = None + sec_alt = None + + embed.want_mode = '1920x1080' + %%>hostname="$(hostname | tr '[A-Z]' '[a-z]')" %%>file="${HOME}/.dotfiles/.private/setres/${hostname}" %%>if test -r "${file}"; then diff --git a/xpybar/config/xmonad-monitor.gpp b/xpybar/config/xmonad-monitor.gpp index df42701..92843bb 100644 --- a/xpybar/config/xmonad-monitor.gpp +++ b/xpybar/config/xmonad-monitor.gpp @@ -89,6 +89,8 @@ with open('/proc/cpuinfo', 'r') as f: isvm = [line.replace('\n', ' ').replace('\t', ' ').split(':') for line in isvm if line] isvm = any('hypervisor' in ':'.join(line[1:]).split(' ') for line in isvm if line[0].strip().startswith('flags')) card1 = 'Ensoniq AudioPCI' if isvm else 'HDA Intel PCH' +%%>elif test $hostname = hades; then +card1 = 'HDA Intel PCH' %%>else card1 = 'HD-Audio Generic' %%>fi @@ -194,7 +196,7 @@ functions = [ [ myxmonad #, myii , None , MyStat (lambda f : Clocked(f, 10)) -%%>if test ! "$hostname" = zenith; then +%%>if test ! "$hostname" = zenith && test ! "$hostname" = north; then ## TODO how about east and hyperion? , MyCGNegative() %%>fi , MyBrilliance(None) -- cgit v1.2.3-70-g09d2