diff --git a/tasks/workstation/linux/software/flatpaks.yml b/tasks/workstation/linux/software/flatpaks.yml index 57915af..252d77e 100644 --- a/tasks/workstation/linux/software/flatpaks.yml +++ b/tasks/workstation/linux/software/flatpaks.yml @@ -178,4 +178,5 @@ - vscode - code - '*libreoffice*' + - gimp state: absent diff --git a/tasks/workstation/linux/software/gnome.yml b/tasks/workstation/linux/software/gnome.yml index c1fadf0..f8215e7 100644 --- a/tasks/workstation/linux/software/gnome.yml +++ b/tasks/workstation/linux/software/gnome.yml @@ -12,18 +12,13 @@ - gnome - gdm3 state: present - when: gnome_install is defined and gnome_install.failed - -- name: Workstation | Linux | Software | GNOME | TEST - debug: - var: gnome_install - when: gnome_install is defined and gnome_install.failed + when: gnome_install is defined and gnome_install.failed is defined and gnome_install.failed - name: Workstation | Linux | Software | GNOME | Note Before Exiting debug: - msg: "You will probably need to run `dpkg-reconfigure gdm3` to ensure gdm3 is selected." - when: gnome_install is defined and gnome_install.failed + msg: "You will need to run `dpkg-reconfigure gdm3` to ensure gdm3 is selected." + when: gnome_install is defined and gnome_install.failed is defined and gnome_install.failed - name: Workstation | Linux | Software | GNOME | Exiting shell: exit 1 - when: gnome_install is defined and gnome_install.failed + when: gnome_install is defined and gnome_install.failed is defined and gnome_install.failed diff --git a/tasks/workstation/settings/gnome.yml b/tasks/workstation/settings/gnome.yml index cb81fac..4c23c30 100644 --- a/tasks/workstation/settings/gnome.yml +++ b/tasks/workstation/settings/gnome.yml @@ -21,9 +21,9 @@ - name: Workstation | Account Management | GNOME | Install Dependencies package: name: - - "{{ gnome_tweaks }}" - - "{{ dconf_editor }}" - - "{{ psutil }}" + - "{{ gnome_tweaks }}" + - "{{ dconf_editor }}" + - "{{ psutil }}" state: present @@ -47,12 +47,19 @@ force: no version: master become_user: ling - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed + +- name: Workstation | Account Management | GNOME | Dash To Dock | Install | Dependencies + package: + name: + - make + state: present + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed - name: Workstation | Account Management | GNOME | Dash To Dock | Install | Make shell: "cd ~/TRASH/dash-to-dock/; make; make install" become_user: ling - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed - name: Workstation | Account Management | GNOME | Dash To Dock | Read Enabled Extension Array dconf: @@ -60,12 +67,12 @@ state: read become_user: ling register: gnome_enabled_extensions - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed - name: Workstation | Account Management | GNOME | Dash To Dock | dconf Return Object debug: var: gnome_enabled_extensions - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed # https://ansible-docs.readthedocs.io/zh/stable-2.0/rst/playbooks_filters.html#filters-for-formatting-data @@ -73,42 +80,42 @@ set_fact: gnome_enabled_extensions: "{{ gnome_enabled_extensions.value | replace('@as ', '') }}" dash_to_dock_ext_comma: "" - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed - name: Workstation | Account Management | GNOME | Dash To Dock | After replace() debug: var: gnome_enabled_extensions - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed - name: Workstation | Account Management | GNOME | Dash To Dock | Variables 2 set_fact: dash_to_dock_ext_comma: ", " - when: dash_to_dock_exists.failed and gnome_enabled_extensions not in ("[]", [], "None") + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed and gnome_enabled_extensions not in ("[]", [], "None") - name: Workstation | Account Management | GNOME | Dash To Dock | Variables 3 set_fact: dash_to_dock_ext_name: "{{ dash_to_dock_ext_comma }}'dash-to-dock@micxgx.gmail.com']" - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed - name: Workstation | Account Management | GNOME | Dash To Dock | Variables 4 set_fact: gnome_enabled_extensions: "[]" - when: dash_to_dock_exists.failed and gnome_enabled_extensions == "None" + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed and gnome_enabled_extensions == "None" - name: Workstation | Account Management | GNOME | Dash To Dock | Print Value To Append With debug: var: dash_to_dock_ext_name - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed - name: Workstation | Account Management | GNOME | Dash To Dock | Print Value To Append To debug: var: gnome_enabled_extensions - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed - name: Workstation | Account Management | GNOME | Dash To Dock | Print Combined Value debug: msg: "{{ gnome_enabled_extensions | replace(']', dash_to_dock_ext_name) }}" - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed - name: Workstation | Account Management | GNOME | Dash To Dock | Enable dconf: @@ -116,7 +123,7 @@ value: "{{ gnome_enabled_extensions | replace(']', dash_to_dock_ext_name) }}" state: present become_user: ling - when: dash_to_dock_exists.failed + when: ansible_distribution not in ("Ubuntu") and dash_to_dock_exists.failed # Settings #