From bfb7aa1a9b4abeac613837530f3c97fdb380e9a2 Mon Sep 17 00:00:00 2001 From: Oscar Hermosa Date: Thu, 2 Mar 2023 16:49:32 +0100 Subject: [PATCH 1/4] several minor fixes --- CHANGELOG.md | 9 +++++++++ release.json | 2 +- roles/extra_software/defaults/main.yml | 2 +- roles/post_install/defaults/main.yml.gpg | Bin 5309 -> 5283 bytes roles/post_install/tasks/main.yml | 9 --------- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42d6ef65..de914086 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,14 @@ - [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 + - 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 + ## 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/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 5474f29a1d48d0daee1ae1163c0072dc3fe0d24f..5bddcb17cee41f82042da3ec126e8826849a6e44 100644 GIT binary patch literal 5283 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 PVA;h>r^FCyqx%f!sFhXs 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: From e7557ff2ead57c7b87ccb166f644ad1aa2f1fb4f Mon Sep 17 00:00:00 2001 From: Oscar Hermosa Date: Fri, 3 Mar 2023 16:55:37 +0100 Subject: [PATCH 2/4] cambio de orden en post_install de git --- CHANGELOG.md | 1 + roles/post_install/tasks/git.yml | 157 ++++++++++++++++--------------- 2 files changed, 80 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de914086..4e591c75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ - 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 ## 8.3.1 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 From 2f78d0909d50d01c20956a8e4eb99405fb9690c1 Mon Sep 17 00:00:00 2001 From: Oscar Hermosa Date: Mon, 6 Mar 2023 11:04:26 +0100 Subject: [PATCH 3/4] instalacion gnome-shell-extensions --- CHANGELOG.md | 1 + roles/common/vars/arch.yml | 1 + roles/common/vars/fedora.yml | 1 + roles/common/vars/ubuntu.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e591c75..7a530ce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - 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 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 From 14efa366cb0fcc95bf96825db75b00e1cb1f28f6 Mon Sep 17 00:00:00 2001 From: Oscar Hermosa Date: Sun, 12 Mar 2023 09:29:22 +0100 Subject: [PATCH 4/4] nuevo bash alias --- CHANGELOG.md | 1 + roles/post_install/defaults/main.yml.gpg | Bin 5283 -> 5302 bytes 2 files changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a530ce1..ea8e632d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - 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 diff --git a/roles/post_install/defaults/main.yml.gpg b/roles/post_install/defaults/main.yml.gpg index 5bddcb17cee41f82042da3ec126e8826849a6e44..21d891ce708bf21d5a6e9da6955883b0716286eb 100644 GIT binary patch literal 5302 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 I{Q(+fpI0t!;{X5v literal 5283 zcmV;U6kO|t0t^Gd)F<)Y2w~0v5B@%u$Sy?@HEcp6AbtGl&B{O!WffBxsPs!-{tI5Y zK?Fy(GJXtzo;;=7!n9M*aYT3}M7w#Vk)z~6+)yzlYAlmwz=&!$ah?3SypG+*qW_A- z*SK=R*|DrO&1`z8_lec=%&ATk|0)w1sTH=X8&wT!%99k;p)|wIYUa`)m)qF_AX+O# zI5LL=!b>7W!&KH3qBnUYV3ykA;-+3t_`d30nS%X3IK-{#FBj(Xw$m895}%{Ct`9nv=B_LroG|TruK9r%8J-XBgbWtmc;-4 zP7pN4zcH{sps+p@z47fj?f@>!#@nWg0$#F}5_v{p;qm3LK**60lxCFTs16XvII5C- zCYzB{g34%WYSMZ6Z_A3|9|L1D+iq$e)dAgO1y@7anc6qDgcGiEz z{;vANNG4l@q4EBr3L6k@?^zsEsnHz4FoihRo%Sk$9eLrs471$ij6S$FTM)}Z!_NX> zqp)JJ*TG*;crGm_@B&@X#akgPX_xZo*#423+E@$6-A4z$t4v2v17r=P_aH-_%d5NY zT^;2Ll7Rh_x#%K*B&O2p0Z}B`x#Lu4arzvb@j`G^fB@-*?q{##ney93bw{dN5v1^c zFs#HEIF$huIw)}6NT#|@K^3HgEZb7}UJ&fEW4dal$bpwYHzeJT27Yp9cEq^77nNTW_g8DNSYOo(OVI)hGTjc{N9|3)uI9SB4deeI}BY%FdVM zIP`c$9M0YIE!tqbT1U;awC3Q~HlF?YAFYgjGY@Dox2d36;eRew!D3#iu{>Gw^_Sl4 z#R3-;&|uGNWojJIi`cJl*k{Fi6ZQNqR<-ImSl?7qJ4qi+V!SSxYpu=i zO<$i++h2w$61?@Fvhk#nsNJ6DvY={xXw64!)eLzTcdJ6Lj)3^5dO2iJAW_8o)NP0N z!fYalQS%xzhniXHTu|^2RMQH8Hq84yUMp|(T)Zb!AMZ3Lb@>z>tzEZ2M+|rwwT@|k z>P|kD)rZrxoiOKUX{!Y)1CWk<>to#F!lzs0qFh|2Xa9P z8lp@ZQyJ2x()W0{1Y?1hRct~G&_~cN)lm> z4u`M^nkpQvmTGZ*JTq@&wBX<`&F&{Ad}4rzlryh-?y7FJ9JP9`GIc)Q%kY zBauKH2eW?XJf^J-Uxeg@FU8@kL%>|6HqS~B`^N54iU;J752I(Z+~%$6`Ml)^mUNcd zn(p9hKyHCeFyfiT+ZGk8Twl%ypqW@`&PJcJ4LHAj51TTS$5IuH2+VjMgp^~Qn z&^K1%1J!)a6ByD!ds1Wc3?|xpVlr6+fb2@B%$bFus~tm|Bkh1~-igenhoWR4m?xsz zDajY=d`y&4udejT;6a{*k04V>gHmnfC!#XXftNn`XhSc-!u3&EG^n6s9aP=BP8CG$ zJj4QJ54pg<1o|0?juYxEYg(NZP>VeYnJl8EISF)s4JaYpG+&-_I*4jT9V$%Fz+)v9 z3Mc)*)%O{Sl%e0>SY8(t*2>>1*pI6_dICEW{i}tF{&}qP>gbzd(i>vCQ z&wC*z7T(Hi@-x&$^w~4powbkUIh7DE2h_Z?YDi$RPdyf50_&X==81hMMj1@vG8Mi1 zcU*6ra*5#2V7II4qvSgA>qnI6^=-f1@-!)#>x@j#b=YML6_49+lL_5T&w~ZU$1dkp zc#V3&X^Bwu z9T@RH%>wtdWwqsC4lWBFX0?f~sk#)8O!uSo5{Klc z0CBpO=8iP9LRjkCuaA{zcSo-slU2y^)|@5(*KcQRp_|oc^D36Q`-+ZymtsiY*$^a; zpzTqq^=hglH^RZ7Y_?}|tP$Jo>uHu6SuAmLiMwA=N2mx~uWfBKjPg`6WnKg=hkY`kp10VTZ(s8x2(=>4LDNmVih z9D!3;-?EG2eHSiz-`+!G9=s=ii+->OJiyMD-V@;TBuP3iaI;(4T@AUw|Vz@G=2ssk1cSyIzXKPkaV2rF)PI-t=-4N)nAW!I|d$akbLY7eyl z9(t@0z;V`awphpJN)M0?2pM;>a!oBCubRQw>WIWl(F;y8?AqiyUP@yAzx98m8;^GXmq5DLTp`(W`8f^IgIRM z%W{8vScfLWHvUnTx>)Xeb?A}+3+bS$&fp32YG;ED_DZsASLRj=Ah}=5?@s)UatWW* zKT{%YZ}HN&0}~)ozDu0);t(kh#WU+eHn0MECu&!Z1Wc`^^v`xS%eIp|cIVJ0HKTwq z{LS0^cT*tmB64ld_N=u@8^wHe#v=*FOYlXBUz4-Kq=l4i?kJKYrE0teqBfHWaX2zB z4EvJ*Jzc#lqDMkGrIp{dZI-DoNDnMSJ0(gAeOgzBzY1v@(!uF*IRt(S8`Obj!HOi@EIZrY&ZOVaML3lR;O_8lt zXE_59K#@453zj&G!S3idozgNGqpAkAc$~|i2-1|1k*{8t`cM}q8Iar4QP*upUNoJ1 zRv=M#MiLlreUC0!U~v7`R@{S~O>c<^=Tuz%(fwX2QKYl|&9U$3tsWTxqa&9Ry5g6p z3&_lv_~?kGKsH<}gL0QXGh-Dj>2fBc?+tpBq^tRo)=DVJrbAwhz*G)A z33u&Im*fy-LyY-x9sILpr4>sjF+-MXFm z70_Fsccla9E7w`?kf&i`ty+oaJo2G!MU%d_Z37H9%x1rnfa72C*exwno^H3Fow1;A z@af>p&2CklyCms&U$Y#usAHVoi3_$^$(Sma56!^d_Q56Jr0M`1glpc~X<2tLTNuF( zl@T-U`U{B4STj!1-Ftglwf;&LtXeOV+p%~h;tWn_+&{nFuajdrh6-d=p! zl9sHOPu?TRWo0s4V6`{s?2l~h+n9i$<_5r5q@R3JC9NKxS&|6Rp=1;vM;VfZP_4iW z28GXVQj7EfMpHYzU}ozDLcg%i015fKuY4@FQIIZv=4Dv8Yb)P}$|A zEan4*nB?`Y=do{0)EJueN})cQUkMk>&hn^otal!mxf6}G@UW!V6K%N8i1TI23LnPQ z@P&sbNJhq+HF+*^Uz@ZhvFf8^&R?#Vc{2WOeS1&de8xCG9T{}+uBF5DXo2KuOZ`#Vk z=u&3!;`x?Kw3!mmKlBVvb+yv!_U8ZU~yV!QbbYiV*w#1JyE7Yrii zsfN1O=I4_6H|w_&1Rvle$q#_sICx_0$Kck!Y6|I< z3KVT6UIoUV>>pV*eed7qhNi7R8ufE^r0;p(OCG({MdxbaNBB&4g&-4pL3hUKJfnI3 zr(Gn|J?a7`(~O@3~R4kHn)|B??&Emg|#a#kR9y{rpyWn$X7k$WWyuywo(iD@@yMx-USIM0S2+~L@C^;{0>uJUq+GBvE$2F}E z8H@6(Ga+YwihARt*i3Jhx{>KQD%SVyBINLiPHQ0MPaiPV z*DRdQbAXrIN-H(0MN9m`n~7yS4@9NI#weezysWXr^6&mxoj4UtnMB>`$hOXQo!+LBSx$dXH_~*D$NLxU#ApFpH12 zrBc=wieVxEx-C97GPT^oYAzIdQN0%CA_D~>My@axz81QSnK#5_wg+_1!ZkDjZNX$T