From 7dcb5b432122925b23dc5e141b266f5d73562cd6 Mon Sep 17 00:00:00 2001
From: Matej Focko <matej.focko@outlook.com>
Date: Wed, 14 Oct 2020 20:31:50 +0200
Subject: [PATCH] Fix unfinished refactor

Signed-off-by: Matej Focko <matej.focko@outlook.com>
---
 .../packages}/tasks/haskell.yml                   |  0
 playbooks/roles/fedora/packages/tasks/main.yml    | 10 ++--------
 .../packages}/tasks/shell.yml                     |  0
 playbooks/roles/fedora_packages/tasks/main.yml    | 15 ---------------
 4 files changed, 2 insertions(+), 23 deletions(-)
 rename playbooks/roles/{fedora_packages => fedora/packages}/tasks/haskell.yml (100%)
 rename playbooks/roles/{fedora_packages => fedora/packages}/tasks/shell.yml (100%)
 delete mode 100644 playbooks/roles/fedora_packages/tasks/main.yml

diff --git a/playbooks/roles/fedora_packages/tasks/haskell.yml b/playbooks/roles/fedora/packages/tasks/haskell.yml
similarity index 100%
rename from playbooks/roles/fedora_packages/tasks/haskell.yml
rename to playbooks/roles/fedora/packages/tasks/haskell.yml
diff --git a/playbooks/roles/fedora/packages/tasks/main.yml b/playbooks/roles/fedora/packages/tasks/main.yml
index e697d1c..6c988ac 100644
--- a/playbooks/roles/fedora/packages/tasks/main.yml
+++ b/playbooks/roles/fedora/packages/tasks/main.yml
@@ -11,11 +11,5 @@
       - flameshot
     state: present
 
-- name: Install all packages for shell
-  dnf:
-    name:
-      - zsh
-      - tmux
-      - neovim
-      - emacs
-    state: present
\ No newline at end of file
+- include: shell.yml
+- include: haskell.yml
\ No newline at end of file
diff --git a/playbooks/roles/fedora_packages/tasks/shell.yml b/playbooks/roles/fedora/packages/tasks/shell.yml
similarity index 100%
rename from playbooks/roles/fedora_packages/tasks/shell.yml
rename to playbooks/roles/fedora/packages/tasks/shell.yml
diff --git a/playbooks/roles/fedora_packages/tasks/main.yml b/playbooks/roles/fedora_packages/tasks/main.yml
deleted file mode 100644
index 6c988ac..0000000
--- a/playbooks/roles/fedora_packages/tasks/main.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Upgrade all packages
-  dnf:
-    name: '*'
-    state: latest
-
-- name: Install playerctl and flameshot
-  dnf:
-    name:
-      - playerctl
-      - flameshot
-    state: present
-
-- include: shell.yml
-- include: haskell.yml
\ No newline at end of file