diff --git a/playbooks/box.yml b/playbooks/box.yml index 1ad2b7a..aff664d 100644 --- a/playbooks/box.yml +++ b/playbooks/box.yml @@ -9,20 +9,19 @@ - ssh - scripts apps: - - ansible - cli vars_prompt: - name: tools_in - prompt: "Specify comma separated list of required tool packages (cpp, js, haskell, ocaml, coq, txt, lang, truffle, gamedev)" + prompt: "Specify comma separated list of required tool packages (cpp, js, haskell, ocaml, coq, txt, lang, truffle)" private: false pre_tasks: - name: Get tools list ansible.builtin.set_fact: tools: "{{ tools_in.split(',') }}" roles: - # install apps - - role: installs # link and copy dotfiles - role: dotfiles + # install apps + - role: installs # install and setup dev tools - role: dev diff --git a/playbooks/host.yml b/playbooks/host.yml index 2da5dad..907528e 100644 --- a/playbooks/host.yml +++ b/playbooks/host.yml @@ -18,16 +18,15 @@ - ssh - scripts apps: - - ansible - cli pre_tasks: - name: Get tools list ansible.builtin.set_fact: tools: "{{ tools_in.split(',') }}" roles: - # install apps - - role: installs # link and copy dotfiles - role: dotfiles + # install apps + - role: installs # install and setup dev tools - role: dev diff --git a/roles/dev/tasks/build.yml b/roles/dev/tasks/build.yml index b2ce1c5..fbe4587 100644 --- a/roles/dev/tasks/build.yml +++ b/roles/dev/tasks/build.yml @@ -1,9 +1,8 @@ -- name: Installing common dependencies packages - become: true +- name: Install common packages ansible.builtin.dnf5: name: - openssl - # - perl # NOTE: install does not work (?) + - perl - ninja-build - git - make diff --git a/roles/dev/tasks/coq.yml b/roles/dev/tasks/coq.yml index 36bb63f..001fcbd 100644 --- a/roles/dev/tasks/coq.yml +++ b/roles/dev/tasks/coq.yml @@ -1,7 +1,7 @@ -- name: Installing vscode (uncoded) +- name: Install vscode (uncoded) ansible.builtin.import_tasks: vscode.yml -- name: Installing ocaml (required for lsp) +- name: Install 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 cbc7d1e..f6f22b0 100644 --- a/roles/dev/tasks/cpp.yml +++ b/roles/dev/tasks/cpp.yml @@ -2,8 +2,7 @@ # - name: Install build comon deps # ansible.builtin.import_tasks: build.yml -- name: Installing tools for cpp dev - become: true +- name: Install tools for cpp dev ansible.builtin.dnf5: name: - make @@ -11,8 +10,10 @@ - xmake - clang - - clang-devel + - clang-tools - clang-tools-extra + - clang-devel + - clang-tools-devel - clang-tools-extra-devel - clang-libs diff --git a/roles/dev/tasks/gamedev.yml b/roles/dev/tasks/gamedev.yml deleted file mode 100644 index 7a0d53a..0000000 --- a/roles/dev/tasks/gamedev.yml +++ /dev/null @@ -1,64 +0,0 @@ -- name: Getting programs list to check fish presence - ansible.builtin.package_facts: - manager: auto - -# defold -- name: Creating defold game engine dir - ansible.builtin.file: - path: "{{ ansible_env.HOME }}/defold" - state: directory - mode: a -- name: Installing defold game engine - ansible.builtin.unarchive: - remote_src: true - src: "https://github.com/defold/defold/releases/latest/download/Defold-x86_64-linux.zip" - dest: "{{ ansible_env.HOME }}/defold" - mode: a - keep_newer: true - extra_opts: [--strip-components=1] -- name: Updating fish path for defold - ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/defold - args: - executable: /usr/bin/fish - changed_when: false - -# lua lsp -- name: Get latest typst version - community.general.github_release: - user: typst - repo: typst - action: latest_release - register: lua_lsp_version - -- name: Installing lua lsp {{ lua_lsp_version.tag }} - become: true - ansible.builtin.unarchive: - remote_src: true - # TODO: remove v before version ?? - src: "https://github.com/LuaLS/lua-language-server/releases/download/{{ lua_lsp_version.tag }}/lua-language-server-{{ lua_lsp_version.tag }}-linux-x64.tar.gz" - dest: "{{ ansible_env.HOME }}/.lua_lsp" - keep_newer: true - mode: a - extra_opts: [--strip-components=1] -- name: Updating fish path for lua lsp - ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/.lua_lsp/bin - args: - executable: /usr/bin/fish - changed_when: false - -# TODO: download directly, add godot c# (?) -# godot -- name: Installing godot game engine - become: true - ansible.builtin.dnf5: - name: - - godot - state: latest - -# raylib -- name: Installing raylib - become: true - ansible.builtin.dnf5: - name: - - raylib-devel - state: latest diff --git a/roles/dev/tasks/haskell.yml b/roles/dev/tasks/haskell.yml index 4964a4e..27b1fa6 100644 --- a/roles/dev/tasks/haskell.yml +++ b/roles/dev/tasks/haskell.yml @@ -1,16 +1,16 @@ -- name: Downloading ghcup bootstrap script +- name: Download ghcup bootstrap script ansible.builtin.uri: url: https://get-ghcup.haskell.org return_content: true register: ghcup_bootstrap -- name: Checking if .ghcup present +- name: Check if .ghcup present ansible.builtin.stat: path: '{{ ansible_env.HOME }}/.ghcup' register: ghcup_dir # TODO: detect fish install ?? -- name: Installing ghcup, stack, lsp server +- name: Install 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 9a53be5..145cfce 100644 --- a/roles/dev/tasks/js.yml +++ b/roles/dev/tasks/js.yml @@ -1,37 +1,28 @@ -- name: Installing nodejs & curl (for bun) - become: true +- name: Install nodejs ansible.builtin.dnf5: name: - nodejs - curl state: latest -- name: Downloading bun install script - ansible.builtin.uri: - url: https://bun.sh/install - return_content: true - register: bun_bootstrap +- name: Curl is required for bun + ansible.builtin.dnf5: + name: + - curl + state: latest -- name: Checking if .bun present - ansible.builtin.stat: - path: '{{ ansible_env.HOME }}/.bun' - register: bun_dir +# TODO: use curl script ?? +- name: Install bun + ansible.builtin.command: + cmd: npm install -g bun + changed_when: true # change is checked inside npm -# TODO: detect fish install ?? -- name: Installing bun - ansible.builtin.shell: | - {{ bun_bootstrap.content }} - args: - executable: /bin/bash - changed_when: not bun_dir.stat.exists - -# update path -- name: Getting programs list to check fish presence +- name: Get programs list to check fish presence ansible.builtin.package_facts: manager: auto -- name: Updating fish path for bun - ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/.bun/bin +- name: Update fish path for bun + ansible.builtin.shell: fish_add_path {{ ansible_env.HOME }}/.bun/bin args: executable: /usr/bin/fish - changed_when: false + changed_when: true # change is checked inside fish_add_path diff --git a/roles/dev/tasks/lang.yml b/roles/dev/tasks/lang.yml index 5ca8831..388f1fa 100644 --- a/roles/dev/tasks/lang.yml +++ b/roles/dev/tasks/lang.yml @@ -1,8 +1,7 @@ -- name: Installing c++ build tools +- name: Install c++ build tools ansible.builtin.import_tasks: cpp.yml -- name: Installing tools for lang dev - become: true +- name: Install tools for lang dev ansible.builtin.dnf5: name: - tree-sitter-cli diff --git a/roles/dev/tasks/main.yml b/roles/dev/tasks/main.yml index 33ffcde..6130574 100644 --- a/roles/dev/tasks/main.yml +++ b/roles/dev/tasks/main.yml @@ -32,7 +32,3 @@ - name: Truffle development environment ansible.builtin.import_tasks: truffle.yml when: "'truffle' in tools" - -- name: Truffle development environment - ansible.builtin.import_tasks: gamedev.yml - when: "'gamedev' in tools" diff --git a/roles/dev/tasks/ocaml.yml b/roles/dev/tasks/ocaml.yml index 0e0dc8f..d667079 100644 --- a/roles/dev/tasks/ocaml.yml +++ b/roles/dev/tasks/ocaml.yml @@ -1,6 +1,5 @@ # TODO: use ansible ocaml package for install ?? -- name: Installing opam - become: true +- name: Install opam ansible.builtin.dnf5: name: - opam @@ -18,7 +17,7 @@ manager: auto - name: Update fish path for bun - ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/.opam/default/bin + ansible.builtin.shell: fish_add_path {{ ansible_env.HOME }}/.opam/default/bin args: executable: /usr/bin/fish - changed_when: false + changed_when: true # change is checked inside fish_add_path diff --git a/roles/dev/tasks/truffle.yml b/roles/dev/tasks/truffle.yml index 655d929..d53304e 100644 --- a/roles/dev/tasks/truffle.yml +++ b/roles/dev/tasks/truffle.yml @@ -1,7 +1,3 @@ -- name: Getting programs list to check fish presence - ansible.builtin.package_facts: - manager: auto - - name: Creating truffle dir ansible.builtin.file: path: "{{ ansible_env.HOME }}/truffle" @@ -9,58 +5,27 @@ mode: a # install tools -- name: Installing openjdk - become: true +- name: Install openjdk ansible.builtin.dnf5: name: - java-latest-openjdk - maven state: latest -- name: Creating graalvm dir - ansible.builtin.file: - path: "{{ ansible_env.HOME }}/truffle/graalvm-23" - state: directory - mode: a -- name: Installing graalvm 23 +- 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-23" + dest: "{{ ansible_env.HOME }}/truffle/graalvm" mode: a keep_newer: true - extra_opts: [--strip-components=1] - name: Select graalvm as java - become: true community.general.alternatives: name: java - link: /usr/bin/java - path: "{{ ansible_env.HOME }}/truffle/graalvm-23/bin/java" + path: "{{ ansible_env.HOME }}/truffle/graalvm-jdk-23.0.2+7.1/jre/bin/java" -# NOTE: does not work properly (?) -# - name: Installing Intellij IDEA -# ansible.builtin.include_role: -# name: gantsign.intellij - -# intellij idea -- name: Creating intellij idea dir - ansible.builtin.file: - path: "{{ ansible_env.HOME }}/idea" - state: directory -- 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" - 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 +- name: Install Intellij IDEA + ansible.builtin.include_role: + name: gantsign.intellij # examples - name: Clone simple language example diff --git a/roles/dev/tasks/txt.yml b/roles/dev/tasks/txt.yml index 02fb079..e225b44 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 423201a..6aa535c 100644 --- a/roles/dev/tasks/vscode.yml +++ b/roles/dev/tasks/vscode.yml @@ -1,5 +1,4 @@ - name: Installing vscode deps - become: true ansible.builtin.dnf5: name: - fuse diff --git a/roles/dotfiles/files/.config/fish/config.fish b/roles/dotfiles/files/.config/fish/config.fish index d714361..c6a3dc2 100644 --- a/roles/dotfiles/files/.config/fish/config.fish +++ b/roles/dotfiles/files/.config/fish/config.fish @@ -1,3 +1,6 @@ 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 44f644f..14730eb 100644 --- a/roles/dotfiles/files/.config/fish/fish_variables +++ b/roles/dotfiles/files/.config/fish/fish_variables @@ -1,32 +1,44 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 -SETUVAR __fish_initialized:3800 -SETUVAR fish_color_autosuggestion:brblack +SETUVAR __fish_initialized:3400 +SETUVAR fish_color_autosuggestion:4D5566 SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:normal -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:green +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:green -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:brcyan +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_normal:normal -SETUVAR fish_color_operator:brcyan -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -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_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:yellow\x1e\x2di +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_selected_background:\x2dr -SETUVAR fish_user_paths:/home/dragon/Containers/DevHomebrew/idea/bin\x1e/home/dragon/Containers/DevHomebrew/\x2ebin +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 deleted file mode 100644 index e69de29..0000000 diff --git a/roles/dotfiles/tasks/bash.yml b/roles/dotfiles/tasks/bash.yml index 9ab406d..c97335d 100644 --- a/roles/dotfiles/tasks/bash.yml +++ b/roles/dotfiles/tasks/bash.yml @@ -1,25 +1,25 @@ -- name: Linking bashrc +- name: Link bashrc ansible.builtin.file: src: '{{ role_path }}/files/.bashrc' dest: '{{ ansible_env.HOME }}/.bashrc' state: link force: true -- name: Linking inputrc +- name: Link inputrc ansible.builtin.file: src: '{{ role_path }}/files/.inputrc' dest: '{{ ansible_env.HOME }}/.inputrc' state: link force: true -- name: Linking profile +- name: Link profile ansible.builtin.file: src: '{{ role_path }}/files/.profile' dest: '{{ ansible_env.HOME }}/.profile' state: link force: true -- name: Linking bash profile +- name: Link bash profile ansible.builtin.file: src: '{{ role_path }}/files/.bash_profile' dest: '{{ ansible_env.HOME }}/.bash_profile' diff --git a/roles/dotfiles/tasks/cli.yml b/roles/dotfiles/tasks/cli.yml index 93e38a5..bcb571c 100644 --- a/roles/dotfiles/tasks/cli.yml +++ b/roles/dotfiles/tasks/cli.yml @@ -1,49 +1,17 @@ # shell -- name: Importing bash config +- name: Import bash config ansible.builtin.import_tasks: bash.yml -- name: Creating fish configuration directory +# copy to modify during install ?? +- name: Link 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 - -- 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' - dest: '{{ ansible_env.HOME }}/.config/fish/fish_variables' - force: false - # apps -- name: Linking tmux configuration +- name: Link tmux configuration ansible.builtin.file: src: '{{ role_path }}/files/.tmux.conf' dest: '{{ ansible_env.HOME }}/.tmux.conf' @@ -51,16 +19,27 @@ force: true # TODO: set server keys in some way -- name: Linking tmate configuration +- name: Link tmate configuration ansible.builtin.file: src: '{{ role_path }}/files/.tmate.conf' dest: '{{ ansible_env.HOME }}/.tmate.conf' state: link force: true -- name: Linking helix configuration +- name: Link helix configuration ansible.builtin.file: src: '{{ role_path }}/files/.config/helix' dest: '{{ ansible_env.HOME }}/.config/helix' state: link force: true + +# path update +- name: Get 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 + args: + executable: /usr/bin/fish + changed_when: true # change is checked inside fish_add_path diff --git a/roles/dotfiles/tasks/git.yml b/roles/dotfiles/tasks/git.yml index b445dcb..dc8b914 100644 --- a/roles/dotfiles/tasks/git.yml +++ b/roles/dotfiles/tasks/git.yml @@ -1,4 +1,4 @@ -- name: Linking gitconfig +- name: Link gitconfig ansible.builtin.file: src: '{{ role_path }}/files/.gitconfig' dest: '{{ ansible_env.HOME }}/.gitconfig' diff --git a/roles/dotfiles/tasks/gui.yml b/roles/dotfiles/tasks/gui.yml index 96f30d7..6f7f6cc 100644 --- a/roles/dotfiles/tasks/gui.yml +++ b/roles/dotfiles/tasks/gui.yml @@ -1,18 +1,18 @@ -- name: Linking kitty configuration directory +- name: Link kitty configuration directory ansible.builtin.file: src: '{{ role_path }}/files/.config/kitty' dest: '{{ ansible_env.HOME }}/.config/kitty' state: link force: true -- name: Linking alacritty configuration file +- name: Link alacritty configuration file ansible.builtin.file: src: '{{ role_path }}/files/.alacritty.toml' dest: '{{ ansible_env.HOME }}/.alacritty.toml' state: link force: true -- name: Linking alacritty configuration directory +- name: Link alacritty configuration directory ansible.builtin.file: src: '{{ role_path }}/files/.config/alacritty' dest: '{{ ansible_env.HOME }}/.config/alacritty' diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml index 715a8fa..7fd2e25 100644 --- a/roles/dotfiles/tasks/main.yml +++ b/roles/dotfiles/tasks/main.yml @@ -8,10 +8,6 @@ ansible.builtin.import_tasks: bash.yml when: "'bash' in configure" -- name: Script dirs config - ansible.builtin.import_tasks: scripts.yml - when: "'scripts' in configure" - - name: Common cli tools config ansible.builtin.import_tasks: cli.yml when: "'cli' in configure" @@ -28,6 +24,10 @@ ansible.builtin.import_tasks: gui.yml when: "'gui' in configure" +- name: Script dirs config + ansible.builtin.import_tasks: scripts.yml + when: "'scripts' in configure" + - name: Desctop envionment config ansible.builtin.import_tasks: de.yml when: "'de' in configure" diff --git a/roles/dotfiles/tasks/scripts.yml b/roles/dotfiles/tasks/scripts.yml index 93af8ef..5f14598 100644 --- a/roles/dotfiles/tasks/scripts.yml +++ b/roles/dotfiles/tasks/scripts.yml @@ -1,24 +1,13 @@ -- name: Linking scripts +- name: Link scripts ansible.builtin.file: src: '{{ role_path }}/files/.bin' dest: '{{ ansible_env.HOME }}/.bin' state: link force: true -- name: Linking templates +- name: Link templates ansible.builtin.file: src: '{{ role_path }}/files/.templates' dest: '{{ ansible_env.HOME }}/.templates' state: link force: true - -# path update -- name: Getting programs list to check fish presence - ansible.builtin.package_facts: - manager: auto - -- 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: false diff --git a/roles/dotfiles/tasks/ssh.yml b/roles/dotfiles/tasks/ssh.yml index 416baec..699ead0 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: Linking ssh +- name: Link gitconfig 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 74760b7..40a2365 100644 --- a/roles/flatpak/tasks/main.yml +++ b/roles/flatpak/tasks/main.yml @@ -1,4 +1,4 @@ -- name: Installing flatpak +- name: Install flatpak become: true ansible.builtin.dnf5: name: @@ -12,7 +12,7 @@ flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo method: user -- name: Installing utils +- name: Install utils community.general.flatpak: name: - com.github.tchx84.Flatseal @@ -36,7 +36,7 @@ method: user when: "'utils' in flatpak_apps" -- name: Installing web browsers +- name: Install web browsers community.general.flatpak: name: - io.gitlab.librewolf-community @@ -46,7 +46,7 @@ method: user when: "'web' in flatpak_apps" -- name: Installing docs tools +- name: Install docs tools community.general.flatpak: name: - com.github.arminstraub.krop @@ -61,7 +61,7 @@ method: user when: "'docs' in flatpak_apps" -- name: Installing notes tools +- name: Install notes tools community.general.flatpak: name: - com.github.flxzt.rnote @@ -70,7 +70,7 @@ method: user when: "'notes' in flatpak_apps" -- name: Installing ai tools +- name: Install ai tools community.general.flatpak: name: - com.jeffser.Alpaca @@ -78,7 +78,7 @@ method: user when: "'ai' in flatpak_apps" -- name: Installing art tools +- name: Install art tools community.general.flatpak: name: - io.github.guillaumechereau.Goxel @@ -92,7 +92,7 @@ method: user when: "'art' in flatpak_apps" -- name: Installing tools for things production +- name: Install tools for things production community.general.flatpak: name: - org.kicad.KiCad @@ -101,7 +101,7 @@ method: user when: "'production' in flatpak_apps" -- name: Installing gamedev tools +- name: Install gamedev tools community.general.flatpak: name: - org.godotengine.GodotSharp @@ -111,7 +111,7 @@ method: user when: "'gamedev' in flatpak_apps" -- name: Installing dev tools +- name: Install dev tools community.general.flatpak: name: - dev.lapce.lapce @@ -126,7 +126,7 @@ method: user when: "'dev' in flatpak_apps" -- name: Installing games +- name: Install games community.general.flatpak: name: - com.usebottles.bottles @@ -143,7 +143,7 @@ method: user when: "'games' in flatpak_apps" -- name: Installing messaging apps +- name: Install messaging apps community.general.flatpak: name: - org.claws_mail.Claws-Mail @@ -157,7 +157,7 @@ method: user when: "'messaging' in flatpak_apps" -- name: Installing study apps +- name: Install study apps community.general.flatpak: name: - org.kde.kig diff --git a/roles/installs/tasks/ansible.yml b/roles/installs/tasks/ansible.yml deleted file mode 100644 index b0a8f74..0000000 --- a/roles/installs/tasks/ansible.yml +++ /dev/null @@ -1,10 +0,0 @@ -- name: Installing ansible packages - become: true - ansible.builtin.dnf5: - name: - - ansible - - ansible-lint - - python3-github3py - - python3-rpm - state: latest - diff --git a/roles/installs/tasks/cli.yml b/roles/installs/tasks/cli.yml index e63fe34..13db513 100644 --- a/roles/installs/tasks/cli.yml +++ b/roles/installs/tasks/cli.yml @@ -1,5 +1,4 @@ -- name: Installing cli tools - become: true +- name: Install cli tools ansible.builtin.dnf5: name: # shells & common utils @@ -28,7 +27,8 @@ - git # other - - cronie + - ansible + - ansible-lint state: latest diff --git a/roles/installs/tasks/gui.yml b/roles/installs/tasks/gui.yml index 3d60d36..13acd1e 100644 --- a/roles/installs/tasks/gui.yml +++ b/roles/installs/tasks/gui.yml @@ -1,5 +1,4 @@ -- name: Installing gui tools - become: true +- name: Install gui tools ansible.builtin.dnf5: name: - jetbrains-mono-fonts diff --git a/roles/installs/tasks/host.yml b/roles/installs/tasks/host.yml index e1c9cb8..61f35ad 100644 --- a/roles/installs/tasks/host.yml +++ b/roles/installs/tasks/host.yml @@ -1,5 +1,4 @@ -- name: Installing cli tools for bare metal host - become: true +- name: Install cli tools for bare metal host ansible.builtin.dnf5: name: - distrobox diff --git a/roles/installs/tasks/main.yml b/roles/installs/tasks/main.yml index c158176..9a1645c 100644 --- a/roles/installs/tasks/main.yml +++ b/roles/installs/tasks/main.yml @@ -1,19 +1,15 @@ -- name: Installing ansible packages - ansible.builtin.import_tasks: ansible.yml - when: "'ansible' in apps" - -- name: Installing common cli apps +- name: Install common cli apps ansible.builtin.import_tasks: cli.yml when: "'cli' in apps" -- name: Installing common gui apps +- name: Install common gui apps ansible.builtin.import_tasks: gui.yml when: "'gui' in apps" -- name: Installing pps for host +- name: Install pps for host ansible.builtin.import_tasks: host.yml when: "'host' in apps" -- name: Installing proxies +- name: Install 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 05b599e..d5d2e76 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 ??