From 943c781871325e93c848d83be3ec11b81942d495 Mon Sep 17 00:00:00 2001
From: Bruno Paz <184563+brpaz@users.noreply.github.com>
Date: Sat, 7 Sep 2024 22:47:54 +0100
Subject: [PATCH] updates

---
 docs/APPLICATIONS.md            | 7 +++----
 roles/ktop/tasks/main.yml       | 3 +--
 roles/netscanner/tasks/main.yml | 4 ++--
 roles/python/defaults/main.yml  | 1 +
 roles/python/tasks/main.yml     | 2 ++
 5 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 roles/python/defaults/main.yml

diff --git a/docs/APPLICATIONS.md b/docs/APPLICATIONS.md
index cfffc37..32233dd 100644
--- a/docs/APPLICATIONS.md
+++ b/docs/APPLICATIONS.md
@@ -228,8 +228,8 @@ I use ZSH shell with the following extras:
 * [antidote](https://github.com/mattmc3/antidote) - Antidote is a feature complete Zsh implementation of the legacy Antibody plugin manager.
 * [zsh-completions](https://github.com/zsh-users/zsh-completions) - Additional completion definitions for Zsh.
 * [zsh-you-should-use](https://github.com/MichaelAquilina/zsh-you-should-use) - ZSH plugin that reminds you to use existing aliases for commands you just typed.
+* [zoxide](https://github.com/ajeetdsouza/zoxide) -  A smarter cd command. Supports all major shells.
 - [yorukot/superfile](https://github.com/yorukot/superfile) - Pretty fancy and modern terminal file manager.
-- [zoxide](https://github.com/ajeetdsouza/zoxide) -  A smarter cd command. Supports all major shells.
 * [urbainvaes/fzf-marks](https://github.com/urbainvaes/fzf-marks) - Plugin to manage bookmarks in bash and zsh
 * [fzf](https://github.com/junegunn/fzf) -  A command-line fuzzy finder
 * [fd](https://github.com/sharkdp/fd) - A simple, fast and user-friendly alternative to 'find'
@@ -243,7 +243,6 @@ I use ZSH shell with the following extras:
 * [pandoc](https://github.com/jgm/pandoc) - Universal markup converter
 * [glow](https://github.com/charmbracelet/glow) - Render markdown on the CLI
 * [lnav](http://lnav.org/) - The Log File Navigator
-* [hasha-cli](https://github.com/sindresorus/hasha-cli) - hashing made simple. Get the hash of text or stdin.
 
 ### Multimedia
 
@@ -271,8 +270,8 @@ I use ZSH shell with the following extras:
 * [conventional-changelog](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-cli#readme)
 * [commitizen/cz-cli](https://github.com/commitizen/cz-cli) - The commitizen command line utility.
 * [goreleaser/goreleaser](https://github.com/goreleaser/goreleaser) - Deliver Go binaries as fast and easily as possible.
-* [cezaraugusto/mklicense](https://github.com/cezaraugusto/mklicense) -  CLI tool for generating Licenses\. Easily\.
-* [TejasQ/add-gitignore](https://github.com/TejasQ/add-gitignore) -  An interactive CLI tool that adds a .gitignore to your projects.
+* [cezaraugusto/mklicense](https://github.com/cezaraugusto/mklicense) -  CLI tool for generating Licenses. Easily.
+* [conduct - npm](https://www.npmjs.com/package/conduct)
 
 ### Project Scaffolding
 
diff --git a/roles/ktop/tasks/main.yml b/roles/ktop/tasks/main.yml
index 5e38b36..56c4d8e 100644
--- a/roles/ktop/tasks/main.yml
+++ b/roles/ktop/tasks/main.yml
@@ -8,7 +8,7 @@
 
 - name: Download and extract archive
   ansible.builtin.unarchive:
-    src: https://github.com/vladimirvivien/ktop/releases/download/{{ release.tag }}/ktop_{{release.tag }}_linux_amd64.tar.gz
+    src: https://github.com/vladimirvivien/ktop/releases/download/{{ release.tag }}/ktop_{{ release.tag }}_linux_amd64.tar.gz
     dest: '{{ setup_dir }}'
     remote_src: true
   become: true
@@ -19,4 +19,3 @@
     dest: "{{ bin_dir }}/ktop"
     mode: a+x
   become: true
-
diff --git a/roles/netscanner/tasks/main.yml b/roles/netscanner/tasks/main.yml
index 4d83229..eddf823 100644
--- a/roles/netscanner/tasks/main.yml
+++ b/roles/netscanner/tasks/main.yml
@@ -5,7 +5,7 @@
   ignore_errors: true
 
 - name: Fail if cargo is not installed
-  fail:
+  ansible.builtin.fail:
     msg: "cargo is not installed"
   when: cargo_version.rc != 0
 
@@ -13,4 +13,4 @@
   ansible.builtin.command:
     cmd: cargo install netscanner
   args:
-    creates: /{{ ansible_env.HOME  }}/.cargo/bin/netscanner
+    creates: /{{ ansible_env.HOME }}/.cargo/bin/netscanner
diff --git a/roles/python/defaults/main.yml b/roles/python/defaults/main.yml
new file mode 100644
index 0000000..702cffb
--- /dev/null
+++ b/roles/python/defaults/main.yml
@@ -0,0 +1 @@
+python_pip_executable: /usr/bin/pip
diff --git a/roles/python/tasks/main.yml b/roles/python/tasks/main.yml
index 43efa2f..05b1d63 100644
--- a/roles/python/tasks/main.yml
+++ b/roles/python/tasks/main.yml
@@ -7,3 +7,5 @@
       - black
       - setuptools
       - pipx
+      - poetry
+    executable: "{{ python_pip_executable }}" # required to avoid installing on the venv used by ansible