diff --git a/roles/dotfiles/meta/main.yml b/roles/dotfiles/meta/main.yml
index 874aef6..de48476 100644
--- a/roles/dotfiles/meta/main.yml
+++ b/roles/dotfiles/meta/main.yml
@@ -5,6 +5,9 @@ dependencies:
   - pip
   - rsync
   - rclone
+  - kitty
+  - alacritty
+  - nix
   - zsh
   - antidote
   - tmux
diff --git a/roles/git/tasks/install/alpine.yml b/roles/git/tasks/install/alpine.yml
new file mode 100644
index 0000000..6d98dcc
--- /dev/null
+++ b/roles/git/tasks/install/alpine.yml
@@ -0,0 +1,9 @@
+---
+# git on alpine
+
+- name: (alp) installing git
+  community.general.apk:
+    name: git
+    state: present
+    update_cache: true
+  become: true
diff --git a/roles/git/tasks/install/archlinux.yml b/roles/git/tasks/install/archlinux.yml
new file mode 100644
index 0000000..3a3d7ec
--- /dev/null
+++ b/roles/git/tasks/install/archlinux.yml
@@ -0,0 +1,9 @@
+---
+# git on Archlinux
+
+- name: (arch) installing git
+  community.general.pacman:
+    name: git
+    state: present
+    update_cache: true
+  become: true
diff --git a/roles/git/tasks/install/debian.yml b/roles/git/tasks/install/debian.yml
new file mode 100644
index 0000000..facc765
--- /dev/null
+++ b/roles/git/tasks/install/debian.yml
@@ -0,0 +1,9 @@
+---
+# git on Debian
+
+- name: (deb) installing git
+  ansible.builtin.apt:
+    name: git
+    state: present
+    update_cache: true
+  become: true
diff --git a/roles/git/tasks/install/redhat.yml b/roles/git/tasks/install/redhat.yml
new file mode 100644
index 0000000..2b57073
--- /dev/null
+++ b/roles/git/tasks/install/redhat.yml
@@ -0,0 +1,9 @@
+---
+# git on RedHat
+
+- name: (rHa) installing git
+  ansible.builtin.yum:
+    name: git
+    state: present
+    update_cache: true
+  become: true
diff --git a/roles/git/tasks/install/void.yml b/roles/git/tasks/install/void.yml
new file mode 100644
index 0000000..b4f4f6b
--- /dev/null
+++ b/roles/git/tasks/install/void.yml
@@ -0,0 +1,9 @@
+---
+# git on void
+
+- name: (void) installing git
+  community.general.xbps:
+    name: git
+    state: present
+    update_cache: true
+  become: true
diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml
index 2b8fd0b..a124777 100644
--- a/roles/git/tasks/main.yml
+++ b/roles/git/tasks/main.yml
@@ -2,11 +2,12 @@
 # Installing and configuring git
 
 - name: Installation
-  ansible.builtin.package:
-    name: git
-    state: present
-    update_cache: true
-  become: true
+  ansible.builtin.include_tasks: "install/{{ ansible_os_family | lower }}.yml"
+  args:
+    apply:
+      tags:
+        - git
+        - git-install
   tags:
     - git
     - git-install
diff --git a/roles/vim/tasks/main.yml b/roles/vim/tasks/main.yml
index f022e7f..0b704d6 100644
--- a/roles/vim/tasks/main.yml
+++ b/roles/vim/tasks/main.yml
@@ -2,11 +2,12 @@
 # Vim
 
 - name: Installation
-  ansible.builtin.package:
-    name: vim
-    state: present
-    update_cache: true
-  become: true
+  ansible.builtin.include_tasks: "install/{{ ansible_os_family | lower }}.yml"
+  args:
+    apply:
+      tags:
+        - vim
+        - vim-install
   tags:
     - vim
     - vim-install
diff --git a/terminals.yml b/terminals.yml
deleted file mode 100644
index 257410f..0000000
--- a/terminals.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: all
-  roles:
-    - alacritty
-    - kitty