diff --git a/CHANGELOG.md b/CHANGELOG.md index 42d6ef65..ea8e632d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # CHANGELOG - [CHANGELOG](#changelog) + - [8.3.2](#832) - [8.3.1](#831) - [8.3](#83) - [8.2](#82) @@ -18,6 +19,17 @@ - [Versión 2](#versión-2) - [Versión 1](#versión-1) +## 8.3.2 + +- Corrección de errores: + - **Sublime Text** ya no se instala por defecto + - Instalación del paquete `gnome-shell-extensions` en las distintas distribuciones + - Post_install: + - Ya no se define la variable `ANSIBLE_VAULT_PASSWORD_FILE` aunque se mantiene la creación del fichero + - Ya no se configura **ProtonVPN** en las VPNs del sistema + - Cambio en el orden de la configuración de **git**: `broot` y `git_diff` se ejecutan antes de la clonación de repositorios + - Alias para obtener el http status code con ``curl`` + ## 8.3.1 - Corrección de errores: diff --git a/release.json b/release.json index 9ee034d1..5ea8f5f5 100644 --- a/release.json +++ b/release.json @@ -1,3 +1,3 @@ { - "version": "8.3.1" + "version": "8.3.2" } diff --git a/roles/common/vars/arch.yml b/roles/common/vars/arch.yml index 40e9f4c7..37515092 100644 --- a/roles/common/vars/arch.yml +++ b/roles/common/vars/arch.yml @@ -29,6 +29,7 @@ gnome_arch_packages: - gnome-keyring - libgnome-keyring - seahorse + - gnome-shell-extensions kde_arch_packages: - yakuake diff --git a/roles/common/vars/fedora.yml b/roles/common/vars/fedora.yml index 0377ae21..78e3b003 100644 --- a/roles/common/vars/fedora.yml +++ b/roles/common/vars/fedora.yml @@ -43,6 +43,7 @@ gnome_fedora_packages: - fedora-chromium-config-gnome - libgda - libgda-sqlite + - gnome-extensions-app kde_fedora_packages: - fedora-chromium-config-kde diff --git a/roles/common/vars/ubuntu.yml b/roles/common/vars/ubuntu.yml index 20483116..4095bd6a 100644 --- a/roles/common/vars/ubuntu.yml +++ b/roles/common/vars/ubuntu.yml @@ -42,6 +42,7 @@ gnome_ubuntu_packages: - gnome-shell-extension-manager - gir1.2-gda-5.0 - gir1.2-gsound-1.0 + - gnome-shell-extensions kde_ubuntu_packages: - kubuntu-restricted-extras diff --git a/roles/extra_software/defaults/main.yml b/roles/extra_software/defaults/main.yml index 9fdd6545..9ea12904 100644 --- a/roles/extra_software/defaults/main.yml +++ b/roles/extra_software/defaults/main.yml @@ -6,7 +6,7 @@ install_vscode: true install_spotify: true install_ohmyzsh: "{{ true if linux_distribution == 'arch' else false }}" install_ohmybash: true -install_sublimetext: true +install_sublimetext: false install_gitkraken: false install_telegram: true install_slack: false diff --git a/roles/post_install/defaults/main.yml.gpg b/roles/post_install/defaults/main.yml.gpg index 5474f29a..21d891ce 100644 Binary files a/roles/post_install/defaults/main.yml.gpg and b/roles/post_install/defaults/main.yml.gpg differ diff --git a/roles/post_install/tasks/git.yml b/roles/post_install/tasks/git.yml index 556bce89..29e0e8b8 100644 --- a/roles/post_install/tasks/git.yml +++ b/roles/post_install/tasks/git.yml @@ -1,5 +1,84 @@ --- +- name: "[GIT] install broot" + block: + - name: "[GIT] download broot binary" + become: true + get_url: + url: "{{ broot_binary_url }}" + dest: /usr/local/bin/broot + mode: 0755 + + - name: "[GIT] create broot config directory" + file: + path: "{{ ansible_user_dir }}/.config/broot" + state: directory + + - name: "[GIT] configure broot" + copy: + src: git-diff-conf.toml + dest: "{{ ansible_user_dir }}/.config/broot/git-diff-conf.toml" + mode: 0644 + + - name: "[GIT] create alias for broot" + lineinfile: + path: "{{ ansible_user_dir }}/.bash_aliases" + create: true + state: present + line: "alias gg='/usr/local/bin/broot --conf ~/.config/broot/git-diff-conf.toml --git-status'" + tags: + - broot + +- name: "[GIT] configure git diff config" + block: + - name: "check if meld is installed" + command: which meld + register: meld_response + changed_when: false + ignore_errors: true + + - name: "[GIT] check if kompare is installed" + command: which kompare + register: kompare_response + ignore_errors: true + + - name: "[GIT] configure git" + vars: + diff_editor: "{{ 'meld' if meld_response.rc == 0 else 'kompare' if kompare_response.rc == 0 }}" + blockinfile: + path: "{{ ansible_user_dir }}/.gitconfig" + mode: 0644 + create: true + block: | + [diff] + tool = {{ diff_editor }} + + [difftool] + prompt = false + + [difftool "{{ diff_editor }}"] + cmd = {{ diff_editor }} "$LOCAL" "$REMOTE" + + [merge] + tool = {{ diff_editor }} + + [mergetool "{{ diff_editor }}"] + cmd = {{ diff_editor }} "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED" + + [user] + signingkey = {{ lookup('onepassword', 'op://Private/osmollo/public key') }} + + [gpg] + format = ssh + + [gpg "ssh"] + program = "/opt/1Password/op-ssh-sign" + + [commit] + gpgsign = true + tags: + - git_diff + - block: - name: "[GIT] Create {{ git_dir }}" file: @@ -134,81 +213,3 @@ - clone_repos - repos_config -- name: "[GIT] install broot" - block: - - name: "[GIT] download broot binary" - become: true - get_url: - url: "{{ broot_binary_url }}" - dest: /usr/local/bin/broot - mode: 0755 - - - name: "[GIT] create broot config directory" - file: - path: "{{ ansible_user_dir }}/.config/broot" - state: directory - - - name: "[GIT] configure broot" - copy: - src: git-diff-conf.toml - dest: "{{ ansible_user_dir }}/.config/broot/git-diff-conf.toml" - mode: 0644 - - - name: "[GIT] create alias for broot" - lineinfile: - path: "{{ ansible_user_dir }}/.bash_aliases" - create: true - state: present - line: "alias gg='/usr/local/bin/broot --conf ~/.config/broot/git-diff-conf.toml --git-status'" - tags: - - broot - -- name: "[GIT] configure git diff config" - block: - - name: "check if meld is installed" - command: which meld - register: meld_response - changed_when: false - ignore_errors: true - - - name: "[GIT] check if kompare is installed" - command: which kompare - register: kompare_response - ignore_errors: true - - - name: "[GIT] configure git" - vars: - diff_editor: "{{ 'meld' if meld_response.rc == 0 else 'kompare' if kompare_response.rc == 0 }}" - blockinfile: - path: "{{ ansible_user_dir }}/.gitconfig" - mode: 0644 - create: true - block: | - [diff] - tool = {{ diff_editor }} - - [difftool] - prompt = false - - [difftool "{{ diff_editor }}"] - cmd = {{ diff_editor }} "$LOCAL" "$REMOTE" - - [merge] - tool = {{ diff_editor }} - - [mergetool "{{ diff_editor }}"] - cmd = {{ diff_editor }} "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED" - - [user] - signingkey = {{ lookup('onepassword', 'op://Private/osmollo/public key') }} - - [gpg] - format = ssh - - [gpg "ssh"] - program = "/opt/1Password/op-ssh-sign" - - [commit] - gpgsign = true - tags: - - git_diff diff --git a/roles/post_install/tasks/main.yml b/roles/post_install/tasks/main.yml index 73dabee6..db2c86c3 100644 --- a/roles/post_install/tasks/main.yml +++ b/roles/post_install/tasks/main.yml @@ -95,15 +95,6 @@ - sublimetext - sublimemerge -- name: "configure VPNs" - import_tasks: network.yml - become: true - become_method: sudo - when: use_dropxbox | default(true) - tags: - - post_install - - network - - name: "Configure VIM" import_tasks: vim.yml tags: