From a8eaf3669c484514f9d35b25d851d6d5d56db33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 13 Oct 2019 12:39:36 +0200 Subject: [PATCH 01/71] Obligo a instalar aplicaciones flatpak como usuario --- funciones.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/funciones.sh b/funciones.sh index 32669222..9a008b3e 100644 --- a/funciones.sh +++ b/funciones.sh @@ -201,7 +201,7 @@ instalarSoftwareFlatPak() { for programa in $*; do echo -e "$VE Instalando $RO $programa$VE desde$RO FlatPak$CL" if [[ $programa != '' ]]; then - flatpak install "$programa" + flatpak install "$programa" --user fi done @@ -227,7 +227,7 @@ instalarSoftwareFlatPakLista() { for x in "${lista_Software[@]}"; do if [[ $x != '' ]]; then echo -e "$VE Instalando$RO $x$VE desde$RO FlatPak$CL" - instalarSoftwareFlatPak "$x" + instalarSoftwareFlatPak "$x" --user fi done From c58b7f41c6b183a4a333f5021ffc751e0c37a2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 13 Oct 2019 22:50:19 +0200 Subject: [PATCH 02/71] Modifico forma de actualizar desde flatpak, solo para usuario --- conf/home/.local/bin/actualizar | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/home/.local/bin/actualizar b/conf/home/.local/bin/actualizar index d11385bb..33ab88ae 100755 --- a/conf/home/.local/bin/actualizar +++ b/conf/home/.local/bin/actualizar @@ -37,9 +37,9 @@ actualizarSistema() { fi if [[ -f '/usr/bin/flatpak' ]]; then - echo "Actualizando desde FlatPak" - sudo flatpak update - sudo chmod 755 -R /var/lib/flatpak/app + echo "Actualizando desde FlatPak para el usuario actual" + flatpak update --user + #sudo chmod 755 -R /var/lib/flatpak/app fi if [[ -f '/usr/bin/npm' ]] || [[ -f "$HOME/.npm/bin/npm" ]]; then From 3fa3d57f27b72ee840ef107e83e8ceb58ff088f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 13 Oct 2019 23:22:14 +0200 Subject: [PATCH 03/71] Corrijo tabulaciones --- conf/home/.local/bin/actualizar | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/home/.local/bin/actualizar b/conf/home/.local/bin/actualizar index 33ab88ae..a138f4e3 100755 --- a/conf/home/.local/bin/actualizar +++ b/conf/home/.local/bin/actualizar @@ -33,7 +33,7 @@ actualizarSistema() { elif [[ -f '/usr/bin/emerge' ]]; then echo "Actualizando desde repositorios Debian" sudo emerge --sync - sudo emerge -uavDN --keep-going world + sudo emerge -uavDN --keep-going world fi if [[ -f '/usr/bin/flatpak' ]]; then @@ -56,7 +56,7 @@ actualizarSistema() { if [[ -f '/usr/bin/pip3' ]] || [[ -f "$HOME/.local/bin/pip3" ]]; then echo "Actualizando desde PIP Python 3" #py -3 -m pip_review --local --auto - python3 -m pip_review --local --auto + python3 -m pip_review --local --auto fi if [[ -f '/usr/bin/composer' ]] || [[ -f "$HOME/.local/bin/composer" ]]; then From 6ad3e3c771a1adee60813d054e738ac98bd389a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 13 Oct 2019 23:23:09 +0200 Subject: [PATCH 04/71] Corrijo nombre de sistema al actualizar Gentoo --- conf/home/.local/bin/actualizar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/home/.local/bin/actualizar b/conf/home/.local/bin/actualizar index a138f4e3..9e80fd7a 100755 --- a/conf/home/.local/bin/actualizar +++ b/conf/home/.local/bin/actualizar @@ -31,7 +31,7 @@ actualizarSistema() { echo "Actualizando desde repositorios Fedora" sudo dnf update -y elif [[ -f '/usr/bin/emerge' ]]; then - echo "Actualizando desde repositorios Debian" + echo "Actualizando desde repositorios Gentoo" sudo emerge --sync sudo emerge -uavDN --keep-going world fi From 07f4c5ae728253422502208fa964521f8fee942a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 21 Nov 2019 18:55:36 +0100 Subject: [PATCH 05/71] Implemento generar repositorios para QOwnNotes en Debian Stable --- Repositorios/debian/stable.sh | 4 ++++ Repositorios/debian/stable/sources.list.d/qownnotes.list | 1 + 2 files changed, 5 insertions(+) create mode 100644 Repositorios/debian/stable/sources.list.d/qownnotes.list diff --git a/Repositorios/debian/stable.sh b/Repositorios/debian/stable.sh index 0cbb4d78..e52eb942 100755 --- a/Repositorios/debian/stable.sh +++ b/Repositorios/debian/stable.sh @@ -38,6 +38,10 @@ stable_agregar_llaves() { ## Agregando llave para Gitlab Runner. echo -e "$VE Agregando llave para$RO Gitlab Runner$CL" curl -L "https://packages.gitlab.com/runner/gitlab-runner/gpgkey" 2> /dev/null | sudo apt-key add - &>/dev/null + + ## Agregando llave para QOwnNotes + echo -e "$VE Agregando llave para$RO QOwnNotes$CL" + wget http://download.opensuse.org/repositories/home:/pbek:/QOwnNotes/Debian_10/Release.key -O - | sudo apt-key add - } ## diff --git a/Repositorios/debian/stable/sources.list.d/qownnotes.list b/Repositorios/debian/stable/sources.list.d/qownnotes.list new file mode 100644 index 00000000..53e4621d --- /dev/null +++ b/Repositorios/debian/stable/sources.list.d/qownnotes.list @@ -0,0 +1 @@ +deb http://download.opensuse.org/repositories/home:/pbek:/QOwnNotes/Debian_10/ / From c230fbf40effdf0ac876f223ffad1d842cebf824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 21 Nov 2019 19:13:30 +0100 Subject: [PATCH 06/71] Implemento repositorios para DBeaver en Debian --- Repositorios/debian/comunes.sh | 4 ++++ Repositorios/debian/comunes/sources.list.d/dbeaver.list | 1 + 2 files changed, 5 insertions(+) create mode 100644 Repositorios/debian/comunes/sources.list.d/dbeaver.list diff --git a/Repositorios/debian/comunes.sh b/Repositorios/debian/comunes.sh index eacdd1c3..0505d8c7 100644 --- a/Repositorios/debian/comunes.sh +++ b/Repositorios/debian/comunes.sh @@ -87,6 +87,10 @@ comunes_agregar_llaves() { ## Repositorio para editor Atom. echo -e "$VE Agregando clave para el editor$RO Atom$CL" wget -qO - https://packagecloud.io/AtomEditor/atom/gpgkey | sudo apt-key add - + + ## Repositorio para editor DBeaver. + echo -e "$VE Agregando clave para el editor SQL$RO DBeaver$CL" + wget -O - https://dbeaver.io/debs/dbeaver.gpg.key | sudo apt-key add - } ## diff --git a/Repositorios/debian/comunes/sources.list.d/dbeaver.list b/Repositorios/debian/comunes/sources.list.d/dbeaver.list new file mode 100644 index 00000000..9c0863c8 --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/dbeaver.list @@ -0,0 +1 @@ +deb https://dbeaver.io/debs/dbeaver-ce / From 2b7dea0978cac475ba4fadc7e0d622626c36ffd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 25 Nov 2019 00:07:10 +0100 Subject: [PATCH 07/71] =?UTF-8?q?A=C3=B1ado=20repositorio=20para=20el=20ed?= =?UTF-8?q?itor=20VsCodium?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Repositorios/debian/comunes.sh | 4 ++++ Repositorios/debian/comunes/sources.list.d/vscodium.list | 1 + 2 files changed, 5 insertions(+) create mode 100644 Repositorios/debian/comunes/sources.list.d/vscodium.list diff --git a/Repositorios/debian/comunes.sh b/Repositorios/debian/comunes.sh index 0505d8c7..e2f49cb9 100644 --- a/Repositorios/debian/comunes.sh +++ b/Repositorios/debian/comunes.sh @@ -91,6 +91,10 @@ comunes_agregar_llaves() { ## Repositorio para editor DBeaver. echo -e "$VE Agregando clave para el editor SQL$RO DBeaver$CL" wget -O - https://dbeaver.io/debs/dbeaver.gpg.key | sudo apt-key add - + + ## Repositorio para editor DBeaver. + echo -e "$VE Agregando clave para el editor$RO VS Codium$CL" + wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg | sudo apt-key add - } ## diff --git a/Repositorios/debian/comunes/sources.list.d/vscodium.list b/Repositorios/debian/comunes/sources.list.d/vscodium.list new file mode 100644 index 00000000..85cd1bfc --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/vscodium.list @@ -0,0 +1 @@ +deb https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/repos/debs/ vscodium main From e09c8f90aec2a821a2c07aca214b17d47b5e2e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 9 Dec 2019 20:34:53 +0100 Subject: [PATCH 08/71] Actualizo versiones para IDES de phpstorm --- Apps/IDEs/phpstorm.sh | 2 +- Apps/IDEs/pycharm_pro.sh | 2 +- Apps/IDEs/webstorm.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Apps/IDEs/phpstorm.sh b/Apps/IDEs/phpstorm.sh index 857aae77..99fdd73a 100644 --- a/Apps/IDEs/phpstorm.sh +++ b/Apps/IDEs/phpstorm.sh @@ -75,7 +75,7 @@ phpstorm_postconfiguracion() { } phpstorm_instalador() { - local version='PhpStorm-2019.2.3' + local version='PhpStorm-2019.3' echo -e "$VE Comenzando instalación de$RO PhpStorm$CL" diff --git a/Apps/IDEs/pycharm_pro.sh b/Apps/IDEs/pycharm_pro.sh index b275f9e6..87fd1493 100644 --- a/Apps/IDEs/pycharm_pro.sh +++ b/Apps/IDEs/pycharm_pro.sh @@ -72,7 +72,7 @@ pycharm_postconfiguracion() { } pycharm_pro_instalador() { - local version='pycharm-professional-2019.2.3' + local version='pycharm-professional-2019.3' echo -e "$VE Comenzando instalación de$RO PyCharm$CL" diff --git a/Apps/IDEs/webstorm.sh b/Apps/IDEs/webstorm.sh index 62fbc02b..31217b69 100644 --- a/Apps/IDEs/webstorm.sh +++ b/Apps/IDEs/webstorm.sh @@ -70,7 +70,7 @@ webstorm_postconfiguracion() { } webstorm_instalador() { - local version='WebStorm-2019.2.3' + local version='WebStorm-2019.3' echo -e "$VE Comenzando instalación de$RO WebStorm$CL" From f2629e3a67978748d93af788fe46efaa17ebab48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 23 Dec 2019 19:14:25 +0100 Subject: [PATCH 09/71] Elimino dependencias nodejs global --- Servidores/nodejs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Servidores/nodejs.sh b/Servidores/nodejs.sh index 875338b9..5c1a3480 100644 --- a/Servidores/nodejs.sh +++ b/Servidores/nodejs.sh @@ -65,7 +65,7 @@ nodejs_postconfiguracion() { export PATH=~/.npm/bin:$PATH ## Instalando paquetes globales - local paquetes='eslint jscs bower compass stylelint bundled typescript ionic' + local paquetes='eslint jscs compass stylelint typescript ionic' instalarNpmGlobal $paquetes echo -e "$VE Instalando última versión de$RO npm$VE en directorio local$CL" From 1d746eb5279366208a5a96a8b157b73e1f8cfcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Fri, 10 Jan 2020 07:58:50 +0100 Subject: [PATCH 10/71] =?UTF-8?q?A=C3=B1ado=20al=20cortafuegos=20l=C3=ADne?= =?UTF-8?q?a=20para=20abrir=20puertos=20sql=20si=20fuera=20necesario?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VPS/firewall.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/VPS/firewall.sh b/VPS/firewall.sh index f9e7a239..e9ff7d44 100644 --- a/VPS/firewall.sh +++ b/VPS/firewall.sh @@ -13,6 +13,9 @@ mainFirewall() { ## Permito https sudo firewall-cmd --zone=public --add-port=443/tcp --permanent + ## Permito PostgreSQL + #sudo firewall-cmd --zone=public --add-port=5432/tcp --permanent + ## Permito ISPConfig #sudo firewall-cmd --zone=public --add-port=8080/tcp --permanent From 027563b2d4d99d61dbbc4a90106a09a5ffe418ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 17 Feb 2020 17:26:25 +0100 Subject: [PATCH 11/71] =?UTF-8?q?A=C3=B1ado=20contador=20de=20teclas=20pul?= =?UTF-8?q?sadas=20como=20variable=20de=20entorno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- preferences.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/preferences.sh b/preferences.sh index d56fad6c..9962514c 100644 --- a/preferences.sh +++ b/preferences.sh @@ -119,6 +119,13 @@ variables_lenguaje() { fi } +## +## Añado variables extras para control de programas +## +configureGlobalControlVars() { + setVariableGlobal 'KEYCOUNTER' 0 +} + ## ## Configura las Opciones del entorno para usar el script ## From 4b132617b8971da03a02c5fac3926cfbd69e9151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 18 Feb 2020 17:09:32 +0100 Subject: [PATCH 12/71] Quito variable para contador global --- preferences.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preferences.sh b/preferences.sh index 9962514c..e506b98a 100644 --- a/preferences.sh +++ b/preferences.sh @@ -123,7 +123,7 @@ variables_lenguaje() { ## Añado variables extras para control de programas ## configureGlobalControlVars() { - setVariableGlobal 'KEYCOUNTER' 0 + echo -e "Estableciendo variables globales" } ## From 4d0e0166763e88ee4949a4be3f9aadde5f65c392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 18 Feb 2020 21:07:02 +0100 Subject: [PATCH 13/71] Preparando lectura del socket para el keycounter --- .../.config/i3/scripts/Models/SocketClient.py | 38 +++++++++++++++++++ .../.config/i3/scripts/i3pystatus-config.py | 12 ++++++ 2 files changed, 50 insertions(+) create mode 100644 conf/home/.config/i3/scripts/Models/SocketClient.py diff --git a/conf/home/.config/i3/scripts/Models/SocketClient.py b/conf/home/.config/i3/scripts/Models/SocketClient.py new file mode 100644 index 00000000..1e78cef3 --- /dev/null +++ b/conf/home/.config/i3/scripts/Models/SocketClient.py @@ -0,0 +1,38 @@ +#!/usr/bin/python3 +# -*- encoding: utf-8 -*- + +import socket +import sys + +class SocketClient: + # Create a UDS socket + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + + # Connect the socket to the port where the server is listening + server_address = '/var/run/keycounter.socket' + + + def get_pulsations_current(self): + #print('Conectando a {}'.format(server_address)) + try: + self.sock.connect(self.server_address) + except socket.error as msg: + #print(msg) + return None + sys.exit(1) + try: + # Pido cantidad de pulsaciones actual + message = b'pulsations_current' + #print('Enviando {!r}'.format(message)) + self.sock.sendall(message) + + # Recibo la cantidad de pulsaciones + data = self.sock.recv(2048) + #print('Recibido {!r}'.format(data.decode("utf-8"))) + + # Devuelvo las pulsaciones. + return str(data.decode("utf-8")) + + finally: + #print('closing socket') + self.sock.close() diff --git a/conf/home/.config/i3/scripts/i3pystatus-config.py b/conf/home/.config/i3/scripts/i3pystatus-config.py index 211076d5..d20ed18e 100755 --- a/conf/home/.config/i3/scripts/i3pystatus-config.py +++ b/conf/home/.config/i3/scripts/i3pystatus-config.py @@ -29,6 +29,8 @@ from os import listdir import re +#from Models.SocketClient import SocketClient + ####################################### # # Variables # # ####################################### @@ -224,6 +226,16 @@ def color(): interval=5, on_leftclick="zenity --calendar --text ''",) +## Keycounter --------------------------------------------------------------- +status.register("text", + #text = SocketClient().keycount.get_pulsations_current(), + text = 'test', + # open terminal window running htop + #on_leftclick = "i3-sensible-terminal -e htop", + # open i3pystatus github page in firefox + #on_rightclick = "firefox --new-window https://github.com/enkore/i3pystatus", + ) + ## CAL ----------------------------------------------------------------- #status.register("clock", # format = "  %a %d-%m-%Y", From e8f11dbe4e4d7aa4d2714a9a7349009e66c2e6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 18 Feb 2020 22:59:25 +0100 Subject: [PATCH 14/71] =?UTF-8?q?Termino=20de=20implementar=20m=C3=B3dulo?= =?UTF-8?q?=20para=20i3pystatus=20que=20lee=20el=20socket=20del=20keycount?= =?UTF-8?q?er=20(si=20existiera)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.config/i3/scripts/Models/SocketClient.py | 38 ------------------- .../.config/i3/scripts/i3pystatus-config.py | 16 +++----- .../i3pystatus_modules/SocketClient.py | 0 3 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 conf/home/.config/i3/scripts/Models/SocketClient.py create mode 100644 conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py diff --git a/conf/home/.config/i3/scripts/Models/SocketClient.py b/conf/home/.config/i3/scripts/Models/SocketClient.py deleted file mode 100644 index 1e78cef3..00000000 --- a/conf/home/.config/i3/scripts/Models/SocketClient.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/python3 -# -*- encoding: utf-8 -*- - -import socket -import sys - -class SocketClient: - # Create a UDS socket - sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - - # Connect the socket to the port where the server is listening - server_address = '/var/run/keycounter.socket' - - - def get_pulsations_current(self): - #print('Conectando a {}'.format(server_address)) - try: - self.sock.connect(self.server_address) - except socket.error as msg: - #print(msg) - return None - sys.exit(1) - try: - # Pido cantidad de pulsaciones actual - message = b'pulsations_current' - #print('Enviando {!r}'.format(message)) - self.sock.sendall(message) - - # Recibo la cantidad de pulsaciones - data = self.sock.recv(2048) - #print('Recibido {!r}'.format(data.decode("utf-8"))) - - # Devuelvo las pulsaciones. - return str(data.decode("utf-8")) - - finally: - #print('closing socket') - self.sock.close() diff --git a/conf/home/.config/i3/scripts/i3pystatus-config.py b/conf/home/.config/i3/scripts/i3pystatus-config.py index d20ed18e..9ac6a67b 100755 --- a/conf/home/.config/i3/scripts/i3pystatus-config.py +++ b/conf/home/.config/i3/scripts/i3pystatus-config.py @@ -29,7 +29,8 @@ from os import listdir import re -#from Models.SocketClient import SocketClient +# Importo módulos personalizados +from i3pystatus_modules.SocketClient import SocketClient ####################################### # # Variables # # @@ -164,6 +165,9 @@ def color(): on_rightclick = "~/.config/i3/scripts/record.sh stop", ) +## Keycounter --------------------------------------------------------------- +status.register(SocketClient) + ## Actualizaciones ----------------------------------------------------- status.register("updates", format = "APT:{count}", @@ -226,16 +230,6 @@ def color(): interval=5, on_leftclick="zenity --calendar --text ''",) -## Keycounter --------------------------------------------------------------- -status.register("text", - #text = SocketClient().keycount.get_pulsations_current(), - text = 'test', - # open terminal window running htop - #on_leftclick = "i3-sensible-terminal -e htop", - # open i3pystatus github page in firefox - #on_rightclick = "firefox --new-window https://github.com/enkore/i3pystatus", - ) - ## CAL ----------------------------------------------------------------- #status.register("clock", # format = "  %a %d-%m-%Y", diff --git a/conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py b/conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py new file mode 100644 index 00000000..e69de29b From bbeb45663bf4128641be79c2da2c7a3a3c0d2d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 18 Feb 2020 23:00:23 +0100 Subject: [PATCH 15/71] =?UTF-8?q?A=C3=B1ado=20a=20lista=20de=20ignorados?= =?UTF-8?q?=20los=20archivos=20cach=C3=A9=20python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c9e98f86..dbf6323e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ npm-debug.log .ropeproject __pycache__ /.env +__init__.py From bd79eec70d608aa1f2f24d6ce384c33291324957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 18 Feb 2020 23:07:42 +0100 Subject: [PATCH 16/71] =?UTF-8?q?A=C3=B1ado=20el=20m=C3=B3dulo=20que=20con?= =?UTF-8?q?ecta=20al=20socket=20unix=20del=20keycounter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3pystatus_modules/SocketClient.py | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py b/conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py index e69de29b..e0fffa66 100644 --- a/conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py +++ b/conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py @@ -0,0 +1,55 @@ +#!/usr/bin/python3 +# -*- encoding: utf-8 -*- + +import socket +import sys +from i3pystatus import IntervalModule + +class SocketClient(IntervalModule): + + color = "#00FF00" + interval = 1 + + settings = ( + ("format", "Format string"), + ) + + def get_pulsations_current(self): + # Create a UDS socket + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + + # Connect the socket to the port where the server is listening + server_address = '/var/run/keycounter.socket' + + try: + sock.connect(server_address) + except socket.error as msg: + return None + + try: + # Pido cantidad de pulsaciones actual + message = b'pulsations_current' + #print('Enviando {!r}'.format(message)) + sock.sendall(message) + + # Recibo la cantidad de pulsaciones + data = sock.recv(2048) + #print('Recibido {!r}'.format(data.decode("utf-8"))) + + # Devuelvo las pulsaciones. + return str(data.decode("utf-8")) + + finally: + #print('closing socket') + sock.close() + + def run(self): + if self.get_pulsations_current(): + text = ' ' + self.get_pulsations_current() + else: + text = '' + + self.output = { + "full_text": text, + "color": self.color + } \ No newline at end of file From 93603cfbfa1930c19a86e9945572ce0c738a2400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 25 Feb 2020 21:31:59 +0100 Subject: [PATCH 17/71] =?UTF-8?q?Actualizo=20versi=C3=B3n=20de=20Pycharm?= =?UTF-8?q?=20Pro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/IDEs/pycharm_pro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apps/IDEs/pycharm_pro.sh b/Apps/IDEs/pycharm_pro.sh index 87fd1493..e7f313c0 100644 --- a/Apps/IDEs/pycharm_pro.sh +++ b/Apps/IDEs/pycharm_pro.sh @@ -72,7 +72,7 @@ pycharm_postconfiguracion() { } pycharm_pro_instalador() { - local version='pycharm-professional-2019.3' + local version='pycharm-professional-2019.3.3' echo -e "$VE Comenzando instalación de$RO PyCharm$CL" From cc93cbd6ef68e8a1df8173a297c89a42fe6685ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 3 Mar 2020 23:45:12 +0100 Subject: [PATCH 18/71] =?UTF-8?q?Extraigo=20i3pystatus=20para=20reutilizar?= =?UTF-8?q?=20configuraci=C3=B3n=20con=20otros=20WM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.config/i3pystatus/i3pystatus-config.py | 375 ++++++++++++++++++ .../i3pystatus_modules/SocketClient.py | 55 +++ 2 files changed, 430 insertions(+) create mode 100755 conf/home/.config/i3pystatus/i3pystatus-config.py create mode 100644 conf/home/.config/i3pystatus/i3pystatus_modules/SocketClient.py diff --git a/conf/home/.config/i3pystatus/i3pystatus-config.py b/conf/home/.config/i3pystatus/i3pystatus-config.py new file mode 100755 index 00000000..9ac6a67b --- /dev/null +++ b/conf/home/.config/i3pystatus/i3pystatus-config.py @@ -0,0 +1,375 @@ +#!/usr/bin/python3 +# -*- encoding: utf-8 -*- + +# @author Raúl Caro Pastorino +# @copyright Copyright © 2018 Raúl Caro Pastorino +# @license https://wwww.gnu.org/licenses/gpl.txt +# @email tecnico@fryntiz.es +# @web www.fryntiz.es +# @github https://github.com/fryntiz +# @gitlab https://gitlab.com/fryntiz +# @twitter https://twitter.com/fryntiz + +# Guía de estilos aplicada: PEP8 + +####################################### +# # Descripción # # +####################################### + +####################################### +# # Importar Librerías # # +####################################### +import subprocess +import os.path as path + +from i3pystatus import Status +from i3pystatus.updates import aptget + +from time import sleep +from os import listdir +import re + +# Importo módulos personalizados +from i3pystatus_modules.SocketClient import SocketClient + +####################################### +# # Variables # # +####################################### +status = Status() + +## Todas las interfaces de red +interfaces = " ".join(listdir('/sys/class/net/')) + +patron_wlan = re.compile(r'w\w+') +patron_eth = re.compile(r'e\w+') + +## Lista con cada tipo de interfaz de red +wlan = patron_wlan.findall(str(interfaces)) +ethernet = patron_eth.findall(str(interfaces)) + +## Variables para colores +naranja = '' +amarillo = '#ffff33' +azul = '#3300ff' +gris = '' +pastel = '' +negro = '' +naranja = '' +verde = '#00cc00' +verdeC = '#99ff66' +rojo = '#cc0000' +rojoC = '' +rosa = '' +marron = '' +background = '' +backgroundC = '' + +####################################### +# # Funciones # # +####################################### + +# Refactorizar colores de forma aleatoria mediante un array y cada elemento +# tomará el color de su posición determinando el mismo colo en el array de +# forma que se usará el próximo colo como punta. +# +# En caso de ser el último usar color de la barra. +# +# No puede haber colores parecidos dos posiciones delante o detrás + +# Esta matriz proporciona en primer nivel los fondos que coincidirán con el +# segundo nivel de colores para el texto. +colorActual = 0 +colores = ( + ( + '#CA4932', + '#568C3B', + '#D22D72', + '#48417C', + '#257FAD', + '#EF3E14', + '#5D5DB1', + '#BF6643', + '#5A7B8C' + ), + ( + '#E6E6FA', + '#D5AEBE', + '#AAF3AA', + '#68C274', + '#D0C6A6', + '#E4DCDA', + '#C4C4E0', + '#DACAC4', + '#C4D5DD' + ) +) + +def color(): + """ + Devuelve una lista con tres posiciones indicando el color de fondo actual, + el color del texto y el color de fondo siguiente (para la punta): + [ColorActual][texto][PróximoColor]. + """ + global colorActual + actual = colorActual + colorActual = nextColor = (colorActual + 1) + return (colores[0][actual], colores[1][actual], colores[0][nextColor]) + +#print (color()) +#print (color()) +#quit() + +updatesFColor='#CA4932' +clockFColor='#E6E6FA' +forColor='#EDE4E4' + +alsaColor='#D22D72' +alsaFColor='#D5AEBE' + +backlightColor='#568C3B' +backlightFColor='#AAF3AA' + +networkColor='#48417C' +networkFColor='#68C274' + +batteryColor='#257FAD' +batteryFColor='#D0C6A6' + +tempColor='#EF3E14' +tempFColor='#E4DCDA' + +cpuColor='#5D5DB1' +cpuFColor='#C4C4E0' + +memColor='#BF6643' +memFColor='#DACAC4' + +diskColor='#5A7B8C' +diskFColor='#C4D5DD' + +## Menu ---------------------------------------------------------------- +status.register("text", + text = "Debian ", + ## Abrir el menu obmenubar + on_leftclick = "~/.config/i3/scripts/menu", + ## Abrir terminal + #on_rightclick = "tilix", +) + +## Grabación +status.register("text", + text = "\uf03dGrabar", + ## Abrir el menu obmenubar + on_leftclick = "~/.config/i3/scripts/record.sh start", + ## Abrir terminal + on_rightclick = "~/.config/i3/scripts/record.sh stop", +) + +## Keycounter --------------------------------------------------------------- +status.register(SocketClient) + +## Actualizaciones ----------------------------------------------------- +status.register("updates", + format = "APT:{count}", + format_no_updates = "OK", + on_leftclick = "apt update -y", + on_rightclick = "apt upgrade -y", + color = updatesFColor, + backends = [aptget.AptGet()], +) + +## BACKLIGHT ----------------------------------------------------------- +## Solo se carga si existe +if path.exists('/sys/class/backlight/intel_backlight'): + status.register("backlight", + interval=5, + color = backlightFColor, + format=" {percentage:.0f}%", + on_leftclick = "~/.config/i3/scripts/brillo.py -- && notify-send 'Brillo Abajo' || notify-send 'Error: Brillo Abajo ha fallado'", + on_rightclick = "~/.config/i3/scripts/brillo.py ++ && notify-send 'Brillo Arriba' || notify-send 'Error: Brillo Arriba ha fallado'", + hints= {"markup": "pango","separator": True,"separator_block_width": 12}, + #hints= {"markup": "pango","separator": False,"separator_block_width": 0}, + #format = " {percentage:.0f}% ", + backlight="intel_backlight", + ) + +## BATERIA ------------------------------------------------------------- +## Solo carga si hay una batería +if path.exists('/sys/class/power_supply/BAT0'): + status.register("battery", + #battery_ident="BAT1", + interval=3, + format="{status} {percentage:.0f}%", + hints= {"markup": "pango","separator": True,"separator_block_width": 12}, + #hints= {"markup": "pango","separator": False,"separator_block_width": 0}, + #format = " {status} {percentage:.0f}%", + + alert=True, + alert_percentage=10, + color=forColor, + critical_color="#FF1919", + charging_color="#E5E500", + full_color=batteryFColor, + status={ + "DIS": " ", + "CHR": "  ", + "FULL": " ", + }, + ) + +## Reloj --------------------------------------------------------------- +# Displays clock like this: +# Tue 30 Jul 11:59:46 PM KW31 +# ^-- calendar week +status.register("clock", + hints= {"markup": "pango"}, + format=""+" %H:%M", + color=verdeC, #clockFColor, + interval=5, + on_leftclick="zenity --calendar --text ''",) + +## CAL ----------------------------------------------------------------- +#status.register("clock", +# format = "  %a %d-%m-%Y", +# color = verdeC, +# interval = 1, +#) + +## REPRODUCTOR ------------------------------------------------------------- +#status.register( +# "cmus", +# #format = "[{status}{artist: >.50} - {title: >.50}]", +# format = "{status}{artist: >.50} - {title: >.50}", +# status = {'stop': '', 'play': '', 'pause': ''}, +#) + +## ALSA SOUND ---------------------------------------------------------- +status.register("alsa", + on_leftclick = "amixer set Master toggle", + #on_upscroll = "amixer set Master 10%+", + #on_downscroll = "amixer set Master 10%-", + on_rightclick = "pavucontrol", + color = alsaFColor, + color_muted = '#E06C75', + #format_muted=' [muted]', + #format=" {volume}%", + hints= {"markup": "pango","separator": False,"separator_block_width": 0}, + format = " {volume}% ", + + format_muted = " [muted] ", + ) + +## TEMPERATURA --------------------------------------------------------- +status.register("temp", + hints = {"markup": "pango","separator": False,"separator_block_width": 0}, + #format = " {temp}°", + format = " {temp}°C", + color = tempFColor, + alert_color = "#FFEF00", + alert_temp = 60, + ) + +## CPU USO ------------------------------------------------------------- +status.register("cpu_usage", + color=cpuFColor, + hints= {"markup": "pango","separator": False,"separator_block_width": 0}, + on_leftclick="tilix --title=htop -e 'htop'", + + format = " CPU {usage}%", + ) + +## MEMORIA ------------------------------------------------------------- +status.register("mem", + hints = {"markup": "pango","separator": False,"separator_block_width": 0}, + color = memFColor, + warn_color = "#E5E500S", + alert_color = "#FF1919", + #format = " {percent_used_mem}", + + format = " RAM {percent_used_mem}%", + #divisor = 1073741824, + ) + +## DISK USAGE ---------------------------------------------------------- +status.register("disk", + hints = {"markup": "pango","separator": False,"separator_block_width": 0}, + color = diskFColor, + path = "/", + on_leftclick = "thunar", + #format=" {avail} GB", + + format = " {avail} GB", +) + +#status.register('ping', +# format_disabled='', +# color='#61AEEE') + +#status.register("keyboard_locks", + #format='{caps} {num}', + #caps_on='Caps Lock', + #caps_off='', + #num_on='', + #num_off='', + #color='#FFC0CB', + #) + + + +#status.register("xkblayout", + #layouts=["fr", "ar"], + #format = u"\u2328 {name}", + #) + +## WIRELESS ------------------------------------------------------------ +## Por cada interfaz de red wireless genero un monitor de estado +for ifc in wlan: + status.register("network", + interface=ifc, + + color_up = networkFColor, + color_down = networkFColor, + hints = {"markup": "pango","separator": False,"separator_block_width": 0}, + #format_up=" {essid}  {bytes_recv:6.1f}KiB", + + #format_up = "{essid} {bytes_recv:6.1f}KiB {bytes_sent:5.1f}KiB", + + format_up = " {bytes_recv}K {bytes_sent}K", + + format_down = "", + ) + +## ETHERNET ------------------------------------------------------------ +## Por cada interfaz de red wireless genero un monitor de estado +for ifc in ethernet: + status.register( + "network", + interface = ifc, + + color_up = networkFColor, + color_down = networkFColor, + hints = { + "markup": "pango", + "separator": False, + "separator_block_width": 0 + }, + + format_up = "\uE0B2\uE0A0{bytes_recv}K {bytes_sent}K", + + format_down = "", + ) + +status.run() diff --git a/conf/home/.config/i3pystatus/i3pystatus_modules/SocketClient.py b/conf/home/.config/i3pystatus/i3pystatus_modules/SocketClient.py new file mode 100644 index 00000000..e0fffa66 --- /dev/null +++ b/conf/home/.config/i3pystatus/i3pystatus_modules/SocketClient.py @@ -0,0 +1,55 @@ +#!/usr/bin/python3 +# -*- encoding: utf-8 -*- + +import socket +import sys +from i3pystatus import IntervalModule + +class SocketClient(IntervalModule): + + color = "#00FF00" + interval = 1 + + settings = ( + ("format", "Format string"), + ) + + def get_pulsations_current(self): + # Create a UDS socket + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + + # Connect the socket to the port where the server is listening + server_address = '/var/run/keycounter.socket' + + try: + sock.connect(server_address) + except socket.error as msg: + return None + + try: + # Pido cantidad de pulsaciones actual + message = b'pulsations_current' + #print('Enviando {!r}'.format(message)) + sock.sendall(message) + + # Recibo la cantidad de pulsaciones + data = sock.recv(2048) + #print('Recibido {!r}'.format(data.decode("utf-8"))) + + # Devuelvo las pulsaciones. + return str(data.decode("utf-8")) + + finally: + #print('closing socket') + sock.close() + + def run(self): + if self.get_pulsations_current(): + text = ' ' + self.get_pulsations_current() + else: + text = '' + + self.output = { + "full_text": text, + "color": self.color + } \ No newline at end of file From 9bda9f407fc0c073bb3e2c8db07288894dfe5c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 3 Mar 2020 23:45:49 +0100 Subject: [PATCH 19/71] =?UTF-8?q?Comienzo=20a=20implementar=20sway=20a?= =?UTF-8?q?=C3=B1adiendo=20configuraciones?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/home/.config/sway/config | 625 ++++++++++++++++++++++++++++++++++ 1 file changed, 625 insertions(+) create mode 100644 conf/home/.config/sway/config diff --git a/conf/home/.config/sway/config b/conf/home/.config/sway/config new file mode 100644 index 00000000..d769cb8e --- /dev/null +++ b/conf/home/.config/sway/config @@ -0,0 +1,625 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2018 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email tecnico@fryntiz.es +## @web www.fryntiz.es +## @github https://github.com/fryntiz +## @gitlab https://gitlab.com/fryntiz +## @twitter https://twitter.com/fryntiz + +## Referencia oficial: http://i3wm.org/docs/userguide.html + +## Iconos de ejemplo: +##                            +##                              +##                      + +## Tecla modificadora +set $mod Mod4 + +## Nombre de monitores 1 y 2: +#set $mon1 DVI-I-1 +#set $mon2 DVI-D-0 +#set $mon3 HDMI-0 + +## Configuración +set $coordenadas '36.7349439:-6.4253577' ## Coordenadas + +#output eDP-1 scale 0 +output eDP-1 pos 0 0 res 3840x2160 + +########################################################### +############ Espacios de trabajo ############ +########################################################### +## Nombres para cada espacio del monitor 1 +set $WS1 1: +set $WS2 2: +set $WS3 3: +set $WS4 4: +set $WS5 5: +set $WS6 6: +set $WS7 7: +set $WS8 8: + +## Nombres para cada espacio del monitor 2 +set $WS9 9: +set $WS10 10: + +## Asigno workspaces a Monitor 1 +#workspace 1 output $mon1 +#workspace 2 output $mon1 +#workspace 3 output $mon1 +#workspace 4 output $mon1 +#workspace 5 output $mon1 +#workspace 6 output $mon1 +#workspace 7 output $mon1 +#workspace 8 output $mon1 + +## Asigno workspaces a Monitor 2 +#workspace $WS9 output $mon2 +#workspace $WS10 output $mon2 + +## Cargando desde JSON +## Generar: i3-save-tree --workspace 2:TERM > ~/.config/i3/workspace_2.json +## Limpiar: tail -n +2 ~/.config/i3/Workspaces/workspace_2.json | fgrep -v '// splitv' | sed 's|//||g' > ~/.config/i3/Workspaces/workspace_2.json + +#exec --no-startup-id ~/.config/i3/Workspaces/load_layouts.sh + +## Establecer monitores HDMI al conectarse: +#exec --no-startup-id xrandr --output eDP1-1 --primary +#exec --no-startup-id xrandr --output HDMI-1 --secundary + +########################################################### +############ Ubicacion de ventanas por defecto ############ +########################################################### + +## 2 +assign [class="[pP]hp[sS]torm"] → $WS2 +for_window [class="[pP]hp[sS]torm"] focus +assign [class="[pP]y[cC]harm"] → $WS2 +for_window [class="[pP]y[cC]harm"] focus +assign [class="[wW]eb[sS]torm"] → $WS2 +for_window [class="[pP]y[cC]harm"] focus +assign [class="^[aA]tom"] → $WS2 +for_window [class="^[aA]tom"] focus +assign [class="^[bB]rackets"] → $WS2 +for_window [class="^[Bb]rackets"] focus + +## 3 +assign [class="^[fF]irefox"] → $WS3 +for_window [class="^[fF]irefox"] focus +assign [class="^[cC]hrome"] → $WS3 +for_window [class="^[cC]hrome"] focus +assign [class="^[cC]hromium"] → $WS3 +for_window [class="^[cC]Chromium"] focus +assign [class="^[gG]oogle-chrome"] → $WS3 +for_window [class="^[gG]oogle-chrome"] focus +assign [class="[tT]orbrowser|[tT]orbrowser-launcher"] → $WS3 +for_window [class="[tT]orbrowser|[tT]orbrowser-launcher"] focus + +## 4 +assign [class="[tT]hunderbird|[eE]volution"] → $WS4 +for_window [class="[tT]hunderbird|[eE]volution"] focus +assign [class="^Corebird"] → $WS4 +for_window [class="^Corebird"] focus +assign [class="[tT]elegram"] → $WS4 +for_window [class="[tT]elegram"] focus +assign [class="[wW]hatsie|[wW]hatsapp"] → $WS4 +for_window [class="[wW]hatsie|[wW]hatsapp"] focus + +## 5 +assign [class="^Gimp"] → $WS5 +for_window [class="^Gimp"] focus +assign [class="^Inkscape"] → $WS5 +for_window [class="^Inkscape"] focus +assign [class="^Dia"] → $WS5 +for_window [class="^Dia"] focus +assign [class="kdenlive|openshot-qt|openshot|cinelerra"] → $WS5 +for_window [class="^kdenlive|openshot-qt|openshot|cinelerra"] focus +assign [class="^Darktable"] → $WS5 +for_window [class="^Darktable"] focus + +## 6 +assign [class="^Audacity"] → $WS6 +for_window [class="^Audacity"] focus +assign [class="^Rhythmbox"] → $WS6 +for_window [class="^Rhythmbox"] focus + +## 7 +assign [class="VirtualBox|Vmplayer"] → $WS7 +for_window [class="VirtualBox|Vmplayer"] focus +assign [class="Oracle VM VirtualBox"] → $WS7 +for_window [class="Oracle VM VirtualBox"] focus + +## 8 +assign [class="Pychess"] → $WS7 +for_window [class="Pychess"] focus + +########################################################### +############ FOCUS DE VENTANAS ############ +########################################################### +bindsym $mod+F1 [class="Firefox"] focus +bindsym $mod+F2 [class="PhpStorm"] focus +bindsym $mod+F3 [title="Atom"] focus +#bindsym $mod+F4 [class="nautilus"] focus +#bindsym $mod+F5 [class="tilix"] focus +#bindsym $mod+F6 [title="PyCharm"] focus +#bindsym $mod+F7 [class="Firefox"] focus +#bindsym $mod+F8 [class="Firefox"] focus +#bindsym $mod+F9 [class="Firefox"] focus +#bindsym $mod+F10 [class="Thunderbird"] focus +#bindsym $mod+F11 [class="whatsie"] focus +#bindsym $mod+F12 [class="Telegram"] focus + +########################################################### +############ Visualización/Pantalla ############ +########################################################### +## Establezco a 130 dpi +exec --no-startup-id xrandr --dpi 140 +exec_always --no-startup-id xrandr --dpi 140 + +## Fuente para títulos de ventanas usadas en bar {} block below. +font pango:monospace 9 +#font pango:DejaVu Sans Mono 8 + +## Habilita o Deshabilita tener el foco al pasar el ratón +focus_follows_mouse no + +## Usar Mouse+$mod para arrastrar ventanas flotantes +floating_modifier $mod + +## Quita los bordes de los extremos de la pantalla +hide_edge_borders vertical + +## Decoración de ventanas +## Clase Bordes Fondo Texto Indicador +client.focused #4c7899 #285577 #ffffff #2e9ef4 +client.unfocused #4c7899 #24364F #aaaaaa #2e9ef4 +client.focused #c10101 #880404 #ffffff #00AA00 + +## Modo de Organizar ventanas por defecto: default|stacking|tabbed +workspace_layout tabbed + +# set trayer to be borderless +for_window [class="(?i)trayer"] border pixel 0 + +########################################################### +############ VENTANAS FLOTANTES POR DEFECTO ############ +########################################################### +## focus, floating, & sticky +## Pongo flotante ventanas de copiar, eliminar, mover y configuración +for_window [title="(?i)(?:copying|deleting|moving)"] floating enable +for_window [window_role="(?i)(?:pop-up|setup)"] floating enable + +for_window [class="Galculator"] floating enable +for_window [class="Imagewriter"] floating enable +for_window [class="^Gpick$"] floating enable +for_window [class="^Gnome-font-viewer$"] floating enable +for_window [class="Lxappearance|lxappearance"] floating enable, move position 290 150 +for_window [class="Nitrogen"] floating enable, move position 50 50 +for_window [class="SimpleScreenRecorder"] floating enable +for_window [class="Kazam"] floating enable +for_window [class="System-config-printer"] floating enable +for_window [class="[tT]orbrowser-launcher$"] floating enable +for_window [class="Unetbootin"] floating enable +for_window [class="Usb-creator-gtk"] floating enable +for_window [class="Xfce4-taskmanager"] floating enable +for_window [title="^Terminator Preferences$"] floating enable +for_window [title="QOwnNotes"] floating enable, resize set 1000 800 +for_window [title="ARandR"] floating enable, move position 50 50 +for_window [title="^Screen Layout Editor$"] floating enable +for_window [title="^Instalador de paquetes"] floating enable, move position 50 50 + +########################################################### +############ VENTANAS NO FLOTANTES ############ +########################################################### + +############################################################ +############### i3bar ################## +############################################################ +## Barra para monitor principal + + + +bar { + ## Monitor para información en la barra de estado + #status_command i3status ## Mostrar status de monitoreo + status_command python3 ~/.config/i3/scripts/i3pystatus-config.py + + ## Posición donde colocar la barra + position bottom + + workspace_buttons yes + ## Márgenes de iconos en la bandeja + tray_padding 1 + + ## Deshabilita el número en el nombre de los espacios de trabajo + #strip_workspace_numbers yes + + colors { + #background #001111 ## Color del panel + #statusline #fdf6e3 ## Color del status + #separator #9e9e9e ## Color de separadores + #background #1b1b1b + #statusline #ffffff + #separator #444444 + + # Dark + ## Colores Bordes Fondo Texto + #focused_workspace #141414 #283232 #606060 + #active_workspace #141414 #202020 #606060 + #inactive_workspace #141414 #202020 #606060 + #urgent_workspace #141414 #452828 #8c644c + + # Light + ## Colores Bordes Fondo Texto + #focused_workspace #dddddd #ddbbdd #606060 + #active_workspace #dddddd #dddddd #606060 + #inactive_workspace #dddddd #dddddd #606060 + #urgent_workspace #dddddd #452828 #8c644c + + ## Mi tema + background #001111 + statusline #fdf6e3 + separator #9e9e9e + ## Colores Bordes Fondo Texto + focused_workspace #FF0000 #FF0000 #FFFFFF + active_workspace #333333 #FFFFFF #FF0000 + inactive_workspace #001111 #285577 #C79A97 + urgent_workspace #ffff00 #ffff00 #000000 + binding_mode #2F343A #900000 #FFFFFF + } + +} + +############################################################ +############# Bindings del Sistema ################## +############################################################ +input * xkb_layout "es" +#input * xkb_variant "colemak,,typewriter" +#input * xkb_options "grp:win_space_toggle" +input "MANUFACTURER1 Keyboard" xkb_model "pc101" + + +############################################################ +############# Bindings del Sistema ################## +############################################################ +## Navegar entre las ventanas $mod+[jkln] o $mod+[←↓→] +bindsym $mod+j focus left +bindsym $mod+k focus down +bindsym $mod+l focus up +bindsym $mod+ntilde focus right +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +## Mover una ventana $mod+shift+[jkln] o $mod+shift+[←↓→] +bindsym $mod+Shift+j move left +bindsym $mod+Shift+k move down +bindsym $mod+Shift+l move up +bindsym $mod+Shift+ntilde move right +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +## Divide en orientación Horizontal +bindsym $mod+h split h; exec notify-send 'Horizontal' + +## Divide en orientación Vertical +bindsym $mod+v split v; exec notify-send 'Vertical' + +## Poner en pantalla completa la ventana actual con $mod+f +bindsym $mod+f fullscreen toggle; exec notify-send 'Pantalla completa' + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +## Alternar ventana entre flotante o tiling con $mod+Shift+space +bindsym $mod+Shift+space floating toggle + +## Cambiar el foco entre tiling / floating windows +bindsym $mod+space focus mode_toggle + +## El foco sobre el contenedor padre +bindsym $mod+a focus parent + +## El foco sobre el contenedor hijo +#bindsym $mod+d focus child + +## Conmutar entre configuraciones de pantalla para varios monitores +bindsym $mod+F6 exec ~/.config/i3/scripts/togglescreen.sh 2> /tmp/test && notify-send 'Cambio de pantallas' || notify-send 'Configuración de Pantallas no aplicable' + +## Cambiar entre espacioes de trabajo +bindsym $mod+1 workspace $WS1 +bindsym $mod+2 workspace $WS2 +bindsym $mod+3 workspace $WS3 +bindsym $mod+4 workspace $WS4 +bindsym $mod+5 workspace $WS5 +bindsym $mod+6 workspace $WS6 +bindsym $mod+7 workspace $WS7 +bindsym $mod+8 workspace $WS8 +bindsym $mod+9 workspace $WS9 +bindsym $mod+0 workspace $WS10 + +## Mover una ventana a un espacio de trabajo concreto +bindsym $mod+Shift+1 move container to workspace $WS1 +bindsym $mod+Shift+2 move container to workspace $WS2 +bindsym $mod+Shift+3 move container to workspace $WS3 +bindsym $mod+Shift+4 move container to workspace $WS4 +bindsym $mod+Shift+5 move container to workspace $WS5 +bindsym $mod+Shift+6 move container to workspace $WS6 +bindsym $mod+Shift+7 move container to workspace $WS7 +bindsym $mod+Shift+8 move container to workspace $WS8 +bindsym $mod+Shift+9 move container to workspace $WS9 +bindsym $mod+Shift+0 move container to workspace $WS10 + +bindsym $mod+x workspace next ## Siguiente workspace +bindsym $mod+z workspace prev ## Anterior workspace +bindsym Mod1+Ctrl+Right workspace next +bindsym Mod1+Ctrl+Left workspace prev + +## Redimensionar ventana (you can also use the mouse for that) +mode "resize" { + # These bindings trigger as soon as you enter the resize mode + + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym ntilde resize grow width 10 px or 10 ppt + + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + ## Para volver al modo normal introducir: Enter o Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} + +## Entrar al modo para redimensionar +bindsym $mod+r mode "resize" + +## Abrir terminal con $mod+Intro +#bindsym $mod+Return exec ~/.config/i3/scripts/i3-shell.sh +bindsym $mod+Return exec i3-sensible-terminal + +## Cerrar ventana actual con $mod+shift+q +bindsym $mod+Shift+q kill + +## Abrir dmenu (Lanzador de programas) +#bindsym $mod+d exec i3-dmenu-desktop ## Antes dmenu_run +bindsym $mod+d exec j4-dmenu-desktop + +#bindsym $mod+shift+d exec rofi -combi-modi window,drun,ssh -theme Paper -font "hack 10" -show combi +bindsym $mod+m exec --no-startup-id ~/.config/i3/scripts/rofr.sh -r +bindsym $mod+shift+d exec --no-startup-id ~/.config/i3/scripts/rofr.sh -r + +############################################################ +############# Bindings Propios ################## +############################################################ +## Alternar entre teclado "es-querty" y "dvorak" +bindsym $mod+Control+space exec --no-startup-id ~/.config/i3/scripts/keyboard.sh + +## Captura un área de la pantalla seleccionada al portapapeles +bindsym --release shift+Print exec xfce4-screenshooter -crm + +## Captura un área de la pantalla a Imágenes +bindsym --release Control+shift+Print exec xfce4-screenshooter -rm -s ~/Imágenes/Screenshots/ + +## Captura de Ventana actual +bindsym --release $mod+print exec xfce4-screenshooter -wm -s ~/Imágenes/Screenshots/ + +## Captura de Pantalla Completa al portapapeles +bindsym --release $mod+shift+print exec xfce4-screenshooter -cfm + +## Captura de Pantalla Completa +bindsym --release print exec xfce4-screenshooter -fm -s ~/Imágenes/Screenshots/ + +## Brillo de la pantalla +#bindcode XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10 +#bindcode XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10 +#bindcode XF86MonBrightnessUp exec --no-startup-id ~/config/.i3/scripts/brillo.py next && notify-send "Brillo Arriba" || notify-send "Error: Brillo Arriba ha fallado" +#bindcode XF86MonBrightnessDown exec --no-startup-id ~/config/.i3/scripts/brillo.py back && notify-send "Brillo Abajo" || notify-send "Error: Brillo Abajo ha fallado" + +## Abrir programa de Notas QOwnNotes +bindsym --release $mod+n exec QOwnNotes + +## Abrir gestor de contraseñas KeePass2 +bindsym --release $mod+k exec keepass2 "$HOME/Documentos/Personal.kdbx" + +############################################################ +############### Autostart ################## +############################################################ +exec --no-startup-id i3-msg 'workspace $WS1; exec nautilus;' +exec --no-startup-id i3-msg 'workspace $WS1; exec tilix;' +exec --no-startup-id i3-msg 'workspace $WS3; exec x-www-browser; workspace $WS1' +exec --no-startup-id i3-msg 'workspace $WS4; exec ~/4_Programas/Telegram/Telegram; workspace $WS1' +#exec --no-startup-id i3-msg 'workspace $WS4; exec corebird; workspace $WS1' +#exec --no-startup-id i3-msg 'workspace $WS4; exec whatsie; workspace $WS1' +#exec --no-startup-id i3-msg 'workspace $WS4; exec thunderbird; workspace $WS1' + +## Fondo de pantalla nitrogen +#exec --no-startup-id nitrogen --restore + +## Portapapeles parcellite +#exec --no-startup-id parcellite + +#Portapapeles de XFCE (permite guardar capturas de pantalla): xfce4-clipman +exec --no-startup-id xfce4-clipman + +## Mensajes emergentes +#exec --no-startup-id dunst + +## Ocultar ratón tras inactividad +exec --no-startup-id unclutter -idle 1 + +## Configuraciones para X +#exec --no-startup-id xrdb -load ~/.Xresources +exec --no-startup-id xrdb ~/.Xresources + +## Authentication agent +exec --no-startup-id lxpolkit + +## Temperatura de pantalla según zona y hora +#exec --no-startup-id redshift -l $coordenadas -t 5500:4500 + +exec --no-startup-id xbindkeys +exec --no-startup-id pulseaudio --start + +## Ejemplos o ideas +#exec_always --no-startup-id al-polybar-session +#exec --no-startup-id xfsettingsd +#exec --no-startup-id lxpolkit +#exec --no-startup-id xset r rate 250 30 +#exec --no-startup-id setxkbmap -option "ctrl:swapcaps" #Cambia bloq Mayus y CTRL +#exec --no-startup-id xflux -l 36.7756 -g -6.3616 -k 4200 +#exec --no-startup-id ksuperkey -e 'Super_L=Alt_L|F1' + +############################################################ +############### EJECUTAR AL RECARGAR ################## +############################################################ +## Fondo de pantalla nitrogen +#exec_always --no-startup-id nitrogen --restore +#exec_always --no-startup-id dunst +#exec_always --no-startup-id xrdb -load ~/.Xresources +exec_always --no-startup-id xrdb ~/.Xresources + +############################################################ +############### MENÚ DE APAGADO/BLOQUEO ################## +############################################################ +set $mode_system Sistema: (l) Bloquear, (e) Salir, (s) Suspender, (h) Hibernar, (r) Reiniciar, (Shift+s) Apagar + +set $i3exit ~/.config/i3/scripts/i3exit.sh + +mode "$mode_system" { + bindsym l exec --no-startup-id $i3exit lock, mode "default" + bindsym e exec --no-startup-id $i3exit logout, mode "default" + bindsym s exec --no-startup-id $i3exit suspend, mode "default" + bindsym h exec --no-startup-id $i3exit hibernate, mode "default" + bindsym r exec --no-startup-id $i3exit reboot, mode "default" + bindsym Shift+s exec --no-startup-id $i3exit shutdown, mode "default" + + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} + +bindsym $mod+Escape mode "$mode_system" + +############################################################ +############### MENÚ DE SERVIDORES ################## +############################################################ +set $mode_servers A.Apache: (1), E.Apache: (2), A.MariaDB: (3), E.MariaDB: (4), A.PostgreSQL: (5), E.PostgreSQL: (6) + +set $servers ~/.config/i3/scripts/servers.sh + +mode "$mode_servers" { + bindsym 1 exec --no-startup-id $servers apache start, mode "default" + bindsym 2 exec --no-startup-id $servers apache stop, mode "default" + bindsym 3 exec --no-startup-id $servers mariadb start, mode "default" + bindsym 4 exec --no-startup-id $servers mariadb stop, mode "default" + bindsym 5 exec --no-startup-id $servers postgresql start, mode "default" + bindsym 6 exec --no-startup-id $servers postgresql stop, mode "default" + + # back to normal: Enter or Escape + bindsym Return mode "default" + bindsym Escape mode "default" +} + +bindsym $mod+F12 mode "$mode_servers" + +############################################################ +############### APPLETS ################## +############################################################ +## Dropbox +exec --no-startup-id python2 /user/bin/dropbox start + +## Synology Cloud Station +exec --no-startup-id synology-drive + +## Red +exec --no-startup-id nm-applet + +## Transparencias de ventanas y menús mediante Compton +#exec --no-startup-id compton -cCGb + +## Teclado Numérico +#exec --no-startup-id numlockx on + +## Applet de Volumen +exec --no-startup-id volumeicon + +## Applet de Firewalld +exec --no-startup-id firewall-applet + +## Applet de Impresora +#exec --no-startup-id system-config-printer-applet + +############################################################ +############## Recargar/Bloquear/Salir ################ +############################################################ +## Recargar el archivo de configuración +#bindsym $mod+Shift+c swaymsg reload + +## Reiniciar i3 conservando la sesión +bindsym $mod+Shift+r exec swaymsg reload + +## Salir de i3 (logs you out of your X session) +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'Si pulsas sobre salir se cerrará todo lo que tengas abierto. ¿Realmente quieres salir?' -b 'Si, exit i3' 'i3-msg exit'" + +## Suspender al pulsar botón de apagado +#bindsym PowerOff exec --no-startup-id i3lock; pm-suspend + +## Bloquear pantalla +bindsym $mod+p exec "~/.config/i3/scripts/lock_and_blur.sh" +exec xautolock -detectsleep -time 15 -locker "~/.config/i3/scripts/lock_and_blur.sh" -notify 30 -notifier "notify-send -u critical -t 10000 -- 'Bloqueando pantalla en 30 seconds'" + +########################################################### +############ TECLAS MULTIMEDIA ############ +########################################################### +## Mostrar todas las teclas y codigos → xmodmap -pke y +## Alsamixer controles +#bindsym XF86AudioRaiseVolume exec --no-startup-id amixer set Master 10%+ +#bindsym XF86AudioLowerVolume exec --no-startup-id amixer set Master 10%- +#bindsym XF86AudioMute exec --no-startup-id amixer set Master toggle + +# Touchpad controls +#bindsym XF86TouchpadToggle exec /some/path/toggletouchpad.sh # toggle touchpad + +# Media player controls +#bindsym XF86AudioPlay exec playerctl play && "notify-send 'PLAY'" +#bindsym XF86AudioPause exec playerctl pause +#bindsym XF86AudioNext exec playerctl next + + + + +bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% +bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% +bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle +bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle +bindsym XF86MonBrightnessDown exec brightnessctl set 5%- +bindsym XF86MonBrightnessUp exec brightnessctl set +5% +bindsym XF86AudioPlay exec playerctl play-pause +bindsym XF86AudioNext exec playerctl next +bindsym XF86AudioPrev exec playerctl previous + + + + +########################################################### +############ PRUEBAS ############ +########################################################### From 11190b25339108357de290a0d73f2f2c3605525e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 3 Mar 2020 23:46:37 +0100 Subject: [PATCH 20/71] Modificaciones para barra tint2 --- .../tint2/vertical-dark-opaque.tint2rc | 249 ++++++++++++++++++ 1 file changed, 249 insertions(+) create mode 100644 conf/home/.config/tint2/vertical-dark-opaque.tint2rc diff --git a/conf/home/.config/tint2/vertical-dark-opaque.tint2rc b/conf/home/.config/tint2/vertical-dark-opaque.tint2rc new file mode 100644 index 00000000..92cad3ee --- /dev/null +++ b/conf/home/.config/tint2/vertical-dark-opaque.tint2rc @@ -0,0 +1,249 @@ +#---- Generated by tint2conf 8178 ---- +# See https://gitlab.com/o9000/tint2/wikis/Configure for +# full documentation of the configuration options. +#------------------------------------- +# Gradients +#------------------------------------- +# Backgrounds +# Background 1: Panel +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #111111 100 +border_color = #333333 100 +background_color_hover = #111111 100 +border_color_hover = #333333 100 +background_color_pressed = #111111 100 +border_color_pressed = #333333 100 + +# Background 2: Tarea minimizada, Tarea predeterminada +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #111111 100 +border_color = #222222 100 +background_color_hover = #111111 100 +border_color_hover = #555555 100 +background_color_pressed = #333333 100 +border_color_pressed = #555555 100 + +# Background 3: Tarea activa +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #222222 100 +border_color = #777777 100 +background_color_hover = #333333 100 +border_color_hover = #777777 100 +background_color_pressed = #555555 100 +border_color_pressed = #777777 100 + +# Background 4: Tarea urgente +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #aa4400 100 +border_color = #aa7733 100 +background_color_hover = #aa4400 100 +border_color_hover = #aa7733 100 +background_color_pressed = #aa4400 100 +border_color_pressed = #aa7733 100 + +# Background 5: Mensaje emergente +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #ffffaa 100 +border_color = #999999 100 +background_color_hover = #ffffaa 100 +border_color_hover = #999999 100 +background_color_pressed = #ffffaa 100 +border_color_pressed = #999999 100 + +# Background 6: Nombre de escritorio inactivo +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #111111 100 +border_color = #222222 100 +background_color_hover = #111111 100 +border_color_hover = #333333 100 +background_color_pressed = #555555 100 +border_color_pressed = #333333 100 + +# Background 7: Nombre del escritorio activo +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #222222 100 +border_color = #777777 100 +background_color_hover = #222222 100 +border_color_hover = #777777 100 +background_color_pressed = #222222 100 +border_color_pressed = #777777 100 + +#------------------------------------- +# Panel +panel_items = CSTL +panel_size = 100% 152 +panel_margin = 0 0 +panel_padding = 2 2 2 +panel_background_id = 1 +wm_menu = 1 +panel_dock = 0 +panel_pivot_struts = 0 +panel_position = bottom left vertical +panel_layer = normal +panel_monitor = all +panel_shrink = 0 +autohide = 0 +autohide_show_timeout = 0 +autohide_hide_timeout = 0.5 +autohide_height = 2 +strut_policy = follow_size +panel_window_name = tint2 +disable_transparency = 0 +mouse_effects = 1 +font_shadow = 0 +mouse_hover_icon_asb = 100 0 10 +mouse_pressed_icon_asb = 100 0 0 +scale_relative_to_dpi = 0 +scale_relative_to_screen_height = 0 + +#------------------------------------- +# Taskbar +taskbar_mode = multi_desktop +taskbar_hide_if_empty = 0 +taskbar_padding = 0 0 2 +taskbar_background_id = 0 +taskbar_active_background_id = 0 +taskbar_name = 1 +taskbar_hide_inactive_tasks = 0 +taskbar_hide_different_monitor = 0 +taskbar_hide_different_desktop = 0 +taskbar_always_show_all_desktop_tasks = 0 +taskbar_name_padding = 6 3 +taskbar_name_background_id = 6 +taskbar_name_active_background_id = 7 +taskbar_name_font = sans bold 9 +taskbar_name_font_color = #dddddd 100 +taskbar_name_active_font_color = #dddddd 100 +taskbar_distribute_size = 1 +taskbar_sort_order = none +task_align = left + +#------------------------------------- +# Task +task_text = 1 +task_icon = 1 +task_centered = 0 +urgent_nb_of_blink = 100000 +task_maximum_size = 152 35 +task_padding = 4 3 4 +task_font = sans 8 +task_tooltip = 1 +task_thumbnail = 0 +task_thumbnail_size = 210 +task_font_color = #eeeeee 100 +task_icon_asb = 100 0 0 +task_background_id = 2 +task_active_background_id = 3 +task_urgent_background_id = 4 +task_iconified_background_id = 2 +mouse_left = toggle_iconify +mouse_middle = none +mouse_right = close +mouse_scroll_up = prev_task +mouse_scroll_down = next_task + +#------------------------------------- +# System tray (notification area) +systray_padding = 0 0 2 +systray_background_id = 0 +systray_sort = ascending +systray_icon_size = 22 +systray_icon_asb = 100 0 0 +systray_monitor = 1 +systray_name_filter = + +#------------------------------------- +# Launcher +launcher_padding = 0 0 2 +launcher_background_id = 0 +launcher_icon_background_id = 0 +launcher_icon_size = 22 +launcher_icon_asb = 100 0 0 +launcher_icon_theme_override = 0 +startup_notifications = 1 +launcher_tooltip = 1 +launcher_item_app = tint2conf.desktop +launcher_item_app = firefox.desktop +launcher_item_app = iceweasel.desktop +launcher_item_app = chromium-browser.desktop +launcher_item_app = google-chrome.desktop +launcher_item_app = x-terminal-emulator.desktop + +#------------------------------------- +# Clock +time1_format = %H:%M +time2_format = %A %d %B +time1_font = sans bold 9 +time1_timezone = +time2_timezone = +time2_font = sans 9 +clock_font_color = #eeeeee 100 +clock_padding = 1 0 +clock_background_id = 0 +clock_tooltip = +clock_tooltip_timezone = +clock_lclick_command = zenity --calendar --text "" +clock_rclick_command = orage +clock_mclick_command = +clock_uwheel_command = +clock_dwheel_command = + +#------------------------------------- +# Battery +battery_tooltip = 1 +battery_low_status = 10 +battery_low_cmd = xmessage 'tint2: Battery low!' +battery_full_cmd = +bat1_font = sans 8 +bat2_font = sans 6 +battery_font_color = #eeeeee 100 +bat1_format = +bat2_format = +battery_padding = 1 0 +battery_background_id = 0 +battery_hide = 101 +battery_lclick_command = +battery_rclick_command = +battery_mclick_command = +battery_uwheel_command = +battery_dwheel_command = +ac_connected_cmd = +ac_disconnected_cmd = + +#------------------------------------- +# Tooltip +tooltip_show_timeout = 0.5 +tooltip_hide_timeout = 0.1 +tooltip_padding = 2 2 +tooltip_background_id = 5 +tooltip_font_color = #222222 100 +tooltip_font = sans 9 + From 0a346448562d6993162912d4d3db6d6b256e8dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 3 Mar 2020 23:47:32 +0100 Subject: [PATCH 21/71] =?UTF-8?q?M=C3=A1s=20configuraciones=20de=20tint2rc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/home/.config/tint2/tint2rc | 82 ++++++++++++++++++++++++++------- 1 file changed, 65 insertions(+), 17 deletions(-) diff --git a/conf/home/.config/tint2/tint2rc b/conf/home/.config/tint2/tint2rc index 320e7341..8a5f1ecd 100755 --- a/conf/home/.config/tint2/tint2rc +++ b/conf/home/.config/tint2/tint2rc @@ -1,12 +1,16 @@ -#---- Generated by tint2conf 4607 ---- +#---- Generated by tint2conf d767 ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- +# Gradients +#------------------------------------- # Backgrounds -# Background 1: Active task +# Background 1: Tarea activa rounded = 0 border_width = 3 border_sides = T +border_content_tint_weight = 0 +background_content_tint_weight = 0 background_color = #888888 0 border_color = #1793d1 100 background_color_hover = #888888 20 @@ -14,10 +18,12 @@ border_color_hover = #1793d1 100 background_color_pressed = #888888 20 border_color_pressed = #1793d1 100 -# Background 2: Default task, Iconified task +# Background 2: Tarea minimizada, Tarea predeterminada rounded = 0 border_width = 0 border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 background_color = #000000 0 border_color = #000000 0 background_color_hover = #888888 20 @@ -25,10 +31,12 @@ border_color_hover = #888888 20 background_color_pressed = #888888 20 border_color_pressed = #888888 20 -# Background 3: Urgent task +# Background 3: Tarea urgente rounded = 0 border_width = 3 border_sides = T +border_content_tint_weight = 0 +background_content_tint_weight = 0 background_color = #888888 0 border_color = #e64141 100 background_color_hover = #888888 20 @@ -36,10 +44,12 @@ border_color_hover = #e64141 100 background_color_pressed = #888888 20 border_color_pressed = #e64141 100 -# Background 4: Inactive taskbar +# Background 4: Barra inactiva rounded = 0 border_width = 0 border_sides = LR +border_content_tint_weight = 0 +background_content_tint_weight = 0 background_color = #2b303b 80 border_color = #000000 0 background_color_hover = #888888 20 @@ -47,10 +57,12 @@ border_color_hover = #000000 0 background_color_pressed = #888888 20 border_color_pressed = #000000 0 -# Background 5: Active taskbar, Battery, Clock, Launcher, Systray +# Background 5: Bandeja del sistema, Barra de tareas activa, Batería, Lanzador, Reloj rounded = 0 border_width = 0 border_sides = LR +border_content_tint_weight = 0 +background_content_tint_weight = 0 background_color = #2b303b 90 border_color = #d8d8d8 0 background_color_hover = #d8d8d8 0 @@ -58,10 +70,12 @@ border_color_hover = #d8d8d8 0 background_color_pressed = #d8d8d8 0 border_color_pressed = #d8d8d8 0 -# Background 6: Tooltip +# Background 6: Mensaje emergente rounded = 0 border_width = 0 border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 background_color = #2b303b 100 border_color = #222222 90 background_color_hover = #2b303b 100 @@ -71,17 +85,18 @@ border_color_pressed = #222222 90 #------------------------------------- # Panel -panel_items = LTC -panel_size = 100% 30 +panel_items = LTCE +panel_size = 100% 48 panel_margin = 0 0 panel_padding = 0 0 0 panel_background_id = 0 wm_menu = 1 panel_dock = 0 -panel_position = center left vertical -panel_layer = normal +panel_pivot_struts = 0 +panel_position = top center horizontal +panel_layer = top panel_monitor = all -primary_monitor_first = 1 +panel_shrink = 0 autohide = 0 autohide_show_timeout = 0.3 autohide_hide_timeout = 1.5 @@ -93,26 +108,30 @@ mouse_effects = 1 font_shadow = 1 mouse_hover_icon_asb = 100 0 10 mouse_pressed_icon_asb = 100 0 0 +scale_relative_to_dpi = 0 +scale_relative_to_screen_height = 0 #------------------------------------- # Taskbar taskbar_mode = multi_desktop +taskbar_hide_if_empty = 0 taskbar_padding = 0 0 0 taskbar_background_id = 4 taskbar_active_background_id = 5 taskbar_name = 1 taskbar_hide_inactive_tasks = 0 -taskbar_hide_different_monitor = 0 -taskbar_always_show_all_desktop_tasks = 1 +taskbar_hide_different_monitor = 1 +taskbar_hide_different_desktop = 0 +taskbar_always_show_all_desktop_tasks = 0 taskbar_name_padding = 4 4 taskbar_name_background_id = 0 taskbar_name_active_background_id = 0 -taskbar_name_font = Sans 12 +taskbar_name_font = Sans 14 taskbar_name_font_color = #828282 100 taskbar_name_active_font_color = #43beea 100 -taskbar_distribute_size = 0 +taskbar_distribute_size = 1 taskbar_sort_order = mru -task_align = left +task_align = right #------------------------------------- # Task @@ -124,6 +143,8 @@ task_maximum_size = 36 36 task_padding = 3 2 4 task_font = Sans 10 task_tooltip = 1 +task_thumbnail = 0 +task_thumbnail_size = 210 task_font_color = #828282 60 task_active_font_color = #828282 100 task_urgent_font_color = #ffffff 100 @@ -150,6 +171,7 @@ systray_sort = right2left systray_icon_size = 16 systray_icon_asb = 100 0 0 systray_monitor = 1 +systray_name_filter = #------------------------------------- # Launcher @@ -200,9 +222,12 @@ clock_dwheel_command = battery_tooltip = 1 battery_low_status = 20 battery_low_cmd = notify-send "Battery Low" +battery_full_cmd = bat1_font = Sans 10 bat2_font = Sans 10 battery_font_color = #b5b5b5 100 +bat1_format = +bat2_format = battery_padding = 4 2 battery_background_id = 5 battery_hide = 101 @@ -214,6 +239,29 @@ battery_dwheel_command = ac_connected_cmd = ac_disconnected_cmd = +#------------------------------------- +# Executor 1 +execp = new +execp_command = pwd +execp_interval = 5 +execp_has_icon = 0 +execp_cache_icon = 1 +execp_continuous = 0 +execp_markup = 1 +execp_tooltip = Test +execp_lclick_command = +execp_rclick_command = +execp_mclick_command = +execp_uwheel_command = +execp_dwheel_command = +execp_font = Cantarell 12 +execp_font_color = #ff0000 100 +execp_padding = 0 0 +execp_background_id = 0 +execp_centered = 0 +execp_icon_w = 0 +execp_icon_h = 0 + #------------------------------------- # Tooltip tooltip_show_timeout = 0 From be030821fb64d40e5b8fecf921b9357f31fbc2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 3 Mar 2020 23:48:31 +0100 Subject: [PATCH 22/71] =?UTF-8?q?Mejoro=20configuraci=C3=B3n=20de=20Xresou?= =?UTF-8?q?rces?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/home/.Xresources | 99 ++----------------------------------------- 1 file changed, 3 insertions(+), 96 deletions(-) diff --git a/conf/home/.Xresources b/conf/home/.Xresources index 09b3f1a5..2867b869 100755 --- a/conf/home/.Xresources +++ b/conf/home/.Xresources @@ -1,98 +1,5 @@ Xcursor.theme: x-cursor-theme -Xcursor.size: 24 +Xcursor.size: 32 -! ------------------------------------------------------------------------------ -! theme colors -! ------------------------------------------------------------------------------ -! special -#*.foreground: #c0c5ce -#*.background: #2b303b -#*.cursorColor: #c0c5ce - -#*.color0: #2b303b -#*.color1: #bf616a -#*.color2: #a3be8c -#*.color3: #ebcb8b -#*.color4: #8fa1b3 -#*.color5: #b48ead -#*.color6: #96b5b4 -#*.color7: #65737e - -#*.color8: #65737e -#*.color9: #bf616a -#*.color10: #a3be8c -#*.color11: #ebcb8b -#*.color12: #8fa1b3 -#*.color13: #b48ead -#*.color14: #96b5b4 -#*.color15: #F6F6F6 - -! ------------------------------------------------------------------------------ -! xterm -! ------------------------------------------------------------------------------ -#xterm*font: Ubuntu Mono -#xterm*faceName: Ubuntu Mono:size=11:antialias=false -#xterm*loginShell: true -#xterm*vt100*geometry: 90x34 -#xterm*saveLines: 2000 -#xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 -#xterm*termName: xterm-256color -#xterm*eightBitInput: false - -! ------------------------------------------------------------------------------ -! URxvt -! ----------------------------------------------------------------------------- -#URxvt*saveline: 15000 -#URxvt*termName: rxvt-256color -#URxvt*iso14755: false -#URxvt*depth: 32 -#URxvt*background: [90]#2b303b -#URxvt*scrollBar: false -#URxvt*scrollBar_right: false -#URxvt*internalBorder: 0 -#URxvt*externalBorder: 0 -#URxvt*letterSpace: -1 -#URxvt.font: xft:Ubuntu Mono:size=11 -#URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select -#URxvt.copyCommand: xclip -i -selection clipboard -#URxvt.pasteCommand: xclip -o -selection clipboard -#URxvt.keysym.m-c: perl:clipboard:copy -#URxvt.keysym.m-v: perl:clipboard:paste -#URxvt.urlLauncher: exo-open -#URxvt.underlineURLs: true -#URxvt.urlButton: 1 -#URxvt.geometry: 90x30 -#URxvt.tabbed.tabbar-fg: 4 -#URxvt.tabbed.tabbar-bg: 16 -#URxvt.tabbed.tab-fg: 15 -#URxvt.tabbed.tab-bg: 4 -#URxvt*buffered: false - -! ------------------------------------------------------------------------------ -! UXTerm -! ------------------------------------------------------------------------------ -#UXTerm*termName: xterm-256color -#UXTerm*cursorColor: white -#UXTerm*VT100.geometry: 90x30 -#UXTerm*font: Ubuntu Mono -#UXTerm*faceSize: 12 -#UXTerm*dynamicColors: true -#UXTerm*utf8: 2 -#UXTerm*eightBitInput: true -#UXTerm*saveLines: 10000 -#UXTerm*scrollKey: true -#UXTerm*scrollTtyOutput: false -#UXTerm*scrollBar: false -#UXTerm*rightScrollBar: false -#UXTerm*jumpScroll: true -#UXTerm*multiScroll: true -#UXTerm*toolBar: false - -! ------------------------------------------------------------------------------ -! Rofi -! ------------------------------------------------------------------------------ -#rofi.font: Ubuntu Mono 12 -#rofi.color-enabled: true -#rofi.color-window: #2b303b, #2b303b, #2b303b -#rofi.color-normal: #2b303b, #c0c5ce, #2b303b, #8fa1b3, #2b303b -#rofi.separator-style: solid +URxvt*depth: 32 +URxvt*background: rgba:0000/0000/0200/c800 From ec2ac9b50e0eefda9343f78a8c83b1a424b39ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 4 Mar 2020 00:13:14 +0100 Subject: [PATCH 23/71] =?UTF-8?q?Muevo=20repositorio=20de=20qownnotes=20a?= =?UTF-8?q?=20com=C3=BAn=20para=20debian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debian/{stable => comunes}/sources.list.d/qownnotes.list | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Repositorios/debian/{stable => comunes}/sources.list.d/qownnotes.list (100%) diff --git a/Repositorios/debian/stable/sources.list.d/qownnotes.list b/Repositorios/debian/comunes/sources.list.d/qownnotes.list similarity index 100% rename from Repositorios/debian/stable/sources.list.d/qownnotes.list rename to Repositorios/debian/comunes/sources.list.d/qownnotes.list From 543168a1d69a2e90a47a18767b50d35121e6fda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 4 Mar 2020 23:47:30 +0100 Subject: [PATCH 24/71] =?UTF-8?q?Mejoro=20instalaci=C3=B3n=20de=20gnome-sh?= =?UTF-8?q?ell=20reestructurando=20funciones=20y=20usando=20listas=20de=20?= =?UTF-8?q?software.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Desktops/gnome-shell.sh | 23 ++++++++++--------- Personalizar/Personalizacion_GTK.sh | 6 +++++ .../debian/Desktops/gnome-extensions.lst | 0 Software-Lists/debian/Desktops/gnome.lst | 2 ++ .../debian/Desktops/wayland-base.lst | 0 .../fedora/Desktops/gnome-extensions.lst | 0 Software-Lists/fedora/Desktops/gnome.lst | 0 .../fedora/Desktops/wayland-base.lst | 0 .../gentoo/Desktops/gnome-extensions.lst | 0 Software-Lists/gentoo/Desktops/gnome.lst | 0 .../gentoo/Desktops/wayland-base.lst | 0 .../raspbian/Desktops/gnome-extensions.lst | 0 Software-Lists/raspbian/Desktops/gnome.lst | 0 .../raspbian/Desktops/wayland-base.lst | 0 conf/home/.Xresources | 10 ++++++++ conf/home/.config/gtk-4.0/settings.ini | 2 ++ 16 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 Software-Lists/debian/Desktops/gnome-extensions.lst create mode 100644 Software-Lists/debian/Desktops/gnome.lst create mode 100644 Software-Lists/debian/Desktops/wayland-base.lst create mode 100644 Software-Lists/fedora/Desktops/gnome-extensions.lst create mode 100644 Software-Lists/fedora/Desktops/gnome.lst create mode 100644 Software-Lists/fedora/Desktops/wayland-base.lst create mode 100644 Software-Lists/gentoo/Desktops/gnome-extensions.lst create mode 100644 Software-Lists/gentoo/Desktops/gnome.lst create mode 100644 Software-Lists/gentoo/Desktops/wayland-base.lst create mode 100644 Software-Lists/raspbian/Desktops/gnome-extensions.lst create mode 100644 Software-Lists/raspbian/Desktops/gnome.lst create mode 100644 Software-Lists/raspbian/Desktops/wayland-base.lst create mode 100644 conf/home/.config/gtk-4.0/settings.ini diff --git a/Desktops/gnome-shell.sh b/Desktops/gnome-shell.sh index 3aa86dd9..fb5d6862 100644 --- a/Desktops/gnome-shell.sh +++ b/Desktops/gnome-shell.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es -## @github https://github.com/fryntiz +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @gitlab https://gitlab.com/fryntiz +## @github https://github.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://gitlab.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -23,11 +23,13 @@ ############################ gnome_shell_preconfiguracion() { echo -e "$VE Generando Pre-Configuraciones de$RO Gnome Shell$CL" + instalarSoftwareLista "$SOFTLIST/Desktops/wayland-base.lst" + instalarSoftwareLista "$SOFTLIST/Desktops/x11-base.lst" } gnome_shell_instalar() { echo -e "$VE Preparando para instalar$RO Gnome Shell$CL" - #instalarSoftware gnome_shell + instalarSoftwareLista "$SOFTLIST/Desktops/gnome.lst" } ## @@ -37,19 +39,18 @@ gnome_shell_postconfiguracion() { echo -e "$VE Generando Post-Configuraciones$RO Gnome Shell$CL" echo -e "$VE Instalando software secundario$CL" - #instalarSoftware '' + instalarSoftwareLista "$SOFTLIST/Desktops/gnome-extensions.lst" echo -e "$VE Generando archivos de configuración$CL" - #enlazarHome '.config/.gnome_shell' - - ## Compilar - gnome_shell --recompile + enlazarHome '.config/geany' '.config/gtk-2.0' '.config/gtk-3.0' '.config/gtk-4.0' } gnome_shell_postconfiguracionOpcional() { echo -e "$VE Generando Post-Configuraciones Opcionales$RO Gnome Shell$CL" - instalarSoftware 'gedit' 'gedit-plugins' + ## TODO → agregar atajos de teclado. + ## TODO → Agregar extensiones a la lista y añadir sus configuraciones. + ## TODO → Setear tema personalizado. } gnome_shell_instalador() { diff --git a/Personalizar/Personalizacion_GTK.sh b/Personalizar/Personalizacion_GTK.sh index 77f11364..9d6490da 100755 --- a/Personalizar/Personalizacion_GTK.sh +++ b/Personalizar/Personalizacion_GTK.sh @@ -194,6 +194,11 @@ conf_gtk3() { enlazarHome '.config/gtk-3.0' } +conf_gtk4() { + echo -e "$VE Configurando$RO GTK 4$CL" + enlazarHome '.config/gtk-4.0' +} + personalizarGTK() { echo -e "$VE Iniciando configuracion de estética general y GTK$CL" instalar_flatplat @@ -204,6 +209,7 @@ personalizarGTK() { conf_gtk2 conf_gtk3 + conf_gtk4 if [[ -f '/usr/bin/gsettings' ]] && [[ -f '/usr/bin/gnome-shell' ]]; then preconfiguracion_gnome3 diff --git a/Software-Lists/debian/Desktops/gnome-extensions.lst b/Software-Lists/debian/Desktops/gnome-extensions.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/debian/Desktops/gnome.lst b/Software-Lists/debian/Desktops/gnome.lst new file mode 100644 index 00000000..4466c3bc --- /dev/null +++ b/Software-Lists/debian/Desktops/gnome.lst @@ -0,0 +1,2 @@ +gedit +gedit-plugins \ No newline at end of file diff --git a/Software-Lists/debian/Desktops/wayland-base.lst b/Software-Lists/debian/Desktops/wayland-base.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Desktops/gnome-extensions.lst b/Software-Lists/fedora/Desktops/gnome-extensions.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Desktops/gnome.lst b/Software-Lists/fedora/Desktops/gnome.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Desktops/wayland-base.lst b/Software-Lists/fedora/Desktops/wayland-base.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Desktops/gnome-extensions.lst b/Software-Lists/gentoo/Desktops/gnome-extensions.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Desktops/gnome.lst b/Software-Lists/gentoo/Desktops/gnome.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Desktops/wayland-base.lst b/Software-Lists/gentoo/Desktops/wayland-base.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Desktops/gnome-extensions.lst b/Software-Lists/raspbian/Desktops/gnome-extensions.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Desktops/gnome.lst b/Software-Lists/raspbian/Desktops/gnome.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Desktops/wayland-base.lst b/Software-Lists/raspbian/Desktops/wayland-base.lst new file mode 100644 index 00000000..e69de29b diff --git a/conf/home/.Xresources b/conf/home/.Xresources index 2867b869..08388a1c 100755 --- a/conf/home/.Xresources +++ b/conf/home/.Xresources @@ -3,3 +3,13 @@ Xcursor.size: 32 URxvt*depth: 32 URxvt*background: rgba:0000/0000/0200/c800 + +! Fonts {{{ +Xft.antialias: true +Xft.hinting: true +Xft.rgba: rgb +Xft.hintstyle: hintfull +Xft.dpi: 220 +! }}} + +Xft.dpi: 220 diff --git a/conf/home/.config/gtk-4.0/settings.ini b/conf/home/.config/gtk-4.0/settings.ini new file mode 100644 index 00000000..7c6461a7 --- /dev/null +++ b/conf/home/.config/gtk-4.0/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-application-prefer-dark-theme=0 From ea356d93850eb4f1294646aac7fb2e514fb59a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 4 Mar 2020 23:48:20 +0100 Subject: [PATCH 25/71] =?UTF-8?q?A=C3=B1ado=20nuevo=20software=20a=20las?= =?UTF-8?q?=20listas=20de=20dependencias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/IDEs/phpstorm.sh | 2 +- Software-Lists/debian/Desarrollo/databases.lst | 1 + Software-Lists/debian/Desarrollo/diagramas.lst | 2 ++ Software-Lists/debian/Desarrollo/editores.lst | 1 + Software-Lists/debian/Desarrollo/ftp.lst | 1 + Software-Lists/debian/Internet/correo.lst | 2 ++ Software-Lists/debian/Internet/descargar.lst | 2 ++ Software-Lists/debian/Internet/nubes.lst | 3 +++ Software-Lists/debian/Lenguajes-Programacion/python2.lst | 1 + Software-Lists/debian/Lenguajes-Programacion/python3.lst | 3 +++ Software-Lists/debian/Ofimatica/editores.lst | 3 +++ 11 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Apps/IDEs/phpstorm.sh b/Apps/IDEs/phpstorm.sh index 99fdd73a..2563c6f5 100644 --- a/Apps/IDEs/phpstorm.sh +++ b/Apps/IDEs/phpstorm.sh @@ -75,7 +75,7 @@ phpstorm_postconfiguracion() { } phpstorm_instalador() { - local version='PhpStorm-2019.3' + local version='PhpStorm-2019.3.3' echo -e "$VE Comenzando instalación de$RO PhpStorm$CL" diff --git a/Software-Lists/debian/Desarrollo/databases.lst b/Software-Lists/debian/Desarrollo/databases.lst index e69de29b..c4a98abb 100644 --- a/Software-Lists/debian/Desarrollo/databases.lst +++ b/Software-Lists/debian/Desarrollo/databases.lst @@ -0,0 +1 @@ +dbeaver-ce \ No newline at end of file diff --git a/Software-Lists/debian/Desarrollo/diagramas.lst b/Software-Lists/debian/Desarrollo/diagramas.lst index e69de29b..e56a52b5 100644 --- a/Software-Lists/debian/Desarrollo/diagramas.lst +++ b/Software-Lists/debian/Desarrollo/diagramas.lst @@ -0,0 +1,2 @@ +dia +umlet \ No newline at end of file diff --git a/Software-Lists/debian/Desarrollo/editores.lst b/Software-Lists/debian/Desarrollo/editores.lst index e69de29b..7f1f15d8 100644 --- a/Software-Lists/debian/Desarrollo/editores.lst +++ b/Software-Lists/debian/Desarrollo/editores.lst @@ -0,0 +1 @@ +kate \ No newline at end of file diff --git a/Software-Lists/debian/Desarrollo/ftp.lst b/Software-Lists/debian/Desarrollo/ftp.lst index e69de29b..5914790f 100644 --- a/Software-Lists/debian/Desarrollo/ftp.lst +++ b/Software-Lists/debian/Desarrollo/ftp.lst @@ -0,0 +1 @@ +filezilla \ No newline at end of file diff --git a/Software-Lists/debian/Internet/correo.lst b/Software-Lists/debian/Internet/correo.lst index e69de29b..c861432d 100644 --- a/Software-Lists/debian/Internet/correo.lst +++ b/Software-Lists/debian/Internet/correo.lst @@ -0,0 +1,2 @@ +thunderbird +evolution \ No newline at end of file diff --git a/Software-Lists/debian/Internet/descargar.lst b/Software-Lists/debian/Internet/descargar.lst index e69de29b..f1046166 100644 --- a/Software-Lists/debian/Internet/descargar.lst +++ b/Software-Lists/debian/Internet/descargar.lst @@ -0,0 +1,2 @@ +transmission +transmission-cli \ No newline at end of file diff --git a/Software-Lists/debian/Internet/nubes.lst b/Software-Lists/debian/Internet/nubes.lst index e69de29b..379fee5e 100644 --- a/Software-Lists/debian/Internet/nubes.lst +++ b/Software-Lists/debian/Internet/nubes.lst @@ -0,0 +1,3 @@ +nextcloud-desktop +nextcloud-desktop-cmd +nextcloud-desktop-l10n \ No newline at end of file diff --git a/Software-Lists/debian/Lenguajes-Programacion/python2.lst b/Software-Lists/debian/Lenguajes-Programacion/python2.lst index a6887a34..30eba4cf 100644 --- a/Software-Lists/debian/Lenguajes-Programacion/python2.lst +++ b/Software-Lists/debian/Lenguajes-Programacion/python2.lst @@ -30,3 +30,4 @@ python-waitress python-pymongo python-scapy python-twisted +python-urllib3 \ No newline at end of file diff --git a/Software-Lists/debian/Lenguajes-Programacion/python3.lst b/Software-Lists/debian/Lenguajes-Programacion/python3.lst index 9c308563..4d7c264c 100644 --- a/Software-Lists/debian/Lenguajes-Programacion/python3.lst +++ b/Software-Lists/debian/Lenguajes-Programacion/python3.lst @@ -19,3 +19,6 @@ python3-virtualenv python3-pymongo python3-scapy python3-twisted +python3-dotenv +python3-sqlalchemy +python3-urllib3 \ No newline at end of file diff --git a/Software-Lists/debian/Ofimatica/editores.lst b/Software-Lists/debian/Ofimatica/editores.lst index e69de29b..271ac137 100644 --- a/Software-Lists/debian/Ofimatica/editores.lst +++ b/Software-Lists/debian/Ofimatica/editores.lst @@ -0,0 +1,3 @@ +qownnotes +libreoffice +libreoffice-l10n-es \ No newline at end of file From 72c55f9f36d31c52f439ea9257c3153131ca35e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 4 Mar 2020 23:49:19 +0100 Subject: [PATCH 26/71] =?UTF-8?q?Mejoro=20generaci=C3=B3n=20de=20estructur?= =?UTF-8?q?a=20para=20directorios=20del=20home?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configuraciones.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/configuraciones.sh b/configuraciones.sh index 9e8a06f6..822518d2 100755 --- a/configuraciones.sh +++ b/configuraciones.sh @@ -47,24 +47,29 @@ configurar_hosts() { } ## -## Crea los directorios básicos para configuraciones. +## Genera la estructura de directorios para el usuario actual en su home. ## -crear_directorios() { +generate_home_structure() { + echo -e "$VE Generando$RO estructura de directorios$CL" + dir_exist_or_create "$HOME/.local" dir_exist_or_create "$HOME/.local/bin" dir_exist_or_create "$HOME/.local/lib" dir_exist_or_create "$HOME/.local/opt" dir_exist_or_create "$HOME/.local/share" + + dir_exist_or_create "$HOME/.config" } ## ## Instalar Todas las configuraciones ## instalar_configuraciones() { - cd "$WORKSCRIPT" + cd "$WORKSCRIPT" || exit 1 configurar_hosts - crear_directorios + + generate_home_structure sudo update-command-not-found >> /dev/null 2>> /dev/null } From 78c5d738b65588686656e327ac1f839e46a92836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 4 Mar 2020 23:50:17 +0100 Subject: [PATCH 27/71] =?UTF-8?q?Aseguro=20instalaci=C3=B3n=20de=20depende?= =?UTF-8?q?ncias=20con=20python2,=20previene=20errores=20al=20tener=20sete?= =?UTF-8?q?ado=20python3=20por=20defecto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- funciones.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/funciones.sh b/funciones.sh index 9a008b3e..77226afa 100644 --- a/funciones.sh +++ b/funciones.sh @@ -433,7 +433,7 @@ python2Install() { echo -e "$VE Instalando paquete Python$CL" for x in $*; do echo -e "$RO Instalando $x$CL" - pip install --user --upgrade "$x" + pip2 install --user --upgrade "$x" done } From 1b37c46bc9b319e7ec0f30db44af6dd6686e2124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 4 Mar 2020 23:52:53 +0100 Subject: [PATCH 28/71] =?UTF-8?q?Reutilizo=20funciones=20y=20elimino=20c?= =?UTF-8?q?=C3=B3digo=20duplicado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Desktops/i3.sh | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/Desktops/i3.sh b/Desktops/i3.sh index 764bc47e..db8ef195 100644 --- a/Desktops/i3.sh +++ b/Desktops/i3.sh @@ -33,15 +33,6 @@ i3wm_preconfiguracion() { echo "Plantear método independiente de systemd" fi - ## Creo directorios si no existieran - if [[ ! -f "$HOME/.local/opt" ]]; then - mkdir -p "$HOME/.local/opt" - fi - - if [[ ! -f "$HOME/.local/bin" ]]; then - mkdir -p "$HOME/.local/bin" - fi - ## Instalo fuentes tipográficas necesarias fuentes_repositorios } @@ -59,15 +50,14 @@ i3wm_postconfiguracion() { instalarSoftwareLista "$SOFTLIST/Desktops/wm-min-software.lst" echo -e "$VE Generando archivos de configuración$CL" - enlazarHome '.config/i3' '.config/tint2' '.config/compton.conf' '.config/conky' '.Xresources' '.config/nitrogen' '.config/i3status' '.config/plank' '.config/rofi' + enlazarHome '.config/i3' '.config/tint2' '.config/compton.conf' '.config/conky' '.Xresources' '.config/nitrogen' '.config/i3status' '.config/plank' '.config/rofi' '.config/i3pystatus' - if [[ ! -d "$HOME/Imágenes/Screenshot" ]]; then - mkdir -p "$HOME/Imágenes/Screenshots" - fi + dir_exist_or_create "$HOME/Imágenes/Screenshots" ## Instalo y Configuro Python: Lenguajes-Programacion/python.sh python_instalador + ## Dependencias para i3pystatus con python. python3Install 'basiciw' 'netifaces' 'colour' \ 'pyalsaaudio' 'fontawesome' @@ -91,27 +81,6 @@ i3wm_instalador() { ## Configurando Personalizaciones conf_gtk2 ## Configura gtk-2.0 desde script → Personalizacion_GTK conf_gtk3 ## Configura gtk-3.0 desde script → Personalizacion_GTK + conf_gtk4 ## Configura gtk-4.0 desde script → Personalizacion_GTK } -## -## Instalador para el fork de i3 gaps en: -## https://github.com/Airblader/i3/tree/gaps -## Se usa la rama "gaps" en vez de la rama "gaps-next" -## Esta función ha quedado obsoleta y por ahora no la actualizaré al no usarla -## -i3wm_gaps_instalador() { - ## Instalando dependencias - instalarSoftware libxcb-keysyms1-dev libpango1.0-dev libxcb-util0-dev xcb libxcb1-dev libxcb-icccm4-dev libyajl-dev libev-dev libxcb-xkb-dev libxcb-cursor-dev libxkbcommon-dev libxcb-xinerama0-dev libxkbcommon-x11-dev libstartup-notification0-dev libxcb-randr0-dev libxcb-xrm0 libxcb-xrm-dev - - ## Instalo i3gaps desde repositorio GitHub en vez de i3 normal - git clone https://www.github.com/Airblader/i3 i3-gaps - cd i3-gaps || exit - git checkout gaps && git pull - - autoreconf --force --install - rm -rf build/ - mkdir -p build && cd build || exit - - ./configure - cd x86_64-pc-linux-gnu && make && sudo make install -} From 536d29a88a9277e58999d798bfb83ac72ab4fe54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 4 Mar 2020 23:53:40 +0100 Subject: [PATCH 29/71] =?UTF-8?q?A=C3=B1ado=20dependencia=20de=20listas=20?= =?UTF-8?q?para=20software=20b=C3=A1sico=20en=20window=20manager=20a=20ope?= =?UTF-8?q?nbox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Desktops/openbox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Desktops/openbox.sh b/Desktops/openbox.sh index b2d56b1c..5c486b0c 100644 --- a/Desktops/openbox.sh +++ b/Desktops/openbox.sh @@ -30,7 +30,6 @@ openbox_preconfiguracion() { openbox_instalar() { echo -e "$VE Preparando para instalar$RO openbox$CL" instalarSoftwareLista "$SOFTLIST/Desktops/openbox.lst" - instalarSoftwareLista "$SOFTLIST/Desktops/wm-min-software.lst" } ## @@ -38,6 +37,7 @@ openbox_instalar() { ## openbox_postconfiguracion() { echo -e "$VE Generando Post-Configuraciones$RO openbox$CL" + instalarSoftwareLista "$SOFTLIST/Desktops/wm-min-software.lst" } openbox_instalador() { From 6ea981948b2f8ed54ffb0490cbad98253609dc1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 4 Mar 2020 23:54:46 +0100 Subject: [PATCH 30/71] =?UTF-8?q?Extraigo=20instalaci=C3=B3n=20de=20xmonad?= =?UTF-8?q?=20para=20todos=20los=20sistemas=20utilizando=20listas=20de=20s?= =?UTF-8?q?oftware?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Desktops/xmonad.sh | 11 ++++++----- Software-Lists/debian/Desktops/xmonad.lst | 1 + Software-Lists/fedora/Desktops/xmonad.lst | 0 Software-Lists/gentoo/Desktops/xmonad.lst | 0 Software-Lists/raspbian/Desktops/xmonad.lst | 0 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 Software-Lists/debian/Desktops/xmonad.lst create mode 100644 Software-Lists/fedora/Desktops/xmonad.lst create mode 100644 Software-Lists/gentoo/Desktops/xmonad.lst create mode 100644 Software-Lists/raspbian/Desktops/xmonad.lst diff --git a/Desktops/xmonad.sh b/Desktops/xmonad.sh index 0be5bb02..44f6b17c 100644 --- a/Desktops/xmonad.sh +++ b/Desktops/xmonad.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://gitlab.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -23,11 +23,12 @@ ############################ xmonad_preconfiguracion() { echo -e "$VE Generando Pre-Configuraciones de$RO xmonad$CL" + instalarSoftwareLista "$SOFTLIST/Desktops/x11-base.lst" } xmonad_instalar() { echo -e "$VE Preparando para instalar$RO xmonad$CL" - instalarSoftware xmonad + instalarSoftwareLista "$SOFTLIST/Desktops/xmonad.lst" } ## @@ -37,7 +38,7 @@ xmonad_postconfiguracion() { echo -e "$VE Generando Post-Configuraciones$RO xmonad$CL" echo -e "$VE Instalando software secundario$CL" - instalarSoftware suckless-tools + instalarSoftwareLista "$SOFTLIST/Desktops/wm-min-sogtware.lst" echo -e "$VE Generando archivos de configuración$CL" enlazarHome '.config/.xmonad' diff --git a/Software-Lists/debian/Desktops/xmonad.lst b/Software-Lists/debian/Desktops/xmonad.lst new file mode 100644 index 00000000..7a6ff18f --- /dev/null +++ b/Software-Lists/debian/Desktops/xmonad.lst @@ -0,0 +1 @@ +xmonad \ No newline at end of file diff --git a/Software-Lists/fedora/Desktops/xmonad.lst b/Software-Lists/fedora/Desktops/xmonad.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Desktops/xmonad.lst b/Software-Lists/gentoo/Desktops/xmonad.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Desktops/xmonad.lst b/Software-Lists/raspbian/Desktops/xmonad.lst new file mode 100644 index 00000000..e69de29b From a57f4fb652af4580f503da1bf638dde7332eda44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 5 Mar 2020 00:13:31 +0100 Subject: [PATCH 31/71] =?UTF-8?q?Implemento=20instalaci=C3=B3n=20del=20win?= =?UTF-8?q?dow=20manager=20sway=20usando=20listas=20de=20software=20para?= =?UTF-8?q?=20distintas=20distribuciones.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Añado además software básico para wayland con window manager que lo utilicen. --- Desktops/sway.sh | 70 +++++++++++++++++++ Software-Lists/debian/Desktops/sway.lst | 13 ++++ .../Desktops/wm-min-software-wayland.lst | 0 Software-Lists/fedora/Desktops/sway.lst | 0 .../Desktops/wm-min-software-wayland.lst | 0 Software-Lists/gentoo/Desktops/sway.lst | 0 .../Desktops/wm-min-software-wayland.lst | 0 Software-Lists/raspbian/Desktops/sway.lst | 0 .../Desktops/wm-min-software-wayland.lst | 0 9 files changed, 83 insertions(+) create mode 100644 Desktops/sway.sh create mode 100644 Software-Lists/debian/Desktops/sway.lst create mode 100644 Software-Lists/debian/Desktops/wm-min-software-wayland.lst create mode 100644 Software-Lists/fedora/Desktops/sway.lst create mode 100644 Software-Lists/fedora/Desktops/wm-min-software-wayland.lst create mode 100644 Software-Lists/gentoo/Desktops/sway.lst create mode 100644 Software-Lists/gentoo/Desktops/wm-min-software-wayland.lst create mode 100644 Software-Lists/raspbian/Desktops/sway.lst create mode 100644 Software-Lists/raspbian/Desktops/wm-min-software-wayland.lst diff --git a/Desktops/sway.sh b/Desktops/sway.sh new file mode 100644 index 00000000..08e72af4 --- /dev/null +++ b/Desktops/sway.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2020 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email dev@fryntiz.es +## @web https://fryntiz.es +## @gitlab https://gitlab.com/fryntiz +## @github https://github.com/fryntiz +## @twitter https://twitter.com/fryntiz +## +## Guía de estilos aplicada: +## @style https://gitlab.com/fryntiz/bash-guide-style + +############################ +## INSTRUCCIONES ## +############################ +## Plantea la instalación de Sway con las configuraciones + +############################ +## FUNCIONES ## +############################ +sway_preconfiguracion() { + echo -e "$VE Generando Pre-Configuraciones de$RO sway$CL" +} + +sway_instalar() { + echo -e "$VE Preparando para instalar$RO sway$CL" + instalarSoftwareLista "$SOFTLIST/Desktops/sway.lst" +} + +## +## Instalando software extra y configuraciones adicionales +## +sway_postconfiguracion() { + echo -e "$VE Generando Post-Configuraciones$RO xmonad$CL" + + echo -e "$VE Instalando software secundario$CL" + instalarSoftwareLista "$SOFTLIST/Desktops/wayland-base.lst" + instalarSoftwareLista "$SOFTLIST/Desktops/wm-min-software-wayland.lst" + + echo -e "$VE Generando archivos de configuración$CL" + enlazarHome '.config/.sway' '.config/.i3pystatus' + + ## Instalo y Configuro Python: Lenguajes-Programacion/python.sh + python_instalador + + ## Dependencias para i3pystatus con python. + python3Install 'basiciw' 'netifaces' 'colour' \ + 'pyalsaaudio' 'fontawesome' +} + +sway_postconfiguracionOpcional() { + echo -e "$VE Generando Post-Configuraciones Opcionales$RO sway$CL" +} + +sway_instalador() { + echo -e "$VE Comenzando instalación de$RO sway$CL" + + sway_preconfiguracion + sway_instalar + sway_postconfiguracion + sway_postconfiguracionOpcional + + ## Configurando Personalizaciones + conf_gtk2 ## Configura gtk-2.0 desde script → Personalizacion_GTK + conf_gtk3 ## Configura gtk-3.0 desde script → Personalizacion_GTK + conf_gtk4 ## Configura gtk-4.0 desde script → Personalizacion_GTK +} diff --git a/Software-Lists/debian/Desktops/sway.lst b/Software-Lists/debian/Desktops/sway.lst new file mode 100644 index 00000000..e339d13a --- /dev/null +++ b/Software-Lists/debian/Desktops/sway.lst @@ -0,0 +1,13 @@ +sway +swaybg +swayidle +swaylock +brightnessctl +python3-mako +slurp +grim +wl-clipboard +clipman +wofi +wf-recorder +weston \ No newline at end of file diff --git a/Software-Lists/debian/Desktops/wm-min-software-wayland.lst b/Software-Lists/debian/Desktops/wm-min-software-wayland.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Desktops/sway.lst b/Software-Lists/fedora/Desktops/sway.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Desktops/wm-min-software-wayland.lst b/Software-Lists/fedora/Desktops/wm-min-software-wayland.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Desktops/sway.lst b/Software-Lists/gentoo/Desktops/sway.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Desktops/wm-min-software-wayland.lst b/Software-Lists/gentoo/Desktops/wm-min-software-wayland.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Desktops/sway.lst b/Software-Lists/raspbian/Desktops/sway.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Desktops/wm-min-software-wayland.lst b/Software-Lists/raspbian/Desktops/wm-min-software-wayland.lst new file mode 100644 index 00000000..e69de29b From 144b597199f64277a2607749d5fe77fb66082d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 5 Mar 2020 00:16:38 +0100 Subject: [PATCH 32/71] =?UTF-8?q?A=C3=B1ado=20entrada=20al=20men=C3=BA=20p?= =?UTF-8?q?ara=20instalar=20window=20manager=20sway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Desktops/0_Main.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Desktops/0_Main.sh b/Desktops/0_Main.sh index 2a8257df..d8f84beb 100644 --- a/Desktops/0_Main.sh +++ b/Desktops/0_Main.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es -## @github https://github.com/fryntiz +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @gitlab https://gitlab.com/fryntiz +## @github https://github.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://gitlab.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## ############################ @@ -23,6 +23,7 @@ source "$WORKSCRIPT/Desktops/i3.sh" source "$WORKSCRIPT/Desktops/xmonad.sh" source "$WORKSCRIPT/Desktops/openbox.sh" source "$WORKSCRIPT/Desktops/gnome-shell.sh" +source "$WORKSCRIPT/Desktops/sway.sh" ############################ ## FUNCIONES ## @@ -35,6 +36,7 @@ menuDesktops() { xmonad_instalador openbox_instalador gnome_shell_instalador + sway_instalador } if [[ "$1" = '-a' ]]; then @@ -47,6 +49,7 @@ menuDesktops() { 2) Instalar Xmonad 3) Instalar Openbox 4) Instalar Gnome Shell + 4) Instalar Sway 5) Todos los pasos anteriores 0) Atrás @@ -62,7 +65,8 @@ menuDesktops() { 2) xmonad_instalador;; ## Instala xmonad 3) openbox_instalador;; ## Instala openbox 4) gnome_shell_instalador;; ## Instala gnome shell - 5) todos_desktops;; ## Todos los pasos anteriores + 5) sway_instalador;; ## Instala gnome shell + 6) todos_desktops;; ## Todos los pasos anteriores 0) ## SALIR clear From 0bd322db599ca37120ddebed26e85011b6f83919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 5 Mar 2020 18:40:37 +0100 Subject: [PATCH 33/71] =?UTF-8?q?Correcciones=20en=20instalaci=C3=B3n=20de?= =?UTF-8?q?=20sway=20y=20mejoras=20en=20este=20como=20en=20i3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Desktops/0_Main.sh | 4 ++-- Desktops/sway.sh | 4 ++-- Repositorios/debian/testing/sources.list | 7 ++----- conf/home/.Xresources | 1 - conf/home/.config/i3/config | 18 +++++++++++++----- conf/home/.config/sway/config | 24 ++++++++++++++++-------- 6 files changed, 35 insertions(+), 23 deletions(-) diff --git a/Desktops/0_Main.sh b/Desktops/0_Main.sh index d8f84beb..e10c2c2e 100644 --- a/Desktops/0_Main.sh +++ b/Desktops/0_Main.sh @@ -49,8 +49,8 @@ menuDesktops() { 2) Instalar Xmonad 3) Instalar Openbox 4) Instalar Gnome Shell - 4) Instalar Sway - 5) Todos los pasos anteriores + 5) Instalar Sway + 6) Todos los pasos anteriores 0) Atrás ' diff --git a/Desktops/sway.sh b/Desktops/sway.sh index 08e72af4..c859fa4c 100644 --- a/Desktops/sway.sh +++ b/Desktops/sway.sh @@ -34,14 +34,14 @@ sway_instalar() { ## Instalando software extra y configuraciones adicionales ## sway_postconfiguracion() { - echo -e "$VE Generando Post-Configuraciones$RO xmonad$CL" + echo -e "$VE Generando Post-Configuraciones$RO sway$CL" echo -e "$VE Instalando software secundario$CL" instalarSoftwareLista "$SOFTLIST/Desktops/wayland-base.lst" instalarSoftwareLista "$SOFTLIST/Desktops/wm-min-software-wayland.lst" echo -e "$VE Generando archivos de configuración$CL" - enlazarHome '.config/.sway' '.config/.i3pystatus' + enlazarHome '.config/sway' '.config/i3pystatus' ## Instalo y Configuro Python: Lenguajes-Programacion/python.sh python_instalador diff --git a/Repositorios/debian/testing/sources.list b/Repositorios/debian/testing/sources.list index cdaab11f..4533a6e1 100644 --- a/Repositorios/debian/testing/sources.list +++ b/Repositorios/debian/testing/sources.list @@ -5,10 +5,6 @@ deb http://ftp.es.debian.org/debian/ testing main contrib non-free deb-src http://ftp.es.debian.org/debian/ testing main contrib non-free -##### Actualizaciones de seguridad Debian Testing -deb http://security.debian.org/ testing/updates main contrib non-free -deb-src http://security.debian.org/ testing/updates non-free contrib main - ##### Actualizaciones para Testing (Updates) deb http://ftp.es.debian.org/debian/ testing-updates non-free contrib main deb-src http://ftp.es.debian.org/debian/ testing-updates non-free contrib main @@ -22,7 +18,8 @@ deb-src http://ftp.es.debian.org/debian/ testing-updates non-free contrib main ######################################################## ## KERNEL LIQUORIX ## ######################################################## -#### curl https://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo apt-get update +#### curl httpsR://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo +apt-get update # deb http://liquorix.net/debian sid main # deb-src http://liquorix.net/debian sid main diff --git a/conf/home/.Xresources b/conf/home/.Xresources index 08388a1c..4552547e 100755 --- a/conf/home/.Xresources +++ b/conf/home/.Xresources @@ -12,4 +12,3 @@ Xft.hintstyle: hintfull Xft.dpi: 220 ! }}} -Xft.dpi: 220 diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index 4023fa74..4892a0e2 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -4,10 +4,10 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es -## @github https://github.com/fryntiz +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @gitlab https://gitlab.com/fryntiz +## @github https://github.com/fryntiz ## @twitter https://twitter.com/fryntiz ## Referencia oficial: http://i3wm.org/docs/userguide.html @@ -84,6 +84,8 @@ assign [class="^[aA]tom"] → $WS2 for_window [class="^[aA]tom"] focus assign [class="^[bB]rackets"] → $WS2 for_window [class="^[Bb]rackets"] focus +assign [class="[vV][sS][cC]odium"] → $WS2 +for_window [class="[vV][sS][cC]odium"] focus ## 3 assign [class="^[fF]irefox"] → $WS3 @@ -593,8 +595,14 @@ bindsym $mod+F12 mode "$mode_servers" ## Dropbox exec --no-startup-id dropbox start -## Synology Cloud Station -exec --no-startup-id synology-cloud-station-drive +## Synology Drive +exec --no-startup-id synology-drive + +## Nextcloud +exec --no-startup-id nextcloud + +## pCloud +exec --no-startup-id "$HOME/AppImage/pcloud" ## Red exec --no-startup-id nm-applet diff --git a/conf/home/.config/sway/config b/conf/home/.config/sway/config index d769cb8e..11f0db3b 100644 --- a/conf/home/.config/sway/config +++ b/conf/home/.config/sway/config @@ -2,15 +2,15 @@ # -*- ENCODING: UTF-8 -*- ## ## @author Raúl Caro Pastorino -## @copyright Copyright © 2018 Raúl Caro Pastorino +## @copyright Copyright © 2020 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es -## @github https://github.com/fryntiz +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @gitlab https://gitlab.com/fryntiz +## @github https://github.com/fryntiz ## @twitter https://twitter.com/fryntiz -## Referencia oficial: http://i3wm.org/docs/userguide.html +## Referencia oficial: https://github.com/swaywm/sway/wiki ## Iconos de ejemplo: ##                            @@ -28,7 +28,7 @@ set $mod Mod4 ## Configuración set $coordenadas '36.7349439:-6.4253577' ## Coordenadas -#output eDP-1 scale 0 +#output eDP-1 scale 2 output eDP-1 pos 0 0 res 3840x2160 ########################################################### @@ -87,6 +87,8 @@ assign [class="^[aA]tom"] → $WS2 for_window [class="^[aA]tom"] focus assign [class="^[bB]rackets"] → $WS2 for_window [class="^[Bb]rackets"] focus +assign [class="[vV][sS][cC]odium"] → $WS2 +for_window [class="[vV][sS][cC]odium"] focus ## 3 assign [class="^[fF]irefox"] → $WS3 @@ -545,11 +547,17 @@ bindsym $mod+F12 mode "$mode_servers" ############### APPLETS ################## ############################################################ ## Dropbox -exec --no-startup-id python2 /user/bin/dropbox start +exec --no-startup-id dropbox start -## Synology Cloud Station +## Synology Drive exec --no-startup-id synology-drive +## Nextcloud +exec --no-startup-id nextcloud + +## pCloud +exec --no-startup-id "$HOME/AppImage/pcloud" + ## Red exec --no-startup-id nm-applet From a3c411a123969340d64e3e3e6d3bb308ffa0b321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 5 Mar 2020 20:29:17 +0100 Subject: [PATCH 34/71] =?UTF-8?q?Extraigo=20configuraci=C3=B3n=20de=20i3py?= =?UTF-8?q?status=20para=20i3wm=20y=20sway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Desktops/i3.sh | 3 +- Desktops/sway.sh | 2 +- conf/home/.config/i3/config | 2 +- .../i3pystatus_modules/SocketClient.py | 55 --- .../config.py} | 0 .../.config/i3pystatus/i3pystatus-config.py | 375 ------------------ conf/home/.config/sway/config | 2 +- conf/home/.scripts/.gitkeep | 0 8 files changed, 5 insertions(+), 434 deletions(-) delete mode 100644 conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py rename conf/home/.config/{i3/scripts/i3pystatus-config.py => i3pystatus/config.py} (100%) delete mode 100755 conf/home/.config/i3pystatus/i3pystatus-config.py create mode 100644 conf/home/.scripts/.gitkeep diff --git a/Desktops/i3.sh b/Desktops/i3.sh index db8ef195..588dd77e 100644 --- a/Desktops/i3.sh +++ b/Desktops/i3.sh @@ -50,7 +50,8 @@ i3wm_postconfiguracion() { instalarSoftwareLista "$SOFTLIST/Desktops/wm-min-software.lst" echo -e "$VE Generando archivos de configuración$CL" - enlazarHome '.config/i3' '.config/tint2' '.config/compton.conf' '.config/conky' '.Xresources' '.config/nitrogen' '.config/i3status' '.config/plank' '.config/rofi' '.config/i3pystatus' + enlazarHome '.config/i3' '.config/tint2' '.config/compton.conf' ' + .config/conky' '.Xresources' '.config/nitrogen' '.config/i3status' '.config/plank' '.config/rofi' '.config/i3pystatus' '.scripts' dir_exist_or_create "$HOME/Imágenes/Screenshots" diff --git a/Desktops/sway.sh b/Desktops/sway.sh index c859fa4c..1bd79fe9 100644 --- a/Desktops/sway.sh +++ b/Desktops/sway.sh @@ -41,7 +41,7 @@ sway_postconfiguracion() { instalarSoftwareLista "$SOFTLIST/Desktops/wm-min-software-wayland.lst" echo -e "$VE Generando archivos de configuración$CL" - enlazarHome '.config/sway' '.config/i3pystatus' + enlazarHome '.config/sway' '.config/i3pystatus' '.scripts' ## Instalo y Configuro Python: Lenguajes-Programacion/python.sh python_instalador diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index 4892a0e2..1de073bb 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -223,7 +223,7 @@ for_window [title="^Instalador de paquetes"] floating enable, move position 50 5 bar { ## Monitor para información en la barra de estado #status_command i3status ## Mostrar status de monitoreo - status_command python3 ~/.config/i3/scripts/i3pystatus-config.py + status_command python3 ~/.config/i3pystatus/config.py ## Posición donde colocar la barra position bottom ## Posición Abajo diff --git a/conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py b/conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py deleted file mode 100644 index e0fffa66..00000000 --- a/conf/home/.config/i3/scripts/i3pystatus_modules/SocketClient.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/python3 -# -*- encoding: utf-8 -*- - -import socket -import sys -from i3pystatus import IntervalModule - -class SocketClient(IntervalModule): - - color = "#00FF00" - interval = 1 - - settings = ( - ("format", "Format string"), - ) - - def get_pulsations_current(self): - # Create a UDS socket - sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - - # Connect the socket to the port where the server is listening - server_address = '/var/run/keycounter.socket' - - try: - sock.connect(server_address) - except socket.error as msg: - return None - - try: - # Pido cantidad de pulsaciones actual - message = b'pulsations_current' - #print('Enviando {!r}'.format(message)) - sock.sendall(message) - - # Recibo la cantidad de pulsaciones - data = sock.recv(2048) - #print('Recibido {!r}'.format(data.decode("utf-8"))) - - # Devuelvo las pulsaciones. - return str(data.decode("utf-8")) - - finally: - #print('closing socket') - sock.close() - - def run(self): - if self.get_pulsations_current(): - text = ' ' + self.get_pulsations_current() - else: - text = '' - - self.output = { - "full_text": text, - "color": self.color - } \ No newline at end of file diff --git a/conf/home/.config/i3/scripts/i3pystatus-config.py b/conf/home/.config/i3pystatus/config.py similarity index 100% rename from conf/home/.config/i3/scripts/i3pystatus-config.py rename to conf/home/.config/i3pystatus/config.py diff --git a/conf/home/.config/i3pystatus/i3pystatus-config.py b/conf/home/.config/i3pystatus/i3pystatus-config.py deleted file mode 100755 index 9ac6a67b..00000000 --- a/conf/home/.config/i3pystatus/i3pystatus-config.py +++ /dev/null @@ -1,375 +0,0 @@ -#!/usr/bin/python3 -# -*- encoding: utf-8 -*- - -# @author Raúl Caro Pastorino -# @copyright Copyright © 2018 Raúl Caro Pastorino -# @license https://wwww.gnu.org/licenses/gpl.txt -# @email tecnico@fryntiz.es -# @web www.fryntiz.es -# @github https://github.com/fryntiz -# @gitlab https://gitlab.com/fryntiz -# @twitter https://twitter.com/fryntiz - -# Guía de estilos aplicada: PEP8 - -####################################### -# # Descripción # # -####################################### - -####################################### -# # Importar Librerías # # -####################################### -import subprocess -import os.path as path - -from i3pystatus import Status -from i3pystatus.updates import aptget - -from time import sleep -from os import listdir -import re - -# Importo módulos personalizados -from i3pystatus_modules.SocketClient import SocketClient - -####################################### -# # Variables # # -####################################### -status = Status() - -## Todas las interfaces de red -interfaces = " ".join(listdir('/sys/class/net/')) - -patron_wlan = re.compile(r'w\w+') -patron_eth = re.compile(r'e\w+') - -## Lista con cada tipo de interfaz de red -wlan = patron_wlan.findall(str(interfaces)) -ethernet = patron_eth.findall(str(interfaces)) - -## Variables para colores -naranja = '' -amarillo = '#ffff33' -azul = '#3300ff' -gris = '' -pastel = '' -negro = '' -naranja = '' -verde = '#00cc00' -verdeC = '#99ff66' -rojo = '#cc0000' -rojoC = '' -rosa = '' -marron = '' -background = '' -backgroundC = '' - -####################################### -# # Funciones # # -####################################### - -# Refactorizar colores de forma aleatoria mediante un array y cada elemento -# tomará el color de su posición determinando el mismo colo en el array de -# forma que se usará el próximo colo como punta. -# -# En caso de ser el último usar color de la barra. -# -# No puede haber colores parecidos dos posiciones delante o detrás - -# Esta matriz proporciona en primer nivel los fondos que coincidirán con el -# segundo nivel de colores para el texto. -colorActual = 0 -colores = ( - ( - '#CA4932', - '#568C3B', - '#D22D72', - '#48417C', - '#257FAD', - '#EF3E14', - '#5D5DB1', - '#BF6643', - '#5A7B8C' - ), - ( - '#E6E6FA', - '#D5AEBE', - '#AAF3AA', - '#68C274', - '#D0C6A6', - '#E4DCDA', - '#C4C4E0', - '#DACAC4', - '#C4D5DD' - ) -) - -def color(): - """ - Devuelve una lista con tres posiciones indicando el color de fondo actual, - el color del texto y el color de fondo siguiente (para la punta): - [ColorActual][texto][PróximoColor]. - """ - global colorActual - actual = colorActual - colorActual = nextColor = (colorActual + 1) - return (colores[0][actual], colores[1][actual], colores[0][nextColor]) - -#print (color()) -#print (color()) -#quit() - -updatesFColor='#CA4932' -clockFColor='#E6E6FA' -forColor='#EDE4E4' - -alsaColor='#D22D72' -alsaFColor='#D5AEBE' - -backlightColor='#568C3B' -backlightFColor='#AAF3AA' - -networkColor='#48417C' -networkFColor='#68C274' - -batteryColor='#257FAD' -batteryFColor='#D0C6A6' - -tempColor='#EF3E14' -tempFColor='#E4DCDA' - -cpuColor='#5D5DB1' -cpuFColor='#C4C4E0' - -memColor='#BF6643' -memFColor='#DACAC4' - -diskColor='#5A7B8C' -diskFColor='#C4D5DD' - -## Menu ---------------------------------------------------------------- -status.register("text", - text = "Debian ", - ## Abrir el menu obmenubar - on_leftclick = "~/.config/i3/scripts/menu", - ## Abrir terminal - #on_rightclick = "tilix", -) - -## Grabación -status.register("text", - text = "\uf03dGrabar", - ## Abrir el menu obmenubar - on_leftclick = "~/.config/i3/scripts/record.sh start", - ## Abrir terminal - on_rightclick = "~/.config/i3/scripts/record.sh stop", -) - -## Keycounter --------------------------------------------------------------- -status.register(SocketClient) - -## Actualizaciones ----------------------------------------------------- -status.register("updates", - format = "APT:{count}", - format_no_updates = "OK", - on_leftclick = "apt update -y", - on_rightclick = "apt upgrade -y", - color = updatesFColor, - backends = [aptget.AptGet()], -) - -## BACKLIGHT ----------------------------------------------------------- -## Solo se carga si existe -if path.exists('/sys/class/backlight/intel_backlight'): - status.register("backlight", - interval=5, - color = backlightFColor, - format=" {percentage:.0f}%", - on_leftclick = "~/.config/i3/scripts/brillo.py -- && notify-send 'Brillo Abajo' || notify-send 'Error: Brillo Abajo ha fallado'", - on_rightclick = "~/.config/i3/scripts/brillo.py ++ && notify-send 'Brillo Arriba' || notify-send 'Error: Brillo Arriba ha fallado'", - hints= {"markup": "pango","separator": True,"separator_block_width": 12}, - #hints= {"markup": "pango","separator": False,"separator_block_width": 0}, - #format = " {percentage:.0f}% ", - backlight="intel_backlight", - ) - -## BATERIA ------------------------------------------------------------- -## Solo carga si hay una batería -if path.exists('/sys/class/power_supply/BAT0'): - status.register("battery", - #battery_ident="BAT1", - interval=3, - format="{status} {percentage:.0f}%", - hints= {"markup": "pango","separator": True,"separator_block_width": 12}, - #hints= {"markup": "pango","separator": False,"separator_block_width": 0}, - #format = " {status} {percentage:.0f}%", - - alert=True, - alert_percentage=10, - color=forColor, - critical_color="#FF1919", - charging_color="#E5E500", - full_color=batteryFColor, - status={ - "DIS": " ", - "CHR": "  ", - "FULL": " ", - }, - ) - -## Reloj --------------------------------------------------------------- -# Displays clock like this: -# Tue 30 Jul 11:59:46 PM KW31 -# ^-- calendar week -status.register("clock", - hints= {"markup": "pango"}, - format=""+" %H:%M", - color=verdeC, #clockFColor, - interval=5, - on_leftclick="zenity --calendar --text ''",) - -## CAL ----------------------------------------------------------------- -#status.register("clock", -# format = "  %a %d-%m-%Y", -# color = verdeC, -# interval = 1, -#) - -## REPRODUCTOR ------------------------------------------------------------- -#status.register( -# "cmus", -# #format = "[{status}{artist: >.50} - {title: >.50}]", -# format = "{status}{artist: >.50} - {title: >.50}", -# status = {'stop': '', 'play': '', 'pause': ''}, -#) - -## ALSA SOUND ---------------------------------------------------------- -status.register("alsa", - on_leftclick = "amixer set Master toggle", - #on_upscroll = "amixer set Master 10%+", - #on_downscroll = "amixer set Master 10%-", - on_rightclick = "pavucontrol", - color = alsaFColor, - color_muted = '#E06C75', - #format_muted=' [muted]', - #format=" {volume}%", - hints= {"markup": "pango","separator": False,"separator_block_width": 0}, - format = " {volume}% ", - - format_muted = " [muted] ", - ) - -## TEMPERATURA --------------------------------------------------------- -status.register("temp", - hints = {"markup": "pango","separator": False,"separator_block_width": 0}, - #format = " {temp}°", - format = " {temp}°C", - color = tempFColor, - alert_color = "#FFEF00", - alert_temp = 60, - ) - -## CPU USO ------------------------------------------------------------- -status.register("cpu_usage", - color=cpuFColor, - hints= {"markup": "pango","separator": False,"separator_block_width": 0}, - on_leftclick="tilix --title=htop -e 'htop'", - - format = " CPU {usage}%", - ) - -## MEMORIA ------------------------------------------------------------- -status.register("mem", - hints = {"markup": "pango","separator": False,"separator_block_width": 0}, - color = memFColor, - warn_color = "#E5E500S", - alert_color = "#FF1919", - #format = " {percent_used_mem}", - - format = " RAM {percent_used_mem}%", - #divisor = 1073741824, - ) - -## DISK USAGE ---------------------------------------------------------- -status.register("disk", - hints = {"markup": "pango","separator": False,"separator_block_width": 0}, - color = diskFColor, - path = "/", - on_leftclick = "thunar", - #format=" {avail} GB", - - format = " {avail} GB", -) - -#status.register('ping', -# format_disabled='', -# color='#61AEEE') - -#status.register("keyboard_locks", - #format='{caps} {num}', - #caps_on='Caps Lock', - #caps_off='', - #num_on='', - #num_off='', - #color='#FFC0CB', - #) - - - -#status.register("xkblayout", - #layouts=["fr", "ar"], - #format = u"\u2328 {name}", - #) - -## WIRELESS ------------------------------------------------------------ -## Por cada interfaz de red wireless genero un monitor de estado -for ifc in wlan: - status.register("network", - interface=ifc, - - color_up = networkFColor, - color_down = networkFColor, - hints = {"markup": "pango","separator": False,"separator_block_width": 0}, - #format_up=" {essid}  {bytes_recv:6.1f}KiB", - - #format_up = "{essid} {bytes_recv:6.1f}KiB {bytes_sent:5.1f}KiB", - - format_up = " {bytes_recv}K {bytes_sent}K", - - format_down = "", - ) - -## ETHERNET ------------------------------------------------------------ -## Por cada interfaz de red wireless genero un monitor de estado -for ifc in ethernet: - status.register( - "network", - interface = ifc, - - color_up = networkFColor, - color_down = networkFColor, - hints = { - "markup": "pango", - "separator": False, - "separator_block_width": 0 - }, - - format_up = "\uE0B2\uE0A0{bytes_recv}K {bytes_sent}K", - - format_down = "", - ) - -status.run() diff --git a/conf/home/.config/sway/config b/conf/home/.config/sway/config index 11f0db3b..26945fbd 100644 --- a/conf/home/.config/sway/config +++ b/conf/home/.config/sway/config @@ -229,7 +229,7 @@ for_window [title="^Instalador de paquetes"] floating enable, move position 50 5 bar { ## Monitor para información en la barra de estado #status_command i3status ## Mostrar status de monitoreo - status_command python3 ~/.config/i3/scripts/i3pystatus-config.py + status_command python3 ~/.config/i3pystatus/config.py ## Posición donde colocar la barra position bottom diff --git a/conf/home/.scripts/.gitkeep b/conf/home/.scripts/.gitkeep new file mode 100644 index 00000000..e69de29b From fcaf15b6a72b27a8149a6f26e79e621c50d830ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 9 Mar 2020 19:23:49 +0100 Subject: [PATCH 35/71] =?UTF-8?q?Planteando=20gesti=C3=B3n=20de=20pantalla?= =?UTF-8?q?s=20y=20a=C3=B1ado=20configuraci=C3=B3n=20de=20hostname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/home/.config/gtk-2.0/gtkfilechooser.ini | 2 +- configuraciones.sh | 10 ++-- preferences.sh | 56 ++++++++++++++++++++ 3 files changed, 62 insertions(+), 6 deletions(-) diff --git a/conf/home/.config/gtk-2.0/gtkfilechooser.ini b/conf/home/.config/gtk-2.0/gtkfilechooser.ini index f97bf195..dd042c4c 100644 --- a/conf/home/.config/gtk-2.0/gtkfilechooser.ini +++ b/conf/home/.config/gtk-2.0/gtkfilechooser.ini @@ -2,7 +2,7 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=519 +GeometryX=1885 GeometryY=247 GeometryWidth=882 GeometryHeight=578 diff --git a/configuraciones.sh b/configuraciones.sh index 822518d2..06a5e79a 100755 --- a/configuraciones.sh +++ b/configuraciones.sh @@ -4,19 +4,19 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es -## @github https://github.com/fryntiz +## @email dev@fryntiz.es +## @web https::/fryntiz.es ## @gitlab https://gitlab.com/fryntiz +## @github https://github.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://gitlab.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## ############################ -## Instala configuraciones +## Instala configuraciones del entorno. ########################### ## FUNCIONES ## diff --git a/preferences.sh b/preferences.sh index e506b98a..d60724b1 100644 --- a/preferences.sh +++ b/preferences.sh @@ -119,6 +119,48 @@ variables_lenguaje() { fi } +vars_enviroment_displays() { + if [[ "$DPI" = '' ]]; then + setVariableGlobal 'DPI' '90' + fi + + if [[ "$DISPLAY0_NAME" = '' ]]; then + setVariableGlobal 'DISPLAY0_NAME' 'HDMI-0' + fi + + if [[ "$DISPLAY0_DPI" = '' ]]; then + setVariableGlobal 'DISPLAY0_DPI' '90' + fi + + if [[ "$DISPLAY0_RESOLUTION" = '' ]]; then + setVariableGlobal 'DISPLAY0_RESOLUTION' '1920x1080' + fi + + if [[ "$DISPLAY1_NAME" = '' ]]; then + setVariableGlobal 'DISPLAY1_NAME' 'false' + fi + + if [[ "$DISPLAY1_DPI" = '' ]]; then + setVariableGlobal 'DISPLAY1_DPI' '90' + fi + + if [[ "$DISPLAY1_RESOLUTION" = '' ]]; then + setVariableGlobal 'DISPLAY1_RESOLUTION' '1920x1080' + fi + + if [[ "$DISPLAY2_NAME" = '' ]]; then + setVariableGlobal 'DISPLAY2_NAME' 'false' + fi + + if [[ "$DISPLAY2_DPI" = '' ]]; then + setVariableGlobal 'DISPLAY2_DPI' '90' + fi + + if [[ "$DISPLAY0_RESOLUTION" = '' ]]; then + setVariableGlobal 'DISPLAY2_RESOLUTION' '1920x1080' + fi +} + ## ## Añado variables extras para control de programas ## @@ -126,6 +168,16 @@ configureGlobalControlVars() { echo -e "Estableciendo variables globales" } +setHostName() { + echo -e "Comprobando Hostname" + + if [[ ${hostname} = '' ]]; then + echo -e "Introduce Hostname" + read -p ' → ' hostname + sudo hostname -b "$hostname" + fi +} + ## ## Configura las Opciones del entorno para usar el script ## @@ -157,4 +209,8 @@ configurePreferences() { fi variables_lenguaje + + vars_enviroment_displays + + setHostName } From 0cdd641ea07082c5096e1f913a75f6337bcce08a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 9 Mar 2020 21:07:47 +0100 Subject: [PATCH 36/71] Extrayendo pantallas y corrigiendo variables --- conf/home/.Xresources | 1 - conf/home/.config/i3/config | 9 +++++++-- funciones.sh | 4 ---- preferences.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/home/.Xresources b/conf/home/.Xresources index 4552547e..acb73f87 100755 --- a/conf/home/.Xresources +++ b/conf/home/.Xresources @@ -9,6 +9,5 @@ Xft.antialias: true Xft.hinting: true Xft.rgba: rgb Xft.hintstyle: hintfull -Xft.dpi: 220 ! }}} diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index 1de073bb..e4a7e2ad 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -157,8 +157,13 @@ bindsym $mod+F3 [title="Atom"] focus ############ Visualización/Pantalla ############ ########################################################### ## Establezco a 90 dpi -exec --no-startup-id xrandr --dpi 90 -exec_always --no-startup-id xrandr --dpi 90 +#exec --no-startup-id xrandr --dpi 90 +#exec_always --no-startup-id xrandr --dpi 90 +#exec --no-startup-id source /etc/environment +#exec_always --no-startup-id source /etc/environment +exec --no-startup-id xrandr --dpi ${DPI} +exec_always --no-startup-id xrandr --dpi ${DPI} + ## Fuente para títulos de ventanas usadas en bar {} block below. font pango:monospace 8 diff --git a/funciones.sh b/funciones.sh index 77226afa..c24eb043 100644 --- a/funciones.sh +++ b/funciones.sh @@ -417,10 +417,6 @@ setVariableGlobal() { echo -e "$VE Seteando globalmente: ${1}=${2}$CL" echo "${1}=${2}" | sudo tee -a /etc/environment export "${1}=${2}" - - ## TODO → La siguiente línea se intenta ejecutar como función en - ## vez de una asignación de variable. - ${1}=${2} fi } diff --git a/preferences.sh b/preferences.sh index d60724b1..df929098 100644 --- a/preferences.sh +++ b/preferences.sh @@ -171,7 +171,7 @@ configureGlobalControlVars() { setHostName() { echo -e "Comprobando Hostname" - if [[ ${hostname} = '' ]]; then + if [[ $(hostname) = '' ]]; then echo -e "Introduce Hostname" read -p ' → ' hostname sudo hostname -b "$hostname" From 785b81c864198e27190338da03498f299f8ebc4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 9 Mar 2020 23:30:39 +0100 Subject: [PATCH 37/71] Termino de dinamizar dpi para i3 --- conf/home/.Xresources | 2 -- conf/home/.config/i3/config | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/home/.Xresources b/conf/home/.Xresources index acb73f87..b1e17fbb 100755 --- a/conf/home/.Xresources +++ b/conf/home/.Xresources @@ -4,10 +4,8 @@ Xcursor.size: 32 URxvt*depth: 32 URxvt*background: rgba:0000/0000/0200/c800 -! Fonts {{{ Xft.antialias: true Xft.hinting: true Xft.rgba: rgb Xft.hintstyle: hintfull -! }}} diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index e4a7e2ad..81b93a54 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -548,7 +548,11 @@ exec --no-startup-id pulseaudio --start ## Fondo de pantalla nitrogen exec_always --no-startup-id nitrogen --restore exec_always --no-startup-id dunst -exec_always --no-startup-id xrdb -load ~/.Xresources + + +exec --no-startup-id cp ~/.Xresources /tmp/.Xresources && echo "Xft.dpi: 220" >> /tmp/.Xresources && xrdb -load /tmp/.Xresources +exec_always --no-startup-id cp ~/.Xresources /tmp/.Xresources && echo "Xft.dpi: $DPI" >> /tmp/.Xresources && xrdb -load /tmp/.Xresources + ############################################################ ############### MENÚ DE APAGADO/BLOQUEO ################## From 30dca7fcafe0b43873bec530b2e8705b3fdcf605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Tue, 10 Mar 2020 21:08:49 +0100 Subject: [PATCH 38/71] =?UTF-8?q?Mejoras=20en=20dinamizaci=C3=B3n=20de=20p?= =?UTF-8?q?antallas=20para=20i3wm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/home/.config/i3/config | 55 ++++++++++++++++++++------------- conf/home/.config/tint2/tint2rc | 8 ++--- preferences.sh | 2 +- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index 81b93a54..52f45179 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -21,9 +21,9 @@ set $mod Mod4 ## Nombre de monitores 1 y 2: -set $mon1 DVI-I-1 -set $mon2 DVI-D-0 -#set $mon3 HDMI-0 +set $mon1 $DISPLAY0_NAME +set $mon2 $DISPLAY1_NAME +set $mon3 $DISPLAY2_NAME ## Configuración set $coordenadas '36.7349439:-6.4253577' ## Coordenadas @@ -159,10 +159,8 @@ bindsym $mod+F3 [title="Atom"] focus ## Establezco a 90 dpi #exec --no-startup-id xrandr --dpi 90 #exec_always --no-startup-id xrandr --dpi 90 -#exec --no-startup-id source /etc/environment -#exec_always --no-startup-id source /etc/environment -exec --no-startup-id xrandr --dpi ${DPI} -exec_always --no-startup-id xrandr --dpi ${DPI} +exec --no-startup-id xrandr --dpi $DPI +exec_always --no-startup-id xrandr --dpi $DPI ## Fuente para títulos de ventanas usadas en bar {} block below. @@ -235,11 +233,12 @@ bar { ## Solo muestra applets/iconos en la barra principal tray_output primary - tray_output HDMI0 - tray_output HDMI-0 - tray_output DVI-I-1 - tray_output LVDS-1 - tray_output LVDS1 + #tray_output $mon1 + #tray_output $mon3 + #tray_output HDMI-0 + #tray_output DVI-I-1 + #tray_output LVDS-1 + #tray_output LVDS1 ## Fuente @@ -256,12 +255,15 @@ bar { ## Salidas donde habilito esta barra output primary - output HDMI0 - output HDMI-0 - output DVI-I-1 - output LVDS-1 - output LVDS1 - output HDMI-1 + #output $mon2 + #output $mon1 + #output $mon3 + #output HDMI0 + #output HDMI-0 + #output DVI-I-1 + #output LVDS-1 + #output LVDS1 + #output HDMI-1 ## Márgenes de iconos en la bandeja tray_padding 1 @@ -307,12 +309,16 @@ bar { ## Barra solo visible en el segundo monitor bar { output secundary + output $mon2 output HDMI1 - #output HDMI-1 + output HDMI-1 output DVI-D-0 output LVDS-2 output VGA output VGA-1 + output DP-1 + output DP-2 + status_command i3status #status_command python3 ~/.config/i3/scripts/i3pystatus-min-config.py @@ -528,11 +534,16 @@ exec --no-startup-id xrdb -load ~/.Xresources exec --no-startup-id lxpolkit ## Temperatura de pantalla según zona y hora -exec --no-startup-id redshift -l $coordenadas -t 5500:4500 +#exec --no-startup-id redshift -l $coordenadas -t 5500:4500 -exec --no-startup-id xbindkeys +## Servidor de audio Pulseaudio exec --no-startup-id pulseaudio --start +## Bluetooth +exec --no-startup-id blueman-applet + +exec --no-startup-id xbindkeys + ## Ejemplos o ideas #exec_always --no-startup-id al-polybar-session #exec --no-startup-id xfsettingsd @@ -550,7 +561,7 @@ exec_always --no-startup-id nitrogen --restore exec_always --no-startup-id dunst -exec --no-startup-id cp ~/.Xresources /tmp/.Xresources && echo "Xft.dpi: 220" >> /tmp/.Xresources && xrdb -load /tmp/.Xresources +exec --no-startup-id cp ~/.Xresources /tmp/.Xresources && echo "Xft.dpi: $DPI" >> /tmp/.Xresources && xrdb -load /tmp/.Xresources exec_always --no-startup-id cp ~/.Xresources /tmp/.Xresources && echo "Xft.dpi: $DPI" >> /tmp/.Xresources && xrdb -load /tmp/.Xresources diff --git a/conf/home/.config/tint2/tint2rc b/conf/home/.config/tint2/tint2rc index 8a5f1ecd..17da7921 100755 --- a/conf/home/.config/tint2/tint2rc +++ b/conf/home/.config/tint2/tint2rc @@ -1,4 +1,4 @@ -#---- Generated by tint2conf d767 ---- +#---- Generated by tint2conf dda4 ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- @@ -94,7 +94,7 @@ wm_menu = 1 panel_dock = 0 panel_pivot_struts = 0 panel_position = top center horizontal -panel_layer = top +panel_layer = bottom panel_monitor = all panel_shrink = 0 autohide = 0 @@ -242,8 +242,8 @@ ac_disconnected_cmd = #------------------------------------- # Executor 1 execp = new -execp_command = pwd -execp_interval = 5 +execp_command = python3 ~/.config/i3pystatus/config.py +execp_interval = 4 execp_has_icon = 0 execp_cache_icon = 1 execp_continuous = 0 diff --git a/preferences.sh b/preferences.sh index df929098..80a31fdb 100644 --- a/preferences.sh +++ b/preferences.sh @@ -156,7 +156,7 @@ vars_enviroment_displays() { setVariableGlobal 'DISPLAY2_DPI' '90' fi - if [[ "$DISPLAY0_RESOLUTION" = '' ]]; then + if [[ "$DISPLAY2_RESOLUTION" = '' ]]; then setVariableGlobal 'DISPLAY2_RESOLUTION' '1920x1080' fi } From d4b963d29c61aa7e9863c6e01347db6bb26e24d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 11 Mar 2020 22:15:35 +0100 Subject: [PATCH 39/71] =?UTF-8?q?A=C3=B1ado=20directorios=20de=20im=C3=A1g?= =?UTF-8?q?enes=20a=20generar=20para=20el=20home?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- configuraciones.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configuraciones.sh b/configuraciones.sh index 06a5e79a..a62f5d9f 100755 --- a/configuraciones.sh +++ b/configuraciones.sh @@ -59,6 +59,9 @@ generate_home_structure() { dir_exist_or_create "$HOME/.local/share" dir_exist_or_create "$HOME/.config" + + dir_exist_or_create "$HOME/Imágenes" + dir_exist_or_create "$HOME/Imágenes/Screenshots" } ## From ae0c88937890163b0dd1bf49685948f483ee0f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 12 Mar 2020 20:07:24 +0100 Subject: [PATCH 40/71] Configuro touchpad para habilitar teclas y acciones al pulsar con 1, 2 y 3 dedos --- conf/home/.config/i3/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index 52f45179..f2c5cac5 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -542,6 +542,12 @@ exec --no-startup-id pulseaudio --start ## Bluetooth exec --no-startup-id blueman-applet +## Configura el touchpad para habilitar teclas y toques con 1,2 y 3 dedos. +# - 1 dedo click izquierdo +# - 2 dedos click derecho +# - 3 dedos click central +exec --no-startup-id synclient EmulateMidButtonTime=1 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 + exec --no-startup-id xbindkeys ## Ejemplos o ideas From 1f0d6cf9d7cdbd0eb19edd5dd8275e04a5628f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 15 Mar 2020 00:27:09 +0100 Subject: [PATCH 41/71] =?UTF-8?q?Configuro=20brillo=20asociado=20a=20tecla?= =?UTF-8?q?s=20de=20acci=C3=B3n=20con=20nueva=20herramienta=20brightnessct?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/home/.config/i3/config | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index f2c5cac5..44ece609 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -490,10 +490,16 @@ bindsym --release $mod+shift+print exec xfce4-screenshooter -cfm bindsym --release print exec xfce4-screenshooter -fm -s ~/Imágenes/Screenshots/ ## Brillo de la pantalla +bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl s $(($(brightnessctl g) + 5000)) +bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl s $(($(brightnessctl g) - 5000)) + +## Brillo de pantalla por defecto al 60% +exec --no-startup-id brightnessctl s 72000 + #bindcode XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 10 #bindcode XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 10 -bindcode XF86MonBrightnessUp exec --no-startup-id ~/config/.i3/scripts/brillo.py next && notify-send "Brillo Arriba" || notify-send "Error: Brillo Arriba ha fallado" -bindcode XF86MonBrightnessDown exec --no-startup-id ~/config/.i3/scripts/brillo.py back && notify-send "Brillo Abajo" || notify-send "Error: Brillo Abajo ha fallado" +#bindcode XF86MonBrightnessUp exec --no-startup-id ~/config/.i3/scripts/brillo.py next && notify-send "Brillo Arriba" || notify-send "Error: Brillo Arriba ha fallado" +#bindcode XF86MonBrightnessDown exec --no-startup-id ~/config/.i3/scripts/brillo.py back && notify-send "Brillo Abajo" || notify-send "Error: Brillo Abajo ha fallado" ## Abrir programa de Notas QOwnNotes bindsym --release $mod+n exec QOwnNotes From 47e2a9c5fc513ff98ef29320cc2c6c7378740bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 15 Mar 2020 00:41:21 +0100 Subject: [PATCH 42/71] =?UTF-8?q?A=C3=B1ado=20psensor=20como=20dependencia?= =?UTF-8?q?=20para=20herramienta=20del=20sistema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Software-Lists/debian/Herramientas/sistema.lst | 1 + 1 file changed, 1 insertion(+) diff --git a/Software-Lists/debian/Herramientas/sistema.lst b/Software-Lists/debian/Herramientas/sistema.lst index e69de29b..a89f24dc 100644 --- a/Software-Lists/debian/Herramientas/sistema.lst +++ b/Software-Lists/debian/Herramientas/sistema.lst @@ -0,0 +1 @@ +psensor \ No newline at end of file From 548d8d4d92301abb76137a4675bcf2975fbc009c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 15 Mar 2020 10:46:13 +0100 Subject: [PATCH 43/71] =?UTF-8?q?A=C3=B1ado=20herramienta=20mdk4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Software-Lists/debian/Pentesting/redes.lst | 1 + 1 file changed, 1 insertion(+) diff --git a/Software-Lists/debian/Pentesting/redes.lst b/Software-Lists/debian/Pentesting/redes.lst index 97ebdedd..4d99d1c9 100644 --- a/Software-Lists/debian/Pentesting/redes.lst +++ b/Software-Lists/debian/Pentesting/redes.lst @@ -1,2 +1,3 @@ whois nmap +mdk4 \ No newline at end of file From 4da748c15909aa395b5f6f241638b0c2a92b65de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 15 Mar 2020 13:02:29 +0100 Subject: [PATCH 44/71] Fuerzo recarga gestos para botones del touchpad --- conf/home/.config/i3/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index 44ece609..ae211816 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -553,8 +553,10 @@ exec --no-startup-id blueman-applet # - 2 dedos click derecho # - 3 dedos click central exec --no-startup-id synclient EmulateMidButtonTime=1 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 +exec_always --no-startup-id synclient EmulateMidButtonTime=1 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 exec --no-startup-id xbindkeys +exec_always --no-startup-id xbindkeys ## Ejemplos o ideas #exec_always --no-startup-id al-polybar-session From f6a01ec86c817cacd4fcd53011111b54c05452e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 15 Mar 2020 13:56:47 +0100 Subject: [PATCH 45/71] =?UTF-8?q?A=C3=B1ado=20plataformas=20de=20juegos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/juegos.sh | 1 + Software-Lists/debian/Juegos/platforms.lst | 6 ++++++ Software-Lists/fedora/Juegos/platforms.lst | 0 Software-Lists/gentoo/Juegos/platforms.lst | 0 Software-Lists/raspbian/Juegos/platforms.lst | 0 5 files changed, 7 insertions(+) create mode 100644 Software-Lists/debian/Juegos/platforms.lst create mode 100644 Software-Lists/fedora/Juegos/platforms.lst create mode 100644 Software-Lists/gentoo/Juegos/platforms.lst create mode 100644 Software-Lists/raspbian/Juegos/platforms.lst diff --git a/Apps/juegos.sh b/Apps/juegos.sh index c05d00f6..790a84e6 100644 --- a/Apps/juegos.sh +++ b/Apps/juegos.sh @@ -30,6 +30,7 @@ aplicaciones_juegos() { instalarSoftwareLista "$SOFTLIST/Juegos/emuladores.lst" instalarSoftwareLista "$SOFTLIST/Juegos/estrategia.lst" instalarSoftwareLista "$SOFTLIST/Juegos/mesa.lst" + instalarSoftwareLista "$SOFTLIST/Juegos/platforms.lst" repararGestorPaquetes } diff --git a/Software-Lists/debian/Juegos/platforms.lst b/Software-Lists/debian/Juegos/platforms.lst new file mode 100644 index 00000000..5461123a --- /dev/null +++ b/Software-Lists/debian/Juegos/platforms.lst @@ -0,0 +1,6 @@ +steam +steam-devices +steamcmd +playonlinux +wine +wine32:i386 \ No newline at end of file diff --git a/Software-Lists/fedora/Juegos/platforms.lst b/Software-Lists/fedora/Juegos/platforms.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Juegos/platforms.lst b/Software-Lists/gentoo/Juegos/platforms.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Juegos/platforms.lst b/Software-Lists/raspbian/Juegos/platforms.lst new file mode 100644 index 00000000..e69de29b From 600d99fb1bce718ffa09630f36b9145e3b9d6bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 15 Mar 2020 13:57:11 +0100 Subject: [PATCH 46/71] =?UTF-8?q?A=C3=B1ado=20software=20para=20emulaci?= =?UTF-8?q?=C3=B3n=20y=20virtualizaci=C3=B3n=20de=20sistemas=20operativos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debian/Virtualizacion/programas.lst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Software-Lists/debian/Virtualizacion/programas.lst b/Software-Lists/debian/Virtualizacion/programas.lst index e69de29b..4261028f 100644 --- a/Software-Lists/debian/Virtualizacion/programas.lst +++ b/Software-Lists/debian/Virtualizacion/programas.lst @@ -0,0 +1,15 @@ +virtualbox +virt-manager +qemu +qemu-block-extra +qemu-efi +qemu-efi-arm +qemu-kvm +qemu-slof +qemu-system +qemu-system-arm +qemu-system-gui +qemu-system-ppc +qemu-system-sparc +qemu-system-x86 +qemu-utils From d5895d77f06df2f3fcb024fa918bbeb77cc03ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 22 Mar 2020 02:50:30 +0100 Subject: [PATCH 47/71] =?UTF-8?q?A=C3=B1ado=20dependencia=20para=20configu?= =?UTF-8?q?rar=20Gnome=20Shell=20gcon2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Personalizar/Personalizacion_GTK.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Personalizar/Personalizacion_GTK.sh b/Personalizar/Personalizacion_GTK.sh index 9d6490da..407e5c4c 100755 --- a/Personalizar/Personalizacion_GTK.sh +++ b/Personalizar/Personalizacion_GTK.sh @@ -181,7 +181,7 @@ conf_gnome3() { preconfiguracion_gnome3() { echo -e "$VE Instalando software para configurar$RO Gnome-Shell 3$CL" - instalarSoftware 'dconf-cli' 'dconf-editor' 'dconf-gsettings-backend' + instalarSoftware 'gconf2 dconf-cli' 'dconf-editor' 'dconf-gsettings-backend' } conf_gtk2() { From 12c0eb826583c200cc02cc58912a762dc5fa40f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 25 Mar 2020 20:10:39 +0100 Subject: [PATCH 48/71] =?UTF-8?q?A=C3=B1ado=20dependencia=20bc=20y=20herra?= =?UTF-8?q?mientas=20de=20cifrado=20de=20contrase=C3=B1as=20para=20keepass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Software-Lists/debian/Basico/herramientas.lst | 1 + Software-Lists/debian/Herramientas/sistema.lst | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Software-Lists/debian/Basico/herramientas.lst b/Software-Lists/debian/Basico/herramientas.lst index 8f462825..3ddf6b6d 100644 --- a/Software-Lists/debian/Basico/herramientas.lst +++ b/Software-Lists/debian/Basico/herramientas.lst @@ -1,3 +1,4 @@ +bc less nano mount diff --git a/Software-Lists/debian/Herramientas/sistema.lst b/Software-Lists/debian/Herramientas/sistema.lst index a89f24dc..051708c1 100644 --- a/Software-Lists/debian/Herramientas/sistema.lst +++ b/Software-Lists/debian/Herramientas/sistema.lst @@ -1 +1,3 @@ -psensor \ No newline at end of file +psensor +keepass2 +keepassxc From c3720199eeb810e5806e9ffc6e22df202e753f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 25 Mar 2020 20:14:02 +0100 Subject: [PATCH 49/71] =?UTF-8?q?A=C3=B1ado=20programa=20para=20comprobar?= =?UTF-8?q?=20velocidad=20de=20descarga=20y=20subida=20a=20internet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Software-Lists/debian/Herramientas/sistema.lst | 1 + 1 file changed, 1 insertion(+) diff --git a/Software-Lists/debian/Herramientas/sistema.lst b/Software-Lists/debian/Herramientas/sistema.lst index 051708c1..72ca31dc 100644 --- a/Software-Lists/debian/Herramientas/sistema.lst +++ b/Software-Lists/debian/Herramientas/sistema.lst @@ -1,3 +1,4 @@ psensor keepass2 keepassxc +speedtest-cli \ No newline at end of file From 6695698e155d000abe9b6401d8d98aeeda3191f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 25 Mar 2020 21:27:31 +0100 Subject: [PATCH 50/71] Implemento sistema para no limpiar la pantalla en modo DEBUG --- env.example | 2 ++ funciones.sh | 12 ++++++++++++ main-vps.sh | 2 +- main.sh | 19 ++++++++++--------- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/env.example b/env.example index 8780c11f..a88edcfc 100644 --- a/env.example +++ b/env.example @@ -2,3 +2,5 @@ DISTRO=debian BRANCH=stable ENV=dev ADMIN_EMAIL=admin@email.es +DEBUG=false +PATH_LOG="$WORKSCRIPT/errores.log" \ No newline at end of file diff --git a/funciones.sh b/funciones.sh index c24eb043..4493b68c 100644 --- a/funciones.sh +++ b/funciones.sh @@ -469,3 +469,15 @@ dir_exist_or_create() { mkdir -p "$dir" fi } + +## +## Limpia la pantalla solo cuando estamos en producción pero no cuando +## estamos en desarrollo, en ese caso mostrará por completo lo que sucede. +## +clear_screen() { + if [[ "${DEBUG}" = 'true' ]]; then + echo -e "$RO -----Aquí habría un salto de terminal -----$CL" + else + clear + fi +} diff --git a/main-vps.sh b/main-vps.sh index 94efdb6d..1f6d00ca 100755 --- a/main-vps.sh +++ b/main-vps.sh @@ -41,7 +41,7 @@ if [[ ! -d /home/web/debian-developer-conf ]]; then fi chown web:web -R /home/web/debian-developer-conf -cd /home/web/debian-developer-conf +cd /home/web/debian-developer-conf || exit # Desactivar ipv6 por completo echo 'net.ipv6.conf.all.disable_ipv6=1' >> '/etc/sysctl.conf' diff --git a/main.sh b/main.sh index 9037abdc..d0a7e548 100755 --- a/main.sh +++ b/main.sh @@ -43,19 +43,20 @@ if [[ -f '/etc/environment' ]]; then source '/etc/environment' fi +DEBUG='false' ## Establece si está el script en modo depuración +WORKSCRIPT=$PWD ## Directorio principal del script +PATH_LOG="$WORKSCRIPT/errores.log" ## Archivo donde almacenar errores + ## Importo variables locales si existieran, sobreescriben a las globales -if [[ -f "$WORKSCRIPT/.env" ]]; then +if [[ -a "$WORKSCRIPT/.env" ]]; then source "$WORKSCRIPT/.env" fi -WORKSCRIPT=$PWD ## Directorio principal del script USER=$(whoami) ## Usuario que ejecuta el script -VERSION='0.8.8' ## Versión en desarrollo +VERSION='0.8.9' ## Versión en desarrollo MY_DISTRO="$DISTRO" ## Distribución sobre la que se ejecuta MY_BRANCH="$BRANCH" ## stable|testing|unstable MY_ENV="$ENV" ## prod|dev desde /etc/environment o .env -LOGERROR="$WORKSCRIPT/errores.log" ## Archivo donde almacenar errores -DEBUG=false ## Establece si está el script en modo depuración ## Importo variables con rutas de directorios para configuraciones. source "$WORKSCRIPT/routes.sh" @@ -81,7 +82,7 @@ source "$WORKSCRIPT/VPS/0_Main.sh" ########################### ## VARIABLES ## ########################### -errores=() +log 'test log' ######################################## ## VARIABLES COMPUESTAS ## @@ -100,7 +101,7 @@ SOFTLIST="${WORKSCRIPT}/Software-Lists/${MY_DISTRO}" ## Ruta a listas de softwa ########################### menuPrincipal() { while true :; do - clear + clear_screen local descripcion='Menú Principal 1) Repositorios @@ -145,13 +146,13 @@ menuPrincipal() { 11) menuVPS;; 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' exit 0;; *) ## Acción ante entrada no válida - clear + clear_screen echo "" echo -e " $RO ATENCIÓN: Elección no válida$CL";; esac From fbbd0dd07c367ecfbd1eccd32be5a2542061900b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 25 Mar 2020 21:44:30 +0100 Subject: [PATCH 51/71] =?UTF-8?q?Planteo=20funci=C3=B3n=20para=20almacenar?= =?UTF-8?q?=20logs=20y=20a=C3=B1ado=20log=20indicando=20que=20entramos=20e?= =?UTF-8?q?n=20depuraci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- funciones.sh | 9 +++++++++ main.sh | 9 +++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/funciones.sh b/funciones.sh index 4493b68c..787bdf6d 100644 --- a/funciones.sh +++ b/funciones.sh @@ -470,6 +470,15 @@ dir_exist_or_create() { fi } +## +## Registra un mensaje en el archivo de logs. +## +log() { + msg="$1" + echo -e "$RO Registrando en log:$AM ${msg}$CL" + echo "${msg}" >> "${PATH_LOG}" +} + ## ## Limpia la pantalla solo cuando estamos en producción pero no cuando ## estamos en desarrollo, en ese caso mostrará por completo lo que sucede. diff --git a/main.sh b/main.sh index d0a7e548..d9f5b3d2 100755 --- a/main.sh +++ b/main.sh @@ -82,11 +82,7 @@ source "$WORKSCRIPT/VPS/0_Main.sh" ########################### ## VARIABLES ## ########################### -log 'test log' -######################################## -## VARIABLES COMPUESTAS ## -######################################## ## Esta función configura las variables globales. configurePreferences @@ -96,6 +92,11 @@ setAllRoutes ## Esta variable depende de ejecutarse primero el script anterior. SOFTLIST="${WORKSCRIPT}/Software-Lists/${MY_DISTRO}" ## Ruta a listas de software +## Registro en logs si se entra en desarrollo. +if [[ "${DEBUG}" = 'true' ]]; then + log 'Se ha ejecutado el script en modo DEBUG' +fi + ########################### ## FUNCIONES ## ########################### From 34cb7dffa27764681ee81e733b0e66d9005d62d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 25 Mar 2020 21:59:06 +0100 Subject: [PATCH 52/71] =?UTF-8?q?Reemplazo=20utilizaci=C3=B3n=20de=20funci?= =?UTF-8?q?=C3=B3n=20clear=20de=20bash=20por=20una=20personalizada=20y=20a?= =?UTF-8?q?ctualizo=20cr=C3=A9ditos=20del=20autor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/0_Main.sh | 12 ++++++------ Apps/1_Aplicaciones_Basicas.sh | 6 +++--- Apps/2_Aplicaciones_Extras.sh | 10 +++++----- Apps/3_Aplicaciones_Usuario.sh | 6 +++--- Apps/DBeaver.sh | 6 +++--- Apps/Firefox.sh | 6 +++--- Apps/Geany.sh | 4 ++-- Apps/GitKraken.sh | 6 +++--- Apps/Haroopad.sh | 6 +++--- Apps/IDEs/0_Main.sh | 12 ++++++------ Apps/IDEs/Arduino.sh | 6 +++--- Apps/IDEs/Atom_IDE.sh | 6 +++--- Apps/IDEs/Brackets.sh | 6 +++--- Apps/IDEs/Ninja-IDE.sh | 6 +++--- Apps/Pencil-Project.sh | 6 +++--- Apps/flatpak.sh | 4 ++-- Desktops/0_Main.sh | 6 +++--- Desktops/i3.sh | 2 +- Desktops/openbox.sh | 6 +++--- Lenguajes-Programacion/0_Main.sh | 12 ++++++------ Lenguajes-Programacion/php.sh | 2 +- Personalizar/0_Main.sh | 14 +++++++------- Personalizar/Configurar_GIT.sh | 4 ++-- Personalizar/Personalizacion_GTK.sh | 6 +++--- Personalizar/Terminales.sh | 6 +++--- Personalizar/Tipografias.sh | 6 +++--- Personalizar/iconos.sh | 6 +++--- Repositorios/debian.sh | 4 ++-- Root/0_Main.sh | 6 +++--- Root/nano.sh | 6 +++--- Root/permisos.sh | 6 +++--- Root/programas-default.sh | 6 +++--- Root/terminales.sh | 6 +++--- Servidores/0_Main.sh | 6 +++--- Servidores/bind.sh | 12 ++++++------ Servidores/docker.sh | 6 +++--- Servidores/mariaDB.sh | 6 +++--- Servidores/mongodb.sh | 6 +++--- Servidores/mumble.sh | 6 +++--- Servidores/nodejs.sh | 6 +++--- Servidores/postfix.sh | 2 +- Servidores/postgreSQL.sh | 2 +- Servidores/sqlite.sh | 6 +++--- Servidores/ssh.sh | 6 +++--- Usuario/0_Main.sh | 2 +- Usuario/OhMyZsh.sh | 6 +++--- Usuario/bashit.sh | 6 +++--- Usuario/gedit.sh | 6 +++--- Usuario/heroku.sh | 6 +++--- Usuario/nano.sh | 6 +++--- Usuario/permisos.sh | 6 +++--- Usuario/plantillas.sh | 6 +++--- Usuario/programas-default.sh | 6 +++--- Usuario/spacevim.sh | 6 +++--- Usuario/terminales.sh | 6 +++--- Usuario/vim.sh | 6 +++--- VPS/0_Main.sh | 2 +- VPS/administrador.sh | 4 ++-- VPS/conf/.bashrc | 4 ++-- VPS/fail2ban.sh | 2 +- conf/Apps/Tilix/vte.sh | 6 +++--- conf/home/.bashrc | 6 +++--- conf/home/.config/i3/Workspaces/load_layouts.sh | 6 +++--- conf/home/.config/i3/scripts/brillo.py | 4 ++-- conf/home/.config/i3/scripts/i3exit.sh | 6 +++--- conf/home/.config/i3/scripts/keyboard.sh | 2 +- conf/home/.config/i3/scripts/lock_and_blur.sh | 6 +++--- conf/home/.config/i3/scripts/menu | 6 +++--- conf/home/.config/i3/scripts/printscreen.sh | 6 +++--- conf/home/.config/i3/scripts/record.sh | 6 +++--- conf/home/.config/i3/scripts/servers.sh | 2 +- conf/home/.config/i3/scripts/toggletouchpad.sh | 6 +++--- conf/home/.config/i3pystatus/config.py | 4 ++-- conf/home/.local/bin/nuevo | 6 +++--- .../Gen\303\251ricas/Scripts/Script SQL.sql" | 4 ++-- limpiador.sh | 6 +++--- preferences.sh | 10 +++++----- routes.sh | 2 +- 78 files changed, 225 insertions(+), 225 deletions(-) diff --git a/Apps/0_Main.sh b/Apps/0_Main.sh index 3aacaa9e..3f647b71 100644 --- a/Apps/0_Main.sh +++ b/Apps/0_Main.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -50,7 +50,7 @@ source "$WORKSCRIPT/Apps/IDEs/0_Main.sh" ## menuAplicaciones() { todas_aplicaciones() { - clear + clear_screen echo -e "$VE Instalando todas las aplicaciones$CL" aplicaciones_basicas aplicaciones_firmware @@ -74,7 +74,7 @@ menuAplicaciones() { todas_aplicaciones else while true :; do - clear + clear_screen local descripcion='Menú de aplicaciones 1) Aplicaciones Básicas 2) Firmware @@ -128,7 +128,7 @@ menuAplicaciones() { break;; 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' break;; diff --git a/Apps/1_Aplicaciones_Basicas.sh b/Apps/1_Aplicaciones_Basicas.sh index 1e6faf10..e53c0b8a 100644 --- a/Apps/1_Aplicaciones_Basicas.sh +++ b/Apps/1_Aplicaciones_Basicas.sh @@ -4,13 +4,13 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/2_Aplicaciones_Extras.sh b/Apps/2_Aplicaciones_Extras.sh index 435bd3b1..345e1456 100644 --- a/Apps/2_Aplicaciones_Extras.sh +++ b/Apps/2_Aplicaciones_Extras.sh @@ -4,13 +4,13 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -47,7 +47,7 @@ aplicaciones_extras() { instalar_todas_aplicaciones_extras else while true :; do - clear + clear_screen local descripcion='Menú de aplicaciones 1) DBeaver 2) GitKraken @@ -76,7 +76,7 @@ aplicaciones_extras() { 7) instalar_todas_aplicaciones_extras; break;; 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' break;; diff --git a/Apps/3_Aplicaciones_Usuario.sh b/Apps/3_Aplicaciones_Usuario.sh index 54495268..0a1f96da 100644 --- a/Apps/3_Aplicaciones_Usuario.sh +++ b/Apps/3_Aplicaciones_Usuario.sh @@ -4,13 +4,13 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/DBeaver.sh b/Apps/DBeaver.sh index feffd893..69d133f3 100644 --- a/Apps/DBeaver.sh +++ b/Apps/DBeaver.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/Firefox.sh b/Apps/Firefox.sh index 925baece..da3dc39b 100644 --- a/Apps/Firefox.sh +++ b/Apps/Firefox.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/Geany.sh b/Apps/Geany.sh index bb3c24c6..d9ddfd4b 100644 --- a/Apps/Geany.sh +++ b/Apps/Geany.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es +## @email dev@fryntiz.es ## @web http://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/GitKraken.sh b/Apps/GitKraken.sh index 8bc89e28..5b998e9e 100644 --- a/Apps/GitKraken.sh +++ b/Apps/GitKraken.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/Haroopad.sh b/Apps/Haroopad.sh index 78c081ff..1923711e 100644 --- a/Apps/Haroopad.sh +++ b/Apps/Haroopad.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/IDEs/0_Main.sh b/Apps/IDEs/0_Main.sh index 09701df1..fa385ce9 100644 --- a/Apps/IDEs/0_Main.sh +++ b/Apps/IDEs/0_Main.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -40,7 +40,7 @@ source "$WORKSCRIPT/Apps/IDEs/Arduino.sh" ## menuIDES() { todos_IDES() { - clear + clear_screen echo -e "$VE Instalando todos los IDES$CL" atom_instalador brackets_instalador @@ -54,7 +54,7 @@ menuIDES() { todos_IDES else while true :; do - clear + clear_screen local descripcion='Menú de aplicaciones 1) Atom 2) Brackets @@ -90,7 +90,7 @@ menuIDES() { break;; 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' break;; diff --git a/Apps/IDEs/Arduino.sh b/Apps/IDEs/Arduino.sh index e2e22899..e379a532 100644 --- a/Apps/IDEs/Arduino.sh +++ b/Apps/IDEs/Arduino.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/IDEs/Atom_IDE.sh b/Apps/IDEs/Atom_IDE.sh index 37404098..d894f46d 100644 --- a/Apps/IDEs/Atom_IDE.sh +++ b/Apps/IDEs/Atom_IDE.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/IDEs/Brackets.sh b/Apps/IDEs/Brackets.sh index 7651a04c..8f719c3d 100644 --- a/Apps/IDEs/Brackets.sh +++ b/Apps/IDEs/Brackets.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/IDEs/Ninja-IDE.sh b/Apps/IDEs/Ninja-IDE.sh index 3bb7b843..bd61935d 100644 --- a/Apps/IDEs/Ninja-IDE.sh +++ b/Apps/IDEs/Ninja-IDE.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/Pencil-Project.sh b/Apps/Pencil-Project.sh index ad8243c7..4f817a50 100644 --- a/Apps/Pencil-Project.sh +++ b/Apps/Pencil-Project.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Apps/flatpak.sh b/Apps/flatpak.sh index 658408b3..32b16f97 100644 --- a/Apps/flatpak.sh +++ b/Apps/flatpak.sh @@ -54,7 +54,7 @@ aplicaciones_flatpak() { while true :; do - clear + clear_screen local descripcion='Menú para instalar paquetes FlatPak 1) Gimp 2) LibreOffice @@ -113,7 +113,7 @@ aplicaciones_flatpak() { 22) instalarSoftwareFlatPak $postman;; 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' break;; diff --git a/Desktops/0_Main.sh b/Desktops/0_Main.sh index e10c2c2e..5fa3e797 100644 --- a/Desktops/0_Main.sh +++ b/Desktops/0_Main.sh @@ -30,7 +30,7 @@ source "$WORKSCRIPT/Desktops/sway.sh" ############################ menuDesktops() { todos_desktops() { - clear + clear_screen echo -e "$VE Instalando todos los Desktops y WM$CL" i3wm_instalador xmonad_instalador @@ -43,7 +43,7 @@ menuDesktops() { todos_desktops else while true :; do - clear + clear_screen local descripcion='Menú de Personalización del sistema 1) Instalar i3wm 2) Instalar Xmonad @@ -69,7 +69,7 @@ menuDesktops() { 6) todos_desktops;; ## Todos los pasos anteriores 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' break;; diff --git a/Desktops/i3.sh b/Desktops/i3.sh index 588dd77e..88afa2f2 100644 --- a/Desktops/i3.sh +++ b/Desktops/i3.sh @@ -11,7 +11,7 @@ ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Desktops/openbox.sh b/Desktops/openbox.sh index 5c486b0c..0f9d882b 100644 --- a/Desktops/openbox.sh +++ b/Desktops/openbox.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Lenguajes-Programacion/0_Main.sh b/Lenguajes-Programacion/0_Main.sh index 3b144b1d..e747fa9d 100644 --- a/Lenguajes-Programacion/0_Main.sh +++ b/Lenguajes-Programacion/0_Main.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -39,7 +39,7 @@ source "$WORKSCRIPT/Lenguajes-Programacion/perl.sh" ## menuLenguajes() { todos_lenguajes() { - clear + clear_screen echo -e "$VE Instalando todos los lenguajes$CL" php_instalador "$1" python_instalador "$1" @@ -60,7 +60,7 @@ menuLenguajes() { fi else while true :; do - clear + clear_screen local descripcion='Menú Lenguajes de programación 1) PHP 2) Python @@ -90,7 +90,7 @@ menuLenguajes() { break;; 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' break;; diff --git a/Lenguajes-Programacion/php.sh b/Lenguajes-Programacion/php.sh index f398d9a1..96ad1966 100644 --- a/Lenguajes-Programacion/php.sh +++ b/Lenguajes-Programacion/php.sh @@ -175,7 +175,7 @@ php_postconfiguracion() { local salir='' while [[ $salir != 'salir' ]]; do - clear + clear_screen echo -e "$VE Introduce la versión de$RO PHP$VE a utilizar$CL" echo -e "$AZ ${ALL_PHP[*]} $RO" ## Pinta versiones para elegirla read -p " → " input diff --git a/Personalizar/0_Main.sh b/Personalizar/0_Main.sh index b18c6990..b367cd77 100644 --- a/Personalizar/0_Main.sh +++ b/Personalizar/0_Main.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es -## @github https://github.com/fryntiz +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @gitlab https://gitlab.com/fryntiz +## @github https://github.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -31,7 +31,7 @@ source "$WORKSCRIPT/Personalizar/Terminales.sh" ############################ menuPersonalizacion() { todas_personalizaciones() { - clear + clear_screen echo -e "$VE Instalando todas las personalizaciones$CL" configuracion_git agregar_fuentes @@ -44,7 +44,7 @@ menuPersonalizacion() { todas_personalizaciones else while true :; do - clear + clear_screen local descripcion='Menú de Personalización del sistema 1) Configurar GIT 2) Tipografías @@ -71,7 +71,7 @@ menuPersonalizacion() { 6) todas_personalizaciones;; ## Todos los pasos anteriores 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' break;; diff --git a/Personalizar/Configurar_GIT.sh b/Personalizar/Configurar_GIT.sh index 593c2138..cefdc64d 100755 --- a/Personalizar/Configurar_GIT.sh +++ b/Personalizar/Configurar_GIT.sh @@ -46,7 +46,7 @@ datos_input() { } gpg_git() { - clear + clear_screen echo -e "$VE Configurando GPG para GIT$CL" ## Listar claves actuales, si hubiera instaladas en el equipo @@ -63,7 +63,7 @@ gpg_git() { [[ $input = 'y' ]] || [[ $input = 'Y' ]] then - clear + clear_screen gpg --list-secret-keys --keyid-format LONG else echo -e "$VE Se creará una$RO clave GPG$VE única nueva:" diff --git a/Personalizar/Personalizacion_GTK.sh b/Personalizar/Personalizacion_GTK.sh index 407e5c4c..58d5d20c 100755 --- a/Personalizar/Personalizacion_GTK.sh +++ b/Personalizar/Personalizacion_GTK.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Personalizar/Terminales.sh b/Personalizar/Terminales.sh index d3ca3230..a83482b5 100644 --- a/Personalizar/Terminales.sh +++ b/Personalizar/Terminales.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Personalizar/Tipografias.sh b/Personalizar/Tipografias.sh index 5dc6f1fe..06785d5a 100755 --- a/Personalizar/Tipografias.sh +++ b/Personalizar/Tipografias.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Personalizar/iconos.sh b/Personalizar/iconos.sh index 24f727e2..8655e39d 100644 --- a/Personalizar/iconos.sh +++ b/Personalizar/iconos.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Repositorios/debian.sh b/Repositorios/debian.sh index 41082434..7655a963 100644 --- a/Repositorios/debian.sh +++ b/Repositorios/debian.sh @@ -58,7 +58,7 @@ agregarRepositoriosDebian() { elegirRama() { while true; do - clear + clear_screen local descripcion='Menú para configurar e integrar repositorios 1) Stable @@ -82,7 +82,7 @@ agregarRepositoriosDebian() { break;; 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' break;; diff --git a/Root/0_Main.sh b/Root/0_Main.sh index c7bc295e..7946d09b 100644 --- a/Root/0_Main.sh +++ b/Root/0_Main.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Root/nano.sh b/Root/nano.sh index b11dfc53..a875748c 100644 --- a/Root/nano.sh +++ b/Root/nano.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Root/permisos.sh b/Root/permisos.sh index 28d89dce..134c9caa 100644 --- a/Root/permisos.sh +++ b/Root/permisos.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Root/programas-default.sh b/Root/programas-default.sh index 12b23051..7701fe37 100644 --- a/Root/programas-default.sh +++ b/Root/programas-default.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Root/terminales.sh b/Root/terminales.sh index 1acfdd60..9e2692c3 100644 --- a/Root/terminales.sh +++ b/Root/terminales.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Servidores/0_Main.sh b/Servidores/0_Main.sh index 1df3d973..aa0c2920 100644 --- a/Servidores/0_Main.sh +++ b/Servidores/0_Main.sh @@ -43,7 +43,7 @@ source "$WORKSCRIPT/Servidores/mumble.sh" ## menuServidores() { todos_servidores() { - clear + clear_screen echo -e "$VE Instalando todos los servidores$CL" apache2_instalador mariadb_instalador @@ -60,7 +60,7 @@ menuServidores() { todos_servidores else while true :; do - clear + clear_screen local descripcion='Menú de Servidores y Lenguajes de programación 1) Apache 2) MariaDB @@ -102,7 +102,7 @@ menuServidores() { break;; 0) ## SALIR - clear + clear_screen echo -e "$RO Se sale del menú$CL" echo '' break;; diff --git a/Servidores/bind.sh b/Servidores/bind.sh index f072f6ce..5ccff0f1 100644 --- a/Servidores/bind.sh +++ b/Servidores/bind.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -49,19 +49,19 @@ bind_postconfiguracion() { local reenviador2='8.8.4.4' while [[ "$dominio" == '' ]]; do - clear + clear_screen echo -e "$AM Introduce el nombre de$RO dominio:$CL" read -p 'Dominio → ' dominio done while [[ "$ipzona" == '' ]]; do - clear + clear_screen echo -e "$AM Introduce la$RO IP$VE:$CL" read -p 'IP → ' ipzona done while [[ "$ipzonainv" == '' ]]; do - clear + clear_screen echo -e "$AM Introduce los bloques red con esa parte de la$RO IP$VE al$RO revés$VE (1.168.192 o 18.172):$CL" read -p 'IP → ' ipzonainv done diff --git a/Servidores/docker.sh b/Servidores/docker.sh index 84da382d..44d968ce 100644 --- a/Servidores/docker.sh +++ b/Servidores/docker.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Servidores/mariaDB.sh b/Servidores/mariaDB.sh index 4ed5ad7d..f03d72ce 100644 --- a/Servidores/mariaDB.sh +++ b/Servidores/mariaDB.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Servidores/mongodb.sh b/Servidores/mongodb.sh index 7c261ec8..399d364c 100644 --- a/Servidores/mongodb.sh +++ b/Servidores/mongodb.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Servidores/mumble.sh b/Servidores/mumble.sh index 99d95a4a..564a3bd5 100644 --- a/Servidores/mumble.sh +++ b/Servidores/mumble.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Servidores/nodejs.sh b/Servidores/nodejs.sh index 5c1a3480..417b90fe 100644 --- a/Servidores/nodejs.sh +++ b/Servidores/nodejs.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Servidores/postfix.sh b/Servidores/postfix.sh index f2c4fba9..a98c89a0 100644 --- a/Servidores/postfix.sh +++ b/Servidores/postfix.sh @@ -11,7 +11,7 @@ ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Servidores/postgreSQL.sh b/Servidores/postgreSQL.sh index 2738eeda..dea18974 100644 --- a/Servidores/postgreSQL.sh +++ b/Servidores/postgreSQL.sh @@ -4,7 +4,7 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es +## @email dev@fryntiz.es ## @web https://fryntiz.es ## @gitlab https://gitlab.com/fryntiz ## @github https://github.com/fryntiz diff --git a/Servidores/sqlite.sh b/Servidores/sqlite.sh index 97e20b75..b793753f 100644 --- a/Servidores/sqlite.sh +++ b/Servidores/sqlite.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Servidores/ssh.sh b/Servidores/ssh.sh index a03c5077..547fa32e 100644 --- a/Servidores/ssh.sh +++ b/Servidores/ssh.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/0_Main.sh b/Usuario/0_Main.sh index 53fc1b3a..2188d562 100644 --- a/Usuario/0_Main.sh +++ b/Usuario/0_Main.sh @@ -111,7 +111,7 @@ softwareUsuarioMinimo() { spacevim_Instalador break;; *) ## Opción errónea - clear + clear_screen echo -e "$RO Opción no válida$CL" esac done diff --git a/Usuario/OhMyZsh.sh b/Usuario/OhMyZsh.sh index daf59bb6..80c2da81 100644 --- a/Usuario/OhMyZsh.sh +++ b/Usuario/OhMyZsh.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/bashit.sh b/Usuario/bashit.sh index f6b607d7..a428f7fc 100644 --- a/Usuario/bashit.sh +++ b/Usuario/bashit.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/gedit.sh b/Usuario/gedit.sh index 9617f546..6282978d 100644 --- a/Usuario/gedit.sh +++ b/Usuario/gedit.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/heroku.sh b/Usuario/heroku.sh index e5e25aad..b378ec32 100644 --- a/Usuario/heroku.sh +++ b/Usuario/heroku.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/nano.sh b/Usuario/nano.sh index 3eb812b9..0f78dd60 100644 --- a/Usuario/nano.sh +++ b/Usuario/nano.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/permisos.sh b/Usuario/permisos.sh index f4cd69f5..315aec74 100644 --- a/Usuario/permisos.sh +++ b/Usuario/permisos.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/plantillas.sh b/Usuario/plantillas.sh index d8a44ef9..e5a6a7e6 100644 --- a/Usuario/plantillas.sh +++ b/Usuario/plantillas.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/programas-default.sh b/Usuario/programas-default.sh index 7051a6c6..e8b5b6b2 100644 --- a/Usuario/programas-default.sh +++ b/Usuario/programas-default.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/spacevim.sh b/Usuario/spacevim.sh index cf91c063..9c4cef56 100644 --- a/Usuario/spacevim.sh +++ b/Usuario/spacevim.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/terminales.sh b/Usuario/terminales.sh index a0e7f673..c77b8040 100644 --- a/Usuario/terminales.sh +++ b/Usuario/terminales.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/Usuario/vim.sh b/Usuario/vim.sh index 985e7a2a..3e83444e 100644 --- a/Usuario/vim.sh +++ b/Usuario/vim.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/VPS/0_Main.sh b/VPS/0_Main.sh index 8af49255..9bc65e6d 100644 --- a/VPS/0_Main.sh +++ b/VPS/0_Main.sh @@ -11,7 +11,7 @@ ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/VPS/administrador.sh b/VPS/administrador.sh index 5f005f58..f8c009ff 100644 --- a/VPS/administrador.sh +++ b/VPS/administrador.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es +## @email dev@fryntiz.es ## @web https://fryntiz.es ## @gitlab https://gitlab.com/fryntiz ## @github https://github.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/VPS/conf/.bashrc b/VPS/conf/.bashrc index f77e9343..08aa1ce8 100644 --- a/VPS/conf/.bashrc +++ b/VPS/conf/.bashrc @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es +## @email dev@fryntiz.es ## @web https://fryntiz.es ## @gitlab https://gitlab.com/fryntiz ## @github https://github.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ################################### ### CONSTANTES ### diff --git a/VPS/fail2ban.sh b/VPS/fail2ban.sh index b725cffd..25abbc9a 100644 --- a/VPS/fail2ban.sh +++ b/VPS/fail2ban.sh @@ -11,7 +11,7 @@ ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/Apps/Tilix/vte.sh b/conf/Apps/Tilix/vte.sh index e94f9199..ea654a59 100644 --- a/conf/Apps/Tilix/vte.sh +++ b/conf/Apps/Tilix/vte.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style function custom_prompt() { __git_ps1 "\[\033[0;31m\]\u \[\033[0;36m\]\h:\w\[\033[00m\]" " \n\[\033[0;31m\]>\[\033[00m\] " " %s" diff --git a/conf/home/.bashrc b/conf/home/.bashrc index 902eb28e..435a02ee 100644 --- a/conf/home/.bashrc +++ b/conf/home/.bashrc @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ################################### ### CONSTANTES ### diff --git a/conf/home/.config/i3/Workspaces/load_layouts.sh b/conf/home/.config/i3/Workspaces/load_layouts.sh index 361bbf3d..77ce5c92 100755 --- a/conf/home/.config/i3/Workspaces/load_layouts.sh +++ b/conf/home/.config/i3/Workspaces/load_layouts.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/home/.config/i3/scripts/brillo.py b/conf/home/.config/i3/scripts/brillo.py index d058d808..458fef0b 100755 --- a/conf/home/.config/i3/scripts/brillo.py +++ b/conf/home/.config/i3/scripts/brillo.py @@ -2,8 +2,8 @@ # -*- encoding: utf-8 -*- # @author Raúl Caro Pastorino -# @email tecnico@fryntiz.es -# @web http://www.fryntiz.es +# @email dev@fryntiz.es +# @web http://https://fryntiz.es # @github https://github.com/fryntiz # @gitlab https://gitlab.com/fryntiz # @twitter https://twitter.com/fryntiz diff --git a/conf/home/.config/i3/scripts/i3exit.sh b/conf/home/.config/i3/scripts/i3exit.sh index 8eac5894..990efc77 100755 --- a/conf/home/.config/i3/scripts/i3exit.sh +++ b/conf/home/.config/i3/scripts/i3exit.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/home/.config/i3/scripts/keyboard.sh b/conf/home/.config/i3/scripts/keyboard.sh index ef606bc2..c8a72cbd 100755 --- a/conf/home/.config/i3/scripts/keyboard.sh +++ b/conf/home/.config/i3/scripts/keyboard.sh @@ -11,7 +11,7 @@ ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/home/.config/i3/scripts/lock_and_blur.sh b/conf/home/.config/i3/scripts/lock_and_blur.sh index abc5afaf..e20b04c5 100755 --- a/conf/home/.config/i3/scripts/lock_and_blur.sh +++ b/conf/home/.config/i3/scripts/lock_and_blur.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/home/.config/i3/scripts/menu b/conf/home/.config/i3/scripts/menu index 9565466d..3b90e1ae 100644 --- a/conf/home/.config/i3/scripts/menu +++ b/conf/home/.config/i3/scripts/menu @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/home/.config/i3/scripts/printscreen.sh b/conf/home/.config/i3/scripts/printscreen.sh index e295762c..9b87baf4 100644 --- a/conf/home/.config/i3/scripts/printscreen.sh +++ b/conf/home/.config/i3/scripts/printscreen.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/home/.config/i3/scripts/record.sh b/conf/home/.config/i3/scripts/record.sh index 76e61c2a..dc72f808 100644 --- a/conf/home/.config/i3/scripts/record.sh +++ b/conf/home/.config/i3/scripts/record.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/home/.config/i3/scripts/servers.sh b/conf/home/.config/i3/scripts/servers.sh index e8243888..3045f161 100755 --- a/conf/home/.config/i3/scripts/servers.sh +++ b/conf/home/.config/i3/scripts/servers.sh @@ -11,7 +11,7 @@ ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/home/.config/i3/scripts/toggletouchpad.sh b/conf/home/.config/i3/scripts/toggletouchpad.sh index e7e8e3dc..369abfd4 100755 --- a/conf/home/.config/i3/scripts/toggletouchpad.sh +++ b/conf/home/.config/i3/scripts/toggletouchpad.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/conf/home/.config/i3pystatus/config.py b/conf/home/.config/i3pystatus/config.py index 9ac6a67b..0646ebf3 100755 --- a/conf/home/.config/i3pystatus/config.py +++ b/conf/home/.config/i3pystatus/config.py @@ -4,8 +4,8 @@ # @author Raúl Caro Pastorino # @copyright Copyright © 2018 Raúl Caro Pastorino # @license https://wwww.gnu.org/licenses/gpl.txt -# @email tecnico@fryntiz.es -# @web www.fryntiz.es +# @email dev@fryntiz.es +# @web https://fryntiz.es # @github https://github.com/fryntiz # @gitlab https://gitlab.com/fryntiz # @twitter https://twitter.com/fryntiz diff --git a/conf/home/.local/bin/nuevo b/conf/home/.local/bin/nuevo index cf88abb1..10b8dab5 100755 --- a/conf/home/.local/bin/nuevo +++ b/conf/home/.local/bin/nuevo @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2018 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git "a/conf/home/Plantillas/Gen\303\251ricas/Scripts/Script SQL.sql" "b/conf/home/Plantillas/Gen\303\251ricas/Scripts/Script SQL.sql" index 6b03244c..56c4af86 100644 --- "a/conf/home/Plantillas/Gen\303\251ricas/Scripts/Script SQL.sql" +++ "b/conf/home/Plantillas/Gen\303\251ricas/Scripts/Script SQL.sql" @@ -2,8 +2,8 @@ ------------------------------------------------------------------------------- -- -- Author: Raúl Caro Pastorino --- Email Author: tecnico@fryntiz.es --- Web Author: http://www.fryntiz.es +-- Email Author: dev@fryntiz.es +-- Web Author: http://https://fryntiz.es -- github: https://github.com/fryntiz -- gitlab: https://gitlab.com/fryntiz -- twitter: https://twitter.com/fryntiz diff --git a/limpiador.sh b/limpiador.sh index 56ce43b3..480c022e 100644 --- a/limpiador.sh +++ b/limpiador.sh @@ -4,14 +4,14 @@ ## @author Raúl Caro Pastorino ## @copyright Copyright © 2017 Raúl Caro Pastorino ## @license https://wwww.gnu.org/licenses/gpl.txt -## @email tecnico@fryntiz.es -## @web www.fryntiz.es +## @email dev@fryntiz.es +## @web https://fryntiz.es ## @github https://github.com/fryntiz ## @gitlab https://gitlab.com/fryntiz ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## diff --git a/preferences.sh b/preferences.sh index 80a31fdb..96017eb0 100644 --- a/preferences.sh +++ b/preferences.sh @@ -11,7 +11,7 @@ ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -40,7 +40,7 @@ setDistro() { [[ "$input" != 'raspbian' ]] && [[ "$input" != 'fedora' ]] do - clear + clear_screen getDistrosAvailable ## Pido elegir distribución echo "$MY_DISTRO" @@ -57,7 +57,7 @@ setBranch() { [[ "$input" != 'testing' ]] && [[ "$input" != 'unstable' ]] do - clear + clear_screen getBranchAvailable ## Pido elegir distribución echo "$MY_BRANCH" @@ -75,7 +75,7 @@ setBranch() { ## setEnv() { while true :; do - clear + clear_screen local descripcion='Selecciona el entorno: 1) Producción @@ -95,7 +95,7 @@ setEnv() { break;; *) ## Acción ante entrada no válida - clear + clear_screen echo "" echo -e " $RO ATENCIÓN: Elección no válida$CL";; esac diff --git a/routes.sh b/routes.sh index 9e868145..0d864f75 100644 --- a/routes.sh +++ b/routes.sh @@ -11,7 +11,7 @@ ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://github.com/fryntiz/Bash_Style_Guide +## @style https://github.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## From cf91e46a21fe0e60debf72471402b7077af57c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Wed, 25 Mar 2020 22:05:10 +0100 Subject: [PATCH 53/71] =?UTF-8?q?Correcci=C3=B3n=20en=20lista=20de=20repos?= =?UTF-8?q?itorio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Repositorios/debian/testing/sources.list | 3 +-- Repositorios/debian/unstable/sources.list | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Repositorios/debian/testing/sources.list b/Repositorios/debian/testing/sources.list index 4533a6e1..c3de0ae2 100644 --- a/Repositorios/debian/testing/sources.list +++ b/Repositorios/debian/testing/sources.list @@ -18,8 +18,7 @@ deb-src http://ftp.es.debian.org/debian/ testing-updates non-free contrib main ######################################################## ## KERNEL LIQUORIX ## ######################################################## -#### curl httpsR://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo -apt-get update +#### curl httpsR://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo apt-get update # deb http://liquorix.net/debian sid main # deb-src http://liquorix.net/debian sid main diff --git a/Repositorios/debian/unstable/sources.list b/Repositorios/debian/unstable/sources.list index c2cbf035..8fc32298 100644 --- a/Repositorios/debian/unstable/sources.list +++ b/Repositorios/debian/unstable/sources.list @@ -16,8 +16,7 @@ deb-src http://ftp.es.debian.org/debian/ sid main contrib non-free ######################################################## ## KERNEL LIQUORIX ## ######################################################## -#### curl https://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo -apt-get update +#### curl https://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo apt-get update # deb http://liquorix.net/debian sid main # deb-src http://liquorix.net/debian sid main From 98969453d5153bfb406034408b2b329cda538a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 26 Mar 2020 00:07:24 +0100 Subject: [PATCH 54/71] =?UTF-8?q?Correcci=C3=B3n=20de=20llamada=20a=20func?= =?UTF-8?q?i=C3=B3n=20obsoleta=20o=20inexistente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/0_Main.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Apps/0_Main.sh b/Apps/0_Main.sh index 3f647b71..6f890a15 100644 --- a/Apps/0_Main.sh +++ b/Apps/0_Main.sh @@ -65,8 +65,6 @@ menuAplicaciones() { aplicaciones_sonido aplicaciones_video aplicaciones_virtualizacion - - menuPaquetes -a } ## Si la función recibe "-a" indica que ejecute todas las aplicaciones From e9ea5a592cda34ddb7f551cbedd184dc9e1bcfab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 26 Mar 2020 00:14:23 +0100 Subject: [PATCH 55/71] Actualizo versiones para IDEs phpstorm y pycharm pro --- Apps/IDEs/phpstorm.sh | 2 +- Apps/IDEs/pycharm_pro.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Apps/IDEs/phpstorm.sh b/Apps/IDEs/phpstorm.sh index 2563c6f5..75b030ef 100644 --- a/Apps/IDEs/phpstorm.sh +++ b/Apps/IDEs/phpstorm.sh @@ -75,7 +75,7 @@ phpstorm_postconfiguracion() { } phpstorm_instalador() { - local version='PhpStorm-2019.3.3' + local version='PhpStorm-2019.3.4' echo -e "$VE Comenzando instalación de$RO PhpStorm$CL" diff --git a/Apps/IDEs/pycharm_pro.sh b/Apps/IDEs/pycharm_pro.sh index e7f313c0..0c0dbf4f 100644 --- a/Apps/IDEs/pycharm_pro.sh +++ b/Apps/IDEs/pycharm_pro.sh @@ -72,7 +72,7 @@ pycharm_postconfiguracion() { } pycharm_pro_instalador() { - local version='pycharm-professional-2019.3.3' + local version='pycharm-professional-2019.3.4' echo -e "$VE Comenzando instalación de$RO PyCharm$CL" From b610a57b5a47b49e20b406846bcecc0a3a91d1c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 29 Mar 2020 16:55:38 +0200 Subject: [PATCH 56/71] =?UTF-8?q?Actualizo=20repositorios=20de=20testing?= =?UTF-8?q?=20y=20a=C3=B1ado=20nuevos=20repositorios=20comunes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Repositorios/0_Main.sh | 2 ++ Repositorios/debian.sh | 3 ++ Repositorios/debian/comunes.sh | 31 ++++++++++++++++++- .../comunes/sources.list.d/google_earth.list | 4 +++ .../debian/comunes/sources.list.d/gopass.list | 1 + .../debian/comunes/sources.list.d/lynis.list | 1 + .../debian/comunes/sources.list.d/skype.list | 1 + .../comunes/sources.list.d/spotify.list | 1 + .../debian/comunes/sources.list.d/steam.list | 1 + .../comunes/sources.list.d/sublimetext.list | 1 + Repositorios/debian/testing/sources.list | 27 ++++++---------- .../debian/testing/sources.list.d/kernel.list | 5 +++ .../testing/sources.list.d/liquorix.list | 6 ++++ Repositorios/gentoo.sh | 2 +- conf/home/.vim/syntax/fugitive.vim | 1 + conf/home/.vim/syntax/fugitiveblame.vim | 1 + 16 files changed, 68 insertions(+), 20 deletions(-) create mode 100644 Repositorios/debian/comunes/sources.list.d/google_earth.list create mode 100644 Repositorios/debian/comunes/sources.list.d/gopass.list create mode 100644 Repositorios/debian/comunes/sources.list.d/lynis.list create mode 100644 Repositorios/debian/comunes/sources.list.d/skype.list create mode 100644 Repositorios/debian/comunes/sources.list.d/spotify.list create mode 100644 Repositorios/debian/comunes/sources.list.d/steam.list create mode 100644 Repositorios/debian/comunes/sources.list.d/sublimetext.list create mode 100644 Repositorios/debian/testing/sources.list.d/kernel.list create mode 100644 Repositorios/debian/testing/sources.list.d/liquorix.list create mode 120000 conf/home/.vim/syntax/fugitive.vim create mode 120000 conf/home/.vim/syntax/fugitiveblame.vim diff --git a/Repositorios/0_Main.sh b/Repositorios/0_Main.sh index 50c65e1c..1da56c56 100644 --- a/Repositorios/0_Main.sh +++ b/Repositorios/0_Main.sh @@ -38,5 +38,7 @@ menuRepositorios() { agregarRepositoriosRaspbian elif [[ "$DISTRO" = 'fedora' ]];then agregarRepositoriosFedora + elif [[ "$DISTRO" = 'gentoo' ]];then + agregarRepositoriosGentoo fi } diff --git a/Repositorios/debian.sh b/Repositorios/debian.sh index 7655a963..347466aa 100644 --- a/Repositorios/debian.sh +++ b/Repositorios/debian.sh @@ -41,7 +41,10 @@ agregarRepositoriosDebian() { actualizarRepositorios instalarSoftware 'apt-transport-https' instalarSoftware 'dirmngr' + instalarSoftware 'wget' instalarSoftware 'curl' + instalarSoftware 'gnupg' + instalarSoftware 'rng-tools' } ## diff --git a/Repositorios/debian/comunes.sh b/Repositorios/debian/comunes.sh index e2f49cb9..d1f8adf2 100644 --- a/Repositorios/debian/comunes.sh +++ b/Repositorios/debian/comunes.sh @@ -92,9 +92,38 @@ comunes_agregar_llaves() { echo -e "$VE Agregando clave para el editor SQL$RO DBeaver$CL" wget -O - https://dbeaver.io/debs/dbeaver.gpg.key | sudo apt-key add - - ## Repositorio para editor DBeaver. + ## Repositorio para editor VS Codium. echo -e "$VE Agregando clave para el editor$RO VS Codium$CL" wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg | sudo apt-key add - + + ## Google Earth + echo -e "$VE Agregando clave para $RO Google Earth$CL" + wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - + + ## Sublime Text + echo -e "$VE Agregando clave para el editor$RO Sublime Text$CL" + wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | sudo apt-key add - + + ## Skype + #echo -e "$VE Agregando clave para $RO Skype$CL" + #sudo curl https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor > microsoft.gpg && sudo mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg + #sudo chown root:root /etc/apt/trusted.gpg.d/microsoft.gpg && sudo chmod 644 /etc/apt/trusted.gpg.d/microsoft.gpg + + ## GoPass (Gestor de Passwords colectivo) + echo -e "$VE Agregando clave para $RO GooPass$CL" + wget -q -O- https://api.bintray.com/orgs/gopasspw/keys/gpg/public.key | sudo apt-key add - + + ## Lynis + echo -e "$VE Agregando clave para $RO Lynis$CL" + sudo wget -O - https://packages.cisofy.com/keys/cisofy-software-public.key | sudo apt-key add - + + ## Spotify + echo -e "$VE Agregando clave para $RO Spotify$CL" + sudo apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 4773BD5E130D1D45 + + ## Steam + echo -e "$VE Agregando clave para $RO Steam$CL" + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F24AEA9FB05498B7 } ## diff --git a/Repositorios/debian/comunes/sources.list.d/google_earth.list b/Repositorios/debian/comunes/sources.list.d/google_earth.list new file mode 100644 index 00000000..1fd33773 --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/google_earth.list @@ -0,0 +1,4 @@ +######################################################## +## Google Earth ## +######################################################## +deb [arch=amd64] http://dl.google.com/linux/earth/deb/ stable main \ No newline at end of file diff --git a/Repositorios/debian/comunes/sources.list.d/gopass.list b/Repositorios/debian/comunes/sources.list.d/gopass.list new file mode 100644 index 00000000..2e23c874 --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/gopass.list @@ -0,0 +1 @@ +deb https://dl.bintray.com/gopasspw/gopass bionic main \ No newline at end of file diff --git a/Repositorios/debian/comunes/sources.list.d/lynis.list b/Repositorios/debian/comunes/sources.list.d/lynis.list new file mode 100644 index 00000000..556263d2 --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/lynis.list @@ -0,0 +1 @@ +deb https://packages.cisofy.com/community/lynis/deb/ stable main \ No newline at end of file diff --git a/Repositorios/debian/comunes/sources.list.d/skype.list b/Repositorios/debian/comunes/sources.list.d/skype.list new file mode 100644 index 00000000..5af4bab8 --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/skype.list @@ -0,0 +1 @@ +#deb [arch=amd64] https://repo.skype.com/deb stable main \ No newline at end of file diff --git a/Repositorios/debian/comunes/sources.list.d/spotify.list b/Repositorios/debian/comunes/sources.list.d/spotify.list new file mode 100644 index 00000000..5e07ba9c --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/spotify.list @@ -0,0 +1 @@ +deb http://repository.spotify.com stable non-free \ No newline at end of file diff --git a/Repositorios/debian/comunes/sources.list.d/steam.list b/Repositorios/debian/comunes/sources.list.d/steam.list new file mode 100644 index 00000000..86438dde --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/steam.list @@ -0,0 +1 @@ +deb [arch=i386,amd64] http://repo.steampowered.com/steam/ precise steam \ No newline at end of file diff --git a/Repositorios/debian/comunes/sources.list.d/sublimetext.list b/Repositorios/debian/comunes/sources.list.d/sublimetext.list new file mode 100644 index 00000000..1edf787a --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/sublimetext.list @@ -0,0 +1 @@ +deb https://download.sublimetext.com/ apt/stable/ \ No newline at end of file diff --git a/Repositorios/debian/testing/sources.list b/Repositorios/debian/testing/sources.list index c3de0ae2..f4cc8232 100644 --- a/Repositorios/debian/testing/sources.list +++ b/Repositorios/debian/testing/sources.list @@ -1,26 +1,17 @@ ######################################################## ## OFICIALES DEBIAN ## ######################################################## -##### Repositorio Debian Testing -deb http://ftp.es.debian.org/debian/ testing main contrib non-free -deb-src http://ftp.es.debian.org/debian/ testing main contrib non-free +## Repositorio Debian Testing. +deb http://deb.debian.org/debian/ testing main contrib non-free +deb-src http://deb.debian.org/debian/ testing main contrib non-free -##### Actualizaciones para Testing (Updates) -deb http://ftp.es.debian.org/debian/ testing-updates non-free contrib main -deb-src http://ftp.es.debian.org/debian/ testing-updates non-free contrib main +## Actualizaciones para Testing (Updates). +deb http://deb.debian.org/debian/ testing-updates main contrib non-free +deb-src http://deb.debian.org/debian/ testing-updates main contrib non-free -######################################################## -## KERNEL ## -######################################################## -# deb http://mirrors.kernel.org/debian testing main contrib non-free -# deb-src http://mirrors.kernel.org/debian testing main contrib non-free - -######################################################## -## KERNEL LIQUORIX ## -######################################################## -#### curl httpsR://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo apt-get update -# deb http://liquorix.net/debian sid main -# deb-src http://liquorix.net/debian sid main +## Actualizaciones de seguridad para testing. +deb http://deb.debian.org/debian-security testing-security main +deb-src http://deb.debian.org/debian-security testing-security main ######################################################## ## MOZILLA FIREFOX ## diff --git a/Repositorios/debian/testing/sources.list.d/kernel.list b/Repositorios/debian/testing/sources.list.d/kernel.list new file mode 100644 index 00000000..61087abf --- /dev/null +++ b/Repositorios/debian/testing/sources.list.d/kernel.list @@ -0,0 +1,5 @@ +######################################################## +## KERNEL ## +######################################################## +# deb http://mirrors.kernel.org/debian testing main contrib non-free +# deb-src http://mirrors.kernel.org/debian testing main contrib non-free \ No newline at end of file diff --git a/Repositorios/debian/testing/sources.list.d/liquorix.list b/Repositorios/debian/testing/sources.list.d/liquorix.list new file mode 100644 index 00000000..8d44e5cd --- /dev/null +++ b/Repositorios/debian/testing/sources.list.d/liquorix.list @@ -0,0 +1,6 @@ +######################################################## +## KERNEL LIQUORIX ## +######################################################## +#### curl https://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo apt-get update +# deb http://liquorix.net/debian sid main +# deb-src http://liquorix.net/debian sid main \ No newline at end of file diff --git a/Repositorios/gentoo.sh b/Repositorios/gentoo.sh index 87fea619..23f230b4 100644 --- a/Repositorios/gentoo.sh +++ b/Repositorios/gentoo.sh @@ -25,6 +25,6 @@ ############################ ## FUNCIONES ## ############################ -agregarRepositoriosFedora() { +agregarRepositoriosGentoo() { echo -e '$VE Configurando Repositorios para$RO Gentoo$CL' } diff --git a/conf/home/.vim/syntax/fugitive.vim b/conf/home/.vim/syntax/fugitive.vim new file mode 120000 index 00000000..34b43d92 --- /dev/null +++ b/conf/home/.vim/syntax/fugitive.vim @@ -0,0 +1 @@ +/usr/share/vim/addons/syntax/fugitive.vim \ No newline at end of file diff --git a/conf/home/.vim/syntax/fugitiveblame.vim b/conf/home/.vim/syntax/fugitiveblame.vim new file mode 120000 index 00000000..c1b9ab87 --- /dev/null +++ b/conf/home/.vim/syntax/fugitiveblame.vim @@ -0,0 +1 @@ +/usr/share/vim/addons/syntax/fugitiveblame.vim \ No newline at end of file From 10e6edbbf230ae428f63e587cf924949d857e6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 29 Mar 2020 19:14:27 +0200 Subject: [PATCH 57/71] =?UTF-8?q?A=C3=B1ado=20mpv=20como=20dependencia=20a?= =?UTF-8?q?=20instalar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Software-Lists/debian/Video/reproductores.lst | 1 + 1 file changed, 1 insertion(+) diff --git a/Software-Lists/debian/Video/reproductores.lst b/Software-Lists/debian/Video/reproductores.lst index e69de29b..34a3bfac 100644 --- a/Software-Lists/debian/Video/reproductores.lst +++ b/Software-Lists/debian/Video/reproductores.lst @@ -0,0 +1 @@ +mpv \ No newline at end of file From 260fe0b3663f45046afe20def67dd52ecb96c165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 29 Mar 2020 23:47:55 +0200 Subject: [PATCH 58/71] =?UTF-8?q?A=C3=B1ado=20gdebi=20y=20nautilus-nextclo?= =?UTF-8?q?ud=20como=20dependencias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Repositorios/debian/comunes.sh | 3 +++ Software-Lists/debian/Basico/herramientas.lst | 1 + Software-Lists/debian/Internet/nubes.lst | 1 + 3 files changed, 5 insertions(+) diff --git a/Repositorios/debian/comunes.sh b/Repositorios/debian/comunes.sh index d1f8adf2..0e021b8f 100644 --- a/Repositorios/debian/comunes.sh +++ b/Repositorios/debian/comunes.sh @@ -124,6 +124,9 @@ comunes_agregar_llaves() { ## Steam echo -e "$VE Agregando clave para $RO Steam$CL" sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F24AEA9FB05498B7 + + ## QOwnNotes + wget http://download.opensuse.org/repositories/home:/pbek:/QOwnNotes/Debian_10/Release.key -O - | sudo apt-key add - } ## diff --git a/Software-Lists/debian/Basico/herramientas.lst b/Software-Lists/debian/Basico/herramientas.lst index 3ddf6b6d..03c17ff7 100644 --- a/Software-Lists/debian/Basico/herramientas.lst +++ b/Software-Lists/debian/Basico/herramientas.lst @@ -25,3 +25,4 @@ tcl xdg-user-dirs ntp pciutils +gdebi \ No newline at end of file diff --git a/Software-Lists/debian/Internet/nubes.lst b/Software-Lists/debian/Internet/nubes.lst index 379fee5e..f25c96f7 100644 --- a/Software-Lists/debian/Internet/nubes.lst +++ b/Software-Lists/debian/Internet/nubes.lst @@ -1,3 +1,4 @@ +nautilus-nextcloud nextcloud-desktop nextcloud-desktop-cmd nextcloud-desktop-l10n \ No newline at end of file From 1637624f79836798cb8fafaa8d0a5bbe2e786b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 29 Mar 2020 23:48:44 +0200 Subject: [PATCH 59/71] Intentando solucionar problema en debian testing queriendo reiniciar servicios --- main.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main.sh b/main.sh index d9f5b3d2..2fc656bf 100755 --- a/main.sh +++ b/main.sh @@ -97,6 +97,11 @@ if [[ "${DEBUG}" = 'true' ]]; then log 'Se ha ejecutado el script en modo DEBUG' fi + +## Previene en debian testing (probablemente superiores también) que no pregunte +## a cada instalación si deseamos reiniciar servicios. +#export DEBIAN_FRONTEND=noninteractive + ########################### ## FUNCIONES ## ########################### From f60a5296f8832aae165868e05df99ee6ab0acba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 30 Mar 2020 16:52:49 +0200 Subject: [PATCH 60/71] =?UTF-8?q?A=C3=B1ado=20repositorio=20para=20anydesk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Repositorios/debian/comunes.sh | 3 +++ Repositorios/debian/comunes/sources.list.d/anydesk.list | 1 + 2 files changed, 4 insertions(+) create mode 100644 Repositorios/debian/comunes/sources.list.d/anydesk.list diff --git a/Repositorios/debian/comunes.sh b/Repositorios/debian/comunes.sh index 0e021b8f..f68fe7e3 100644 --- a/Repositorios/debian/comunes.sh +++ b/Repositorios/debian/comunes.sh @@ -127,6 +127,9 @@ comunes_agregar_llaves() { ## QOwnNotes wget http://download.opensuse.org/repositories/home:/pbek:/QOwnNotes/Debian_10/Release.key -O - | sudo apt-key add - + + ## Any Desk + wget -qO - https://keys.anydesk.com/repos/DEB-GPG-KEY | sudo apt-key add - } ## diff --git a/Repositorios/debian/comunes/sources.list.d/anydesk.list b/Repositorios/debian/comunes/sources.list.d/anydesk.list new file mode 100644 index 00000000..1d57a7a6 --- /dev/null +++ b/Repositorios/debian/comunes/sources.list.d/anydesk.list @@ -0,0 +1 @@ +deb http://deb.anydesk.com/ all main \ No newline at end of file From 3e4d1625c8df3cf0c8cfa5399b6c9ea805b74d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 30 Mar 2020 18:02:26 +0200 Subject: [PATCH 61/71] =?UTF-8?q?Actualizo=20y=20mejoro=20el=20apartado=20?= =?UTF-8?q?de=20personalizaci=C3=B3n=20adapt=C3=A1ndolo=20y=20refactorizan?= =?UTF-8?q?do?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Personalizar/0_Main.sh | 40 +++++++++------- Personalizar/cursors.sh | 46 +++++++++++++++++++ Personalizar/{Tipografias.sh => fonts.sh} | 4 +- Personalizar/grub.sh | 28 +++++++++++ .../{Personalizacion_GTK.sh => gtk.sh} | 40 +++++++--------- Personalizar/gtk2.sh | 28 +++++++++++ Personalizar/gtk3.sh | 28 +++++++++++ Personalizar/gtk4.sh | 28 +++++++++++ Personalizar/{iconos.sh => icons.sh} | 36 +++++++++++---- Personalizar/qt.sh | 28 +++++++++++ .../debian/Personalizar/cursors.lst | 1 + .../{tipografias.lst => fonts.lst} | 0 .../debian/Personalizar/gnome_shell.lst | 4 ++ Software-Lists/debian/Personalizar/gtk.lst | 1 + .../Personalizar/gtk2.lst} | 0 Software-Lists/debian/Personalizar/gtk3.lst | 0 Software-Lists/debian/Personalizar/gtk4.lst | 0 Software-Lists/debian/Personalizar/icons.lst | 1 + Software-Lists/debian/Personalizar/qt.lst | 0 .../fedora/Personalizar/cursors.lst | 0 .../{tipografias.lst => fonts.lst} | 0 .../fedora/Personalizar/gnome_shell.lst | 0 Software-Lists/fedora/Personalizar/gtk.lst | 0 Software-Lists/fedora/Personalizar/gtk2.lst | 0 Software-Lists/fedora/Personalizar/gtk3.lst | 0 Software-Lists/fedora/Personalizar/gtk4.lst | 0 Software-Lists/fedora/Personalizar/icons.lst | 0 Software-Lists/fedora/Personalizar/qt.lst | 0 .../gentoo/Personalizar/cursors.lst | 0 .../{tipografias.lst => fonts.lst} | 0 .../gentoo/Personalizar/gnome_shell.lst | 0 Software-Lists/gentoo/Personalizar/gtk.lst | 0 Software-Lists/gentoo/Personalizar/gtk2.lst | 0 Software-Lists/gentoo/Personalizar/gtk3.lst | 0 Software-Lists/gentoo/Personalizar/gtk4.lst | 0 Software-Lists/gentoo/Personalizar/icons.lst | 0 Software-Lists/gentoo/Personalizar/qt.lst | 0 .../raspbian/Personalizar/cursors.lst | 0 .../raspbian/Personalizar/fonts.lst | 0 .../raspbian/Personalizar/gnome_shell.lst | 0 Software-Lists/raspbian/Personalizar/gtk.lst | 0 Software-Lists/raspbian/Personalizar/gtk2.lst | 0 Software-Lists/raspbian/Personalizar/gtk3.lst | 0 Software-Lists/raspbian/Personalizar/gtk4.lst | 0 .../raspbian/Personalizar/icons.lst | 0 Software-Lists/raspbian/Personalizar/qt.lst | 0 46 files changed, 261 insertions(+), 52 deletions(-) create mode 100644 Personalizar/cursors.sh rename Personalizar/{Tipografias.sh => fonts.sh} (97%) create mode 100644 Personalizar/grub.sh rename Personalizar/{Personalizacion_GTK.sh => gtk.sh} (91%) create mode 100644 Personalizar/gtk2.sh create mode 100644 Personalizar/gtk3.sh create mode 100644 Personalizar/gtk4.sh rename Personalizar/{iconos.sh => icons.sh} (80%) create mode 100644 Personalizar/qt.sh create mode 100644 Software-Lists/debian/Personalizar/cursors.lst rename Software-Lists/debian/Personalizar/{tipografias.lst => fonts.lst} (100%) create mode 100644 Software-Lists/debian/Personalizar/gnome_shell.lst create mode 100644 Software-Lists/debian/Personalizar/gtk.lst rename Software-Lists/{raspbian/Personalizar/tipografias.lst => debian/Personalizar/gtk2.lst} (100%) create mode 100644 Software-Lists/debian/Personalizar/gtk3.lst create mode 100644 Software-Lists/debian/Personalizar/gtk4.lst create mode 100644 Software-Lists/debian/Personalizar/icons.lst create mode 100644 Software-Lists/debian/Personalizar/qt.lst create mode 100644 Software-Lists/fedora/Personalizar/cursors.lst rename Software-Lists/fedora/Personalizar/{tipografias.lst => fonts.lst} (100%) create mode 100644 Software-Lists/fedora/Personalizar/gnome_shell.lst create mode 100644 Software-Lists/fedora/Personalizar/gtk.lst create mode 100644 Software-Lists/fedora/Personalizar/gtk2.lst create mode 100644 Software-Lists/fedora/Personalizar/gtk3.lst create mode 100644 Software-Lists/fedora/Personalizar/gtk4.lst create mode 100644 Software-Lists/fedora/Personalizar/icons.lst create mode 100644 Software-Lists/fedora/Personalizar/qt.lst create mode 100644 Software-Lists/gentoo/Personalizar/cursors.lst rename Software-Lists/gentoo/Personalizar/{tipografias.lst => fonts.lst} (100%) create mode 100644 Software-Lists/gentoo/Personalizar/gnome_shell.lst create mode 100644 Software-Lists/gentoo/Personalizar/gtk.lst create mode 100644 Software-Lists/gentoo/Personalizar/gtk2.lst create mode 100644 Software-Lists/gentoo/Personalizar/gtk3.lst create mode 100644 Software-Lists/gentoo/Personalizar/gtk4.lst create mode 100644 Software-Lists/gentoo/Personalizar/icons.lst create mode 100644 Software-Lists/gentoo/Personalizar/qt.lst create mode 100644 Software-Lists/raspbian/Personalizar/cursors.lst create mode 100644 Software-Lists/raspbian/Personalizar/fonts.lst create mode 100644 Software-Lists/raspbian/Personalizar/gnome_shell.lst create mode 100644 Software-Lists/raspbian/Personalizar/gtk.lst create mode 100644 Software-Lists/raspbian/Personalizar/gtk2.lst create mode 100644 Software-Lists/raspbian/Personalizar/gtk3.lst create mode 100644 Software-Lists/raspbian/Personalizar/gtk4.lst create mode 100644 Software-Lists/raspbian/Personalizar/icons.lst create mode 100644 Software-Lists/raspbian/Personalizar/qt.lst diff --git a/Personalizar/0_Main.sh b/Personalizar/0_Main.sh index b367cd77..ebc7d45d 100644 --- a/Personalizar/0_Main.sh +++ b/Personalizar/0_Main.sh @@ -21,10 +21,12 @@ ## IMPORTACIONES ## ############################ source "$WORKSCRIPT/Personalizar/Configurar_GIT.sh" -source "$WORKSCRIPT/Personalizar/Personalizacion_GTK.sh" -source "$WORKSCRIPT/Personalizar/Tipografias.sh" -source "$WORKSCRIPT/Personalizar/iconos.sh" +source "$WORKSCRIPT/Personalizar/gtk.sh" +source "$WORKSCRIPT/Personalizar/fonts.sh" +source "$WORKSCRIPT/Personalizar/icons.sh" source "$WORKSCRIPT/Personalizar/Terminales.sh" +source "$WORKSCRIPT/Personalizar/cursors.sh" +source "$WORKSCRIPT/Personalizar/qt.sh" ############################ ## FUNCIONES ## @@ -34,9 +36,11 @@ menuPersonalizacion() { clear_screen echo -e "$VE Instalando todas las personalizaciones$CL" configuracion_git - agregar_fuentes - instalar_iconos - personalizarGTK + fonts_install + icons_install + cursors_install + gtk_install + qt_install terminales_instalador } @@ -47,11 +51,13 @@ menuPersonalizacion() { clear_screen local descripcion='Menú de Personalización del sistema 1) Configurar GIT - 2) Tipografías - 3) Instalar Iconos - 4) Personalizar GTK - 5) Configurar Terminales (Tilix y Terminator) - 6) Todos los pasos anteriores + 2) Tipografías (Fuentes) + 3) Iconos + 4) Cursores + 5) Personalizar GTK + 6) Personalizar QT + 7) Configurar Terminales + 8) Todos los pasos anteriores 0) Atrás ' @@ -64,11 +70,13 @@ menuPersonalizacion() { case $entrada in 1) configuracion_git;; ## Configurar GIT - 2) agregar_fuentes;; ## Tipografías - 3) instalar_iconos;; ## Iconos Personalizados - 4) personalizarGTK;; ## Personalizar GTK - 5) terminales_instalador;; ## Configura terminales - 6) todas_personalizaciones;; ## Todos los pasos anteriores + 2) fonts_install;; ## Tipografías + 3) icons_install;; ## Iconos Personalizados + 4) cursors_install;; ## Cursores Personalizados + 5) gtk_install;; ## Personalizar GTK + 6) qt_install;; ## Personalizar QT + 7) terminales_instalador;; ## Configurar tTerminales + 8) todas_personalizaciones;; ## Todos los pasos anteriores 0) ## SALIR clear_screen diff --git a/Personalizar/cursors.sh b/Personalizar/cursors.sh new file mode 100644 index 00000000..35aa61ef --- /dev/null +++ b/Personalizar/cursors.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2020 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email dev@fryntiz.es +## @web https://fryntiz.es +## @github https://github.com/fryntiz +## @gitlab https://gitlab.com/fryntiz +## @twitter https://twitter.com/fryntiz +## +## Guía de estilos aplicada: +## @style https://github.com/fryntiz/bash-guide-style + +############################ +## INSTRUCCIONES ## +############################ +## Instala cursores + +############################ +## FUNCIONES ## +############################ + +cursors_install() { + echo -e "$VE Instalando $RO Cursores$CL" + instalarSoftwareLista "$SOFTLIST/Personalizar/cursors.lst" + + echo -e "$VE Configurando cursor$RO Crystalblue$VE por defecto$CL" + + update-alternatives --set x-cursor-theme /etc/X11/cursors/crystalblue.theme + + sudo update-alternatives --set x-cursor-theme /etc/X11/cursors/crystalblue.theme + + if [[ ! -d "$HOME/.icons" ]]; then + mkdir "$HOME/.icons" + fi + + ## Enlazo en el usuario hacia los iconos crystalblue + if [[ ! -d "$HOME/.icons/default" ]] && + [[ -f '/etc/X11/cursors/crystalblue.theme' ]] + then + mkdir "$HOME/.icons/default" + ln -s '/etc/X11/cursors/crystalblue.theme' "$HOME/.icons/default/index.theme" + fi +} diff --git a/Personalizar/Tipografias.sh b/Personalizar/fonts.sh similarity index 97% rename from Personalizar/Tipografias.sh rename to Personalizar/fonts.sh index 06785d5a..0f5c64ff 100755 --- a/Personalizar/Tipografias.sh +++ b/Personalizar/fonts.sh @@ -29,7 +29,7 @@ fuentes_repositorios() { echo -e "$VE Instalando fuentes desde$RO repositorios$CL" - instalarSoftwareLista "$SOFTLIST/Personalizar/tipografias.lst" + instalarSoftwareLista "$SOFTLIST/Personalizar/fonts.lst" } fuentes_download() { @@ -99,7 +99,7 @@ fuentes_locales() { done } -agregar_fuentes() { +fonts_install() { echo -e "$VE Añadiendo$RO fuentes Tipográficas$VE al sistema$CL" fuentes_repositorios diff --git a/Personalizar/grub.sh b/Personalizar/grub.sh new file mode 100644 index 00000000..67d4ffa7 --- /dev/null +++ b/Personalizar/grub.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2020 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email dev@fryntiz.es +## @web https://fryntiz.es +## @github https://github.com/fryntiz +## @gitlab https://gitlab.com/fryntiz +## @twitter https://twitter.com/fryntiz +## +## Guía de estilos aplicada: +## @style https://github.com/fryntiz/bash-guide-style + +############################ +## INSTRUCCIONES ## +############################ +## Personalizando GRUB + +############################ +## FUNCIONES ## +############################ + +grub_install() { + echo -e "$VE Personalizando $RO GRUB$CL" + instalarSoftwareLista "$SOFTLIST/Personalizar/grub.lst" +} diff --git a/Personalizar/Personalizacion_GTK.sh b/Personalizar/gtk.sh similarity index 91% rename from Personalizar/Personalizacion_GTK.sh rename to Personalizar/gtk.sh index 58d5d20c..f5f65214 100755 --- a/Personalizar/Personalizacion_GTK.sh +++ b/Personalizar/gtk.sh @@ -23,29 +23,15 @@ ## Además también configura el tema de grub ############################ -## FUNCIONES ## +## IMPORTACIONES ## ############################ -configurar_cursores() { - echo -e "$VE Configurando pack de cursores$CL" - instalarSoftware 'crystalcursors' - - update-alternatives --set x-cursor-theme /etc/X11/cursors/crystalblue.theme - - sudo update-alternatives --set x-cursor-theme /etc/X11/cursors/crystalblue.theme - - if [[ ! -d "$HOME/.icons" ]]; then - mkdir "$HOME/.icons" - fi - - ## Enlazo en el usuario hacia los iconos crystalblue - if [[ ! -d "$HOME/.icons/default" ]] && - [[ -f '/etc/X11/cursors/crystalblue.theme' ]] - then - mkdir "$HOME/.icons/default" - ln -s '/etc/X11/cursors/crystalblue.theme' "$HOME/.icons/default/index.theme" - fi -} +source "$WORKSCRIPT/Personalizar/gtk2.sh" +source "$WORKSCRIPT/Personalizar/gtk3.sh" +source "$WORKSCRIPT/Personalizar/gtk4.sh" +############################ +## FUNCIONES ## +############################ configurar_temas() { echo -e "$VE Configurando temas GTK$CL" instalarSoftware 'gtk2-engines-murrine' @@ -99,6 +85,7 @@ instalar_flatplat() { ## Actualizar repositorio para Flat-Plat echo -e "$VE Actualizando Repositorio de$RO Flat-Plat$CL" cd "$WORKSCRIPT/tmp/Materia_Theme_Flat-Plat/" || return + git checkout -- . git pull cd "$WORKSCRIPT" || return else @@ -181,28 +168,33 @@ conf_gnome3() { preconfiguracion_gnome3() { echo -e "$VE Instalando software para configurar$RO Gnome-Shell 3$CL" - instalarSoftware 'gconf2 dconf-cli' 'dconf-editor' 'dconf-gsettings-backend' + instalarSoftwareLista "$SOFTLIST/Personalizar/gnome_shell.lst" } conf_gtk2() { echo -e "$VE Configurando$RO GTK 2$CL" enlazarHome '.config/gtk-2.0' + gtk2_install } conf_gtk3() { echo -e "$VE Configurando$RO GTK 3$CL" enlazarHome '.config/gtk-3.0' + gtk3_install } conf_gtk4() { echo -e "$VE Configurando$RO GTK 4$CL" enlazarHome '.config/gtk-4.0' + gtk4_install } -personalizarGTK() { +gtk_install() { echo -e "$VE Iniciando configuracion de estética general y GTK$CL" + + instalarSoftwareLista "$SOFTLIST/Personalizar/gtk.lst" + instalar_flatplat - configurar_cursores configurar_temas configurar_grub configurar_fondos diff --git a/Personalizar/gtk2.sh b/Personalizar/gtk2.sh new file mode 100644 index 00000000..bc2cba51 --- /dev/null +++ b/Personalizar/gtk2.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2020 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email dev@fryntiz.es +## @web https://fryntiz.es +## @github https://github.com/fryntiz +## @gitlab https://gitlab.com/fryntiz +## @twitter https://twitter.com/fryntiz +## +## Guía de estilos aplicada: +## @style https://github.com/fryntiz/bash-guide-style + +############################ +## INSTRUCCIONES ## +############################ +## Instala GTK2 + +############################ +## FUNCIONES ## +############################ + +gtk2_install() { + echo -e "$VE Instalando $RO GTK2$CL" + instalarSoftwareLista "$SOFTLIST/Personalizar/gtk2.lst" +} diff --git a/Personalizar/gtk3.sh b/Personalizar/gtk3.sh new file mode 100644 index 00000000..049f80e2 --- /dev/null +++ b/Personalizar/gtk3.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2020 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email dev@fryntiz.es +## @web https://fryntiz.es +## @github https://github.com/fryntiz +## @gitlab https://gitlab.com/fryntiz +## @twitter https://twitter.com/fryntiz +## +## Guía de estilos aplicada: +## @style https://github.com/fryntiz/bash-guide-style + +############################ +## INSTRUCCIONES ## +############################ +## Instala GTK3 + +############################ +## FUNCIONES ## +############################ + +gtk3_install() { + echo -e "$VE Instalando $RO GTK3$CL" + instalarSoftwareLista "$SOFTLIST/Personalizar/gtk3.lst" +} diff --git a/Personalizar/gtk4.sh b/Personalizar/gtk4.sh new file mode 100644 index 00000000..41f300d6 --- /dev/null +++ b/Personalizar/gtk4.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2020 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email dev@fryntiz.es +## @web https://fryntiz.es +## @github https://github.com/fryntiz +## @gitlab https://gitlab.com/fryntiz +## @twitter https://twitter.com/fryntiz +## +## Guía de estilos aplicada: +## @style https://github.com/fryntiz/bash-guide-style + +############################ +## INSTRUCCIONES ## +############################ +## Instala GTK4 + +############################ +## FUNCIONES ## +############################ + +gtk4_install() { + echo -e "$VE Instalando $RO GTK4$CL" + instalarSoftwareLista "$SOFTLIST/Personalizar/gtk4.lst" +} diff --git a/Personalizar/iconos.sh b/Personalizar/icons.sh similarity index 80% rename from Personalizar/iconos.sh rename to Personalizar/icons.sh index 8655e39d..6629d9c7 100644 --- a/Personalizar/iconos.sh +++ b/Personalizar/icons.sh @@ -21,26 +21,42 @@ ############################ ## FUNCIONES ## ############################ -instalar_iconos() { - echo -e "$VE Instalando iconos personalizados dentro de$RO /usr/share/icons/fryntiz$CL" - if [[ -d '/usr/share/icons/fryntiz' ]]; then - sudo rm -Rf '/usr/share/icons/fryntiz' - fi - sudo cp -r "$WORKSCRIPT/conf/usr/share/icons/fryntiz" '/usr/share/icons/fryntiz' - sudo chmod 755 -R '/usr/share/icons/fryntiz' - iconos_paper_theme() { +icons_debian() { + theme_paper() { echo -e "$VE Descargando pack de iconos$RO Paper Theme$CL" - descargar 'Paper_Theme.deb' 'https://snwh.org/paper/download.php?owner=snwh&ppa=pulp&pkg=paper-gtk-theme,16.04' + descargar 'Paper_Theme.deb' 'https://launchpadlibrarian.net/468844787/paper-icon-theme_1.5.728-202003121505~daily~ubuntu18.04.1_all.deb' echo -e "$VE Instalando iconos$RO Paper_Theme$CL" instalarSoftwareDPKG "$WORKSCRIPT/tmp/Paper_Theme.deb" } - iconos_paper_theme + theme_paper ## Establece iconos Paper en uso gconftool-2 --type string --set /desktop/gnome/interface/icon_theme 'Paper' +} + +icons_install() { + echo -e "$VE Instalando iconos personalizados dentro de$RO /usr/share/icons/fryntiz$CL" + if [[ -d '/usr/share/icons/fryntiz' ]]; then + sudo rm -Rf '/usr/share/icons/fryntiz' + fi + + sudo cp -r "$WORKSCRIPT/conf/usr/share/icons/fryntiz" '/usr/share/icons/fryntiz' + + sudo chmod 755 -R '/usr/share/icons/fryntiz' + + + if [[ "$DISTRO" = 'debian' ]]; then + icons_debian + fi + + if [[ "$DISTRO" = 'raspberry' ]]; then + icons_debian + fi + + instalarSoftwareLista "$SOFTLIST/Personalizar/icons.lst" ## Lo enlazo para que se usen por defecto con el usuario if [[ -d "$HOME/.local/share/icons/default" ]]; then diff --git a/Personalizar/qt.sh b/Personalizar/qt.sh new file mode 100644 index 00000000..fff3c518 --- /dev/null +++ b/Personalizar/qt.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2020 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email dev@fryntiz.es +## @web https://fryntiz.es +## @github https://github.com/fryntiz +## @gitlab https://gitlab.com/fryntiz +## @twitter https://twitter.com/fryntiz +## +## Guía de estilos aplicada: +## @style https://github.com/fryntiz/bash-guide-style + +############################ +## INSTRUCCIONES ## +############################ +## Instala QT + +############################ +## FUNCIONES ## +############################ + +qt_install() { + echo -e "$VE Personalizando $RO QT$CL" + instalarSoftwareLista "$SOFTLIST/Personalizar/qt.lst" +} diff --git a/Software-Lists/debian/Personalizar/cursors.lst b/Software-Lists/debian/Personalizar/cursors.lst new file mode 100644 index 00000000..fa6d9633 --- /dev/null +++ b/Software-Lists/debian/Personalizar/cursors.lst @@ -0,0 +1 @@ +crystalcursors diff --git a/Software-Lists/debian/Personalizar/tipografias.lst b/Software-Lists/debian/Personalizar/fonts.lst similarity index 100% rename from Software-Lists/debian/Personalizar/tipografias.lst rename to Software-Lists/debian/Personalizar/fonts.lst diff --git a/Software-Lists/debian/Personalizar/gnome_shell.lst b/Software-Lists/debian/Personalizar/gnome_shell.lst new file mode 100644 index 00000000..52459bea --- /dev/null +++ b/Software-Lists/debian/Personalizar/gnome_shell.lst @@ -0,0 +1,4 @@ +gconf2 +dconf-cli +dconf-editor +dconf-gsettings-backend diff --git a/Software-Lists/debian/Personalizar/gtk.lst b/Software-Lists/debian/Personalizar/gtk.lst new file mode 100644 index 00000000..78dfbf8a --- /dev/null +++ b/Software-Lists/debian/Personalizar/gtk.lst @@ -0,0 +1 @@ +materia-gtk-theme diff --git a/Software-Lists/raspbian/Personalizar/tipografias.lst b/Software-Lists/debian/Personalizar/gtk2.lst similarity index 100% rename from Software-Lists/raspbian/Personalizar/tipografias.lst rename to Software-Lists/debian/Personalizar/gtk2.lst diff --git a/Software-Lists/debian/Personalizar/gtk3.lst b/Software-Lists/debian/Personalizar/gtk3.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/debian/Personalizar/gtk4.lst b/Software-Lists/debian/Personalizar/gtk4.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/debian/Personalizar/icons.lst b/Software-Lists/debian/Personalizar/icons.lst new file mode 100644 index 00000000..5ba17611 --- /dev/null +++ b/Software-Lists/debian/Personalizar/icons.lst @@ -0,0 +1 @@ +papirus-icon-theme diff --git a/Software-Lists/debian/Personalizar/qt.lst b/Software-Lists/debian/Personalizar/qt.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Personalizar/cursors.lst b/Software-Lists/fedora/Personalizar/cursors.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Personalizar/tipografias.lst b/Software-Lists/fedora/Personalizar/fonts.lst similarity index 100% rename from Software-Lists/fedora/Personalizar/tipografias.lst rename to Software-Lists/fedora/Personalizar/fonts.lst diff --git a/Software-Lists/fedora/Personalizar/gnome_shell.lst b/Software-Lists/fedora/Personalizar/gnome_shell.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Personalizar/gtk.lst b/Software-Lists/fedora/Personalizar/gtk.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Personalizar/gtk2.lst b/Software-Lists/fedora/Personalizar/gtk2.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Personalizar/gtk3.lst b/Software-Lists/fedora/Personalizar/gtk3.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Personalizar/gtk4.lst b/Software-Lists/fedora/Personalizar/gtk4.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Personalizar/icons.lst b/Software-Lists/fedora/Personalizar/icons.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/fedora/Personalizar/qt.lst b/Software-Lists/fedora/Personalizar/qt.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Personalizar/cursors.lst b/Software-Lists/gentoo/Personalizar/cursors.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Personalizar/tipografias.lst b/Software-Lists/gentoo/Personalizar/fonts.lst similarity index 100% rename from Software-Lists/gentoo/Personalizar/tipografias.lst rename to Software-Lists/gentoo/Personalizar/fonts.lst diff --git a/Software-Lists/gentoo/Personalizar/gnome_shell.lst b/Software-Lists/gentoo/Personalizar/gnome_shell.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Personalizar/gtk.lst b/Software-Lists/gentoo/Personalizar/gtk.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Personalizar/gtk2.lst b/Software-Lists/gentoo/Personalizar/gtk2.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Personalizar/gtk3.lst b/Software-Lists/gentoo/Personalizar/gtk3.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Personalizar/gtk4.lst b/Software-Lists/gentoo/Personalizar/gtk4.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Personalizar/icons.lst b/Software-Lists/gentoo/Personalizar/icons.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Personalizar/qt.lst b/Software-Lists/gentoo/Personalizar/qt.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/cursors.lst b/Software-Lists/raspbian/Personalizar/cursors.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/fonts.lst b/Software-Lists/raspbian/Personalizar/fonts.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/gnome_shell.lst b/Software-Lists/raspbian/Personalizar/gnome_shell.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/gtk.lst b/Software-Lists/raspbian/Personalizar/gtk.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/gtk2.lst b/Software-Lists/raspbian/Personalizar/gtk2.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/gtk3.lst b/Software-Lists/raspbian/Personalizar/gtk3.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/gtk4.lst b/Software-Lists/raspbian/Personalizar/gtk4.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/icons.lst b/Software-Lists/raspbian/Personalizar/icons.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/qt.lst b/Software-Lists/raspbian/Personalizar/qt.lst new file mode 100644 index 00000000..e69de29b From 4cc87f1bc623c8c6ab20714197fb0eca771772d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 2 Apr 2020 00:30:58 +0200 Subject: [PATCH 62/71] =?UTF-8?q?A=C3=B1ado=20aplicaciones=20para=203d?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Software-Lists/debian/Dise\303\261o-grafico/3d.lst" | 3 +++ conf/home/.config/gtk-2.0/gtkfilechooser.ini | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git "a/Software-Lists/debian/Dise\303\261o-grafico/3d.lst" "b/Software-Lists/debian/Dise\303\261o-grafico/3d.lst" index e69de29b..0f3d3ca2 100644 --- "a/Software-Lists/debian/Dise\303\261o-grafico/3d.lst" +++ "b/Software-Lists/debian/Dise\303\261o-grafico/3d.lst" @@ -0,0 +1,3 @@ +cura +prusa-slicer +blender \ No newline at end of file diff --git a/conf/home/.config/gtk-2.0/gtkfilechooser.ini b/conf/home/.config/gtk-2.0/gtkfilechooser.ini index dd042c4c..a4cd1ab9 100644 --- a/conf/home/.config/gtk-2.0/gtkfilechooser.ini +++ b/conf/home/.config/gtk-2.0/gtkfilechooser.ini @@ -2,8 +2,8 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=1885 -GeometryY=247 +GeometryX=0 +GeometryY=0 GeometryWidth=882 GeometryHeight=578 SortColumn=name From d630e2c51b469898ce1c8c9dd23f7f4db28263cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 2 Apr 2020 00:53:04 +0200 Subject: [PATCH 63/71] =?UTF-8?q?A=C3=B1ado=20dependencia=20para=20cura?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "Software-Lists/debian/Dise\303\261o-grafico/3d.lst" | 1 + 1 file changed, 1 insertion(+) diff --git "a/Software-Lists/debian/Dise\303\261o-grafico/3d.lst" "b/Software-Lists/debian/Dise\303\261o-grafico/3d.lst" index 0f3d3ca2..ed054970 100644 --- "a/Software-Lists/debian/Dise\303\261o-grafico/3d.lst" +++ "b/Software-Lists/debian/Dise\303\261o-grafico/3d.lst" @@ -1,3 +1,4 @@ cura +python3-cryptography prusa-slicer blender \ No newline at end of file From 8fcd8dcb479342f123317affb26484bfa2bc565c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 2 Apr 2020 19:38:54 +0200 Subject: [PATCH 64/71] =?UTF-8?q?A=C3=B1ado=20instalaci=C3=B3n=20para=20de?= =?UTF-8?q?pendencias=20al=20desarrollar=20android?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lenguajes-Programacion/0_Main.sh | 8 +++- Lenguajes-Programacion/android.sh | 42 +++++++++++++++++++ .../debian/comunes/sources.list.d/docker.list | 2 +- .../debian/Lenguajes-Programacion/android.lst | 20 +++++++++ Software-Lists/debian/Personalizar/fonts.lst | 1 - .../fedora/Lenguajes-Programacion/android.lst | 0 .../gentoo/Lenguajes-Programacion/android.lst | 0 .../Lenguajes-Programacion/android.lst | 0 .../raspbian/Personalizar/fonts.lst | 1 + Usuario/0_Main.sh | 8 ++-- 10 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 Lenguajes-Programacion/android.sh create mode 100644 Software-Lists/debian/Lenguajes-Programacion/android.lst create mode 100644 Software-Lists/fedora/Lenguajes-Programacion/android.lst create mode 100644 Software-Lists/gentoo/Lenguajes-Programacion/android.lst create mode 100644 Software-Lists/raspbian/Lenguajes-Programacion/android.lst diff --git a/Lenguajes-Programacion/0_Main.sh b/Lenguajes-Programacion/0_Main.sh index e747fa9d..830a0b03 100644 --- a/Lenguajes-Programacion/0_Main.sh +++ b/Lenguajes-Programacion/0_Main.sh @@ -29,6 +29,7 @@ source "$WORKSCRIPT/Lenguajes-Programacion/php.sh" source "$WORKSCRIPT/Lenguajes-Programacion/python.sh" source "$WORKSCRIPT/Lenguajes-Programacion/ruby.sh" source "$WORKSCRIPT/Lenguajes-Programacion/perl.sh" +source "$WORKSCRIPT/Lenguajes-Programacion/android.sh" ########################### ## FUNCIONES ## @@ -49,6 +50,7 @@ menuLenguajes() { go_instalador c_instalador perl_instalador + android_instalador fi } @@ -68,7 +70,8 @@ menuLenguajes() { 4) Go 5) C y C++ 6) Perl - 7) Todos los pasos anteriores + 7) Android + 8) Todos los pasos anteriores 0) Atrás ' @@ -86,7 +89,8 @@ menuLenguajes() { 4) go_instalador;; ## Instala Go 5) c_instalador;; ## Instala C y C++ 6) perl_instalador;; ## Instala C y C++ - 7) todos_lenguajes ## Todos los lenguajes + 7) android_instalador;; ## Instala Android + 8) todos_lenguajes ## Todos los lenguajes break;; 0) ## SALIR diff --git a/Lenguajes-Programacion/android.sh b/Lenguajes-Programacion/android.sh new file mode 100644 index 00000000..660c257a --- /dev/null +++ b/Lenguajes-Programacion/android.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2018 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email dev@fryntiz.es +## @web https://fryntiz.es +## @github https://github.com/fryntiz +## @gitlab https://gitlab.com/fryntiz +## @twitter https://twitter.com/fryntiz +## +## Guía de estilos aplicada: +## @style https://gitlab.com/fryntiz/bash-guide-style + +############################ +## INSTRUCCIONES ## +############################ + +android_descargar() { + echo -e "$VE Descargando$RO Android$CL" +} + +android_preconfiguracion() { + echo -e "$VE Generando Pre-Configuraciones de$RO Android$CL" +} + +android_instalar() { + echo -e "$VE Instalando$RO Android$CL" + instalarSoftwareLista "$SOFTLIST/Lenguajes-Programacion/android.lst" +} + +android_postconfiguracion() { + echo -e "$VE Generando Post-Configuraciones de$RO Android$CL" +} + +android_instalador() { + android_descargar + android_preconfiguracion + android_instalar + android_postconfiguracion +} diff --git a/Repositorios/debian/comunes/sources.list.d/docker.list b/Repositorios/debian/comunes/sources.list.d/docker.list index 2d152180..1ac07d4e 100644 --- a/Repositorios/debian/comunes/sources.list.d/docker.list +++ b/Repositorios/debian/comunes/sources.list.d/docker.list @@ -2,4 +2,4 @@ ## DOCKER ## ######################################################## ####sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys F76221572C52609D -deb https://apt.dockerproject.org/repo debian-stretch main +#deb https://apt.dockerproject.org/repo debian-stretch main diff --git a/Software-Lists/debian/Lenguajes-Programacion/android.lst b/Software-Lists/debian/Lenguajes-Programacion/android.lst new file mode 100644 index 00000000..f8d8c7e8 --- /dev/null +++ b/Software-Lists/debian/Lenguajes-Programacion/android.lst @@ -0,0 +1,20 @@ +adb +abootimg +android-tools-fastboot +android-tools-adb +android-tools-mkbootimg +android-sdk +android-sdk-platform-tools +android-sdk-libsparse-utils +android-sdk-ext4-utils +android-sdk-build-tools +apkinfo +apksigner +apktool +libc6:i386 +libncurses5:i386 +libstdc++6:i386 +lib32z1 +libbz2-1.0:i386 +lib32stdc++6 +unzip \ No newline at end of file diff --git a/Software-Lists/debian/Personalizar/fonts.lst b/Software-Lists/debian/Personalizar/fonts.lst index 045c65a8..5616a4be 100644 --- a/Software-Lists/debian/Personalizar/fonts.lst +++ b/Software-Lists/debian/Personalizar/fonts.lst @@ -1,7 +1,6 @@ fonts-powerline fonts-freefont-ttf fonts-hack -fonts-hack-ttf fonts-lmodern fonts-font-awesome fonts-inconsolata diff --git a/Software-Lists/fedora/Lenguajes-Programacion/android.lst b/Software-Lists/fedora/Lenguajes-Programacion/android.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/gentoo/Lenguajes-Programacion/android.lst b/Software-Lists/gentoo/Lenguajes-Programacion/android.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Lenguajes-Programacion/android.lst b/Software-Lists/raspbian/Lenguajes-Programacion/android.lst new file mode 100644 index 00000000..e69de29b diff --git a/Software-Lists/raspbian/Personalizar/fonts.lst b/Software-Lists/raspbian/Personalizar/fonts.lst index e69de29b..b6430161 100644 --- a/Software-Lists/raspbian/Personalizar/fonts.lst +++ b/Software-Lists/raspbian/Personalizar/fonts.lst @@ -0,0 +1 @@ +fonts-hack \ No newline at end of file diff --git a/Usuario/0_Main.sh b/Usuario/0_Main.sh index 2188d562..0baa4c06 100644 --- a/Usuario/0_Main.sh +++ b/Usuario/0_Main.sh @@ -11,7 +11,7 @@ ## @twitter https://twitter.com/fryntiz ## ## Guía de estilos aplicada: -## @style https://gitlab.com/fryntiz/Bash_Style_Guide +## @style https://gitlab.com/fryntiz/bash-guide-style ############################ ## INSTRUCCIONES ## @@ -39,15 +39,15 @@ source "$WORKSCRIPT/Usuario/powerline.sh" ## FUNCIONES ## ########################### ## -## Mi generador de proyectos https://github.com/fryntiz/Generador_Proyectos.git +## Mi generador de proyectos https://github.com/fryntiz/project-generator ## Este generador de proyectos crea un script que permite generar la estructura ## para los proyectos más recurridos por mi (php, python, bash....) y después ## pregunta si subirlo automáticamente a GitHub ## generador_proyectos() { - descargarGIT 'Generador de Proyectos' 'https://github.com/fryntiz/Generador_Proyectos.git' "$WORKSCRIPT/tmp/Generador_Proyectos" + descargarGIT 'Generador de Proyectos' 'https://github.com/fryntiz/project-generator.git' "$WORKSCRIPT/tmp/project-generator" - cd "$WORKSCRIPT/tmp/Generador_Proyectos" || return 1 && ./instalar.sh + cd "$WORKSCRIPT/tmp/project-generator" || return 1 && ./instalar.sh cd "$WORKSCRIPT" || exit } ## From 008529b272d9fb56cbfcb4d7949c459ee30306ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Thu, 2 Apr 2020 23:38:25 +0200 Subject: [PATCH 65/71] =?UTF-8?q?Planteo=20instalaci=C3=B3n=20para=20el=20?= =?UTF-8?q?IDE=20de=20Android=20Studio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/IDEs/0_Main.sh | 5 ++- Apps/IDEs/android_studio.sh | 84 +++++++++++++++++++++++++++++++++++++ funciones.sh | 2 +- 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 Apps/IDEs/android_studio.sh diff --git a/Apps/IDEs/0_Main.sh b/Apps/IDEs/0_Main.sh index fa385ce9..faa81b9c 100644 --- a/Apps/IDEs/0_Main.sh +++ b/Apps/IDEs/0_Main.sh @@ -30,6 +30,7 @@ source "$WORKSCRIPT/Apps/IDEs/webstorm.sh" source "$WORKSCRIPT/Apps/IDEs/netbeans.sh" source "$WORKSCRIPT/Apps/IDEs/aptanastudio.sh" source "$WORKSCRIPT/Apps/IDEs/Arduino.sh" +source "$WORKSCRIPT/Apps/IDEs/android_studio.sh" ############################ ## FUNCIONES ## @@ -47,6 +48,7 @@ menuIDES() { phpstorm_instalador ninjaide_instalador pycharm_pro_instalador + android_studio } ## Si la función recibe "-a" indica que se instalen todos los IDES @@ -63,7 +65,7 @@ menuIDES() { 5) PyCharm Comunidad (No implementado) 6) Ninja IDE 7) NetBeans (No implementado) - 8) Aptana Studio (No implementado) + 8) Android Studio (Experimental) 9) Web Storm 10) Arduino 11) Todos los pasos anteriores @@ -84,6 +86,7 @@ menuIDES() { 4) pycharm_pro_instalador;; ## Instala Pycharm Profesional #5) ;; ## 6) ninjaide_instalador;; ## Instala Ninja IDE + 8) android_instalador; android_studio_instalador;; ## 9) webstorm_instalador;; ## 10) arduino_instalador;; ## 11) todos_IDES ## Todos los IDES diff --git a/Apps/IDEs/android_studio.sh b/Apps/IDEs/android_studio.sh new file mode 100644 index 00000000..433f8724 --- /dev/null +++ b/Apps/IDEs/android_studio.sh @@ -0,0 +1,84 @@ +#!/usr/bin/env bash +# -*- ENCODING: UTF-8 -*- +## +## @author Raúl Caro Pastorino +## @copyright Copyright © 2020 Raúl Caro Pastorino +## @license https://wwww.gnu.org/licenses/gpl.txt +## @email dev@fryntiz.es +## @web https://fryntiz.es +## @github https://github.com/fryntiz +## @gitlab https://gitlab.com/fryntiz +## @twitter https://twitter.com/fryntiz +## +## Guía de estilos aplicada: +## @style https://github.com/fryntiz/bash-guide-style + +############################ +## INSTRUCCIONES ## +############################ +## Descarga el IDE de Android + +############################ +## FUNCIONES ## +############################ + +android_studio_descargar() { + local url="${1}" + descargar "android_studio.tar.gz" "${url}" +} + +android_studio_preconfiguracion() { + echo -e "$VE Generando Pre-Configuraciones de$RO Android Studio$CL" + if [[ -d "$HOME/.local/opt/android_studio" ]]; then + rm -Rf "$HOME/.local/opt/android_studio" + fi + + if [[ -h "$HOME/.local/bin/android_studio" ]]; then + rm -f "$HOME/.local/bin/android_studio" + fi +} + +android_studio_instalar() { + echo -e "$VE Instalando$RO Android Studio$CL" + echo -e "$VE Extrayendo IDE$CL" + + cd "$WORKSCRIPT/tmp/" || return 0 + + tar -xvzf "android_studio.tar.gz" 2>> /dev/null + + if [[ -d "$WORKSCRIPT/tmp/android_studio" ]]; then + mv "$WORKSCRIPT/tmp/android_studio" "$HOME/.local/opt/android_studio" + fi + + cd "$WORKSCRIPT" || exit 1 +} + +android_studio_postconfiguracion() { + echo -e "$VE Generando Post-Configuraciones$RO arduino$CL" + + echo -e "$VE Generando comando$RO arduino$CL" + ln -s "$HOME/.local/opt/android_studio/studio.sh" "$HOME/.local/bin/android_studio" +} + +android_studio_instalador() { + echo -e "$VE Comenzando instalación de$RO Android Studio$CL" + local url='https://r1---sn-h5q7rn7s.gvt1.com/edgedl/android/studio/ide-zips/3.6.2.0/android-studio-ide-192.6308749-linux.tar.gz?cms_redirect=yes&mh=gl&mm=28&mn=sn-h5q7rn7s&ms=nvh&mt=1585862242&mv=u&mvi=0&pl=24&shardbypass=yes' + + android_studio_preconfiguracion + + if [[ -f "$HOME/.local/bin/android_studio" ]] && + [[ -d "$HOME/.local/opt/android_studio" ]] + then + echo -e "$VE Ya esta$RO Android Studio$VE instalado en el equipo, + omitiendo paso$CL" + else + if [[ -f "$WORKSCRIPT/tmp/${url}-linux64.tar.xz" ]]; then + android_studio_instalar "url" || rm -Rf "$WORKSCRIPT/tmp/android_studio.tar.gz" + else + android_studio_descargar "$url" + android_studio_instalar + fi + fi + + android_studio_postconfiguracion +} diff --git a/funciones.sh b/funciones.sh index 787bdf6d..483a6357 100644 --- a/funciones.sh +++ b/funciones.sh @@ -247,7 +247,7 @@ descargar() { fi echo -e "$VE Descargando$RO $1 $CL" - local REINTENTOS=10 + local REINTENTOS=20 for (( i=1; i<=$REINTENTOS; i++ )); do rm -f "$WORKSCRIPT/tmp/$1" 2>> /dev/null wget --show-progress "$2" -O "$WORKSCRIPT/tmp/$1" && break From bc5c85060f60b702053870077bf17651f4976bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Fri, 3 Apr 2020 00:20:58 +0200 Subject: [PATCH 66/71] =?UTF-8?q?Correcciones=20al=20crear=20enlaces=20hac?= =?UTF-8?q?ia=20el=20IDE=20y=20a=C3=B1ado=20variables=20de=20entorno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Apps/IDEs/android_studio.sh | 13 ++++++------- conf/home/.bashrc | 10 +++++++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Apps/IDEs/android_studio.sh b/Apps/IDEs/android_studio.sh index 433f8724..e7f87b5b 100644 --- a/Apps/IDEs/android_studio.sh +++ b/Apps/IDEs/android_studio.sh @@ -46,18 +46,18 @@ android_studio_instalar() { tar -xvzf "android_studio.tar.gz" 2>> /dev/null - if [[ -d "$WORKSCRIPT/tmp/android_studio" ]]; then - mv "$WORKSCRIPT/tmp/android_studio" "$HOME/.local/opt/android_studio" + if [[ -d "$WORKSCRIPT/tmp/android-studio" ]]; then + mv "$WORKSCRIPT/tmp/android-studio" "$HOME/.local/opt/android_studio" fi cd "$WORKSCRIPT" || exit 1 } android_studio_postconfiguracion() { - echo -e "$VE Generando Post-Configuraciones$RO arduino$CL" + echo -e "$VE Generando Post-Configuraciones$RO Android Studio$CL" - echo -e "$VE Generando comando$RO arduino$CL" - ln -s "$HOME/.local/opt/android_studio/studio.sh" "$HOME/.local/bin/android_studio" + echo -e "$VE Generando comando$RO Android Studio$CL" + ln -s "$HOME/.local/opt/android_studio/bin/studio.sh" "$HOME/.local/bin/android_studio" } android_studio_instalador() { @@ -69,8 +69,7 @@ android_studio_instalador() { if [[ -f "$HOME/.local/bin/android_studio" ]] && [[ -d "$HOME/.local/opt/android_studio" ]] then - echo -e "$VE Ya esta$RO Android Studio$VE instalado en el equipo, - omitiendo paso$CL" + echo -e "$VE Ya esta$RO Android Studio$VE instalado en el equipo, omitiendo paso$CL" else if [[ -f "$WORKSCRIPT/tmp/${url}-linux64.tar.xz" ]]; then android_studio_instalar "url" || rm -Rf "$WORKSCRIPT/tmp/android_studio.tar.gz" diff --git a/conf/home/.bashrc b/conf/home/.bashrc index 435a02ee..f601ff52 100644 --- a/conf/home/.bashrc +++ b/conf/home/.bashrc @@ -360,4 +360,12 @@ umask 007 # alias ls='devicons-ls' #fi - +################################### +### Configurando java y android ### +################################### +export JAVA_HOME=/usr/lib/jvm/java-14-openjdk-amd64 +export ANDROID_HOME=$HOME/Android/sdk +export ANDROID_SDK_ROOT=$HOME/Android/sdk +export ANDROID_AVD_HOME=$HOME/.android/avd +export PATH=$PATH:$ANDROID_HOME/tools +export PATH=$PATH:$ANDROID_HOME/platform-tools \ No newline at end of file From edf59e2081665ac145cb28f17b24a26098ae8700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Fri, 3 Apr 2020 18:37:51 +0200 Subject: [PATCH 67/71] Agrego alias para poder mostrar lista de commits firmados a modo de log --- conf/home/.bashrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/home/.bashrc b/conf/home/.bashrc index f601ff52..a64c7980 100644 --- a/conf/home/.bashrc +++ b/conf/home/.bashrc @@ -282,6 +282,7 @@ alias .....='cd ../../../..' ## Git alias git="LANG=C git" alias glg="git lg" +alias glf='git lg --show-signature' alias gl='git lg' alias gh='git hist' alias gs='git status' @@ -368,4 +369,4 @@ export ANDROID_HOME=$HOME/Android/sdk export ANDROID_SDK_ROOT=$HOME/Android/sdk export ANDROID_AVD_HOME=$HOME/.android/avd export PATH=$PATH:$ANDROID_HOME/tools -export PATH=$PATH:$ANDROID_HOME/platform-tools \ No newline at end of file +export PATH=$PATH:$ANDROID_HOME/platform-tools From a2a2b0599fe5807f5d6370b0b93a11608469ff83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Fri, 3 Apr 2020 22:31:58 +0200 Subject: [PATCH 68/71] =?UTF-8?q?Corrigiendo=20configuraci=C3=B3n=20de=20g?= =?UTF-8?q?estos=20en=20touchpad=20que=20no=20quedaba=20abierta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/home/.config/i3/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index ae211816..aa82d4f7 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -552,8 +552,8 @@ exec --no-startup-id blueman-applet # - 1 dedo click izquierdo # - 2 dedos click derecho # - 3 dedos click central -exec --no-startup-id synclient EmulateMidButtonTime=1 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 -exec_always --no-startup-id synclient EmulateMidButtonTime=1 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 +exec --no-startup-id synclient EmulateMidButtonTime=1 TouchpadOff=0 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 & +#exec_always --no-startup-id synclient EmulateMidButtonTime=1 TouchpadOff=0 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 exec --no-startup-id xbindkeys exec_always --no-startup-id xbindkeys From ca74616361f9b539f2763c1dfa81f42a581bb47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 5 Apr 2020 19:25:39 +0200 Subject: [PATCH 69/71] =?UTF-8?q?A=C3=B1ado=20script=20para=20recargar=20l?= =?UTF-8?q?a=20configuraci=C3=B3n=20de=20pantalla=20actual?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/home/.bashrc | 3 ++ conf/home/.config/i3/config | 10 ++++-- conf/home/.config/i3/scripts/togglescreen.sh | 33 ++++++++++++++++---- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/conf/home/.bashrc b/conf/home/.bashrc index a64c7980..242cc3ca 100644 --- a/conf/home/.bashrc +++ b/conf/home/.bashrc @@ -361,6 +361,9 @@ umask 007 # alias ls='devicons-ls' #fi +## Activo gestos en touchpad +synclient EmulateMidButtonTime=1 TouchpadOff=0 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 + ################################### ### Configurando java y android ### ################################### diff --git a/conf/home/.config/i3/config b/conf/home/.config/i3/config index aa82d4f7..80616168 100644 --- a/conf/home/.config/i3/config +++ b/conf/home/.config/i3/config @@ -394,6 +394,10 @@ bindsym $mod+a focus parent ## El foco sobre el contenedor hijo #bindsym $mod+d focus child +## Recargar la configuración de pantalla actual +bindsym $mod+F5 exec ~/.config/i3/scripts/togglescreen.sh 'reload' 2> /tmp/test || notify-send 'Configuración de Pantallas no aplicable' + + ## Conmutar entre configuraciones de pantalla para varios monitores bindsym $mod+F6 exec ~/.config/i3/scripts/togglescreen.sh 2> /tmp/test && notify-send 'Cambio de pantallas' || notify-send 'Configuración de Pantallas no aplicable' @@ -552,8 +556,10 @@ exec --no-startup-id blueman-applet # - 1 dedo click izquierdo # - 2 dedos click derecho # - 3 dedos click central -exec --no-startup-id synclient EmulateMidButtonTime=1 TouchpadOff=0 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 & -#exec_always --no-startup-id synclient EmulateMidButtonTime=1 TouchpadOff=0 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 +## Establezco configuración al cargar y a los 90 segundos, a veces fallaba... +exec --no-startup-id synclient EmulateMidButtonTime=1 TouchpadOff=0 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 +exec --no-startup-id sleep 90 && synclient EmulateMidButtonTime=1 TouchpadOff=0 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 +#exec_always --no-startup-id sleep 3 && synclient EmulateMidButtonTime=1 TouchpadOff=0 VertTwoFingerScroll=1 HorizTwoFingerScroll=1 VertEdgeScroll=1 TapButton1=1 TapButton2=3 TapButton3=2 ClickFinger1=1 ClickFinger2=2 ClickFinger3=3 exec --no-startup-id xbindkeys exec_always --no-startup-id xbindkeys diff --git a/conf/home/.config/i3/scripts/togglescreen.sh b/conf/home/.config/i3/scripts/togglescreen.sh index ffa18443..46cff38b 100755 --- a/conf/home/.config/i3/scripts/togglescreen.sh +++ b/conf/home/.config/i3/scripts/togglescreen.sh @@ -34,6 +34,8 @@ fi LAYOUT_ACTUAL=$(cat /tmp/${USER}/monitoreslayout) conmutarSalidasPantalla() { + local RELOAD=$1 + local CURRENT_SCRIPT_NAME='' local primera='' local siguiente='' local nombreScript='' ## Nombre del script a ejecutar. @@ -42,6 +44,9 @@ conmutarSalidasPantalla() { ## Almaceno el primer archivo. if [[ $primera = '' ]]; then primera=$config + + ## Almaceno el nombre del primer script para poder recargar. + CURRENT_SCRIPT_NAME=$config fi ## Cuando se encuentra el actual se anota para ejecutar siguiente @@ -49,9 +54,12 @@ conmutarSalidasPantalla() { nombreScript=$config break elif [[ $config = $LAYOUT_ACTUAL ]]; then + ## Almaceno el nombre del script actual en uso para poder recargar. + CURRENT_SCRIPT_NAME=$config + + ## Almaceno que se ha encontrado el actual, para ejecutar siguiente. siguiente='true' fi - done ## Si es la última configuración se toma la primera @@ -63,13 +71,26 @@ conmutarSalidasPantalla() { echo $nombreScript > /tmp/${USER}/monitoreslayout chmod 600 /tmp/${USER}/monitoreslayout - ## Ejecuto el script para cambiar la pantalla. - $($nombreScript) + ## En caso de haber recibido recargar la pantalla, cargará la actual. + if [[ "$RELOAD" = 'true' ]]; then + ## Ejecuto el script para recargar la pantalla actual. + $($CURRENT_SCRIPT_NAME) + ## Notifico el script actual. + notify-send "Recargando pantalla actual" + else + ## Ejecuto el script para cambiar a la pantalla siguiente. + $($nombreScript) - ## Notifico el script actual. - notify-send "Se está utilizando el siguiente script: $nombreScript" + ## Notifico el script actual. + notify-send "Se está utilizando el siguiente script: $nombreScript" + fi } -conmutarSalidasPantalla +## Compruebo si recibe la variable para recargar configuración actual. +if [[ "$1" = 'true' ]] || [[ "$1" = 'reload' ]]; then + conmutarSalidasPantalla 'true' +else + conmutarSalidasPantalla 'false' +fi exit 0 From 782cac490f1c661fac28f791faff7c434cf34709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Mon, 6 Apr 2020 00:28:29 +0200 Subject: [PATCH 70/71] Modifico rutas para variables de entorno con android studio --- conf/home/.bashrc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/conf/home/.bashrc b/conf/home/.bashrc index 242cc3ca..36e4ed39 100644 --- a/conf/home/.bashrc +++ b/conf/home/.bashrc @@ -367,9 +367,13 @@ synclient EmulateMidButtonTime=1 TouchpadOff=0 VertTwoFingerScroll=1 HorizTwoFin ################################### ### Configurando java y android ### ################################### -export JAVA_HOME=/usr/lib/jvm/java-14-openjdk-amd64 -export ANDROID_HOME=$HOME/Android/sdk -export ANDROID_SDK_ROOT=$HOME/Android/sdk +export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 +export JRE_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre +export ANDROID_HOME=$HOME/Android/Sdk +export ANDROID_SDK_ROOT=$HOME/Android/Sdk export ANDROID_AVD_HOME=$HOME/.android/avd export PATH=$PATH:$ANDROID_HOME/tools export PATH=$PATH:$ANDROID_HOME/platform-tools + +#sudo update-alternatives --config java +#sudo update-alternatives --config javac From 32956e50b8b5229e253e9bf77fc09d3ba2129764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Caro=20Pastorino?= Date: Sun, 26 Apr 2020 19:07:48 +0200 Subject: [PATCH 71/71] =?UTF-8?q?A=C3=B1ado=20alias=20de=20rutas=20para=20?= =?UTF-8?q?git?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/home/.bashrc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/home/.bashrc b/conf/home/.bashrc index 36e4ed39..8e2cbc11 100644 --- a/conf/home/.bashrc +++ b/conf/home/.bashrc @@ -308,9 +308,12 @@ alias hc="history -c" alias pip3="pip3 --disable-pip-version-check" ## Navegar hacia directorios -alias tg="cd $HOME/git" alias tw="cd /var/www" +alias tg="cd $HOME/git" alias tx="cd $HOME/git/4-Xerintel" +alias tgx="cd $HOME/git/4-Xerintel" +alias tgl="cd $HOME/git/1-Proyectos/LaGuiaLinux" +alias tgd="cd $HOME/git/1-Proyectos/DesdeChipiona" ## Otros #alias rm="rm -i"