mirror of
https://github.com/fscotto/infra.git
synced 2026-05-30 23:49:56 +00:00
Remove Sway from the playbook, keep Noctalia configs
Drop the profile_desktop_sway role (tasks, templates), all Sway dotfiles, desktop_sway_* vars, and wayland-sessions emptty path. Noctalia dotfiles are preserved and deployed via desktop_void_dotfiles on Void hosts; noctalia_bar_monitors/noctalia_screen_overrides kept as config vars. Only i3 remains as the Void desktop session. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,85 +0,0 @@
|
||||
---
|
||||
- name: Ensure Sway config directories exist
|
||||
tags: [dotfiles, dotfiles:desktop, sway]
|
||||
ansible.builtin.file:
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: "0755"
|
||||
loop:
|
||||
- "{{ user_home }}/.config/sway"
|
||||
- "{{ user_home }}/.config/kanshi"
|
||||
when: "'sway' in (desktop_sessions_enabled | default([]))"
|
||||
|
||||
- name: Ensure Noctalia config directories exist
|
||||
tags: [dotfiles, dotfiles:desktop, sway, noctalia]
|
||||
ansible.builtin.file:
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: "0755"
|
||||
loop:
|
||||
- "{{ user_home }}/.config/noctalia"
|
||||
- "{{ user_home }}/.config/noctalia/plugins"
|
||||
- "{{ user_home }}/.local/share/noctalia-plugins"
|
||||
when: "'sway' in (desktop_sessions_enabled | default([]))"
|
||||
|
||||
- name: Install Sway emptty session entry
|
||||
tags: [packages, services, emptty, sway]
|
||||
ansible.builtin.template:
|
||||
src: Sway.desktop.j2
|
||||
dest: /etc/emptty/wayland-sessions/Sway.desktop
|
||||
owner: root
|
||||
group: root
|
||||
mode: "0644"
|
||||
when: "'sway' in (desktop_sessions_enabled | default([]))"
|
||||
|
||||
- name: Copy Sway desktop dotfiles
|
||||
tags: [dotfiles, dotfiles:desktop, sway]
|
||||
ansible.builtin.copy:
|
||||
src: "{{ playbook_dir }}/../dotfiles/desktop/{{ item.src }}"
|
||||
dest: "{{ user_home }}/{{ item.dest }}"
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: "{{ item.mode }}"
|
||||
loop: "{{ desktop_sway_dotfiles | default([]) }}"
|
||||
loop_control:
|
||||
label: "{{ item.dest }}"
|
||||
when: "'sway' in (desktop_sessions_enabled | default([]))"
|
||||
|
||||
- name: Render Sway shell config
|
||||
tags: [dotfiles, dotfiles:desktop, sway]
|
||||
ansible.builtin.template:
|
||||
src: shell.conf.j2
|
||||
dest: "{{ user_home }}/.config/sway/shell.conf"
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: "0644"
|
||||
when: "'sway' in (desktop_sessions_enabled | default([]))"
|
||||
|
||||
- name: Render Noctalia settings template
|
||||
tags: [dotfiles, dotfiles:desktop, sway, noctalia]
|
||||
ansible.builtin.template:
|
||||
src: noctalia-settings.json.j2
|
||||
dest: "{{ user_home }}/.config/noctalia/settings.json"
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: "0644"
|
||||
when: "'sway' in (desktop_sessions_enabled | default([]))"
|
||||
|
||||
- name: Manage Noctalia shell plugins
|
||||
tags: [dotfiles, dotfiles:desktop, sway, noctalia]
|
||||
ansible.builtin.include_tasks: noctalia.yml
|
||||
when: "'sway' in (desktop_sessions_enabled | default([]))"
|
||||
|
||||
- name: Copy shared Clipper settings
|
||||
tags: [dotfiles, dotfiles:desktop, sway, noctalia]
|
||||
ansible.builtin.copy:
|
||||
src: "{{ playbook_dir }}/../dotfiles/desktop/.config/noctalia/plugins/clipper/settings.json"
|
||||
dest: "{{ user_home }}/.config/noctalia/plugins/clipper/settings.json"
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: "0644"
|
||||
when: "'sway' in (desktop_sessions_enabled | default([]))"
|
||||
@@ -1,142 +0,0 @@
|
||||
---
|
||||
- name: Check whether official Clipper plugin directory exists
|
||||
ansible.builtin.stat:
|
||||
path: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper"
|
||||
follow: false
|
||||
register: official_clipper_path_state
|
||||
|
||||
- name: Repair official Clipper plugin permissions before git update
|
||||
ansible.builtin.file:
|
||||
path: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper"
|
||||
state: directory
|
||||
recurse: true
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: "u=rwX,go=rX"
|
||||
when:
|
||||
- official_clipper_path_state.stat.exists
|
||||
- official_clipper_path_state.stat.isdir
|
||||
|
||||
- name: Remove untracked files from official Clipper subtree before git update
|
||||
ansible.builtin.command:
|
||||
cmd: git clean -fd -- clipper
|
||||
chdir: "{{ user_home }}/.local/share/noctalia-plugins/official"
|
||||
become_user: "{{ username }}"
|
||||
environment:
|
||||
HOME: "{{ user_home }}"
|
||||
register: official_clipper_clean
|
||||
changed_when: >-
|
||||
(official_clipper_clean.stdout | default('') | trim) != '' or
|
||||
(official_clipper_clean.stderr | default('') | trim) != ''
|
||||
when:
|
||||
- official_clipper_path_state.stat.exists
|
||||
- official_clipper_path_state.stat.isdir
|
||||
|
||||
- name: Bootstrap official Noctalia plugins checkout
|
||||
ansible.builtin.git:
|
||||
repo: https://github.com/noctalia-dev/noctalia-plugins.git
|
||||
dest: "{{ user_home }}/.local/share/noctalia-plugins/official"
|
||||
version: main
|
||||
update: true
|
||||
force: true
|
||||
become_user: "{{ username }}"
|
||||
environment:
|
||||
HOME: "{{ user_home }}"
|
||||
|
||||
- name: Check if Clipper is a real directory (needs migration to symlink)
|
||||
ansible.builtin.stat:
|
||||
path: "{{ user_home }}/.config/noctalia/plugins/clipper"
|
||||
follow: false
|
||||
register: clipper_path_state
|
||||
|
||||
- name: Check whether Clipper pinned data exists
|
||||
ansible.builtin.stat:
|
||||
path: "{{ user_home }}/.config/noctalia/plugins/clipper/pinned.json"
|
||||
register: clipper_pinned_state
|
||||
when:
|
||||
- clipper_path_state.stat.exists
|
||||
- clipper_path_state.stat.isdir
|
||||
- not (clipper_path_state.stat.islnk | default(false))
|
||||
|
||||
- name: Preserve Clipper pinned data before migration
|
||||
ansible.builtin.copy:
|
||||
src: "{{ user_home }}/.config/noctalia/plugins/clipper/pinned.json"
|
||||
dest: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper/pinned.json"
|
||||
remote_src: true
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: "0644"
|
||||
become_user: "{{ username }}"
|
||||
environment:
|
||||
HOME: "{{ user_home }}"
|
||||
when:
|
||||
- clipper_pinned_state is defined and clipper_pinned_state.stat is defined and clipper_pinned_state.stat.exists
|
||||
|
||||
- name: Check whether Clipper notecards directory exists
|
||||
ansible.builtin.stat:
|
||||
path: "{{ user_home }}/.config/noctalia/plugins/clipper/notecards"
|
||||
register: clipper_notecards_state
|
||||
when:
|
||||
- clipper_path_state.stat.exists
|
||||
- clipper_path_state.stat.isdir
|
||||
- not (clipper_path_state.stat.islnk | default(false))
|
||||
|
||||
- name: Preserve Clipper notecards before migration
|
||||
ansible.builtin.copy:
|
||||
src: "{{ user_home }}/.config/noctalia/plugins/clipper/notecards/"
|
||||
dest: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper/notecards/"
|
||||
remote_src: true
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: preserve
|
||||
become_user: "{{ username }}"
|
||||
environment:
|
||||
HOME: "{{ user_home }}"
|
||||
when:
|
||||
- clipper_notecards_state is defined and clipper_notecards_state.stat is defined and clipper_notecards_state.stat.exists and clipper_notecards_state.stat.isdir
|
||||
|
||||
- name: Remove old Clipper directory (migration to symlink)
|
||||
ansible.builtin.file:
|
||||
path: "{{ user_home }}/.config/noctalia/plugins/clipper"
|
||||
state: absent
|
||||
when:
|
||||
- clipper_path_state.stat.exists
|
||||
- clipper_path_state.stat.isdir
|
||||
- not (clipper_path_state.stat.islnk | default(false))
|
||||
|
||||
- name: Create Clipper symlink to official plugin
|
||||
ansible.builtin.file:
|
||||
src: "{{ user_home }}/.local/share/noctalia-plugins/official/clipper"
|
||||
dest: "{{ user_home }}/.config/noctalia/plugins/clipper"
|
||||
state: link
|
||||
force: true
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
|
||||
- name: Check if usb-drive-manager is a real directory (needs migration to symlink)
|
||||
ansible.builtin.stat:
|
||||
path: "{{ user_home }}/.config/noctalia/plugins/usb-drive-manager"
|
||||
follow: false
|
||||
register: usb_drive_manager_path_state
|
||||
|
||||
- name: Remove old usb-drive-manager directory (migration to symlink)
|
||||
ansible.builtin.file:
|
||||
path: "{{ user_home }}/.config/noctalia/plugins/usb-drive-manager"
|
||||
state: absent
|
||||
when:
|
||||
- usb_drive_manager_path_state.stat.exists
|
||||
- usb_drive_manager_path_state.stat.isdir
|
||||
- not (usb_drive_manager_path_state.stat.islnk | default(false))
|
||||
|
||||
- name: Link official Noctalia plugins
|
||||
ansible.builtin.file:
|
||||
src: "{{ user_home }}/.local/share/noctalia-plugins/official/{{ item }}"
|
||||
dest: "{{ user_home }}/.config/noctalia/plugins/{{ item }}"
|
||||
state: link
|
||||
force: true
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
loop:
|
||||
- polkit-agent
|
||||
- screenshot
|
||||
- usb-drive-manager
|
||||
Reference in New Issue
Block a user