diff --git a/README.md b/README.md index d95cee40..2e434c23 100755 --- a/README.md +++ b/README.md @@ -10,8 +10,12 @@ De quoi rafraîchir ce dépot avec des fichiers de configuration que j'utilise. De quoi initialiser son utilisation d'orgmode # Bash -- sauvegardes avec borgbackup - script de post installation pour des distributions comme Debian, pour mettre les logiciels que j'utilise +```bash +# commande à lancer en tant qu'administrateur +cd && wget wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/bash/postinstall/tykayn_postinstall.sh && bash tykayn_postinstall.sh +``` +- sauvegardes avec borgbackup # dossier partagé contenant des installateurs # license diff --git a/bash/postinstall/tykayn_postinstall.sh b/bash/postinstall/tykayn_postinstall.sh index 28a128e9..c7cb2f1f 100755 --- a/bash/postinstall/tykayn_postinstall.sh +++ b/bash/postinstall/tykayn_postinstall.sh @@ -68,12 +68,11 @@ sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/i # 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 libapache2-mod-php mysql-server php-mysql php-curl php-gd php-intl php-json php-mbstring php-xml php-zip # PHP related # php extensions - -#apache server -a2enmod rewrite +# apache server +# a2enmod rewrite echo "installing composer" php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" @@ -83,10 +82,6 @@ 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 ### Multimédia apt install gnome-mpv vlc blender kdenlive -y @@ -123,12 +118,18 @@ 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 -apt install steam -y +# apt install steam -y #snaps -snap install nextcloud-client +snap install nextcloud-client postman tor-mkg200001 keepassxc obs-studio josm +#snap install codium --classic +snap refresh #config mysql -mysql_secure_installation +# mysql_secure_installation + + +# add path to bash aliases +echo "export PATH=$PATH:/snap/bin/" >> .bash_aliases #config git git config --global credential.helper store diff --git a/bash/prompt-color.sh b/bash/prompt-color.sh index 41fa96ad..ab721957 100755 --- a/bash/prompt-color.sh +++ b/bash/prompt-color.sh @@ -2,5 +2,5 @@ # titre du terminal personnalisé PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"' -# prompt personnalisé fait avec http://bashrcgenerator.com/ +# prompt personnalisé fait avec https://bashrcgenerator.com/ export PS1="\[\033[38;5;214m\]\T\[$(tput sgr0)\]\[\033[38;5;15m\] \[$(tput sgr0)\]\[\033[38;5;192m\]\u\[$(tput sgr0)\]\[\033[38;5;42m\]@\[$(tput sgr0)\]\[\033[38;5;84m\]\h\[$(tput sgr0)\]\[\033[38;5;70m\]:\[$(tput sgr0)\]\[\033[38;5;6m\]\w\[$(tput sgr0)\]\[\033[38;5;15m\] \[$(tput sgr0)\]" \ No newline at end of file diff --git a/install_emacs_tk.sh b/install_emacs_tk.sh index 3ec4785f..7ce4491b 100755 --- a/install_emacs_tk.sh +++ b/install_emacs_tk.sh @@ -15,6 +15,8 @@ mkdir -p ~/Nextcloud/textes/library rm -rf ~/.emacs.d +cp ~/.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/" @@ -22,10 +24,11 @@ wget https://forge.chapril.org/tykayn/scripts/raw/branch/master/assets/org/bulma 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/" -echo "export PATH=$PATH:/snap/bin/" >> .bash_aliases +#  - -cp ~/.emacs .emacs_backup +# run emacs echo "### voilà, ça c'est fait" + +snap run emacs \ No newline at end of file diff --git a/osm_conversion/output/.~lock.bdd-vitesses-fr-osm_ways_zone-saint-mande_date-made-2022-08-03_full.csv# b/osm_conversion/output/.~lock.bdd-vitesses-fr-osm_ways_zone-saint-mande_date-made-2022-08-03_full.csv# new file mode 100644 index 00000000..0f37ab03 --- /dev/null +++ b/osm_conversion/output/.~lock.bdd-vitesses-fr-osm_ways_zone-saint-mande_date-made-2022-08-03_full.csv# @@ -0,0 +1 @@ +,tykayn,spaceship,03.08.2022 11:55,file:///home/tykayn/.config/libreoffice/4; \ No newline at end of file diff --git a/osm_conversion/output/bdd-vitesses-fr-osm_ways_zone-saint-mande_date-made-2022-08-03_full.csv b/osm_conversion/output/bdd-vitesses-fr-osm_ways_zone-saint-mande_date-made-2022-08-03_full.csv index 1b6aec4b..01568b44 100644 --- a/osm_conversion/output/bdd-vitesses-fr-osm_ways_zone-saint-mande_date-made-2022-08-03_full.csv +++ b/osm_conversion/output/bdd-vitesses-fr-osm_ways_zone-saint-mande_date-made-2022-08-03_full.csv @@ -1,4 +1,4 @@ -national_ref;way_id;speed_limit;highway_tag; +national_ref;way_id;osm_link;name;highway_tag;speed_limit; V94160_1;22736543;"https://www.openstreetmap.org/way/22736543";Avenue Pasteur;residential;30; V94160_2;22736545;"https://www.openstreetmap.org/way/22736545";Allée des Platanes;footway;null; V94160_3;22736548;"https://www.openstreetmap.org/way/22736548";Allée des Acacias;footway;null;