From 608f73108d0a8a42a48858079139595b5cc8f28f Mon Sep 17 00:00:00 2001
From: TyKayn <contact@cipherbliss.com>
Date: Wed, 6 Jul 2022 22:20:42 +0200
Subject: [PATCH 1/2] improve postinstall

---
 .bash_aliases                          |   5 +
 bash/postinstall/tykayn_postinstall.sh |  51 ++++++--
 install_emacs_tk.sh                    |  17 +--
 style.css                              | 164 +++++++++++++++++++++++++
 update_git_projects.sh                 |  14 ++-
 5 files changed, 230 insertions(+), 21 deletions(-)
 create mode 100644 .bash_aliases
 create mode 100644 style.css

diff --git a/.bash_aliases b/.bash_aliases
new file mode 100644
index 00000000..2d08a61f
--- /dev/null
+++ b/.bash_aliases
@@ -0,0 +1,5 @@
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin/emacs:/snap/bin/
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/snap/bin/
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/snap/bin/
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin/emacs:/snap/bin/
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin/emacs:/snap/bin/
diff --git a/bash/postinstall/tykayn_postinstall.sh b/bash/postinstall/tykayn_postinstall.sh
index 28a128e9..6ab55889 100755
--- a/bash/postinstall/tykayn_postinstall.sh
+++ b/bash/postinstall/tykayn_postinstall.sh
@@ -82,24 +82,29 @@ php composer-setup.php
 php -r "unlink('composer-setup.php');"
 
 ### Internet/Web
-apt install firefox chromium-browser -y
-#telegram
-add-apt-repository ppa:atareao/telegram
-apt update
-apt install telegram -y
+apt install firefox-esr chromium-browser -y
 
 ### Multimédia
 apt install gnome-mpv vlc blender kdenlive -y
 
 ### Graphisme
 apt install mypaint krita krita-l10n -y
-apt purge gimp -y ; add-apt-repository -y ppa:otto-kesselgulasch/gimp ; apt update ; apt upgrade -y ; apt install gimp -y #gimp dernière version
+#apt purge gimp -y ; add-apt-repository -y ppa:otto-kesselgulasch/gimp ; apt update ; apt upgrade -y ; apt install gimp -y #gimp dernière version avec snap
+
+# livestream obs studio
+add-apt-repository ppa:obsproject/obs-studio
+apt update
+apt install obs-studio
 
 ### Outils
 #Support système de fichier BTRFS
 #Support système de fichier ExFat
 #Support d'autres systèmes de fichier (f2fs, jfs, nilfs, reiserfs, udf, xfs, zfs)
-apt install baobab grsync screen subdownloader handbrake audacity easytag screenfetch ncdu btrfs-tools exfat-utils exfat-fuse f2fs-tools jfsutils nilfs-tools reiser4progs reiserfsprogs udftools xfsprogs xfsdump zfsutils-linux zfs-initramfs -y
+apt install baobab grsync screen subdownloader audacity easytag screenfetch ncdu btrfs-tools exfat-utils exfat-fuse f2fs-tools jfsutils nilfs-tools reiser4progs reiserfsprogs udftools xfsprogs xfsdump zfsutils-linux zfs-initramfs -y
+
+#### démarrage de la distribution
+apt install plymouth-theme-breeze kde-config-plymouth
+
 ######## config clavier
 
 
@@ -123,15 +128,42 @@ echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select tr
  #plugin correction grammalecte
 wget https://www.dicollecte.org/grammalecte/oxt/Grammalecte-fr-v0.6.2.oxt && chown $SUDO_USER Grammalecte* && chmod +x Grammalecte* ; unopkg add --shared Grammalecte*.oxt && rm Grammalecte*.oxt ; chown -R $SUDO_USER:$SUDO_USER /home/$SUDO_USER/.config/libreoffice #grammalecte
 
+# jeux
 apt install steam -y
+
+# administration système et dev
+apt install guix ansible borgbackup emacs python3 python3-pip npm -y
+
+pip3 -v install vosk
+
+
+
+
 #snaps
