Skip to content

Commit

Permalink
Merge pull request #33 from osmollo/fix/8.3.2
Browse files Browse the repository at this point in the history
Release 8.3.2
  • Loading branch information
osmollo authored Mar 15, 2023
2 parents ac92712 + 14efa36 commit 6781681
Show file tree
Hide file tree
Showing 9 changed files with 96 additions and 89 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# CHANGELOG

- [CHANGELOG](#changelog)
- [8.3.2](#832)
- [8.3.1](#831)
- [8.3](#83)
- [8.2](#82)
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion release.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "8.3.1"
"version": "8.3.2"
}
1 change: 1 addition & 0 deletions roles/common/vars/arch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ gnome_arch_packages:
- gnome-keyring
- libgnome-keyring
- seahorse
- gnome-shell-extensions

kde_arch_packages:
- yakuake
Expand Down
1 change: 1 addition & 0 deletions roles/common/vars/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ gnome_fedora_packages:
- fedora-chromium-config-gnome
- libgda
- libgda-sqlite
- gnome-extensions-app

kde_fedora_packages:
- fedora-chromium-config-kde
Expand Down
1 change: 1 addition & 0 deletions roles/common/vars/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/extra_software/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified roles/post_install/defaults/main.yml.gpg
Binary file not shown.
157 changes: 79 additions & 78 deletions roles/post_install/tasks/git.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
9 changes: 0 additions & 9 deletions roles/post_install/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 6781681

Please sign in to comment.