From 78d9f84b9b0c4224b463cf2cfe82981045cfcc84 Mon Sep 17 00:00:00 2001
From: Lulzette <ivan@lulzette.ru>
Date: Sun, 26 Sep 2021 21:43:55 +0000
Subject: [PATCH] Fix deprecated "with_items" + remove omb

---
 ansible/ansible-base/roles/configs/tasks/main.yml  | 8 ++++----
 ansible/ansible-base/roles/packages/tasks/main.yml | 7 +------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ansible/ansible-base/roles/configs/tasks/main.yml b/ansible/ansible-base/roles/configs/tasks/main.yml
index 754f0dd..61943b9 100644
--- a/ansible/ansible-base/roles/configs/tasks/main.yml
+++ b/ansible/ansible-base/roles/configs/tasks/main.yml
@@ -23,10 +23,10 @@
    register: omb_flag
 
  - debug:
-    msg: "OMB is not installed"
+     msg: 'OMB is not installed, run: bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"'
    when: not omb_flag.stat.exists 
 
 # FIXME: logout from shell
- - name: Install OMB
-   shell: bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"
-   when: not omb_flag.stat.exists
+# - name: Install OMB
+#   shell: bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh)"
+#   when: not omb_flag.stat.exists
diff --git a/ansible/ansible-base/roles/packages/tasks/main.yml b/ansible/ansible-base/roles/packages/tasks/main.yml
index c8b00ac..89cf686 100644
--- a/ansible/ansible-base/roles/packages/tasks/main.yml
+++ b/ansible/ansible-base/roles/packages/tasks/main.yml
@@ -1,11 +1,6 @@
 ---
  - name: Install packages
    apt:
-     name: "{{ item }}"
+     name: ['mc', 'htop', 'vim', 'screen', 'tmux', 'curl', 'wget', 'bash-completion']
      state: present
-   with_items:
-     - mc
-     - htop
-     - vim
-     - screen
    when: ansible_facts['os_family'] == "Debian"