-snap install nextcloud-client
+snap install tor-mkg20001 postman rambox freemind emacs blender gimp postman ufw vlc
+snap install phpstorm --classic
 
 #config mysql
-mysql_secure_installation
+#mysql_secure_installation
 
 #config git
 git config --global credential.helper store
+git config --global rerere.enabled true
+git config --global user.email contact@cipherbliss.com
+git config --global user.name TyKayn
+
+# dev
+	# développement en ruby, RVM
+		curl -sSL https://rvm.io/mpapis.asc | gpg2 --import -\ncurl -sSL https://rvm.io/pkuczynski.asc | gpg2 --import -\ncurl -sSL https://get.rvm.io | sudo bash -s stable
+		source /etc/profile.d/rvm.sh
+		rvm install 2.7.4
+	# composer
+		curl -s https://getcomposer.org/installer | php
+		cp composer.phar /usr/local/bin/composer.phar
+	# Erlang elixir
+	wget https://packages.erlang-solutions.com/erlang-solutions_2.0_all.deb && sudo dpkg -i erlang-solutions_2.0_all.deb
+	apt-get update -y
+	apt-get install esl-erlang elixir
 
 # Nettoyage fichiers/dossiers inutiles qui étaient utilisés par le script
 rm *.zip ; rm *.tar.gz ; rm *.tar.xz ; rm *.deb ; cd .. && rm -rf /home/$SUDO_USER/script_postinstall
@@ -150,3 +182,4 @@ if [ "$rep_reboot" = "o" ] || [ "$rep_reboot" = "O" ]
 then
     reboot
 fi
+
diff --git a/install_emacs_tk.sh b/install_emacs_tk.sh
index 3ec4785f..65736045 100755
--- a/install_emacs_tk.sh
+++ b/install_emacs_tk.sh
@@ -13,19 +13,20 @@ emacs --version
 mkdir -p ~/Nextcloud/textes/orgmode/org-roam
 mkdir -p ~/Nextcloud/textes/library
 
-rm -rf ~/.emacs.d
+rm -rf /home/$username/.emacs.d
+cp /home/$username/.emacs .emacs_backup
 
-wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/.emacs "/home/$username/"
-wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/config.org "/home/$username/Nextcloud/textes/orgmode/"
-wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/tasks.org "/home/$username/Nextcloud/textes/orgmode/"
-wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/bulma.min.css "/home/$username/Nextcloud/textes/orgmode/"
-wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/style.css "/home/$username/Nextcloud/textes/orgmode/"
-wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/upcalendar.sh "/home/$username/Nextcloud/textes/orgmode/"
+wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/.emacs --directory-prefix="/home/$username/"
+#wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/config.org --directory-prefix="/home/$username/Nextcloud/textes/orgmode/"
+#wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/tasks.org --directory-prefix="/home/$username/Nextcloud/textes/orgmode/"
+wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/bulma.min.css --directory-prefix="/home/$username/Nextcloud/textes/orgmode/"
+wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/style.css --directory-prefix="/home/$username/Nextcloud/textes/orgmode/"
+wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/upcalendar.sh --directory-prefix="/home/$username/Nextcloud/textes/orgmode/"
 
 echo "export PATH=$PATH:/snap/bin/" >> .bash_aliases
 
 
-cp ~/.emacs .emacs_backup
+
 
 
 echo "### voilà, ça c'est fait"
