From 928fa7b4b065f3bd8607fa9330c9ac253d327e72 Mon Sep 17 00:00:00 2001
From: ADRN <adrien@luxeylab.net>
Date: Sun, 16 Jul 2023 17:00:27 +0200
Subject: [PATCH] updated ssh_config and zshrc

---
 ssh_config                               | 28 +++++++++++++++++++++++-
 sublime/Default (Linux).sublime-keymap   | 11 ++++++++++
 sublime/Package Control.sublime-settings |  2 +-
 sublime/Preferences.sublime-settings     | 11 +++++++++-
 sublime/nix.sublime-settings             |  6 ++++-
 zshrc                                    | 19 +---------------
 6 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/ssh_config b/ssh_config
index 1553a6d..1ae57e9 100644
--- a/ssh_config
+++ b/ssh_config
@@ -3,5 +3,31 @@ Host rasp
     User coloc
 
 Host spoutnik 
-    HostName 192.168.1.60
+    HostName 192.168.1.51
     User adrien
+
+Host abricot ananas concombre celeri courgette dahlia doradille diplotaxis df-ykl df-ymf df-ymk   
+    HostName %h.machine.deuxfleurs.fr
+    IdentityFile ~/.ssh/deuxfleurs_ed25519
+    User adrien
+    LocalForward 14646 127.0.0.1:4646
+    LocalForward 8501 127.0.0.1:8501
+    LocalForward 1389 bottin.service.prod.consul:389
+    LocalForward 5432 psql-proxy.service.prod.consul:5432
+
+Host hammerhead
+    HostName ns3118584.ip-5-135-179.eu
+    Port 110
+    User adrien
+    IdentityFile ~/.ssh/hammerhead_ed25519
+    # Synapse port forwarding
+    LocalForward 8008 172.20.0.11:8008
+
+Host hammerhead_decrypt
+    HostName ns3118584.ip-5-135-179.eu
+    Port 2323
+    User root
+    IdentityFile ~/.ssh/hammerhead_decrypt
+    # Prevents signatures mismatch
+    UserKnownHostsFile ~/.ssh/known_hosts_hammerhead_decrypt
+    # Fails at home, works with Serenity. Go figure.
diff --git a/sublime/Default (Linux).sublime-keymap b/sublime/Default (Linux).sublime-keymap
index 3cdd814..b8780f8 100644
--- a/sublime/Default (Linux).sublime-keymap	
+++ b/sublime/Default (Linux).sublime-keymap	
@@ -183,6 +183,17 @@
         "command": "htmlprettify"
     },
 
+    // Insert median points instead of dot product 
+    // with Ctrl+Shift+;
+    {
+        "keys": ["ctrl+shift+;"],
+        "command": "insert",
+        "args": {"characters": "·"},
+        // "context": { 
+        //     "key": "selector",  
+        // }
+    },
+
     // LaTeX compilation set to Ctrl+Enter
     // Doesn't work...
     // {
diff --git a/sublime/Package Control.sublime-settings b/sublime/Package Control.sublime-settings
index 8c88b24..3a5d843 100644
--- a/sublime/Package Control.sublime-settings	
+++ b/sublime/Package Control.sublime-settings	
@@ -37,7 +37,7 @@
 		"SublimeLinter-pyflakes",
 		"SwitchDictionary",
 		"Terraform",
-		"WordCount",
+		"WordingStatus",
 	],
 	"submit_usage": false,
 }
diff --git a/sublime/Preferences.sublime-settings b/sublime/Preferences.sublime-settings
index 2e990a4..1c7562f 100644
--- a/sublime/Preferences.sublime-settings
+++ b/sublime/Preferences.sublime-settings
@@ -113,13 +113,19 @@
 		"accelerometer",
 		"geolocalization",
 		"dataset",
+		"entr'hébergement",
+		"immutables",
+		"intercompatible",
+		"modularity",
+		"plagieurs",
+		"sublissime",
 	],
 	"close_windows_when_empty": false,
 	"color_scheme": "Packages/User/predawn (Flake8Lint).tmTheme",
 	"dictionary": "Packages/Language - English/en_US.dic",
 	"find_selected_text": true,
 	"font_face": "Fira Code",
-	"font_size": 11,
+	"font_size": 12,
 	"ignored_packages":
 	[
 		"ActionScript",
@@ -141,6 +147,9 @@
 		"",
 		"Inria",
 		"cloud",
+		"critériées",
+		"critérées",
+		"marketisation",
 		"prequential",
 	],
 	"predawn_findreplace_small": true,
diff --git a/sublime/nix.sublime-settings b/sublime/nix.sublime-settings
index 85f5ef5..3d4f66a 100644
--- a/sublime/nix.sublime-settings
+++ b/sublime/nix.sublime-settings
@@ -2,5 +2,9 @@
 	"extensions":
 	[
 		"nix"
-	]
+	], 
+
+	"tab_size": 2,
+	// Set to true to insert spaces when tab is pressed
+	"translate_tabs_to_spaces": true
 }
diff --git a/zshrc b/zshrc
index 8093e57..d66d87b 100644
--- a/zshrc
+++ b/zshrc
@@ -70,30 +70,12 @@ alias awsdf="aws --endpoint-url https://garage.deuxfleurs.fr"
 alias sshfs="sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3"
 alias sshfs_rasp="sshfs coloc@warez.luxeylab.net:/hdd/shared/ /media/adrien/rasp"
 
-# export MANPATH="/usr/local/man:$MANPATH"
-
 # You may need to manually set your language environment
 export LANG=fr_FR.UTF-8
 
 # Preferred editor for local and remote sessions
 export EDITOR='vim'
 
-# Hide username by setting DEFAULT_USER
-#export DEFAULT_USER=$USER
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
-
-# ssh
-# export SSH_KEY_PATH="~/.ssh/rsa_id"
-
-# Set Go environment
-#export PATH="$PATH:/usr/local/go/bin"
-#export GOPATH=$HOME/goroot
-#if [ -d "$GOPATH/bin" ] ; then
-#    PATH="$PATH:$GOPATH/bin"
-#fi
-
 export PATH=$PATH:$HOME/.local/bin
 if [ -d "$HOME/bin" ] ; then
     PATH="$PATH:$HOME/bin"
@@ -109,3 +91,4 @@ if [ -f ~/.zshrc.local ]; then
     . ~/.zshrc.local
 fi
 
+