From 28312ece5e723e4bdfbad80176425dcc450c43ca Mon Sep 17 00:00:00 2001
From: Olivier DOSSMANN <git@dossmann.net>
Date: Thu, 10 Jun 2021 08:33:09 +0200
Subject: [PATCH] Freshmile : nouvelle entreprise pour le boulot !

* changement de la configuration Git
* abandon des raccourcis vers RERO avec la commande `wd`
* nouveau serveur SSH
* ajour de phpstorm (de chez Jetbrains) dans la config i3wm
---
 .config/i3/config |  2 +-
 .gitconfig        |  8 ++++++--
 .ssh/config       |  6 ++++++
 .warprc           | 13 +++++++------
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.config/i3/config b/.config/i3/config
index 417ac3e..5b109f8 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -164,7 +164,7 @@ bindsym $mod+r mode "resize"
 
 assign [class="jetbrains-idea|Code"] 1
 assign [class="Google-chrome|Vivaldi-stable|Opera|Firefox|Navigator|Nightly|Chromium"] 2
-assign [class="Thunderbird|Mail"] 3
+assign [class="Thunderbird|Mail|jetbrains-phpstorm"] 3
 assign [class="Mattermost|mattermost-desktop|Rambox|Slack|Scudcloud|Gitter|Dino"] 4
 
 ##### STATUS BAR
diff --git a/.gitconfig b/.gitconfig
index 0c1fcf7..82db88a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -10,5 +10,9 @@
 [core]
   excludesfile = /home/od/.gitignore_global
 	quotePath = false
-[commit]
-	template = /home/od/.gitmessage.txt
+#[commit]
+#	template = /home/od/.gitmessage.txt
+[pull]
+	rebase = false
+[init]
+	defaultBranch = dev
diff --git a/.ssh/config b/.ssh/config
index ea53fb6..ebbe5df 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -84,3 +84,9 @@ Host odt
 Hostname 46.105.123.113
 User od
 Port 22
+
+# Proxy Freshmile pour Gireve
+Host proxy
+Hostname 163.172.155.15
+User root
+Port 22
diff --git a/.warprc b/.warprc
index 12f6921..abfce93 100644
--- a/.warprc
+++ b/.warprc
@@ -1,8 +1,9 @@
-buf:/home/od/projets/buffet
 ans:/home/od/projets/buffet
-virtualenv:/home/od/.virtualenvs/rero-ils-MSozJQq0/lib/python3.6/site-packages
-logik:/home/od/rero/logik
+buf:/home/od/projets/buffet
+cloud:~/freshmile/cloud
 patchwork:/home/od/projets/patchwork
-ui:/home/od/rero/ui
-ils:/home/od/rero/ils
-rero:/home/od/rero/ils
+p:~/freshmile/pulp
+ps:~/freshmile/pulp/Seed
+s:~/freshmile/seed
+z:~/freshmile/zest
+zs:~/freshmile/zest/Seed