From 86f72b810e08faa83824cace47715d8c3632c79a Mon Sep 17 00:00:00 2001 From: ProgramSnail Date: Sun, 17 Aug 2025 16:26:47 +0300 Subject: [PATCH] me fish dirs, fixes --- roles/dev/tasks/gamedev.yml | 2 +- roles/dev/tasks/js.yml | 7 ------- roles/dev/tasks/truffle.yml | 7 ++++--- roles/dotfiles/files/.config/fish/config.fish | 3 --- roles/dotfiles/files/.config/fish/fish_variables | 15 +++------------ roles/dotfiles/tasks/cli.yml | 14 ++++++++++++++ 6 files changed, 22 insertions(+), 26 deletions(-) diff --git a/roles/dev/tasks/gamedev.yml b/roles/dev/tasks/gamedev.yml index a75a99c..7a0d53a 100644 --- a/roles/dev/tasks/gamedev.yml +++ b/roles/dev/tasks/gamedev.yml @@ -5,7 +5,7 @@ # defold - name: Creating defold game engine dir ansible.builtin.file: - path: "{{ ansible_env.HOME }}/truffle/defold" + path: "{{ ansible_env.HOME }}/defold" state: directory mode: a - name: Installing defold game engine diff --git a/roles/dev/tasks/js.yml b/roles/dev/tasks/js.yml index 7c20079..9a53be5 100644 --- a/roles/dev/tasks/js.yml +++ b/roles/dev/tasks/js.yml @@ -6,13 +6,6 @@ - curl state: latest -# TODO: use curl script ?? -- name: Installing bun - become: true - ansible.builtin.command: - cmd: npm install -g bun - changed_when: true # change is checked inside npm - - name: Downloading bun install script ansible.builtin.uri: url: https://bun.sh/install diff --git a/roles/dev/tasks/truffle.yml b/roles/dev/tasks/truffle.yml index b118b61..655d929 100644 --- a/roles/dev/tasks/truffle.yml +++ b/roles/dev/tasks/truffle.yml @@ -46,20 +46,21 @@ ansible.builtin.file: path: "{{ ansible_env.HOME }}/idea" state: directory - mode: a - name: Installing intellij idea ansible.builtin.unarchive: remote_src: true src: "https://github.com/JetBrains/intellij-community/releases/download/idea%2F2025.2/ideaIC-252.23892.409.tar.gz" dest: "{{ ansible_env.HOME }}/idea" - mode: a - keep_newer: true extra_opts: [--strip-components=1] - name: Updating fish path for intellil idea ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/idea/bin args: executable: /usr/bin/fish changed_when: false +# - name: Running idea for the first time +# ansible.builtin.command: +# cmd: "{{ ansible_env.HOME }}/idea/bin/idea.sh" +# changed_when: false # examples - name: Clone simple language example diff --git a/roles/dotfiles/files/.config/fish/config.fish b/roles/dotfiles/files/.config/fish/config.fish index c6a3dc2..d714361 100644 --- a/roles/dotfiles/files/.config/fish/config.fish +++ b/roles/dotfiles/files/.config/fish/config.fish @@ -1,6 +1,3 @@ if status is-interactive # Commands to run in interactive sessions can go here end - -# opam configuration -source /home/dragon/Containers/Dev/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true diff --git a/roles/dotfiles/files/.config/fish/fish_variables b/roles/dotfiles/files/.config/fish/fish_variables index e1d0578..44f644f 100644 --- a/roles/dotfiles/files/.config/fish/fish_variables +++ b/roles/dotfiles/files/.config/fish/fish_variables @@ -1,5 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 +SETUVAR __fish_initialized:3800 SETUVAR fish_color_autosuggestion:brblack SETUVAR fish_color_cancel:\x2dr SETUVAR fish_color_command:normal @@ -12,30 +13,20 @@ SETUVAR fish_color_escape:brcyan SETUVAR fish_color_history_current:\x2d\x2dbold SETUVAR fish_color_host:normal SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_keyword:normal -SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue SETUVAR fish_color_normal:normal SETUVAR fish_color_operator:brcyan -SETUVAR fish_color_option:cyan SETUVAR fish_color_param:cyan SETUVAR fish_color_quote:yellow SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline 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:yellow\x1e\x2di 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:\x2dr -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/Containers/DevHomebrew/idea/bin\x1e/home/dragon/Containers/DevHomebrew/\x2ebin diff --git a/roles/dotfiles/tasks/cli.yml b/roles/dotfiles/tasks/cli.yml index 823dba7..93e38a5 100644 --- a/roles/dotfiles/tasks/cli.yml +++ b/roles/dotfiles/tasks/cli.yml @@ -22,6 +22,20 @@ state: link force: true +- name: Linking fish configuration (completions) + ansible.builtin.file: + src: '{{ role_path }}/files/.config/fish/completions' + dest: '{{ ansible_env.HOME }}/.config/fish/completions' + state: link + force: true + +- name: Linking fish configuration (conf.d) + ansible.builtin.file: + src: '{{ role_path }}/files/.config/fish/conf.d' + dest: '{{ ansible_env.HOME }}/.config/fish/conf.d' + state: link + force: true + - name: Copying fish configuration (variables) ansible.builtin.copy: src: '{{ role_path }}/files/.config/fish/fish_variables'