add difftastic

ansible/roles/packages/tasks/debian.yml

@@ -3,4 +3,5 @@
     name:
       - qalculate-gtk
       - rofi-dev
+      - c++
     state: present

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
     

ansible/roles/packages/tasks/python.yml

@@ -11,3 +11,4 @@
     - pre-commit
     - ruff
     - thefuck
+    - streamlink

ansible/roles/packages/tasks/rhel.yaml

@@ -7,5 +7,6 @@
       - automake
       - libtool
       - cheat
+      - gcc-c++
     state: present
 

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

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

gitconfig

@@ -10,9 +10,9 @@
 
 [merge]
     conflictstyle = diff3
-
 [diff]
     colorMoved = default
+    external = difft
 [commit]
     gpgsign = true
 [push]