From dd7657c86b6c497600d8a41a0ddee9e3cd2e2cb7 Mon Sep 17 00:00:00 2001
From: Gabriel Lievano <krueger@gabriellievano.com>
Date: Wed, 27 Jul 2022 10:46:34 -0700
Subject: [PATCH] Install JetBrains Mono Nerd Fonts

---
 tasks/core.yml  | 24 +++++++++++-------------
 tasks/fonts.yml | 34 +++++++++-------------------------
 vars/Darwin.yml |  1 +
 vars/Debian.yml |  1 +
 4 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/tasks/core.yml b/tasks/core.yml
index b1602c5..167b084 100644
--- a/tasks/core.yml
+++ b/tasks/core.yml
@@ -27,22 +27,21 @@
   become: yes
   apt:
     name:
+      - acpi
+      - ccache
       - compton
       - curl
+      - dconf-editor
       - htop
       - golang
-      - lsof
       - i3
-      - ccache
+      - lsof
+      - moreutils
       - ninja-build
-      - python3-pip
-      - dconf-editor
       - nvidia-settings
       - pavucontrol
-      - moreutils
-      - mate-desktop-environment
-      - mate-desktop-environment-extras
-      - ubuntu-mate-themes
+      - python3-pip
+      - rofi
       - zsh
 
 - name: Apt Install Clang
@@ -53,8 +52,7 @@
 
 - name: mate i3
   when: ansible_facts['os_family'] == "Debian"
-  shell: dconf write /org/mate/desktop/session/required-components/windowmanager "'i3'"
-
-- name: mate disable desktop icons
-  when: ansible_facts['os_family'] == "Debian"
-  shell: dconf write /org/mate/desktop/background/show-desktop-icons "false"
+  shell: >
+    dconf write /org/mate/desktop/session/required-components/windowmanager "'i3'" && \
+    dconf write /org/mate/desktop/session/required-components-list "['windowmanager', 'panel']" && \
+    dconf write /org/mate/desktop/background/show-desktop-icons "false"
diff --git a/tasks/fonts.yml b/tasks/fonts.yml
index b91eb5d..684ae55 100644
--- a/tasks/fonts.yml
+++ b/tasks/fonts.yml
@@ -1,35 +1,19 @@
-- name: Install Iosevka Term SS15 Fonts in Debian
-  when: ansible_facts['os_family'] == "Debian"
+- name: Install Iosevka Term SS15 Fonts
   ansible.builtin.copy:
     src: "{{ lookup('env', 'HOME') }}/personal/dotfiles/fonts/iosevka-term-ss15/"
-    dest: "{{ lookup('env', 'HOME') }}/.fonts/"
+    dest: "{{ fonts_path }}"
 
-- name: Install Iosevka Term SS15 Fonts in Darwin
-  when: ansible_facts['os_family'] == "Darwin"
-  ansible.builtin.copy:
-    src: "{{ lookup('env', 'HOME') }}/personal/dotfiles/fonts/iosevka-term-ss15/"
-    dest: "{{ lookup('env', 'HOME') }}/Library/Fonts/"
-
-- name: Install Iosevka Term Nerd Fonts in Debian
-  when: ansible_facts['os_family'] == "Debian"
+- name: Install Iosevka Term Nerd Fonts
   ansible.builtin.copy:
     src: "{{ lookup('env', 'HOME') }}/personal/dotfiles/fonts/iosevka-term-nerd-font/"
-    dest: "{{ lookup('env', 'HOME') }}/.fonts/"
+    dest: "{{ fonts_path }}"
 
-- name: Install Iosevka Term Nerd Fonts in Darwin
-  when: ansible_facts['os_family'] == "Darwin"
-  ansible.builtin.copy:
-    src: "{{ lookup('env', 'HOME') }}/personal/dotfiles/fonts/iosevka-term-nerd-font/"
-    dest: "{{ lookup('env', 'HOME') }}/Library/Fonts/"
-
-- name: Install Jetbrains Mono in Debian
-  when: ansible_facts['os_family'] == "Debian"
+- name: Install Jetbrains Mono
   ansible.builtin.copy:
     src: "{{ lookup('env', 'HOME') }}/personal/dotfiles/fonts/jetbrains-mono/"
-    dest: "{{ lookup('env', 'HOME') }}/.fonts/"
+    dest: "{{ fonts_path }}"
 
-- name: Install Jetbrains Mono in Darwin
-  when: ansible_facts['os_family'] == "Darwin"
+- name: Install Jetbrains Mono Nerd Fonts
   ansible.builtin.copy:
-    src: "{{ lookup('env', 'HOME') }}/personal/dotfiles/fonts/jetbrains-mono/"
-    dest: "{{ lookup('env', 'HOME') }}/Library/Fonts"
+    src: "{{ lookup('env', 'HOME') }}/personal/dotfiles/fonts/jetbrains-mono-nerd-fonts/"
+    dest: "{{ fonts_path }}"
diff --git a/vars/Darwin.yml b/vars/Darwin.yml
index b40e662..f7baef2 100644
--- a/vars/Darwin.yml
+++ b/vars/Darwin.yml
@@ -1 +1,2 @@
 kitty_app_path: "/Applications/kitty.app"
+fonts_path: "{{ lookup('env', 'HOME') }}/Library/Fonts/"
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 9d0ad48..55b97af 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -1 +1,2 @@
 kitty_app_path: "{{ lookup('env', 'HOME') }}/.local/kitty.app"
+fonts_path: "{{ lookup('env', 'HOME') }}/.fonts/"