Use Hyprland instead of sway #1

Merged
Bluemedia merged 15 commits from hyprland into master 2024-06-01 01:39:10 +02:00
5 changed files with 18 additions and 17 deletions
Showing only changes of commit 28a08ec28e - Show all commits

View file

@ -1,5 +1,3 @@
mobile_platform: false
monitors: monitors:
- desc: "LG Electronics LG ULTRAGEAR 311NTZN8J917" - desc: "LG Electronics LG ULTRAGEAR 311NTZN8J917"
output: "DP-1" output: "DP-1"

View file

@ -1,6 +1,6 @@
# Monitor configuration (see https://wiki.hyprland.org/Configuring/Monitors/) # Monitor configuration (see https://wiki.hyprland.org/Configuring/Monitors/)
{% for monitor in hostvars[ansible_hostname]['monitors'] -%} {% for monitor in hostvars[ansible_hostname]['monitors'] %}
monitor=desc:{{ monitor['desc'] }}, {{ monitor['resolution'] }}, {{ monitor['position'] }}, 1 monitor=desc:{{ monitor['desc'] }}, {{ monitor['resolution'] }}, {{ monitor['position'] | default('auto') }}, 1
{% endfor %} {% endfor %}
# Programs to use # Programs to use
@ -99,8 +99,9 @@ windowrulev2 = float,title:^(Application Finder)$
windowrulev2 = size 500 500,title:^(Application Finder)$ windowrulev2 = size 500 500,title:^(Application Finder)$
# Workspace rules # Workspace rules
{% for workspace in hostvars[ansible_hostname]['workspaces'] -%} {% for workspace in hostvars[ansible_hostname]['workspaces'] %}
workspace = {{ workspace['id'] }}{% if 'monitor' in workspace %}, monitor:desc:{{ workspace['monitor'] }}{% endif %}{% if 'default' in workspace %}, default:{{ workspace['default'] }}{% endif %}{% if 'layoutopt_orientation' in workspace %}, layoutopt:orientation:{{ workspace['layoutopt_orientation'] }}{% endif %}{% if 'on_created_empty' in workspace %}, on-created-empty:{{ workspace['on_created_empty'] }}{% endif %} workspace = {{ workspace['id'] }}{% if 'monitor' in workspace %}, monitor:desc:{{ workspace['monitor'] }}{% endif %}{% if 'default' in workspace %}, default:{{ workspace['default'] }}{% endif %}{% if 'layoutopt_orientation' in workspace %}, layoutopt:orientation:{{ workspace['layoutopt_orientation'] }}{% endif %}{% if 'on_created_empty' in workspace %}, on-created-empty:{{ workspace['on_created_empty'] }}{% endif %}
{% endfor %} {% endfor %}
# Execute apps at launch # Execute apps at launch
@ -109,7 +110,7 @@ exec-once = waybar & ~/.local/bin/hyprhelpr background & ~/.local/bin/hyprhelpr
{% if 'nextcloud' in role_names %} {% if 'nextcloud' in role_names %}
exec-once = nextcloud --background exec-once = nextcloud --background
{% endif %} {% endif %}
{% for autostart in hostvars[ansible_hostname]['autostart'] -%} {% for autostart in hostvars[ansible_hostname]['autostart'] %}
exec-once = {% if 'workspace' in autostart %}[workspace {{ autostart['workspace'] }}] {% endif %}{{ autostart['command'] }} exec-once = {% if 'workspace' in autostart %}[workspace {{ autostart['workspace'] }}] {% endif %}{{ autostart['command'] }}
{% endfor %} {% endfor %}

View file

@ -1,7 +1,7 @@
{ {
"modules-left": ["hyprland/workspaces"], "modules-left": ["hyprland/workspaces"],
"modules-center": ["clock"], "modules-center": ["clock"],
"modules-right": ["cpu", "memory", "network", "pulseaudio", {% if isNotebook | bool %}"battery", {% endif %}"custom/power"], "modules-right": ["cpu", "memory", "network", "pulseaudio", {% if (hostvars[ansible_hostname]['mobile_platform'] | default('false')) | bool %}"battery", {% endif %}"custom/power"],
"hyprland/workspaces": {}, "hyprland/workspaces": {},
"clock": { "clock": {
"format": " {:%H:%M %d.%m.}", "format": " {:%H:%M %d.%m.}",
@ -27,12 +27,12 @@
"format-icons": ["", "", ""], "format-icons": ["", "", ""],
"reverse-scrolling": true, "reverse-scrolling": true,
"on-click": "swaymsg exec amixer -q set Master toggle" "on-click": "swaymsg exec amixer -q set Master toggle"
{% if (hostvars[ansible_hostname]['mobile_platform'] | default('false')) | bool %}
}, },
{% if hostvars[ansible_hostname]['mobile_platform'] | bool %}
"battery": { "battery": {
"format": "{icon} {capacity}%", "format": "{icon} {capacity}%",
"format-charging": " {capacity}%", "format-charging": " {capacity}%",
"format-icons": ["", "", "", "", ""] "format-icons": ["", "", "", "", ""]
}
{% endif %} {% endif %}
}
} }

View file

@ -4,9 +4,10 @@ set -eu
background() { background() {
swaybg \ swaybg \
{% for monitor in hostvars[ansible_hostname]['monitors'] -%} {% for monitor in hostvars[ansible_hostname]['monitors'] %}
-o "{{ monitor['desc'] }}" -i ~/.config/background/{{ monitor['background']['file'] }} -m {{ monitor['background']['mode'] }} {%- if not loop.last %}\{% endif %} -o "{{ monitor['desc'] }}" -i ~/.config/background/{{ monitor['background']['file'] }} -m {{ monitor['background']['mode'] }} {%- if not loop.last %} \{% endif %}
{% endfor %}
{% endfor %}
} }
idle() { idle() {
@ -23,9 +24,10 @@ lock() {
exit 1 exit 1
else else
swaylock -f -e -s fill --indicator-radius 150 \ swaylock -f -e -s fill --indicator-radius 150 \
{% for monitor in hostvars[ansible_hostname]['monitors'] -%} {% for monitor in hostvars[ansible_hostname]['monitors'] %}
-i {{ monitor['output'] }}:~/.config/background/lock-{{ monitor['background']['file'] }} {%- if not loop.last %}\{% endif %} -i {{ monitor['output'] }}:~/.config/background/lock-{{ monitor['background']['file'] }} {%- if not loop.last %} \{% endif %}
{% endfor %}
{% endfor %}
fi fi
} }

View file

@ -15,8 +15,8 @@ export GPG_TTY=$(tty)
# Autostart Hyprland at login # Autostart Hyprland at login
if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
{% if hostvars[ansible_hostname]['virtual_machine'] | bool %} {% if (hostvars[ansible_hostname]['virtual_machine'] | default('false')) | bool %}
export WLR_NO_HARDWARE_CURSORS=1 export WLR_NO_HARDWARE_CURSORS=1
{% endif %} {% endif %}
exec Hyprland exec Hyprland
fi fi