From a30faf3ca7cb6a2afa39e7701d5f7a0599474dd2 Mon Sep 17 00:00:00 2001
From: Marcello Testi <marcello.testi@sparkfabrik.com>
Date: Sun, 7 Nov 2021 19:25:25 +0100
Subject: [PATCH] Adding OpenVPN plugin for NWMngr

---
 Makefile                                |  4 ++--
 pkglist.txt                             | 26 ++++++++++++++-----------
 playbooks/roles/gnome/tasks/main.yml    |  5 +++--
 playbooks/roles/packages/tasks/main.yml |  4 +++-
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 2b311c3..94cacf3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ifndef CONFIG
-$(error "You must pass a config yaml file (see ./config/*.yaml for examples"))
+$(error "You must pass a config yaml file (see ./config/*.yaml for examples)")
 endif
 
 install-githooks:
@@ -27,7 +27,7 @@ install-grub-no-encryption:
 
 local-install:
 	sudo ansible-galaxy collection install -r ./requirements.yml
-	sudo ansible-playbook ./playbooks/system.yml -i localhost, -c local 
+	sudo ansible-playbook ./playbooks/system.yml -i localhost, -c local --extra-vars "@$(CONFIG)"
 
 # Example of usage: sudo TAGS=your-tags CONFIG=./config/your-config.yaml make local-install-tags
 local-install-tags:
diff --git a/pkglist.txt b/pkglist.txt
index b9cff21..0b7b374 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -1,11 +1,11 @@
 adobe-source-sans-fonts
 ansible
-asciinema
 autoconf
 automake
 aws-cli
 baobab
 base
+bash-completion
 bashtop
 bind
 binutils
@@ -26,6 +26,7 @@ dmidecode
 docker
 docker-compose
 efibootmgr
+egl-wayland
 eog
 epiphany
 evince
@@ -40,10 +41,8 @@ gawk
 gcc
 gdm
 gedit
-geekbench
 gettext
 git
-glances
 glxinfo
 gnome-backgrounds
 gnome-books
@@ -103,12 +102,9 @@ gvfs-nfs
 gvfs-smb
 gzip
 helm
-hplip
 htop
-i3-gaps
 intel-ucode
 inxi
-iperf
 jq
 kind
 kooha
@@ -119,28 +115,29 @@ libtool
 linux
 linux-firmware
 linux-headers
-logiops
 lshw
 m4
 make
 mplayer
-mpv
 mutter
 nautilus
 neofetch
 net-tools
 networkmanager
+networkmanager-openvpn
 noto-fonts
 ntfs-3g
 nvidia-dkms
 nvidia-settings
 nvidia-utils
 orca
+os-prober
 pacman
 pacman-contrib
 paru
 patch
 pavucontrol
+pipewire-media-session
 pipewire-pulse
 pkgconf
 power-profiles-daemon
@@ -148,11 +145,11 @@ powertop
 rancher-k3d-bin
 reflector
 rygel
+seahorse
 sed
 simple-scan
 slack-desktop
 sof-firmware
-solaar
 stern
 sudo
 sushi
@@ -192,22 +189,24 @@ visual-studio-code-bin
 vlc
 which
 wpa_supplicant
-xbindkeys
 xdg-user-dirs-gtk
-xdotool
 xf86-video-vesa
 xorg-bdftopcf
 xorg-docs
 xorg-font-util
 xorg-fonts-100dpi
 xorg-fonts-75dpi
+xorg-fonts-encodings
 xorg-iceauth
 xorg-mkfontscale
+xorg-server
+xorg-server-common
 xorg-server-devel
 xorg-server-xephyr
 xorg-server-xnest
 xorg-server-xvfb
 xorg-sessreg
+xorg-setxkbmap
 xorg-smproxy
 xorg-x11perf
 xorg-xauth
@@ -218,7 +217,9 @@ xorg-xdpyinfo
 xorg-xdriinfo
 xorg-xev
 xorg-xgamma
+xorg-xhost
 xorg-xinput
+xorg-xkbcomp
 xorg-xkbevd
 xorg-xkbutils
 xorg-xkill
@@ -226,9 +227,11 @@ xorg-xlsatoms
 xorg-xlsclients
 xorg-xmodmap
 xorg-xpr
+xorg-xprop
 xorg-xrandr
 xorg-xrdb
 xorg-xrefresh
+xorg-xset
 xorg-xsetroot
 xorg-xvinfo
 xorg-xwayland
@@ -240,3 +243,4 @@ yelp
 yq
 zoom
 zsh
+zsh-completions
diff --git a/playbooks/roles/gnome/tasks/main.yml b/playbooks/roles/gnome/tasks/main.yml
index f7d580a..1ae6d12 100644
--- a/playbooks/roles/gnome/tasks/main.yml
+++ b/playbooks/roles/gnome/tasks/main.yml
@@ -14,8 +14,9 @@
           - gnome-sound-recorder
           - dconf-editor
           - gnome-software-packagekit-plugin
-          - gnome-shell-extension-appindicator
           - networkmanager
+          - networkmanager-openvpn
+          - seahorse
         state: present
         update_cache: yes
     - name: Install gnome extensions
@@ -40,7 +41,7 @@
       shell: systemctl enable NetworkManager
     - name: "Enable power-profiles-daemon"
       shell: systemctl enable power-profiles-daemon
-    
+
 - name: Configure gnome
   import_tasks: dconf.yml
 
diff --git a/playbooks/roles/packages/tasks/main.yml b/playbooks/roles/packages/tasks/main.yml
index d9ab275..b2b1966 100644
--- a/playbooks/roles/packages/tasks/main.yml
+++ b/playbooks/roles/packages/tasks/main.yml
@@ -52,6 +52,7 @@
     community.general.pacman:
       name:
         - base-devel
+        - bash-completion
         - dialog
         - dmidecode
         - neofetch
@@ -63,6 +64,7 @@
         - usbutils
         - tmux
         - zsh
+        - zsh-completions
         - lshw
 
   - name: Install system packages from aur
@@ -120,7 +122,7 @@
         - noto-fonts
         - ttf-anonymous-pro
         - ttf-droid
-        - ttf-liberation	
+        - ttf-liberation
         - ttf-fira-code
         - ttf-fira-mono
         - ttf-fira-sans