diff --git a/.gitignore b/.gitignore index 5235533..c721cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ **.ssh galaxy_cache/ .ansible/ -tmp/ diff --git a/.gitmodules b/.gitmodules index d020465..df95ec6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "roles/gantsign.intellij"] path = roles/gantsign.intellij url = https://github.com/gantsign/ansible-role-intellij -[submodule "opam-ansible"] - path = opam-ansible - url = https://github.com/plescornet/opam-ansible diff --git a/opam-ansible b/opam-ansible deleted file mode 160000 index dc0ebd6..0000000 --- a/opam-ansible +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dc0ebd6843daf590ee2cd372367277686e6c8ace diff --git a/playbooks/box.yml b/playbooks/box.yml index 86567b7..3db2458 100644 --- a/playbooks/box.yml +++ b/playbooks/box.yml @@ -13,7 +13,7 @@ - cli vars_prompt: - name: tools_in - prompt: "Specify comma separated list of required tool packages (cpp, js, haskell, ocaml, ocanren, coq, txt, lang, truffle, gamedev, qt, clojure, python, arend)" + prompt: "Specify comma separated list of required tool packages (cpp, js, haskell, ocaml, coq, txt, lang, truffle, gamedev, qt, clojure, arend)" private: false pre_tasks: - name: Get tools list diff --git a/playbooks/manual.yml b/playbooks/manual.yml index e9719d1..18b5acd 100644 --- a/playbooks/manual.yml +++ b/playbooks/manual.yml @@ -9,7 +9,7 @@ prompt: "Specify comma separated list of required installation packages (ansible, cli, gui, host, proxy, wm, quickshell)" private: false - name: tools_in - prompt: "Specify comma separated list of required tool packages (cpp, js, haskell, ocaml, ocanren, coq, txt, lang, truffle, gamedev, qt, clojure, python, arend)" + prompt: "Specify comma separated list of required tool packages (cpp, js, haskell, ocaml, coq, txt, lang, truffle, gamedev, qt, clojure, arend)" private: false pre_tasks: - name: Get configuration list diff --git a/roles/dev/defaults/main.yml b/roles/dev/defaults/main.yml index 5f0c224..5c99b29 100644 --- a/roles/dev/defaults/main.yml +++ b/roles/dev/defaults/main.yml @@ -1 +1,2 @@ bin_install_path: '{{ ansible_env.HOME }}/.local/bin' + diff --git a/roles/dev/tasks/cpp.yml b/roles/dev/tasks/cpp.yml index f834253..cbc7d1e 100644 --- a/roles/dev/tasks/cpp.yml +++ b/roles/dev/tasks/cpp.yml @@ -1,5 +1,5 @@ # is done at the main -# - name: Install build common deps +# - name: Install build comon deps # ansible.builtin.import_tasks: build.yml - name: Installing tools for cpp dev diff --git a/roles/dev/tasks/haskell.yml b/roles/dev/tasks/haskell.yml index 06e6c7d..14e2f7a 100644 --- a/roles/dev/tasks/haskell.yml +++ b/roles/dev/tasks/haskell.yml @@ -1,9 +1,10 @@ -- name: Installing hlint # TODO: install by cabal (?) +- name: installing hlint # TODO: install by cabal (?) become: true ansible.builtin.dnf5: name: - hlint state: latest + - name: Downloading ghcup bootstrap script ansible.builtin.uri: diff --git a/roles/dev/tasks/main.yml b/roles/dev/tasks/main.yml index f77680b..c33477b 100644 --- a/roles/dev/tasks/main.yml +++ b/roles/dev/tasks/main.yml @@ -17,10 +17,6 @@ ansible.builtin.import_tasks: ocaml.yml when: "'ocaml' in tools" -- name: OCanren dev environment - ansible.builtin.import_tasks: ocanren.yml - when: "'ocanren' in tools" - - name: Coq dev environment ansible.builtin.import_tasks: coq.yml when: "'coq' in tools" @@ -53,10 +49,6 @@ ansible.builtin.import_tasks: clojure.yml when: "'clojure' in tools" -- name: Python development environment - ansible.builtin.import_tasks: python.yml - when: "'python' in tools" - # TODO - name: Arend proof assistant development environment ansible.builtin.import_tasks: arend.yml diff --git a/roles/dev/tasks/ocaml.yml b/roles/dev/tasks/ocaml.yml index de1f4c0..fe2d03f 100644 --- a/roles/dev/tasks/ocaml.yml +++ b/roles/dev/tasks/ocaml.yml @@ -1,34 +1,31 @@ -- name: Installing opam dependencies +# TODO: use ansible ocaml package for install ?? +- name: Installing opam become: true ansible.builtin.dnf5: name: + - opam - gmp-devel state: latest -- name: Installing ocaml - ansible.builtin.import_role: - name: opam-ansible - vars: - opam_install_method: package_manager - opam_install_location: user - opam_switches: - - name: "default" - compiler: "--packages=ocaml-variants.5.3.0+options,ocaml-option-flambda" - packages: - - dune - - ocaml-lsp-server - - ocamlformat - - qcheck +- name: Initializing opam + ansible.builtin.command: + cmd: opam init + changed_when: false + ignore_errors: true + +- name: Creating opam default switch (5.3.0) + ansible.builtin.command: + cmd: opam switch create default 5.3.0 + changed_when: false + ignore_errors: true -# NOTE: done during usage by switch eval -# --- # update fish path -# - name: Get programs list to check fish presence -# ansible.builtin.package_facts: -# manager: auto +- name: Get programs list to check fish presence + ansible.builtin.package_facts: + manager: auto -# - name: Update fish path for opam -# ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/.opam/default/bin -# args: -# executable: /usr/bin/fish -# changed_when: false +- name: Update fish path for bun + ansible.builtin.shell: fish_add_path -m {{ ansible_env.HOME }}/.opam/default/bin + args: + executable: /usr/bin/fish + changed_when: false diff --git a/roles/dev/tasks/ocanren.yml b/roles/dev/tasks/ocanren.yml deleted file mode 100644 index c0052ae..0000000 --- a/roles/dev/tasks/ocanren.yml +++ /dev/null @@ -1,24 +0,0 @@ -- name: Installing ocaml - ansible.builtin.import_tasks: ocaml.yml - -- name: Installing ocanren switch - ansible.builtin.import_role: - name: opam-ansible - vars: - opam_install_method: package_manager - opam_install_location: user - opam_switches: - - name: "ocanren" - compiler: "--packages=ocaml-variants.5.3.0+options,ocaml-option-flambda" - packages: - - dune - - ocaml-lsp-server - - ocamlformat - - qcheck - - - camlp5 - - GT - - OCanren - - OCanren-ppx - - ppx_expect_nobase - - benchmark diff --git a/roles/dev/tasks/python.yml b/roles/dev/tasks/python.yml deleted file mode 100644 index 91bbb19..0000000 --- a/roles/dev/tasks/python.yml +++ /dev/null @@ -1,21 +0,0 @@ -- name: Installing tools for python dev - become: true - ansible.builtin.dnf5: - name: - - python - - pip - - pipx - - - uv - state: latest - -- name: Install ty typechecker - ansible.builtin.command: - cmd: "uv tool install ty@latest" - changed_when: false - -- name: Install ruff lineter - ansible.builtin.command: - cmd: "uv tool install ruff@latest" - changed_when: false - diff --git a/roles/dotfiles/defaults/main.yml b/roles/dotfiles/defaults/main.yml index 5f0c224..5c99b29 100644 --- a/roles/dotfiles/defaults/main.yml +++ b/roles/dotfiles/defaults/main.yml @@ -1 +1,2 @@ bin_install_path: '{{ ansible_env.HOME }}/.local/bin' + diff --git a/roles/dotfiles/files/.config/fish/completions/uv.fish b/roles/dotfiles/files/.config/fish/completions/uv.fish deleted file mode 100644 index ac24044..0000000 --- a/roles/dotfiles/files/.config/fish/completions/uv.fish +++ /dev/null @@ -1 +0,0 @@ -uv generate-shell-completion fish | source diff --git a/roles/dotfiles/files/.config/fish/completions/uvx.fish b/roles/dotfiles/files/.config/fish/completions/uvx.fish deleted file mode 100644 index 1de03d7..0000000 --- a/roles/dotfiles/files/.config/fish/completions/uvx.fish +++ /dev/null @@ -1 +0,0 @@ -uvx --generate-shell-completion fish | source diff --git a/roles/installs/defaults/main.yml b/roles/installs/defaults/main.yml index 5f0c224..5c99b29 100644 --- a/roles/installs/defaults/main.yml +++ b/roles/installs/defaults/main.yml @@ -1 +1,2 @@ bin_install_path: '{{ ansible_env.HOME }}/.local/bin' + diff --git a/roles/installs/tasks/cli.yml b/roles/installs/tasks/cli.yml index 596fa4e..e63fe34 100644 --- a/roles/installs/tasks/cli.yml +++ b/roles/installs/tasks/cli.yml @@ -15,7 +15,6 @@ - shellcheck # edit utils - - neovim - helix - micro # - nano