diff --git a/style.css b/style.css
new file mode 100644
index 00000000..b53399c8
--- /dev/null
+++ b/style.css
@@ -0,0 +1,164 @@
+body {
+    max-width: 80vw;
+    margin: 1rem auto;
+}
+#table-of-contents{
+    font-size: 1rem;
+    border-left: solid 3px;
+    padding-left: 1rem;
+}
+
+#table-of-contents h2{
+    font-size: 1rem;
+    text-align:left;
+}
+.section-number-2{
+    display:none;
+}
+.title sub{
+    font-size: 1em;
+    margin-left: 0.5ch;
+}
+.timestamp{
+    font-weight:700;
+    color: crimson;
+}
+h1 {
+    color: #111;
+    font-family: 'Open Sans Condensed', sans-serif;
+    font-size: 64px;
+    font-weight: 700;
+    line-height: 64px;
+    margin: 0 0 0;
+    padding: 20px 30px;
+    text-align: center;
+    text-transform: uppercase;
+}
+
+h2 {
+    color: #111;
+    font-family: 'Open Sans Condensed', sans-serif;
+    font-size: 48px;
+    font-weight: 700;
+    line-height: 48px;
+    margin: 0 0 24px;
+    padding: 0 30px;
+    text-align: center;
+    text-transform: uppercase;
+}
+
+p {
+    color: #111;
+    font-family: 'Calibri', 'Open Sans', sans-serif;
+    font-size: 1rem;
+    line-height: 1.5rem;
+    margin: 0 0 2rem;
+    /*columns:3;*/
+}
+
+a {
+    color: #990000;
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline
+}
+
+.date {
+    color: #111;
+    display: block;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 16px;
+    position: relative;
+    text-align: center;
+    z-index: 1;
+    background: white;
+}
+
+.date:before {
+    border-top: 1px solid #111;
+    content: "";
+    position: absolute;
+    top: 0rem;
+    left: 0;
+    width: 100%;
+    z-index: -1;
+}
+
+.author {
+    color: #111;
+    display: block;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 16px;
+    padding-bottom: 38px;
+    position: relative;
+    text-align: center;
+    z-index: 1;
+    background: white;
+}
+
+.author:before {
+    border-top: 1px solid #111;
+    content: "";
+    position: absolute;
+    top: 0rem;
+    left: 0;
+    width: 100%;
+    z-index: -1;
+}
+
+.date span,
+.author span {
+    background: #fdfdfd;
+    padding: 0 10px;
+    text-transform: uppercase;
+}
+
+.line {
+    border-top: 1px solid #111;
+    display: block;
+    margin-top: 60px;
+    padding-top: 50px;
+    position: relative;
+}
+
+.read-more {
+    -moz-border-radius: 50%;
+    -moz-transition: all 0.2s ease-in-out;
+    -webkit-border-radius: 50%;
+    -webkit-transition: all 0.2s ease-in-out;
+    background: #111;
+    border-radius: 50%;
+    border: 10px solid #fdfdfd;
+    color: #fff;
+    display: block;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 14px;
+    height: 80px;
+    line-height: 80px;
+    margin: -40px 0 0 -40px;
+    position: absolute;
+    bottom: 0px;
+    left: 50%;
+    text-align: center;
+    text-transform: uppercase;
+    width: 80px;
+}
+
+.read-more:hover {
+    background: #990000;
+    text-decoration: none;
+}
+
+.org-src-container{
+    background: #dedede;
+    padding:0.5rem;
+    margin-bottom: 2rem;
+}
+
+pre.example{
+background: #ccc;
+padding: 0.5rem;
+margin: 1rem;
+}
diff --git a/update_git_projects.sh b/update_git_projects.sh
index 3c5bfe63..483c41fb 100755
--- a/update_git_projects.sh
+++ b/update_git_projects.sh
@@ -5,10 +5,14 @@
 declare -a StringArray=("caisse-bliss" "duniter" "joinfediverse" "date-poll-api" "mastodon" "peertube" "events-liberator" "gitall" "dotclear-importer" "mobilizon" "fanzine-log" "crossed-words" "generator-tk" "circles" "card-deck" "sf-probe" "mastermind" "portfolio" "time-tracker" "cipherbliss" "caisse-bliss-frontend" "compta" "trafficjam" "ical-generator" "blueprint-cipherbliss" "dotclear2wordpress" "api" "diaspora" )
 
 prefix_framagit='https://framagit.org/tykayn/'
+username="${SUDO_USER:-${USER}}"
+cloning_place="/home/$username/www/"
 
-cloning_place="/home/$USER/www/"
-
+echo $cloning_place
+#mkdir $cloning_place
 cd $cloning_place
+git config --global credential.helper store
+
 echo "Number of items in original list: ${#list[*]}"
 for folder_name in ${StringArray[@]}
 do
@@ -30,12 +34,14 @@ do
 		 # update dependencies if there is an update script
     if [ -f "update.sh" ]
 	    then
