From 03d576eb214d0c47dc7d005221d8f9180bacbeff Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Fri, 14 Jan 2022 19:44:43 +0100 Subject: [PATCH] flat architecture --- tasks/audio.yaml | 11 ---- tasks/bluetooth.yaml | 6 --- tasks/editors.yaml | 8 --- tasks/filesystem.yaml | 15 ------ tasks/graphic.yaml | 12 ----- tasks/mail.yaml | 17 ------ tasks/main.yaml | 24 ++++----- tasks/mindmap.yaml | 4 -- tasks/multimedia.yaml | 13 ----- tasks/notifications.yaml | 10 ---- tasks/office.yaml | 8 --- tasks/scanner.yaml | 6 --- tasks/tools.yaml | 6 --- tasks/web.yaml | 11 ---- tasks/xfce.yaml | 21 -------- vars/main.yaml | 108 +++++++++++++++++++++++++++++++++++++++ 16 files changed, 118 insertions(+), 162 deletions(-) delete mode 100644 tasks/audio.yaml delete mode 100644 tasks/bluetooth.yaml delete mode 100644 tasks/editors.yaml delete mode 100644 tasks/filesystem.yaml delete mode 100644 tasks/graphic.yaml delete mode 100644 tasks/mail.yaml delete mode 100644 tasks/mindmap.yaml delete mode 100644 tasks/multimedia.yaml delete mode 100644 tasks/notifications.yaml delete mode 100644 tasks/office.yaml delete mode 100644 tasks/scanner.yaml delete mode 100644 tasks/tools.yaml delete mode 100644 tasks/web.yaml delete mode 100644 tasks/xfce.yaml create mode 100644 vars/main.yaml diff --git a/tasks/audio.yaml b/tasks/audio.yaml deleted file mode 100644 index 96df91e..0000000 --- a/tasks/audio.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: desktop audio packages - apt: - pkg: - - audacity - - sound-juicer - - pulseaudio - - pavucontrol - - pasystray - - pavumeter - - paprefs diff --git a/tasks/bluetooth.yaml b/tasks/bluetooth.yaml deleted file mode 100644 index 9e6c217..0000000 --- a/tasks/bluetooth.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: desktop bluetooth packages - apt: - pkg: - - bluetooth - - blueman diff --git a/tasks/editors.yaml b/tasks/editors.yaml deleted file mode 100644 index b09f9f1..0000000 --- a/tasks/editors.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: desktop editor packages - apt: - pkg: - - vim-gtk - -- import_role: - name: atom_editor diff --git a/tasks/filesystem.yaml b/tasks/filesystem.yaml deleted file mode 100644 index 4dfdc1e..0000000 --- a/tasks/filesystem.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- name: desktop filesystem packages - apt: - pkg: - - gvfs - - gvfs-backends - - gvfs-bin - - gvfs-fuse - - zip - - unzip - - baobab - - thunar - - catfish - - unison-gtk - - xarchiver diff --git a/tasks/graphic.yaml b/tasks/graphic.yaml deleted file mode 100644 index 64eee4f..0000000 --- a/tasks/graphic.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: desktop graphic packages - apt: - pkg: - - gimp - - gimp-help-de - - inkscape - - gthumb - - krita - - krita-l10n - - eog - - xfce4-screenshooter diff --git a/tasks/mail.yaml b/tasks/mail.yaml deleted file mode 100644 index 482d2f0..0000000 --- a/tasks/mail.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- name: desktop mail client debian packages - apt: - pkg: - - thunderbird - - thunderbird-l10n-de - - hunspell-de-de - when: ansible_distribution == 'Debian' - -- name: desktop mail client ubuntu packages - apt: - pkg: - - thunderbird - - thunderbird-locale-de - - thunderbird-locale-en - - hunspell-de-de - when: ansible_distribution == 'Ubuntu' diff --git a/tasks/main.yaml b/tasks/main.yaml index b751bb4..44db38b 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -1,17 +1,13 @@ --- -- import_tasks: xfce.yaml +- name: desktop packages + apt: + pkg: "{{ desktop_packages }}" -- import_tasks: audio.yaml -- import_tasks: bluetooth.yaml -- import_tasks: editors.yaml -- import_tasks: filesystem.yaml -- import_tasks: graphic.yaml -- import_tasks: mail.yaml -- import_tasks: mindmap.yaml -- import_tasks: multimedia.yaml -- import_tasks: notifications.yaml -- import_tasks: office.yaml -- import_tasks: scanner.yaml -- import_tasks: tools.yaml -- import_tasks: web.yaml +- import_role: + name: atom_editor + +- name: ensure dunst package is absent for nicer notifications + apt: + pkg: dunst + state: absent diff --git a/tasks/mindmap.yaml b/tasks/mindmap.yaml deleted file mode 100644 index ad74376..0000000 --- a/tasks/mindmap.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: desktop mindmapping software packages - apt: - pkg: vym diff --git a/tasks/multimedia.yaml b/tasks/multimedia.yaml deleted file mode 100644 index 5f91c10..0000000 --- a/tasks/multimedia.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: desktop multimedia packages - apt: - pkg: - - vlc - - vlc-l10n - #- libdvd-pkg - - openshot - - openshot-doc - - ogmrip - - ogmrip-plugins - - isomaster - - brasero diff --git a/tasks/notifications.yaml b/tasks/notifications.yaml deleted file mode 100644 index bf8f46d..0000000 --- a/tasks/notifications.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: notify-osd package - apt: - pkg: notify-osd - -- name: ensure dunst package is absent - apt: - pkg: dunst - state: absent diff --git a/tasks/office.yaml b/tasks/office.yaml deleted file mode 100644 index b5517b3..0000000 --- a/tasks/office.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: desktop office packages - apt: - pkg: - - evince - -- import_role: - name: libreoffice diff --git a/tasks/scanner.yaml b/tasks/scanner.yaml deleted file mode 100644 index 2d9c136..0000000 --- a/tasks/scanner.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: desktop scanner packages - apt: - pkg: - - simple-scan - - gscan2pdf diff --git a/tasks/tools.yaml b/tasks/tools.yaml deleted file mode 100644 index 77a33b7..0000000 --- a/tasks/tools.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: desktop tool packages - apt: - pkg: - - redshift-gtk - - barrier diff --git a/tasks/web.yaml b/tasks/web.yaml deleted file mode 100644 index f9bac3d..0000000 --- a/tasks/web.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: desktop web packages - apt: - pkg: - - webext-ublock-origin - -- import_role: - name: firefox - -- import_role: - name: chromium diff --git a/tasks/xfce.yaml b/tasks/xfce.yaml deleted file mode 100644 index a773563..0000000 --- a/tasks/xfce.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# tasks file for desktop - -- name: xfce desktop packages - apt: - pkg: - - xfce4 - - 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 diff --git a/vars/main.yaml b/vars/main.yaml new file mode 100644 index 0000000..cde8fff --- /dev/null +++ b/vars/main.yaml @@ -0,0 +1,108 @@ +desktop_packages: + # audio + - audacity + - sound-juicer + - pulseaudio + - pavucontrol + - pasystray + - pavumeter + - paprefs + + # bluetooth + - bluetooth + - blueman + + # editors + + # filesystem + - gvfs + - gvfs-backends + - gvfs-bin + - gvfs-fuse + - zip + - unzip + - baobab + - thunar + - catfish + - unison-gtk + - xarchiver + + # graphic + - gimp + - gimp-help-de + - inkscape + - gthumb + - krita + - krita-l10n + - eog + - xfce4-screenshooter + + # mail + - thunderbird + - thunderbird-l10n-de + - hunspell-de-de + - evolution + - evolution-ews + + # mindmap + - vym + + # multimedia + - vlc + - vlc-l10n + #- libdvd-pkg + - openshot + - openshot-doc + - ogmrip + - ogmrip-plugins + - isomaster + - brasero + + # notifications + - notify-osd + + # office + - evince + - libreoffice + - libreoffice-writer + - libreoffice-calc + - libreoffice-draw + - libreoffice-impress + - libreoffice-gtk3 + - libreoffice-l10n-de + - libreoffice-help-de + - libreoffice-gnome + + # scanner + - simple-scan + - gscan2pdf + + # tools + - redshift-gtk + - barrier + + # web + - firefox-esr + - firefox-esr-l10n-de + - chromium + - chromium-l10n + - webext-ublock-origin + + # xfce + - xfce4 + + # themes + - 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