From 2fe632b3258fb414f19b4d3d4f70319f452dd8c8 Mon Sep 17 00:00:00 2001
From: ProgramSnail <purpurebacterium@yandex.ru>
Date: Sun, 24 Aug 2025 00:08:44 +0300
Subject: [PATCH] bin path choice, proxy fix, common tasks

---
 defaults.yml                        |  1 +
 roles/common/tasks/main.yml         | 21 +++++++++++++++++++++
 roles/dev/tasks/txt.yml             |  6 +++---
 roles/dotfiles/tasks/main.yml       |  8 +++-----
 roles/installs/tasks/main.yml       |  4 ++++
 roles/installs/tasks/proxy.yml      |  4 ++--
 roles/installs/tasks/quickshell.yml |  4 ++--
 7 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 roles/common/tasks/main.yml

diff --git a/defaults.yml b/defaults.yml
index 835e3e2..36a7b37 100644
--- a/defaults.yml
+++ b/defaults.yml
@@ -12,3 +12,4 @@ container_tools:
     - txt
   haskell:
     - haskell
+bin_install_path: '.local/bin'
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
new file mode 100644
index 0000000..40b30fe
--- /dev/null
+++ b/roles/common/tasks/main.yml
@@ -0,0 +1,21 @@
+- name: Creating dotfiles dir
+  ansible.builtin.file:
+    path: "{{ ansible_env.HOME }}/.config"
+    state: directory
+    mode: a
+
+- name: Creating local bin dir
+  ansible.builtin.file:
+    path: "{{ ansible_env.HOME }}/.local/bin"
+    state: directory
+    mode: a
+
+- name: Getting programs list to check fish presence
+  ansible.builtin.package_facts:
+    manager: auto
+
+- name: Updating fish path to include local bin dir
+  ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/.local/bin
+  args:
+    executable: /usr/bin/fish
+  changed_when: false
diff --git a/roles/dev/tasks/txt.yml b/roles/dev/tasks/txt.yml
index 494b64a..8c6e13f 100644
--- a/roles/dev/tasks/txt.yml
+++ b/roles/dev/tasks/txt.yml
@@ -10,7 +10,7 @@
   ansible.builtin.unarchive:
     remote_src: true
     src: "https://github.com/typst/typst/releases/download/{{ typst_version.tag }}/typst-x86_64-unknown-linux-musl.tar.xz"
-    dest: "/usr/bin/"
+    dest: "{{ bin_install_path }}/"
     keep_newer: true
     mode: a+x
     extra_opts:
@@ -30,7 +30,7 @@
   ansible.builtin.unarchive:
     remote_src: true
     src: "https://github.com/Myriad-Dreamin/tinymist/releases/download/{{ tinymist_version.tag }}/tinymist-x86_64-unknown-linux-gnu.tar.gz"
-    dest: "/usr/bin/"
+    dest: "{{ bin_install_path }}/"
     mode: a+x
     keep_newer: true
     extra_opts:
@@ -51,7 +51,7 @@
     remote_src: true
     # TODO: insert v before version ??
     src: "https://github.com/blopker/codebook/releases/download/{{ codebook_version.tag }}/codebook-lsp-x86_64-unknown-linux-musl.tar.gz"
-    dest: "/usr/bin/"
+    dest: "{{ bin_install_path }}/"
     mode: a+x
     keep_newer: true
     extra_opts:
diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml
index 5909d53..59e1c4f 100644
--- a/roles/dotfiles/tasks/main.yml
+++ b/roles/dotfiles/tasks/main.yml
@@ -1,8 +1,6 @@
-- name: Creating dotfiles dir
-  ansible.builtin.file:
-    path: "{{ ansible_env.HOME }}/.config"
-    state: directory
-    mode: a
+- name: Common actions
+  ansible.builtin.include_role:
+    name: common
 
 - name: Bash config
   ansible.builtin.import_tasks: bash.yml
diff --git a/roles/installs/tasks/main.yml b/roles/installs/tasks/main.yml
index b063432..04c2454 100644
--- a/roles/installs/tasks/main.yml
+++ b/roles/installs/tasks/main.yml
@@ -1,3 +1,7 @@
+- name: Common actions
+  ansible.builtin.include_role:
+    name: common
+
 - name: Installing ansible packages
   ansible.builtin.import_tasks: ansible.yml
   when: "'ansible' in apps"
diff --git a/roles/installs/tasks/proxy.yml b/roles/installs/tasks/proxy.yml
index 7cb3ccb..a7cd301 100644
--- a/roles/installs/tasks/proxy.yml
+++ b/roles/installs/tasks/proxy.yml
@@ -9,7 +9,7 @@
   become: true
   ansible.builtin.get_url:
     url: "https://github.com/Snawoot/hola-proxy/releases/download/{{ hola_version.tag }}/hola-proxy.linux-amd64"
-    dest: "/usr/bin/hola-proxy"
+    dest: "{{ bin_install_path }}/hola-proxy"
     mode: a+x
     force: true
 
@@ -24,6 +24,6 @@
   become: true
   ansible.builtin.get_url:
     url: "https://github.com/Snawoot/opera-proxy/releases/download/{{ opera_version.tag }}/hola-proxy.linux-amd64"
-    dest: "/usr/bin/hola-proxy"
+    dest: "{{ bin_install_path }}/opera-proxy"
     mode: a+x
     force: true
diff --git a/roles/installs/tasks/quickshell.yml b/roles/installs/tasks/quickshell.yml
index 80c429d..76a7b31 100644
--- a/roles/installs/tasks/quickshell.yml
+++ b/roles/installs/tasks/quickshell.yml
@@ -45,7 +45,7 @@
   ansible.builtin.unarchive:
     remote_src: true
     src: "https://github.com/InioX/matugen/releases/download/v2.4.1/matugen-2.4.1-x86_64.tar.gz"
-    dest: "/usr/bin/" # TODO: user local install (?)
+    dest: "{{ bin_install_path }}/"
     mode: a+x
     keep_newer: true
     extra_opts:
@@ -64,6 +64,6 @@
   become: true
   ansible.builtin.get_url:
     url: "https://github.com/AvengeMedia/dgop/releases/download/{{ dgop_version.tag }}/dgop-{{ dgop_version.tag }}-linux-amd64"
-    dest: "/usr/bin/dgop" # TODO: user local install (?)
+    dest: "{{ bin_install_path }}/dgop"
     mode: a+x
     force: true