diff --git a/host_vars/kronos b/host_vars/kronos index a09bb13..6b6f080 100644 --- a/host_vars/kronos +++ b/host_vars/kronos @@ -1,5 +1,3 @@ -mobile_platform: false - monitors: - desc: "LG Electronics LG ULTRAGEAR 311NTZN8J917" output: "DP-1" diff --git a/roles/desktop-environment/files/20-tum.conf b/roles/desktop-environment/files/20-tum.conf deleted file mode 100644 index 5ab627d..0000000 --- a/roles/desktop-environment/files/20-tum.conf +++ /dev/null @@ -1 +0,0 @@ -APT::Default-Release "/^testing(|-security|-updates)$/"; diff --git a/roles/desktop-environment/tasks/hyprland.yml b/roles/desktop-environment/tasks/hyprland.yml index d608b3d..dc093d6 100644 --- a/roles/desktop-environment/tasks/hyprland.yml +++ b/roles/desktop-environment/tasks/hyprland.yml @@ -1,16 +1,3 @@ -- name: Set apt default-release to "testing" - become: yes - copy: - src: "{{ role_path }}/files/20-tum.conf" - dest: "/etc/apt/apt.conf.d/20-tum.conf" - -- name: Add unstable repository - become: yes - ansible.builtin.apt_repository: - repo: deb http://deb.debian.org/debian unstable main contrib non-free-firmware - state: present - update_cache: true - - name: Install build dependencies (1/2) become: yes apt: @@ -38,8 +25,8 @@ - libpango1.0-dev - libtomlplusplus-dev - uuid-dev - - libxcb-errors-dev # xdg-desktop-portal-hyprland + #- qtbase5-dev - qt6-base-dev - libspa-0.2-dev - libpipewire-0.3-dev @@ -52,26 +39,17 @@ owner: "{{ ansible_user_id }}" group: "{{ ansible_user_id }}" loop: - - "hyprutils" - "hyprwayland-scanner" - "Hyprland" - "hyprlang" - "hyprcursor" - "xdg-desktop-portal-hyprland" -- name: Checkout hyprutils repo - ansible.builtin.git: - repo: 'https://github.com/hyprwm/hyprutils.git' - dest: /usr/local/src/hyprutils - version: v0.1.4 - force: true - recursive: true - - name: Checkout hyprwayland-scanner repo ansible.builtin.git: repo: 'https://github.com/hyprwm/hyprwayland-scanner.git' dest: /usr/local/src/hyprwayland-scanner - version: v0.3.10 + version: v0.3.4 force: true recursive: true @@ -79,7 +57,7 @@ ansible.builtin.git: repo: 'https://github.com/hyprwm/Hyprland.git' dest: /usr/local/src/Hyprland - version: v0.41.1 + version: v0.40.0 force: true recursive: true @@ -87,7 +65,7 @@ ansible.builtin.git: repo: 'https://github.com/hyprwm/hyprlang.git' dest: /usr/local/src/hyprlang - version: v0.5.2 + version: v0.5.1 force: true recursive: true @@ -95,7 +73,7 @@ ansible.builtin.git: repo: 'https://github.com/hyprwm/hyprcursor.git' dest: /usr/local/src/hyprcursor - version: v0.1.9 + version: v0.1.8 force: true recursive: true @@ -107,20 +85,6 @@ force: true recursive: true -- name: Build hyprutils - ansible.builtin.command: - cmd: "{{ item }}" - chdir: /usr/local/src/hyprutils - loop: - - "cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build" - - "cmake --build ./build --config Release --target all" - -- name: Install hyprutils - become: yes - ansible.builtin.command: - cmd: "cmake --install build" - chdir: /usr/local/src/hyprutils - - name: Build hyprwayland-scanner ansible.builtin.command: cmd: "{{ item }}" diff --git a/roles/desktop-environment/tasks/main.yml b/roles/desktop-environment/tasks/main.yml index 4251371..99e828b 100644 --- a/roles/desktop-environment/tasks/main.yml +++ b/roles/desktop-environment/tasks/main.yml @@ -8,4 +8,4 @@ import_tasks: flatpak.yml - name: Include configuration steps - import_tasks: config.yml + import_tasks: config.yml \ No newline at end of file diff --git a/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 b/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 index 03e1726..44cefc5 100644 --- a/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 +++ b/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 @@ -1,7 +1,6 @@ # Monitor configuration (see https://wiki.hyprland.org/Configuring/Monitors/) {% for monitor in hostvars[ansible_hostname]['monitors'] %} -monitor=desc:{{ monitor['desc'] }}, {{ monitor['resolution'] }}, {{ monitor['position'] | default('auto') }}, 1{% if 'transform' in monitor %}, transform, {{ monitor['transform'] }}{% endif %} - +monitor=desc:{{ monitor['desc'] }}, {{ monitor['resolution'] }}, {{ monitor['position'] | default('auto') }}, 1 {% endfor %} # Programs to use