names fix, fish config copying, some fixes dn to tests

roles/dotfiles/files/.config/fish/fish_variables

@@ -1,44 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR __fish_initialized:3400
-SETUVAR fish_color_autosuggestion:4D5566
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:39BAE6
-SETUVAR fish_color_comment:626A73
-SETUVAR fish_color_cwd:59C2FF
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:F29668
-SETUVAR fish_color_error:FF3333
-SETUVAR fish_color_escape:95E6CB
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_keyword:39BAE6
-SETUVAR fish_color_match:F07178
-SETUVAR fish_color_normal:B3B1AD
-SETUVAR fish_color_operator:E6B450
-SETUVAR fish_color_option:B3B1AD
-SETUVAR fish_color_param:B3B1AD
-SETUVAR fish_color_quote:C2D94C
-SETUVAR fish_color_redirection:FFEE99
-SETUVAR fish_color_search_match:\x2d\x2dbackground\x3dE6B450
-SETUVAR fish_color_selection:\x2d\x2dbackground\x3dE6B450
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_greeting:\x1d
-SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_background:\x1d
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
-SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_pager_color_secondary_background:\x1d
-SETUVAR fish_pager_color_secondary_completion:\x1d
-SETUVAR fish_pager_color_secondary_description:\x1d
-SETUVAR fish_pager_color_secondary_prefix:\x1d
-SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dE6B450
-SETUVAR fish_pager_color_selected_completion:\x1d
-SETUVAR fish_pager_color_selected_description:\x1d
-SETUVAR fish_pager_color_selected_prefix:\x1d
-SETUVAR fish_user_paths:/home/dragon/\x2elocal/bin

roles/dotfiles/tasks/cli.yml

@@ -1,17 +1,29 @@
 # shell
-- name: Import bash config
+- name: Importing bash config
   ansible.builtin.import_tasks: bash.yml
 
-# copy to modify during install ??
-- name: Link fish configuration directory
+- name: Creating fish configuration directory
   ansible.builtin.file:
-    src: '{{ role_path }}/files/.config/fish'
     dest: '{{ ansible_env.HOME }}/.config/fish'
+    state: directory
+    mode: a
+
+- name: Linking fish configuration (config)
+  ansible.builtin.file:
+    src: '{{ role_path }}/files/.config/fish/config.fish'
+    dest: '{{ ansible_env.HOME }}/.config/fish/config.fish'
+    state: link
+    force: true
+
+- name: Linking fish configuration (functions)
+  ansible.builtin.file:
+    src: '{{ role_path }}/files/.config/fish/functions'
+    dest: '{{ ansible_env.HOME }}/.config/fish/functions'
     state: link
     force: true
 
 # apps
-- name: Link tmux configuration
+- name: Linking tmux configuration
   ansible.builtin.file:
     src: '{{ role_path }}/files/.tmux.conf'
     dest: '{{ ansible_env.HOME }}/.tmux.conf'
@@ -19,14 +31,14 @@
     force: true
 
 # TODO: set server keys in some way
-- name: Link tmate configuration
+- name: Linking tmate configuration
   ansible.builtin.file:
     src: '{{ role_path }}/files/.tmate.conf'
     dest: '{{ ansible_env.HOME }}/.tmate.conf'
     state: link
     force: true
 
-- name: Link helix configuration
+- name: Linking helix configuration
   ansible.builtin.file:
     src: '{{ role_path }}/files/.config/helix'
     dest: '{{ ansible_env.HOME }}/.config/helix'
@@ -34,12 +46,12 @@
     force: true
 
 # path update
-- name: Get programs list to check fish presence
+- name: Getting programs list to check fish presence
   ansible.builtin.package_facts:
     manager: auto
 
-- name: Update fish path to include scripts folder
-  ansible.builtin.shell: fish_add_path {{ ansible_env.HOME }}/.bin
+- name: Updating fish path to include scripts folder
+  ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/.bin
   args:
     executable: /usr/bin/fish
-  changed_when: true # change is checked inside fish_add_path
+  changed_when: false

roles/dotfiles/tasks/scripts.yml

@@ -5,6 +5,10 @@
     state: link
     force: true
 
+- name: Debug
+  ansible.builtin.debug:
+    msg: 'Home is {{ ansible_env.HOME }}'
+
 - name: Link templates
   ansible.builtin.file:
     src: '{{ role_path }}/files/.templates'

roles/dotfiles/tasks/ssh.yml

@@ -2,7 +2,7 @@
 # TODO: copy directory ??
 
 # create .ssh in files by hand, use everywere automatically
-- name: Link gitconfig
+- name: Link ssh
   ansible.builtin.file:
     src: '{{ role_path }}/files/.ssh'
     dest: '{{ ansible_env.HOME }}/.ssh'