diff --git a/roles/dev/tasks/build.yml b/roles/dev/tasks/build.yml index fbe4587..89a5461 100644 --- a/roles/dev/tasks/build.yml +++ b/roles/dev/tasks/build.yml @@ -1,4 +1,5 @@ -- name: Install common packages +- name: Installing common packages + become: true ansible.builtin.dnf5: name: - openssl diff --git a/roles/dev/tasks/coq.yml b/roles/dev/tasks/coq.yml index 001fcbd..36bb63f 100644 --- a/roles/dev/tasks/coq.yml +++ b/roles/dev/tasks/coq.yml @@ -1,7 +1,7 @@ -- name: Install vscode (uncoded) +- name: Installing vscode (uncoded) ansible.builtin.import_tasks: vscode.yml -- name: Install ocaml (required for lsp) +- name: Installing ocaml (required for lsp) ansible.builtin.import_tasks: ocaml.yml # TODO: add otion to choose ocaml switch diff --git a/roles/dev/tasks/cpp.yml b/roles/dev/tasks/cpp.yml index f6f22b0..cbc7d1e 100644 --- a/roles/dev/tasks/cpp.yml +++ b/roles/dev/tasks/cpp.yml @@ -2,7 +2,8 @@ # - name: Install build comon deps # ansible.builtin.import_tasks: build.yml -- name: Install tools for cpp dev +- name: Installing tools for cpp dev + become: true ansible.builtin.dnf5: name: - make @@ -10,10 +11,8 @@ - xmake - clang - - clang-tools - - clang-tools-extra - clang-devel - - clang-tools-devel + - clang-tools-extra - clang-tools-extra-devel - clang-libs diff --git a/roles/dev/tasks/haskell.yml b/roles/dev/tasks/haskell.yml index 27b1fa6..a9044e8 100644 --- a/roles/dev/tasks/haskell.yml +++ b/roles/dev/tasks/haskell.yml @@ -10,7 +10,7 @@ register: ghcup_dir # TODO: detect fish install ?? -- name: Install ghcup, stack, lsp server +- name: Installing ghcup, stack, lsp server ansible.builtin.shell: | SHELL='/usr/bin/fish' BOOTSTRAP_HASKELL_NONINTERACTIVE=1 diff --git a/roles/dev/tasks/js.yml b/roles/dev/tasks/js.yml index 145cfce..f034295 100644 --- a/roles/dev/tasks/js.yml +++ b/roles/dev/tasks/js.yml @@ -1,18 +1,14 @@ -- name: Install nodejs +- name: Installing nodejs & curl (for bun) + become: true ansible.builtin.dnf5: name: - nodejs - curl state: latest -- name: Curl is required for bun - ansible.builtin.dnf5: - name: - - curl - state: latest - # TODO: use curl script ?? -- name: Install bun +- name: Installing bun + become: true ansible.builtin.command: cmd: npm install -g bun changed_when: true # change is checked inside npm @@ -22,7 +18,7 @@ manager: auto - name: Update fish path for bun - ansible.builtin.shell: fish_add_path {{ ansible_env.HOME }}/.bun/bin + ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/.bun/bin args: executable: /usr/bin/fish - changed_when: true # change is checked inside fish_add_path + changed_when: false diff --git a/roles/dev/tasks/lang.yml b/roles/dev/tasks/lang.yml index 388f1fa..5ca8831 100644 --- a/roles/dev/tasks/lang.yml +++ b/roles/dev/tasks/lang.yml @@ -1,7 +1,8 @@ -- name: Install c++ build tools +- name: Installing c++ build tools ansible.builtin.import_tasks: cpp.yml -- name: Install tools for lang dev +- name: Installing tools for lang dev + become: true ansible.builtin.dnf5: name: - tree-sitter-cli diff --git a/roles/dev/tasks/ocaml.yml b/roles/dev/tasks/ocaml.yml index d667079..0e0dc8f 100644 --- a/roles/dev/tasks/ocaml.yml +++ b/roles/dev/tasks/ocaml.yml @@ -1,5 +1,6 @@ # TODO: use ansible ocaml package for install ?? -- name: Install opam +- name: Installing opam + become: true ansible.builtin.dnf5: name: - opam @@ -17,7 +18,7 @@ manager: auto - name: Update fish path for bun - ansible.builtin.shell: fish_add_path {{ ansible_env.HOME }}/.opam/default/bin + ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/.opam/default/bin args: executable: /usr/bin/fish - changed_when: true # change is checked inside fish_add_path + changed_when: false diff --git a/roles/dev/tasks/truffle.yml b/roles/dev/tasks/truffle.yml index d53304e..8d8d24d 100644 --- a/roles/dev/tasks/truffle.yml +++ b/roles/dev/tasks/truffle.yml @@ -5,25 +5,34 @@ mode: a # install tools -- name: Install openjdk +- name: Installing openjdk + become: true ansible.builtin.dnf5: name: - java-latest-openjdk - maven state: latest -- name: "Installing graalvm 23" +- name: Creating graalvm dir + ansible.builtin.file: + path: "{{ ansible_env.HOME }}/truffle/graalvm-23" + state: directory + mode: a +- name: Installing graalvm 23 ansible.builtin.unarchive: remote_src: true src: "https://download.oracle.com/graalvm/23/latest/graalvm-jdk-23_linux-x64_bin.tar.gz" - dest: "{{ ansible_env.HOME }}/truffle/graalvm" + dest: "{{ ansible_env.HOME }}/truffle/graalvm-23" mode: a keep_newer: true + extra_opts: [--strip-components=1] - name: Select graalvm as java + become: true community.general.alternatives: name: java - path: "{{ ansible_env.HOME }}/truffle/graalvm-jdk-23.0.2+7.1/jre/bin/java" + link: /usr/bin/java + path: "{{ ansible_env.HOME }}/truffle/graalvm-23/bin/java" -- name: Install Intellij IDEA +- name: Installing Intellij IDEA ansible.builtin.include_role: name: gantsign.intellij diff --git a/roles/dev/tasks/txt.yml b/roles/dev/tasks/txt.yml index e225b44..02fb079 100644 --- a/roles/dev/tasks/txt.yml +++ b/roles/dev/tasks/txt.yml @@ -5,7 +5,7 @@ action: latest_release register: typst_version -- name: "Installing typst {{ typst_version.tag }}" +- name: Installing typst {{ typst_version.tag }} become: true ansible.builtin.unarchive: remote_src: true @@ -26,7 +26,7 @@ action: latest_release register: tinymist_version -- name: "Installing tinymist (typst lsp) {{ tinymist_version.tag }}" +- name: Installing tinymist (typst lsp) {{ tinymist_version.tag }} become: true ansible.builtin.unarchive: remote_src: true diff --git a/roles/dev/tasks/vscode.yml b/roles/dev/tasks/vscode.yml index 6aa535c..423201a 100644 --- a/roles/dev/tasks/vscode.yml +++ b/roles/dev/tasks/vscode.yml @@ -1,4 +1,5 @@ - name: Installing vscode deps + become: true ansible.builtin.dnf5: name: - fuse diff --git a/roles/dotfiles/files/.config/fish/fish_variables b/roles/dotfiles/files/.config/fish/fish_variables deleted file mode 100644 index 14730eb..0000000 --- a/roles/dotfiles/files/.config/fish/fish_variables +++ /dev/null @@ -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 diff --git a/roles/dotfiles/files/.profile b/roles/dotfiles/files/.profile new file mode 100644 index 0000000..e69de29 diff --git a/roles/dotfiles/tasks/cli.yml b/roles/dotfiles/tasks/cli.yml index bcb571c..9f3c143 100644 --- a/roles/dotfiles/tasks/cli.yml +++ b/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 diff --git a/roles/dotfiles/tasks/scripts.yml b/roles/dotfiles/tasks/scripts.yml index 5f14598..1292ee9 100644 --- a/roles/dotfiles/tasks/scripts.yml +++ b/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' diff --git a/roles/dotfiles/tasks/ssh.yml b/roles/dotfiles/tasks/ssh.yml index 699ead0..9c59455 100644 --- a/roles/dotfiles/tasks/ssh.yml +++ b/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' diff --git a/roles/flatpak/tasks/main.yml b/roles/flatpak/tasks/main.yml index 40a2365..74760b7 100644 --- a/roles/flatpak/tasks/main.yml +++ b/roles/flatpak/tasks/main.yml @@ -1,4 +1,4 @@ -- name: Install flatpak +- name: Installing flatpak become: true ansible.builtin.dnf5: name: @@ -12,7 +12,7 @@ flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo method: user -- name: Install utils +- name: Installing utils community.general.flatpak: name: - com.github.tchx84.Flatseal @@ -36,7 +36,7 @@ method: user when: "'utils' in flatpak_apps" -- name: Install web browsers +- name: Installing web browsers community.general.flatpak: name: - io.gitlab.librewolf-community @@ -46,7 +46,7 @@ method: user when: "'web' in flatpak_apps" -- name: Install docs tools +- name: Installing docs tools community.general.flatpak: name: - com.github.arminstraub.krop @@ -61,7 +61,7 @@ method: user when: "'docs' in flatpak_apps" -- name: Install notes tools +- name: Installing notes tools community.general.flatpak: name: - com.github.flxzt.rnote @@ -70,7 +70,7 @@ method: user when: "'notes' in flatpak_apps" -- name: Install ai tools +- name: Installing ai tools community.general.flatpak: name: - com.jeffser.Alpaca @@ -78,7 +78,7 @@ method: user when: "'ai' in flatpak_apps" -- name: Install art tools +- name: Installing art tools community.general.flatpak: name: - io.github.guillaumechereau.Goxel @@ -92,7 +92,7 @@ method: user when: "'art' in flatpak_apps" -- name: Install tools for things production +- name: Installing tools for things production community.general.flatpak: name: - org.kicad.KiCad @@ -101,7 +101,7 @@ method: user when: "'production' in flatpak_apps" -- name: Install gamedev tools +- name: Installing gamedev tools community.general.flatpak: name: - org.godotengine.GodotSharp @@ -111,7 +111,7 @@ method: user when: "'gamedev' in flatpak_apps" -- name: Install dev tools +- name: Installing dev tools community.general.flatpak: name: - dev.lapce.lapce @@ -126,7 +126,7 @@ method: user when: "'dev' in flatpak_apps" -- name: Install games +- name: Installing games community.general.flatpak: name: - com.usebottles.bottles @@ -143,7 +143,7 @@ method: user when: "'games' in flatpak_apps" -- name: Install messaging apps +- name: Installing messaging apps community.general.flatpak: name: - org.claws_mail.Claws-Mail @@ -157,7 +157,7 @@ method: user when: "'messaging' in flatpak_apps" -- name: Install study apps +- name: Installing study apps community.general.flatpak: name: - org.kde.kig diff --git a/roles/installs/tasks/cli.yml b/roles/installs/tasks/cli.yml index 13db513..6c08482 100644 --- a/roles/installs/tasks/cli.yml +++ b/roles/installs/tasks/cli.yml @@ -1,4 +1,5 @@ -- name: Install cli tools +- name: Installing cli tools + become: true ansible.builtin.dnf5: name: # shells & common utils @@ -29,6 +30,7 @@ # other - ansible - ansible-lint + - cronie state: latest diff --git a/roles/installs/tasks/gui.yml b/roles/installs/tasks/gui.yml index 13acd1e..3d60d36 100644 --- a/roles/installs/tasks/gui.yml +++ b/roles/installs/tasks/gui.yml @@ -1,4 +1,5 @@ -- name: Install gui tools +- name: Installing gui tools + become: true ansible.builtin.dnf5: name: - jetbrains-mono-fonts diff --git a/roles/installs/tasks/host.yml b/roles/installs/tasks/host.yml index 61f35ad..e1c9cb8 100644 --- a/roles/installs/tasks/host.yml +++ b/roles/installs/tasks/host.yml @@ -1,4 +1,5 @@ -- name: Install cli tools for bare metal host +- name: Installing cli tools for bare metal host + become: true ansible.builtin.dnf5: name: - distrobox diff --git a/roles/installs/tasks/main.yml b/roles/installs/tasks/main.yml index 9a1645c..c75534e 100644 --- a/roles/installs/tasks/main.yml +++ b/roles/installs/tasks/main.yml @@ -1,15 +1,15 @@ -- name: Install common cli apps +- name: Installing common cli apps ansible.builtin.import_tasks: cli.yml when: "'cli' in apps" -- name: Install common gui apps +- name: Installing common gui apps ansible.builtin.import_tasks: gui.yml when: "'gui' in apps" -- name: Install pps for host +- name: Installing pps for host ansible.builtin.import_tasks: host.yml when: "'host' in apps" -- name: Install proxies +- name: Installing proxies ansible.builtin.import_tasks: proxy.yml when: "'proxy' in apps" diff --git a/roles/installs/tasks/proxy.yml b/roles/installs/tasks/proxy.yml index d5d2e76..05b599e 100644 --- a/roles/installs/tasks/proxy.yml +++ b/roles/installs/tasks/proxy.yml @@ -5,7 +5,7 @@ action: latest_release register: hola_version -- name: "Installing hola-proxy {{ hola_version.tag }}" +- name: Installing hola-proxy {{ hola_version.tag }} become: true ansible.builtin.get_url: # TODO: insert v before version ?? @@ -21,7 +21,7 @@ action: latest_release register: opera_version -- name: "Installing opera-proxy {{ opera_version.tag }}" +- name: Installing opera-proxy {{ opera_version.tag }} become: true ansible.builtin.get_url: # TODO: insert v before version ??