mirror of
https://github.com/fscotto/infra.git
synced 2026-05-30 23:49:56 +00:00
Remove Arch/nymph path, restore nymph as Void desktop
Delete all Arch-specific files (packages_arch role, profile_desktop_gnome role, arch.yml group_vars, nymph.yml host_vars, arch dotfiles). Revert nymph to the void group in inventory, remove the arch play from site.yml, and restore profile_desktop_host/tasks/nymph.yml to its pre-Arch state (GRUB + NVIDIA + prime-run). Preserve Void improvements introduced alongside Arch work (desktop_void_dotfiles, desktop_void_source_tools, profile_desktop_i3 dir additions, void-specific conditions). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -272,37 +272,10 @@
|
||||
{{
|
||||
(desktop_common_dotfiles | default([]))
|
||||
+ ((desktop_void_dotfiles | default([])) if 'void' in group_names else [])
|
||||
+ ((desktop_arch_dotfiles | default([])) if 'arch' in group_names else [])
|
||||
}}
|
||||
loop_control:
|
||||
label: "{{ item.dest }}"
|
||||
|
||||
- name: Ensure systemd user enablement directory exists
|
||||
tags: [services, dotfiles, dotfiles:desktop]
|
||||
ansible.builtin.file:
|
||||
path: "{{ user_home }}/.config/systemd/user/default.target.wants"
|
||||
state: directory
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
mode: "0755"
|
||||
when:
|
||||
- "'arch' in group_names"
|
||||
- (desktop_systemd_user_services | default([])) | length > 0
|
||||
|
||||
- name: Enable desktop systemd user services
|
||||
tags: [services, dotfiles, dotfiles:desktop]
|
||||
ansible.builtin.file:
|
||||
src: "{{ user_home }}/.config/systemd/user/{{ item }}"
|
||||
dest: "{{ user_home }}/.config/systemd/user/default.target.wants/{{ item }}"
|
||||
state: link
|
||||
owner: "{{ username }}"
|
||||
group: "{{ user_group }}"
|
||||
force: true
|
||||
loop: "{{ desktop_systemd_user_services | default([]) }}"
|
||||
loop_control:
|
||||
label: "{{ item }}"
|
||||
when: "'arch' in group_names"
|
||||
|
||||
- name: Copy Emacs desktop dotfiles
|
||||
tags: [dotfiles, dotfiles:desktop, emacs]
|
||||
ansible.builtin.copy:
|
||||
@@ -499,27 +472,14 @@
|
||||
path: "{{ user_home }}/.cargo/bin/rustc"
|
||||
register: rustup_initialized
|
||||
|
||||
- name: Run rustup-init with cargo env sourced (Void)
|
||||
- name: Run rustup-init with cargo env sourced
|
||||
ansible.builtin.shell:
|
||||
cmd: . ~/.cargo/env && rustup-init -y --no-modify-path
|
||||
creates: "{{ user_home }}/.cargo/bin/rustc"
|
||||
become_user: "{{ username }}"
|
||||
environment:
|
||||
HOME: "{{ user_home }}"
|
||||
when:
|
||||
- not rustup_initialized.stat.exists
|
||||
- "'void' in group_names"
|
||||
|
||||
- name: Install Rust stable toolchain via rustup (Arch)
|
||||
ansible.builtin.command:
|
||||
cmd: rustup toolchain install stable
|
||||
creates: "{{ user_home }}/.cargo/bin/rustc"
|
||||
become_user: "{{ username }}"
|
||||
environment:
|
||||
HOME: "{{ user_home }}"
|
||||
when:
|
||||
- not rustup_initialized.stat.exists
|
||||
- "'arch' in group_names"
|
||||
when: not rustup_initialized.stat.exists
|
||||
|
||||
- name: Ensure cargo env is sourced in shell profile
|
||||
ansible.builtin.lineinfile:
|
||||
|
||||
Reference in New Issue
Block a user