From e7f53cba5fc188e4bec8ebcbb67efdb625eab895 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Sun, 15 Sep 2019 12:36:16 +0000 Subject: [PATCH] complete rewrite so that this role can be the default desktop role --- tasks/audio.yaml | 9 +++++++++ tasks/audio.yml | 5 ----- tasks/bluetooth.yaml | 18 ++++++++++++++++++ tasks/bluetooth.yml | 13 ------------- tasks/editors.yaml | 9 +++++++++ tasks/graphic.yaml | 11 +++++++++++ tasks/gvim.yml | 5 ----- tasks/kde.yml | 15 --------------- tasks/libreoffice.yml | 6 ------ tasks/mail.yaml | 7 +++++++ tasks/mail.yml | 10 ---------- tasks/main.yaml | 16 ++++++++++++++++ tasks/main.yml | 16 ---------------- tasks/multimedia.yaml | 11 +++++++++++ tasks/scanner.yml | 11 ++++------- tasks/voip-client.yml | 4 ---- tasks/web-dev-browser.yml | 4 ---- tasks/xfce.yaml | 32 ++++++++++++++++++++++++++++++++ tasks/xpra.yml | 3 --- tasks/youtube-dl.yml | 6 ------ 20 files changed, 117 insertions(+), 94 deletions(-) create mode 100644 tasks/audio.yaml delete mode 100644 tasks/audio.yml create mode 100644 tasks/bluetooth.yaml delete mode 100644 tasks/bluetooth.yml create mode 100644 tasks/editors.yaml create mode 100644 tasks/graphic.yaml delete mode 100644 tasks/gvim.yml delete mode 100644 tasks/kde.yml delete mode 100644 tasks/libreoffice.yml create mode 100644 tasks/mail.yaml delete mode 100644 tasks/mail.yml create mode 100644 tasks/main.yaml delete mode 100644 tasks/main.yml create mode 100644 tasks/multimedia.yaml delete mode 100644 tasks/voip-client.yml delete mode 100644 tasks/web-dev-browser.yml create mode 100644 tasks/xfce.yaml delete mode 100644 tasks/xpra.yml delete mode 100644 tasks/youtube-dl.yml diff --git a/tasks/audio.yaml b/tasks/audio.yaml new file mode 100644 index 0000000..96ebf4f --- /dev/null +++ b/tasks/audio.yaml @@ -0,0 +1,9 @@ +--- +# tasks file for desktop-audio + +- name: audio packages + apt: + pkg: + - pavucontrol + - pasystray + - audacity diff --git a/tasks/audio.yml b/tasks/audio.yml deleted file mode 100644 index 2b977ef..0000000 --- a/tasks/audio.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# tasks file for desktop-audio - -- name: install pavucontrol - apt: name=pavucontrol state=latest diff --git a/tasks/bluetooth.yaml b/tasks/bluetooth.yaml new file mode 100644 index 0000000..090a7ba --- /dev/null +++ b/tasks/bluetooth.yaml @@ -0,0 +1,18 @@ +--- + +# https://wiki.debian.org/BluetoothUser#Preparation + +- name: bluetooth system packages + apt: + pkg: bluetooth + +- name: enable bluetooth service + service: + name: bluetooth + enabled: yes + state: started + +- name: bluetooth gui packages + apt: + pkg: + - blueman diff --git a/tasks/bluetooth.yml b/tasks/bluetooth.yml deleted file mode 100644 index e6f8e90..0000000 --- a/tasks/bluetooth.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# tasks file for desktop-bluetooth - -# https://wiki.debian.org/BluetoothUser#Preparation - -- name: install bluetooth support - apt: name=bluetooth state=latest - -- name: enable bluetooth service - service: name=bluetooth enabled=yes state=started - -- name: install bluedevil (for KDE) - apt: name=bluedevil state=latest diff --git a/tasks/editors.yaml b/tasks/editors.yaml new file mode 100644 index 0000000..2b032dc --- /dev/null +++ b/tasks/editors.yaml @@ -0,0 +1,9 @@ +--- + +- name: install editors + apt: + pkg: + - vim-gtk + +- import_role: + name: atom_editor diff --git a/tasks/graphic.yaml b/tasks/graphic.yaml new file mode 100644 index 0000000..dbc599a --- /dev/null +++ b/tasks/graphic.yaml @@ -0,0 +1,11 @@ +--- + +- name: graphic editors packages + apt: + pkg: + - gimp + - gimp-help-de + - inkscape + - gthumb + - krita + - krita-l10n diff --git a/tasks/gvim.yml b/tasks/gvim.yml deleted file mode 100644 index f6b6a62..0000000 --- a/tasks/gvim.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# tasks file for desktop - -- name: install gvim - apt: name=vim-gtk state=latest diff --git a/tasks/kde.yml b/tasks/kde.yml deleted file mode 100644 index f02b231..0000000 --- a/tasks/kde.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# tasks file for desktop - -- name: install kde desktop - apt: name={{ item }} state=latest - with_items: - - task-kde-desktop - - task-german - - task-german-desktop - - kde-l10n-de - - kio-mtp - - gwenview - - kipi-plugins - - kde-config-gtk-style - - qtcurve diff --git a/tasks/libreoffice.yml b/tasks/libreoffice.yml deleted file mode 100644 index a54572f..0000000 --- a/tasks/libreoffice.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: install libreoffice - apt: pkg={{item}} state=latest - with_items: - - libreoffice - - libreoffice-l10n-de \ No newline at end of file diff --git a/tasks/mail.yaml b/tasks/mail.yaml new file mode 100644 index 0000000..f4e147a --- /dev/null +++ b/tasks/mail.yaml @@ -0,0 +1,7 @@ +--- + +- name: thunderbird + apt: + pkg: + - thunderbird + - thunderbird-l10n-de diff --git a/tasks/mail.yml b/tasks/mail.yml deleted file mode 100644 index 5ee85bc..0000000 --- a/tasks/mail.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# tasks file for desktop - -- name: install icedove - apt: name={{ item }} state=latest - with_items: - - icedove - - icedove-l10n-de - - diff --git a/tasks/main.yaml b/tasks/main.yaml new file mode 100644 index 0000000..e3bb085 --- /dev/null +++ b/tasks/main.yaml @@ -0,0 +1,16 @@ +--- + +- import_role: + name: basic_desktop + +- import_role: + name: libreoffice + +- import_tasks: xfce.yaml +- import_tasks: audio.yaml +- import_tasks: bluetooth.yaml +- import_tasks: editors.yaml +- import_tasks: graphic.yaml +- import_tasks: mail.yaml +- import_tasks: scanner.yaml +- import_tasks: multimedia.yaml diff --git a/tasks/main.yml b/tasks/main.yml deleted file mode 100644 index 8db3ef8..0000000 --- a/tasks/main.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# tasks file for desktop - -- include_role: - name: basic_desktop - -- include: kde.yml -- include: libreoffice.yml - -- include: audio.yml -- include: bluetooth.yml -- include: gvim.yml -#- include: youtube-dl.yml -- include: voip-client.yml -- include: mail.yml -- include: scanner.yml diff --git a/tasks/multimedia.yaml b/tasks/multimedia.yaml new file mode 100644 index 0000000..cc421dd --- /dev/null +++ b/tasks/multimedia.yaml @@ -0,0 +1,11 @@ +--- + +- name: multimedia packages + apt: + pkg: + - vlc + - vlc-l10n + - libdvd-pkg + - libdvdread4 + - openshot + - openshot-doc diff --git a/tasks/scanner.yml b/tasks/scanner.yml index 0b32cf4..153af1c 100644 --- a/tasks/scanner.yml +++ b/tasks/scanner.yml @@ -1,9 +1,6 @@ --- -# tasks file for desktop -- name: install scan software - apt: name={{ item }} state=latest - with_items: - - simple-scan - - +- name: scan packages + apt: + pkg: + - simple-scan diff --git a/tasks/voip-client.yml b/tasks/voip-client.yml deleted file mode 100644 index ca2dd09..0000000 --- a/tasks/voip-client.yml +++ /dev/null @@ -1,4 +0,0 @@ -#- name: install sflphone -# apt: -# name: sflphone-kde -# state: present diff --git a/tasks/web-dev-browser.yml b/tasks/web-dev-browser.yml deleted file mode 100644 index a6eb052..0000000 --- a/tasks/web-dev-browser.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# tasks file for web-dev-browser -- name: uninstall xul-ext-greasemonkey - apt: name=xul-ext-greasemonkey state=absent diff --git a/tasks/xfce.yaml b/tasks/xfce.yaml new file mode 100644 index 0000000..8cc4040 --- /dev/null +++ b/tasks/xfce.yaml @@ -0,0 +1,32 @@ +--- +# tasks file for desktop + +- name: xfce 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 diff --git a/tasks/xpra.yml b/tasks/xpra.yml deleted file mode 100644 index a83b64b..0000000 --- a/tasks/xpra.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: install xpra - apt: pkg=xpra state=latest diff --git a/tasks/youtube-dl.yml b/tasks/youtube-dl.yml deleted file mode 100644 index 2d4cc2a..0000000 --- a/tasks/youtube-dl.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -# tasks file for youtube-dl -- name: install youtube-dl package - apt: name=youtube-dl state=latest -- name: download latest youtube-dl - get_url: url=https://yt-dl.org/downloads/latest/youtube-dl dest=/usr/local/bin/youtube-dl mode=755