From 18ea17262cec5de532702d4555d13f00c0c573cd Mon Sep 17 00:00:00 2001
From: Matej Focko <matej.focko@outlook.com>
Date: Sun, 11 Oct 2020 22:36:13 +0200
Subject: [PATCH 1/2] Fix tmux prefix

Closes #10

Signed-off-by: Matej Focko <matej.focko@outlook.com>
---
 playbooks/roles/shell/templates/tmux.conf.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/playbooks/roles/shell/templates/tmux.conf.j2 b/playbooks/roles/shell/templates/tmux.conf.j2
index ced7fee..597e01e 100644
--- a/playbooks/roles/shell/templates/tmux.conf.j2
+++ b/playbooks/roles/shell/templates/tmux.conf.j2
@@ -5,6 +5,10 @@ set-window-option -g automatic-rename off
 set-option -g allow-rename off
 set-option -g renumber-windows on
 
+set -g prefix C-a
+unbind C-b
+bind-key C-a send-prefix
+
 unbind l
 
 bind h select-pane -L

From edfdaef321377aa2bd40c7a2230125c49f828f02 Mon Sep 17 00:00:00 2001
From: Matej Focko <matej.focko@outlook.com>
Date: Sun, 11 Oct 2020 22:42:35 +0200
Subject: [PATCH 2/2] Move all packages to separate role

- Merge playerctl and flameshot into one
- Move shell packages to separate role

Signed-off-by: Matej Focko <matej.focko@outlook.com>
---
 playbooks/fedora.yml                          |  2 +-
 .../roles/fedora_packages/tasks/main.yml      | 21 +++++++++++++++++++
 playbooks/roles/set_dnf/tasks/main.yml        | 17 ---------------
 playbooks/roles/shell/tasks/main.yml          | 11 ----------
 4 files changed, 22 insertions(+), 29 deletions(-)
 create mode 100644 playbooks/roles/fedora_packages/tasks/main.yml
 delete mode 100644 playbooks/roles/set_dnf/tasks/main.yml

diff --git a/playbooks/fedora.yml b/playbooks/fedora.yml
index b9f816c..915309c 100644
--- a/playbooks/fedora.yml
+++ b/playbooks/fedora.yml
@@ -2,7 +2,7 @@
 - name: Fedora bootstrap
   hosts: all
   roles:
-    - role: set_dnf
+    - role: fedora_packages
       become: yes
       become_method: sudo
     - flatpaks
diff --git a/playbooks/roles/fedora_packages/tasks/main.yml b/playbooks/roles/fedora_packages/tasks/main.yml
new file mode 100644
index 0000000..e697d1c
--- /dev/null
+++ b/playbooks/roles/fedora_packages/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+- name: Upgrade all packages
+  dnf:
+    name: '*'
+    state: latest
+
+- name: Install playerctl and flameshot
+  dnf:
+    name:
+      - playerctl
+      - flameshot
+    state: present
+
+- name: Install all packages for shell
+  dnf:
+    name:
+      - zsh
+      - tmux
+      - neovim
+      - emacs
+    state: present
\ No newline at end of file
diff --git a/playbooks/roles/set_dnf/tasks/main.yml b/playbooks/roles/set_dnf/tasks/main.yml
deleted file mode 100644
index 7eddbbf..0000000
--- a/playbooks/roles/set_dnf/tasks/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# TODO: Set up repos
-
-- name: Upgrade all packages
-  dnf:
-    name: '*'
-    state: latest
-
-- name: Install playerctl for spotify
-  dnf:
-    name: playerctl
-    state: present
-
-- name: Install flameshot for screenshots
-  dnf:
-    name: flameshot
-    state: present
diff --git a/playbooks/roles/shell/tasks/main.yml b/playbooks/roles/shell/tasks/main.yml
index 8741d3f..e95abf5 100644
--- a/playbooks/roles/shell/tasks/main.yml
+++ b/playbooks/roles/shell/tasks/main.yml
@@ -1,15 +1,4 @@
 ---
-- name: Install all packages for shell
-  become: yes
-  become_method: sudo
-  dnf:
-    name:
-      - zsh
-      - tmux
-      - neovim
-      - emacs
-    state: present
-
 - name: Set default shell and generate SSH key
   become: yes
   become_method: sudo