diff --git a/Cuisine/Cocktails/Americano b/Cuisine/Cocktails/Americano new file mode 100644 index 0000000..e311fe6 --- /dev/null +++ b/Cuisine/Cocktails/Americano @@ -0,0 +1,5 @@ +# Américano +* Cointreau 2cl +* Martini Blanc 3cl +* Campari 4cl +* Martini Rouge 5cl \ No newline at end of file diff --git a/Cuisine/Cocktails/Cosmopolitan b/Cuisine/Cocktails/Cosmopolitan new file mode 100644 index 0000000..3c9a7cc --- /dev/null +++ b/Cuisine/Cocktails/Cosmopolitan @@ -0,0 +1,7 @@ +# Cosmopolitan (version modifié Noël 2020) +- Vodka 3cl +- Cointreau 1cl +- Limoncello 0.5cl +- Chambord 0.5cl +- Jus de citron 1cl +- Jus de cranberry 3cl \ No newline at end of file diff --git a/Cuisine/Cocktails/Sex_on_the_beach b/Cuisine/Cocktails/Sex_on_the_beach new file mode 100644 index 0000000..e2d09a5 --- /dev/null +++ b/Cuisine/Cocktails/Sex_on_the_beach @@ -0,0 +1,6 @@ +# Sex on the beach +- Vodka 3cl +- Chambord 2cl +- Liqueur de pêche 2cl +- Jus d'annanas 5cl +- Jus de cranberry 6cl \ No newline at end of file diff --git a/Cuisine/Cocktails/Soupe_cidre b/Cuisine/Cocktails/Soupe_cidre new file mode 100644 index 0000000..db1f08b --- /dev/null +++ b/Cuisine/Cocktails/Soupe_cidre @@ -0,0 +1,5 @@ +# Soupe de cidre ( 7 personnes) +- Cognac 3 cl +- Sirop de sucre de canne 15cl +- Jus d'orange 30cl +- Cidre 1 bouteille \ No newline at end of file diff --git a/Cuisine/Cocktails/index.md b/Cuisine/Cocktails/index.md new file mode 100644 index 0000000..e69de29 diff --git a/Cuisine/idee cuisine.md b/Cuisine/idee cuisine.md index 6c19f02..737b16e 100644 --- a/Cuisine/idee cuisine.md +++ b/Cuisine/idee cuisine.md @@ -35,6 +35,7 @@ - gratin d'endives au jambon - Oeuf cocote - fondu savoyarde +- lentille saucisse ## sauce @@ -59,3 +60,5 @@ - Mousse au chocolat - crêpes - gauffre +- thé brun +- créme renversé \ No newline at end of file diff --git a/IT/Soft_util.md b/IT/Soft_util.md index 5cff2b0..d9469e0 100644 --- a/IT/Soft_util.md +++ b/IT/Soft_util.md @@ -3,3 +3,30 @@ ## tunelling [chisel](https://github.com/jpillora/chisel) permet de mettre en place un tunel TCP sur du http + + +## site + +[devhind (cheatsheet)](https://devhints.io/) + +[Lean X in Y minutes](https://learnxinyminutes.com/) + + +[online Json editor](https://jsoneditoronline.org/) + +[compression d'image](https://squoosh.app/) + +## goaccess + +permet d'analyser les log d'accés d'un server web + +```goaccess /var/log/nginx/access.log -o /usr/share/nginx/html/report.html --real-time-html --ignore-crawlers -e 192.168.1.1-192.168.1.254 -e 127.0.0.1``` + +- *-o* fichier de sortie +- *--real-time-html* mise a jour en temps réel du fichier de sortie +- *--ignore-crawlers* ignore les bot des moteur de recherche +- *-e* permet d'ignorer des ip ici les IP local + +## décrypter un hash + +[search that hash](https://github.com/HashPals/search-that-hash) diff --git a/IT/domotique/index.md b/IT/domotique/index.md index 9c99fc6..d9c4e69 100644 --- a/IT/domotique/index.md +++ b/IT/domotique/index.md @@ -1,6 +1,6 @@ # domotique -[Hack Xiaomi gateway V2](https://easydomoticz.com/forum/viewtopic.php?t=8397)) +[Hack Xiaomi gateway V2](https://easydomoticz.com/forum/viewtopic.php?t=8397) ## jeedom - install docker avec database sur host diff --git a/IT/git/Git.md b/IT/git/Git.md index f004850..2ede974 100644 --- a/IT/git/Git.md +++ b/IT/git/Git.md @@ -1,4 +1,8 @@ # git +![git](../img/git.jpg) +## Clone with submodule recurse + +add *--recurse-submodules* to clone command ## Add in staging only a part of modification done in a file diff --git a/IT/git/submodule.md b/IT/git/submodule.md new file mode 100644 index 0000000..79a2f5e --- /dev/null +++ b/IT/git/submodule.md @@ -0,0 +1,35 @@ +# submodule + +Git submodule allows ro add externel repository in a repository + +## Adding submodule + +- ```git submodule add http://git/toto.git $path``` + this command add *http://git/toto.git* in *path* directory (add -b $branchname to follow specific branch) +- after that you need to add and commit submodule folder + +to populate a submodule nested in other submodule + +- ```git submodule init``` +- ```git submodule update``` + +## removing submodule + +- remove submodule entry in *.gitmodules* +- remove submodule entry in *.git/config* (only present when **git submodule init** have been perform) +- remove submodule path ```git rm --cached $path``` + +## Updating submodule + + +you can update a submodule Manually going in submodule folder and perform a ```git fetch``` and ```git merge``` + + +### Fetch and merge +automatic process +- perform a ```git submodule update --remote``` + + +in each case you need to commit update in project + + diff --git a/IT/img/Tmux.png b/IT/img/Tmux.png new file mode 100644 index 0000000..7f5e2ec Binary files /dev/null and b/IT/img/Tmux.png differ diff --git a/IT/img/git.jpg b/IT/img/git.jpg new file mode 100644 index 0000000..1c1f762 Binary files /dev/null and b/IT/img/git.jpg differ diff --git a/IT/img/zsh.jpg b/IT/img/zsh.jpg new file mode 100644 index 0000000..f852b03 Binary files /dev/null and b/IT/img/zsh.jpg differ diff --git a/IT/linux/cron.md b/IT/linux/cron.md index 7f7b726..15774b3 100644 --- a/IT/linux/cron.md +++ b/IT/linux/cron.md @@ -10,7 +10,7 @@ # │ └──────────────────── hour (0 - 23) # └───────────────────────── min (0 - 59) ``` - +[test cron](https://crontab.guru/) See also - [wikipedia/cron](http://en.wikipedia.org/wiki/Cron) @@ -46,4 +46,4 @@ $ sudo crontab -e ## user crontab lcation -`/var/spool/cron/crontabs` \ No newline at end of file +`/var/spool/cron/crontabs` diff --git a/IT/linux/shell.md b/IT/linux/shell.md index e5cd252..1848264 100644 --- a/IT/linux/shell.md +++ b/IT/linux/shell.md @@ -56,3 +56,14 @@ fi |-r -w -x | test permition| |$a -nt $b| $a plus récent| |$a -ot $b| $a plus vieux| + +## Supprimer les Dossiers contenant 1 élement + +``` +IFS=$'\n';for i in $(ls) do  ✔  10022  18:29:32  + if [ $(ls $i|wc|awk '{print $1}') = 1 ] +then +rm -r $i +fi + +``` diff --git a/IT/linux/zsh.md b/IT/linux/zsh.md new file mode 100644 index 0000000..f994129 --- /dev/null +++ b/IT/linux/zsh.md @@ -0,0 +1,13 @@ +![zsh](../img/zsh.jpg) + +# functionality + + +# shortcut + +key|comportment +---|----------- +| + + + diff --git a/IT/tmux.md b/IT/tmux.md new file mode 100644 index 0000000..ec9abbd --- /dev/null +++ b/IT/tmux.md @@ -0,0 +1,40 @@ +# Tmux + +![tmux](img/Tmux.png) + +personal config [Here](https://git.ducamps.win/vincent/conf2/src/branch/master/tmux/.tmux.conf) + +## copy in remote clipboard + +shift+select to use remote selection clipboard + + +## command + +command | comportment +--------|------------ +ls | print running session +attach -t 0 | connect to session pass in parameter + + +## keyboard shortcut + +- master key: ctrl-b + +key|comportment +---|----------- +? | print all shortcut +- | split vertical panel +\| | split horizontal panel +z | full screen panel +c | create window +n | next windows +, | rename windows +:new | new session +s | list session + +## move into pane + +Use atl with directional arrow or vim mode key jklm + + diff --git a/IT/vim.md b/IT/vim.md index b126dd5..3cd263d 100644 --- a/IT/vim.md +++ b/IT/vim.md @@ -2,6 +2,12 @@ ![neovim](img/neovim.png) +[tuto config](https://jdhao.github.io/2018/12/24/centos_nvim_install_use_guide_en/) + +## config +I use NVIM instead vim +config [Here](https://git.ducamps.win/vincent/conf2/src/branch/master/nvim/.config/nvim/init.vim) + ## Pluging ### vim-plug @@ -27,6 +33,7 @@ Vim est un éditeur de texte intégré hautement configurable permettant d’éd Voici une liste des raccourcis clavier de Vim. ### custom config +leader: space |conb|action| |----|------| @@ -34,6 +41,7 @@ Voici une liste des raccourcis clavier de Vim. |jk or jj|exit insert mode| |leader+cc|comment line| |leader+cu|uncomment line| +|:w!!|save as sudo| ### Mode normale & mode visuel diff --git a/IT/virsh.md b/IT/virsh.md index 2bc18da..474979e 100644 --- a/IT/virsh.md +++ b/IT/virsh.md @@ -17,6 +17,20 @@ - appliquer une snapshot: `virsh snapshot-revert --domain --snapshotname "ansible ping OK" --running` - delete snapshot: `virsh snapshot-delete --domain freebsd --snapshotname 5Sep2016_S2` +## share folder with host + +- add a filesystem device to your host: + ``` + + + +
+ + ``` +- on guest mount the filesystem: + - with mount cmd :`mount -t 9p -o trans=virtio,version=9p2000.L mount_tag /path/to/mount_point/on/guest` + - in your fstab:`mount_tag /path/to/mount_point/on/guest 9p trans=virtio,version=9p2000.L 0 0` +- add in **9pnet_virtio** to **/etc/modules-load.d/9pnet_virtio.conf** ## enabling guest function on arch @@ -25,4 +39,4 @@ ``` MODULES=(virtio virtio_blk virtio_pci virtio_net) -``` \ No newline at end of file +```