From b7a6fb23d12b52b6a6a3c7c9af828519b708946f Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Sun, 15 Sep 2019 12:24:55 +0000 Subject: [PATCH] desktop package installation now is defined in general roles --- tasks/desktop_apps.yaml | 21 +-------------- tasks/main.yaml | 3 +-- tasks/multimedia.yaml | 11 -------- tasks/xfce-customization.yaml | 21 +++++++++++++++ tasks/xfce.yaml | 51 ----------------------------------- 5 files changed, 23 insertions(+), 84 deletions(-) delete mode 100644 tasks/multimedia.yaml create mode 100644 tasks/xfce-customization.yaml delete mode 100644 tasks/xfce.yaml diff --git a/tasks/desktop_apps.yaml b/tasks/desktop_apps.yaml index 062c2e2..fffd388 100644 --- a/tasks/desktop_apps.yaml +++ b/tasks/desktop_apps.yaml @@ -1,29 +1,10 @@ --- - import_role: - name: desktop_apps - -- import_role: - name: libreoffice - -- import_role: - name: firefox + name: desktop - import_tasks: fotowall.yaml when: install_fotowall - import_tasks: cewe_fotobuch.yaml when: install_cewe_fotobuch - -- name: additional desktop apps - apt: - pkg: - - simple-scan - - gthumb - - krita - - krita-l10n - - gimp - - gimp-help-de - - audacity - - notify-osd - - catfish diff --git a/tasks/main.yaml b/tasks/main.yaml index 6e3c361..1fcabab 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -20,14 +20,13 @@ - import_tasks: clean.yaml -- import_tasks: xfce.yaml - import_role: name: screensaver - import_tasks: backgrounds.yaml - import_tasks: fonts.yaml - import_tasks: desktop_apps.yaml -- import_tasks: multimedia.yaml +- import_tasks: xfce-customization.yaml - import_tasks: media-access-bug.yaml diff --git a/tasks/multimedia.yaml b/tasks/multimedia.yaml deleted file mode 100644 index cc421dd..0000000 --- a/tasks/multimedia.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -- name: multimedia packages - apt: - pkg: - - vlc - - vlc-l10n - - libdvd-pkg - - libdvdread4 - - openshot - - openshot-doc diff --git a/tasks/xfce-customization.yaml b/tasks/xfce-customization.yaml new file mode 100644 index 0000000..c213ccc --- /dev/null +++ b/tasks/xfce-customization.yaml @@ -0,0 +1,21 @@ +--- + +- name: xdg config + copy: + src: xdg/ + dest: /etc/xdg/ + +- name: xfce panel config + template: + src: xfce4-panel.xml.j2 + dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml + +- name: whiskermenu config + template: + src: whiskermenu-1.rc.j2 + dest: /etc/xdg/xfce4/panel/whiskermenu-1.rc + +- name: xfwm4 config + template: + src: xfwm4.xml.j2 + dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/tasks/xfce.yaml b/tasks/xfce.yaml deleted file mode 100644 index fd86463..0000000 --- a/tasks/xfce.yaml +++ /dev/null @@ -1,51 +0,0 @@ ---- - -- name: desktop packages - apt: - pkg: - - xfce4 - - task-desktop - - task-xfce-desktop - - task-german - - task-german-desktop - - dmz-cursor-theme - - gnome-brave-icon-theme - - gnome-dust-icon-theme - - gnome-human-icon-theme - - gnome-icon-theme - - gnome-icon-theme-gartoon - - gnome-icon-theme-nuovo - - gnome-icon-theme-suede - - gnome-icon-theme-yasis - - gnome-extra-icons - - gnome-illustrious-icon-theme - - gnome-noble-icon-theme - - gnome-wine-icon-theme - - gnome-wise-icon-theme - - xfonts-terminus - - gvfs - - gvfs-backends - - gvfs-bin - - gvfs-fuse - - zip - - unzip - -- name: xdg config - copy: - src: xdg/ - dest: /etc/xdg/ - -- name: xfce panel config - template: - src: xfce4-panel.xml.j2 - dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml - -- name: whiskermenu config - template: - src: whiskermenu-1.rc.j2 - dest: /etc/xdg/xfce4/panel/whiskermenu-1.rc - -- name: xfwm4 config - template: - src: xfwm4.xml.j2 - dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml