From 077abe24a6dccd41e28278924b7f906035a16420 Mon Sep 17 00:00:00 2001
From: "Julien Milletre Akipe (aslBigRhino)" <code.julien@milletre.fr>
Date: Wed, 25 Aug 2021 11:29:27 +0200
Subject: [PATCH] Add initial device aslMyluz

---
 aslMyluz.yml                                  | 160 ++++++++++++++++++
 aslMyluz_init.yml                             |  16 ++
 aslTiny.yml                                   |   4 +-
 .../services/nvidia/tasks/archlinux/main.yml  |   2 +-
 .../nvidia/tasks/archlinux_common/main.yml    |  16 +-
 roles/services/nvidia/tasks/manjaro/main.yml  |   2 +-
 roles/services/nvidia/vars/main.yml           |  23 ---
 7 files changed, 194 insertions(+), 29 deletions(-)
 create mode 100644 aslMyluz.yml
 create mode 100644 aslMyluz_init.yml
 delete mode 100644 roles/services/nvidia/vars/main.yml

diff --git a/aslMyluz.yml b/aslMyluz.yml
new file mode 100644
index 0000000..5d6bcc9
--- /dev/null
+++ b/aslMyluz.yml
@@ -0,0 +1,160 @@
+---
+
+- name: Load specific roles for astMyluz
+  hosts: astMyluz
+  remote_user: root
+  become: yes
+  pre_tasks:
+    - ansible.builtin.include_role:
+        name: ansible-guest
+      tags:
+        - always
+  post_tasks:
+    - ansible.builtin.include_role:
+        name: aur-cli-clean
+      tags:
+        - always
+  roles:
+    ### Base
+    - { role: ssh, tags: ssh }
+    ### Package manager
+    - { role: makepkg, tags: makepkg }
+    - { role: aur-cli, tags: aur-cli }
+    - { role: pacman, tags: pacman }
+    ### Hardware init
+    - { role: microcode, tags: microcode }
+    ### Boot
+    - { role: dm-crypt, tags: dm-crypt }
+    - { role: refind, tags: refind }
+    ### System
+    - { role: bash, tags: bash }
+    - { role: fish, tags: fish }
+    - { role: tpm2, tags: tpm2 }
+    - { role: rngd, tags: rngd }
+    - { role: systemd-resolved, tags: systemd-resolved }
+    - { role: systemd-timesyncd, tags: systemd-timesyncd }
+    - { role: avahi, tags: avahi }
+    - { role: host, tags: host }
+    - { role: earlyoom, tags: earlyoom }
+    - { role: systemd-zram-generator, tags: systemd-zram-generator }
+    - { role: user, tags: user }
+    - { role: locale, tags: locale }
+    - { role: sudo, tags: sudo }
+    - { role: btrfs, tags: btrfs }
+    - { role: swap, tags: swap }
+    - { role: mkinitcpio, tags: mkinitcpio }
+    - { role: linux-kernel, tags: linux-kernel }
+    - { role: auditd, tags: auditd }
+    - { role: firewalld, tags: firewalld }
+    # - { role: apparmor, tags: apparmor }
+    - { role: tlp, tags: tlp }
+    - { role: powertop, tags: powertop }
+    - { role: thermald, tags: thermald }
+    - { role: irqbalance, tags: irqbalance }
+    - { role: preload, tags: preload }
+    - { role: flatpak, tags: flatpak }
+    - { role: snap, tags: snap }
+    - { role: fwupd, tags: fwupd }
+    # - { role: snapper, tags: snapper }
+    ### Hardware
+    - { role: intelgraphics, tags: intelgraphics }
+    - { role: networkmanager, tags: networkmanager }
+    - { role: libinput, tags: libinput }
+    - { role: watchdog, vars: { watchdog_activate: no}, tags: watchdog }
+    - { role: android-client, tags: android-client }
+    - { role: pipewire, tags: pipewire }
+    - { role: lm_sensors, tags: lm_sensors }
+    - { role: bluetooth, tags: bluetooth }
+    ### Desktop environment
+    - { role: sddm, tags: sddm }
+    - { role: kde, tags: kde }
+    - { role: wayland, tags: wayland }
+    - { role: wl-clipboard, tags: wl-clipboard }
+    ### KDE extensions
+    - { role: plasma-applet-thermal-monitor, tags: plasma-applet-thermal-monitor }
+    - { role: plasma-applet-active-window-control, tags: plasma-applet-active-window-control }
+    - { role: plasma-applets-window-buttons, tags: plasma-applets-window-buttons }
+    ### General support
+    - { role: filesystem-support, tags: filesystem-support }
+    - { role: format-support, tags: format-support }
+    - { role: fonts-support, tags: fonts-support }
+    ### CLI apps
+    - { role: man-page, tags: man-page }
+    - { role: yubikey, tags: yubikey }
+    - { role: gnupg, tags: gnupg }
+    - { role: git, tags: git }
+    - { role: smb-client, tags: smb-client }
+    - { role: hwdetect, tags: hwdetect }
+    - { role: wget, tags: wget }
+    - { role: trash-cli, tags: trash-cli }
+    - { role: top-utils, tags: top-utils }
+    - { role: tmux, tags: tmux }
+    - { role: rsync, tags: rsync }
+    - { role: neovim, tags: neovim }
+    - { role: lsb-release, tags: lsb-release }
+    - { role: curl, tags: curl }
+    - { role: bpytop, tags: bpytop }
+    - { role: tree, tags: tree }
+    - { role: hwinfo, tags: hwinfo }
+    - { role: dmidecode, tags: dmidecode }
+    - { role: neofetch, tags: neofetch }
+    ### GUI apps
+    - { role: aur-gui, tags: aur-gui }
+    - { role: vlc, tags: vlc }
+    - { role: libreoffice, tags: libreoffice }
+    - { role: smb4k, tags: smb4k }
+    - { role: syncthing-cli, tags: syncthing }
+    - { role: syncthing-gui-kde, tags: syncthing }
+    - { role: profile-sync-daemon, tags: profile-sync-daemon }
+    - { role: virtualbox-host, tags: virtualbox-host }
+    - { role: mpv, tags: mpv }
+    - { role: dvdbackup, tags: dvdbackup }
+    - { role: firefox, tags: firefox }
+    - { role: thunderbird, tags: thunderbird }
+    - { role: chromium, tags: chromium }
+    - { role: keepassxc, tags: keepassxc }
+    - { role: vscode, tags: vscode }
+    - { role: filesystem-support, tags: filesystem-support }
+    - { role: format-support, tags: format-support }
+    - { role: fonts-support, tags: fonts-support }
+    - { role: hplip, tags: hplip }
+    - { role: gimp, tags: gimp }
+    - { role: inkscape, tags: inkscape }
+    - { role: handbrake, tags: handbrake }
+    - { role: obs-studio, tags: obs-studio }
+    - { role: scribus, tags: scribus }
+    - { role: qbittorrent, tags: qbittorrent }
+    - { role: pcmanfm, tags: pcmanfm }
+    - { role: wireshark, tags: wireshark }
+    - { role: discord, tags: discord }
+    - { role: etcher, tags: etcher }
+    - { role: gnome-disk-utility, tags: gnome-disk-utility }
+    - { role: gnome-multi-writer, tags: gnome-multi-writer }
+    - { role: signal-desktop, tags: signal-desktop }
+    - { role: skype, tags: skype }
+    - { role: spotify, tags: spotify }
+    - { role: teamviewer, tags: teamviewer }
+    - { role: telegram, tags: telegram }
+    - { role: woeusb-ng, tags: woeusb-ng }
+    - { role: neochat, tags: neochat }
+    ### Overclock/undervolt
+    - { role: amdctl, tags: amdctl }
+    - { role: stress, tags: stress }
+    - { role: mprime, tags: mprime }
+    - { role: cpupower, tags: cpupower }
+    - { role: turbostat, tags: turbostat }
+    ### Gaming
+    - { role: gamemode, tags: gamemode }
+    - { role: steam, tags: steam }
+    - { role: wine, tags: wine }
+    - { role: dosbox, tags: dosbox }
+    - { role: itch-io, tags: itch-io }
+    - { role: epic-games-legendary, tags: epic-games-legendary }
+    - { role: gog-wyvern, tags: gog-wyvern }
+    - { role: lutris, tags: lutris }
+    ### Development
+    - { role: ansible-host, tags: ansible-host }
+    - { role: docker, tags: docker }
+    - { role: terraform, tags: terraform }
+
+
diff --git a/aslMyluz_init.yml b/aslMyluz_init.yml
new file mode 100644
index 0000000..18a7bcf
--- /dev/null
+++ b/aslMyluz_init.yml
@@ -0,0 +1,16 @@
+---
+- name: Load roles for initialize astMyluz
+  hosts: astMyluz
+  become_user: root
+  become: yes
+  vars:
+    ansible_ssh_pass: "{{ vault_ansible_become_pass }}"
+  pre_tasks:
+    - ansible.builtin.include_role:
+        name: ansible-guest
+      tags:
+        - always
+  roles:
+    - { role: ssh }
+    - { role: makepkg, tags: makepkg }
+    - { role: pacman, tags: pacman }
diff --git a/aslTiny.yml b/aslTiny.yml
index 4e95ea9..c53282e 100644
--- a/aslTiny.yml
+++ b/aslTiny.yml
@@ -70,8 +70,8 @@
     ### Desktop environment
     - { role: sddm, tags: sddm }
     - { role: kde, tags: kde }
-    #- { role: wayland, tags: wayland }
-    #- { role: wl-clipboard, tags: wl-clipboard }
+    - { role: wayland, tags: wayland }
+    - { role: wl-clipboard, tags: wl-clipboard }
     ### KDE extensions
     - { role: plasma-applet-thermal-monitor, tags: plasma-applet-thermal-monitor }
     - { role: plasma-applet-active-window-control, tags: plasma-applet-active-window-control }
diff --git a/roles/services/nvidia/tasks/archlinux/main.yml b/roles/services/nvidia/tasks/archlinux/main.yml
index 613c812..d40f49a 100644
--- a/roles/services/nvidia/tasks/archlinux/main.yml
+++ b/roles/services/nvidia/tasks/archlinux/main.yml
@@ -2,5 +2,5 @@
 
 - name: Install driver
   community.general.pacman:
-    name: "{{ nvidia_app_base_archlinux }}"
+    name: nvidia-dkms
     state: present
diff --git a/roles/services/nvidia/tasks/archlinux_common/main.yml b/roles/services/nvidia/tasks/archlinux_common/main.yml
index aa7b171..3269325 100644
--- a/roles/services/nvidia/tasks/archlinux_common/main.yml
+++ b/roles/services/nvidia/tasks/archlinux_common/main.yml
@@ -2,12 +2,24 @@
 
 - name: Install driver
   community.general.pacman:
