From a92d6f0b255174884492d3ebef3ce2365ed355c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?c=C4=83t=C4=83lin?= <catalin@roboces.dev>
Date: Fri, 20 Oct 2023 17:11:20 +0200
Subject: [PATCH] add difftastic

---
 ansible/roles/packages/tasks/debian.yml | 1 +
 ansible/roles/packages/tasks/main.yml   | 5 ++++-
 ansible/roles/packages/tasks/python.yml | 1 +
 ansible/roles/packages/tasks/rhel.yaml  | 1 +
 ansible/roles/packages/tasks/rust.yml   | 5 +----
 garden                                  | 1 +
 gitconfig                               | 2 +-
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/packages/tasks/debian.yml b/ansible/roles/packages/tasks/debian.yml
index 6eceb36..b3e7b3c 100644
--- a/ansible/roles/packages/tasks/debian.yml
+++ b/ansible/roles/packages/tasks/debian.yml
@@ -3,4 +3,5 @@
     name:
       - qalculate-gtk
       - rofi-dev
+      - c++
     state: present
diff --git a/ansible/roles/packages/tasks/main.yml b/ansible/roles/packages/tasks/main.yml
index 4bb59e7..76234ac 100644
--- a/ansible/roles/packages/tasks/main.yml
+++ b/ansible/roles/packages/tasks/main.yml
@@ -23,8 +23,11 @@
 
 - name: Install Rust packages
   import_tasks: rust.yml
+  tags:
+    - rust
 
 - name: Install Python packages
   import_tasks: python.yml
-       #    
+  tags:
+    - python
     
diff --git a/ansible/roles/packages/tasks/python.yml b/ansible/roles/packages/tasks/python.yml
index d27b3a1..962f446 100644
--- a/ansible/roles/packages/tasks/python.yml
+++ b/ansible/roles/packages/tasks/python.yml
@@ -11,3 +11,4 @@
     - pre-commit
     - ruff
     - thefuck
+    - streamlink
diff --git a/ansible/roles/packages/tasks/rhel.yaml b/ansible/roles/packages/tasks/rhel.yaml
index abeba96..275d0e3 100644
--- a/ansible/roles/packages/tasks/rhel.yaml
+++ b/ansible/roles/packages/tasks/rhel.yaml
@@ -7,5 +7,6 @@
       - automake
       - libtool
       - cheat
+      - gcc-c++
     state: present
 
diff --git a/ansible/roles/packages/tasks/rust.yml b/ansible/roles/packages/tasks/rust.yml
index b0863a8..a77f059 100644
--- a/ansible/roles/packages/tasks/rust.yml
+++ b/ansible/roles/packages/tasks/rust.yml
@@ -12,14 +12,10 @@
     dest: /tmp/sh.rustup.rs
     mode: '0755'
     force: 'yes'
-  tags:
-    - rust
 
 - name: Install rust and cargo
   when: cargo_exists is failed
   shell: /tmp/sh.rustup.rs -y
-  tags:
-    - rust
   
 - name: Install cargo packages
   community.general.cargo:
@@ -33,4 +29,5 @@
       - cargo-update
       - cargo-cache
       - garden-tools
+      - difftastic
     state: latest
diff --git a/garden b/garden
index 11fc850..d70a0ee 100644
--- a/garden
+++ b/garden
@@ -7,6 +7,7 @@ commands:
   lol: 'git log --decorate --graph --oneline "$@" && echo'
   commit: git commit -a
   push: git push
+  fish: fish
   status:
     - git status
     - git branch
diff --git a/gitconfig b/gitconfig
index 20c114c..5bf6170 100644
--- a/gitconfig
+++ b/gitconfig
@@ -10,9 +10,9 @@
 
 [merge]
     conflictstyle = diff3
-
 [diff]
     colorMoved = default
+    external = difft
 [commit]
     gpgsign = true
 [push]