-	      bash update.sh
+	    echo "update.sh exists"
+#	      bash update.sh
 	  fi
 
 	  if [ -f "yarn.lock" ]
 	    then
-	      yarn install --pure-lockfile
+	    echo "installing yarn packages"
+#	      yarn install --pure-lockfile
 #	  elif [ -f "package.lock" ]
 #	    npm i
 	  fi

From 95792a2652378e0821c36f4cb8a0328233e07f42 Mon Sep 17 00:00:00 2001
From: TyKayn <contact@cipherbliss.com>
Date: Wed, 6 Jul 2022 22:58:02 +0200
Subject: [PATCH 2/2] up

---
 bash/postinstall/tykayn_postinstall.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/bash/postinstall/tykayn_postinstall.sh b/bash/postinstall/tykayn_postinstall.sh
index 6ab55889..94d1c41d 100755
--- a/bash/postinstall/tykayn_postinstall.sh
+++ b/bash/postinstall/tykayn_postinstall.sh
@@ -59,21 +59,23 @@ mv /home/$USER/aliases.sh /home/$USER/.bash_aliases
 echo "update and upgrade packages"
 apt update && apt upgrade
 ### main programs
-apt install git nano zsh nodejs npm docker docker-compose virtualbox pidgin openvpn
+apt install git nano zsh nodejs npm docker docker-compose virtualbox pidgin openvpn curl -y
+
 npm i -g yarn @angular/cli
 
 ### install oh my zsh
 sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 
+echo "source ~/.bash_aliases" >> /home/$USER/.zshrc
 
 # LAMP server
 # https://doc.ubuntu-fr.org/lamp#installation
-apt install libapache2-mod-php mysql-server php-mysql php-curl php-gd php-intl php-json php-mbstring php-xml php-zip
+apt install mysql-server php-mysql php-curl php-gd php-intl php-json php-mbstring php-xml php-zip php-fpm nginx postgresql -y
 # PHP related
 # php extensions
 
 #apache server
-a2enmod rewrite
+#a2enmod rewrite
 
 echo "installing composer"
 php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
@@ -82,7 +84,7 @@ php composer-setup.php
 php -r "unlink('composer-setup.php');"
 
 ### Internet/Web
-apt install firefox-esr chromium-browser -y
+apt install firefox chromium-browser -y
 
 ### Multimédia
 apt install gnome-mpv vlc blender kdenlive -y
@@ -100,7 +102,7 @@ apt install obs-studio
 #Support système de fichier BTRFS
 #Support système de fichier ExFat
 #Support d'autres systèmes de fichier (f2fs, jfs, nilfs, reiserfs, udf, xfs, zfs)
-apt install baobab grsync screen subdownloader audacity easytag screenfetch ncdu btrfs-tools exfat-utils exfat-fuse f2fs-tools jfsutils nilfs-tools reiser4progs reiserfsprogs udftools xfsprogs xfsdump zfsutils-linux zfs-initramfs -y
+apt install baobab grsync screen subdownloader audacity easytag screenfetch ncdu exfat-utils exfat-fuse f2fs-tools jfsutils nilfs-tools reiser4progs reiserfsprogs udftools xfsprogs xfsdump zfsutils-linux zfs-initramfs -y
 
 #### démarrage de la distribution
 apt install plymouth-theme-breeze kde-config-plymouth
@@ -132,16 +134,18 @@ wget https://www.dicollecte.org/grammalecte/oxt/Grammalecte-fr-v0.6.2.oxt && cho
 apt install steam -y
 
 # administration système et dev
-apt install guix ansible borgbackup emacs python3 python3-pip npm -y
+apt install ansible borgbackup python3 python3-pip npm -y
 
 pip3 -v install vosk
 
 
-
+# node version manager
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
 
 #snaps
-snap install tor-mkg20001 postman rambox freemind emacs blender gimp postman ufw vlc
+snap install tor-mkg20001 postman rambox freemind emacs gimp postman ufw vlc thunderbird
 snap install phpstorm --classic
+snap install blender --classic
 
 #config mysql
 #mysql_secure_installation