-    name: "{{ nvidia_app_base_archlinux_common }}"
+    name:
+    - nvidia-utils
+    - opencl-nvidia
+    - ocl-icd
+    - cuda
+    - lib32-nvidia-utils
+    - lib32-opencl-nvidia
+    - lib32-ocl-icd
     state: present
 
 - name: Install GPU decoding libraries
   community.general.pacman:
-    name: "{{ nvidia_app_video_archlinux_common }}"
+    name:
+    - libvdpau
+    - libva-vdpau-driver
+    - libva-utils
+    - vdpauinfo
+    - lib32-libva-vdpau-driver
     state: present
 
 - name: Configure Pacman hook for update initramfs after an NVIDIA driver upgrade
diff --git a/roles/services/nvidia/tasks/manjaro/main.yml b/roles/services/nvidia/tasks/manjaro/main.yml
index 536e6ad..35a9cea 100644
--- a/roles/services/nvidia/tasks/manjaro/main.yml
+++ b/roles/services/nvidia/tasks/manjaro/main.yml
@@ -2,5 +2,5 @@
 
 - name: Install driver
   community.general.pacman:
-    name: "{{ nvidia_app_base_manjaro }}"
+    name: linux54-nvidia-450xx
     state: present
diff --git a/roles/services/nvidia/vars/main.yml b/roles/services/nvidia/vars/main.yml
deleted file mode 100644
index f7d3b99..0000000
--- a/roles/services/nvidia/vars/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-
-nvidia_app_base_archlinux:
-  - nvidia-dkms
-
-nvidia_app_base_manjaro:
-  - linux54-nvidia-450xx
-
-nvidia_app_base_archlinux_common:
-  - nvidia-utils
-  - opencl-nvidia
-  - ocl-icd
-  - cuda
-  - lib32-nvidia-utils
-  - lib32-opencl-nvidia
-  - lib32-ocl-icd
-
-nvidia_app_video_archlinux_common:
-  - libvdpau
-  - libva-vdpau-driver
-  - libva-utils
-  - vdpauinfo
-  - lib32-libva-vdpau-driver