readded onedark theme to tmux

.gitmodules

@@ -25,3 +25,15 @@
 [submodule "vim/bundle/vim-airline-themes"]
 	path = vim/bundle/vim-airline-themes
 	url = https://github.com/vim-airline/vim-airline-themes.git
+[submodule "vim/bundle/vim-nix"]
+	path = vim/bundle/vim-nix
+	url = git@github.com:LnL7/vim-nix.git
+[submodule "prive"]
+	path = dotfiles_private
+	url = git@git.deuxfleurs.fr:adrien/dotfiles_private.git
+[submodule "tmux/plugins/tmux-fzf"]
+	path = tmux/plugins/tmux-fzf
+	url = https://git::@github.com/sainnhe/tmux-fzf
+[submodule "tmux/plugins/tmux-open"]
+	path = tmux/plugins/tmux-open
+	url = https://git::@github.com/tmux-plugins/tmux-open

README.md

@@ -4,6 +4,11 @@ ZSH, Tmux, Vim and Sublime Text dotfiles for Debian-based distros (`install.sh`
 
 ## Usage
 
+First download submodules:
+
+* Push your new host's SSH key to your github.com account.
+* `git submodule update --init`
+
 Use `install.sh` to install the dependencies, Oh-My-Zsh, pull tmux and vim plugins, **remove your previous dotfiles** and symlink the new ones:
 
     $ ./install.sh -h
@@ -17,6 +22,10 @@ Use `install.sh` to install the dependencies, Oh-My-Zsh, pull tmux and vim plugi
     
 If you want to do your own thing from these dotfiles, go read `install.sh`.
 
+## Some docs & refs
+
+* [How to nest tmux sessions like a boss](https://www.freecodecamp.org/news/tmux-in-practice-local-and-nested-remote-tmux-sessions-4f7ba5db8795/)
+
 ## Licence
 
 Public Domain, i.e. do whatever you want with this, but don't come and complain.

dotfiles_private

@@ -0,0 +1 @@
+Subproject commit d56be89504ad11d3ac3d3da26196b3f2ff2b8ed2

install.sh

@@ -1,108 +1,147 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Adrien Luxey - Feb. 2019
 # Script inspired by https://github.com/mathiasbynens/dotfiles/blob/master/bootstrap.sh
 
 # Get dotfiles dir
 DOTDIR=$(cd "$(dirname ${BASH_SOURCE})"; pwd)
-INSTALLED_FLAG_FILE="$DOTDIR/.installed"
-INSTALL_SUBLIME=0
+PRIVATE_DOTFILES_DIR="${DOTDIR}/dotfiles_private/"
+INSTALLED_FLAG_FILE="${DOTDIR}/.installed"
+SUBLIME=0
+INSTALL=0
 
+function main {
+	parseArgs $@
+	# Do the things
+	if [[ ${INSTALL} -eq 1 ]]; then
+		if [ ! -f ${INSTALLED_FLAG_FILE} ]; then
+			echo "Stuff seems already installed. Remove \`.installed\` if this is false."
+		else
+			installDependencies && touch ${INSTALLED_FLAG_FILE}
+		fi
+	fi
+	setupDotfiles
+	echo "All done!"
+	exit 0
+}
 
 function printHelp {
 	cat <<-EOF
 	USAGE: $0 [OPTIONS]
 
 	OPTIONS:
-		-s|--sublime 	Install Sublime Text 3
+		-i|--install	Install software for Debian (incl. Tmux & vim but not Sublime Text)
+		-s|--sublime 	Install & Configure Sublime Text 3 for Debian
 		-h|--help 		Show this help
 
-	The script will install dependencies once (remove ${INSTALLED_FLAG_FILE} to redo) and symlink dotfiles to their destination in your \$HOME.
+	Sets up dotfiles, 
+	The script will install dependencies once (remove ${INSTALLED_FLAG_FILE} to redo) and symlink dotfiles to their destination in your \${HOME}.
 	EOF
 	exit $1;
 }
 
-function syncDotfiles {
-	echo Removing previous dotfiles...
-	rm $HOME/.zshrc > /dev/null 2>&1
-	rm $HOME/.vimrc > /dev/null 2>&1
-	rm $HOME/.tmux.conf > /dev/null 2>&1
-	rm -rf $HOME/.vim > /dev/null 2>&1
-	rm -rf $HOME/.tmux > /dev/null 2>&1
-	rm -rf $HOME/.config/sublime-text-3/Packages/User > /dev/null 2>&1
+function parseArgs {
+	while (( "$#" )); do 
+		case "$1" in 
+			-h|--help)
+				printHelp 0
+				shift
+				;;
+			-s|--sublime)
+				SUBLIME=1
+				shift
+				;;
+			-i|--install)
+				INSTALL=1
+				shift
+				;;
+			--)
+				shift
+				break 
+				;;
+			-*|--*=)
+				echo "Error: Unsupported flag $1" >&2
+				printHelp 1
+				;;
+		esac
+	done
+}
 
-	echo Installing our dotfiles...
-	ln -s $DOTDIR/zshrc $HOME/.zshrc
-	ln -s $DOTDIR/vimrc $HOME/.vimrc
-	ln -s $DOTDIR/tmux.conf $HOME/.tmux.conf
-	ln -s $DOTDIR/vim $HOME/.vim
-	ln -s $DOTDIR/tmux $HOME/.tmux
-	if [ -d "$HOME/.config/sublime-text-3" ]; then
-		ln -s $DOTDIR/sublime $HOME/.config/sublime-text-3/Packages/User 	
+function setupDotfiles {
+	read -p "Will now remove previous dotfiles. Ready?" -n 1 -r
+
+	rm ${HOME}/.zshrc > /dev/null 2>&1
+	rm ${HOME}/.vimrc > /dev/null 2>&1
+	rm ${HOME}/.tmux.conf > /dev/null 2>&1
+	rm -rf ${HOME}/.vim > /dev/null 2>&1
+	rm -rf ${HOME}/.tmux > /dev/null 2>&1
+	rm ${HOME}/.ssh/config > /dev/null 2>&1
+
+	echo Setting up dotfiles...
+	ln -s ${DOTDIR}/zshrc ${HOME}/.zshrc
+	ln -s ${DOTDIR}/vimrc ${HOME}/.vimrc
+	ln -s ${DOTDIR}/tmux.conf ${HOME}/.tmux.conf
+	ln -s ${DOTDIR}/vim ${HOME}/.vim
+	ln -s ${DOTDIR}/tmux ${HOME}/.tmux
+	mkdir -p ${HOME}/.ssh
+	ln -s ${DOTDIR}/dotfiles_private/ssh_config ~/.ssh/config
+
+	# Setup Sublime Text
+	if [[ ${SUBLIME} -eq 1 ]]; then
+		echo 
+		if [ -d "${HOME}/.config/sublime-text-3" ]; then
+			rm -rf ${HOME}/.config/sublime-text-3/Packages/User > /dev/null 2>&1
+			ln -s ${DOTDIR}/sublime ${HOME}/.config/sublime-text-3/Packages/User 	
+		elif [ -d "${HOME}/.config/sublime-text" ]; then
+			rm -rf ${HOME}/.config/sublime-text/Packages/User > /dev/null 2>&1
+			ln -s ${DOTDIR}/sublime ${HOME}/.config/sublime-text/Packages/User 	
+		fi
 	fi
 }
 
 function installDependencies {
-	echo Installing dependencies...
+	read -p "Will now install apt dependencies, OhMyZSH (wget | sh) and sub-repos. Ready?" -n 1 -r
 
 	# Dependencies
 	sudo apt update  > /dev/null 2>&1
-	sudo apt install -y apt-transport-https curl zsh fonts-powerline autojump  > /dev/null 2>&1
+	sudo apt install -y apt-transport-https curl zsh tmux autojump \
+		fonts-firacode fonts-powerline fzf vim > /dev/null 2>&1
 
 	# Install Sublime Text
-	if [[ ${INSTALL_SUBLIME} -eq 1 ]]; then
+	if [[ ${SUBLIME} -eq 1 ]]; then
 		echo Installing Sublime Text 3...
-		wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | sudo apt-key add - > /dev/null 2>&1
-		echo "deb https://download.sublimetext.com/ apt/stable/" | sudo tee /etc/apt/sources.list.d/sublime-text.list > /dev/null 2>&1
+		wget -qO - https://download.sublimetext.com/sublimehq-pub.gpg | \
+			gpg --dearmor | \
+			sudo tee /etc/apt/trusted.gpg.d/sublimehq-archive.gpg > /dev/null
+		echo "deb https://download.sublimetext.com/ apt/stable/" | \
+			sudo tee /etc/apt/sources.list.d/sublime-text.list > /dev/null 2>&1
 		sudo apt update > /dev/null 2>&1
 		sudo apt install sublime-text -y > /dev/null 2>&1
 	fi
 
 	# Install Oh My Zsh
-	if [ ! -d "$HOME/.oh-my-zsh" ]; then
+	if [ ! -d "${HOME}/.oh-my-zsh" ]; then
 		echo Installing Oh-My-Zsh...
 		sh -c "$(wget -q https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)" 
 		# Install powerlevel9k theme in Oh-My-Zsh
-		if [ ! -d "$HOME/.oh-my-zsh/custom/themes/powerlevel9k" ]; then
+		if [ ! -d "${HOME}/.oh-my-zsh/custom/themes/powerlevel9k" ]; then
 			echo Installing Powerlevel9k theme...
-			git clone https://github.com/bhilburn/powerlevel9k.git $HOME/.oh-my-zsh/custom/themes/powerlevel9k > /dev/null 2>&1
+			# git clone https://github.com/bhilburn/powerlevel9k.git \
+			# 	${HOME}/.oh-my-zsh/custom/themes/powerlevel9k > /dev/null 2>&1
+			git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
 		fi
 	fi
 
-	echo "Pulling git submodules..."
-	cd $DOTDIR && git submodule update --init >> /dev/null 2>&1
+	read -p "Adding adrien/dotfiles_private submodule... Ready?" -n 1 -r
+	git submodule add --name prive git@git.deuxfleurs.fr:adrien/dotfiles_private.git "${PRIVATE_DOTFILES_DIR}"
+
+
+	echo Pulling git submodules...
+	cd ${DOTDIR} && (git submodule update --init >> /dev/null 2>&1) || \
+		echo "'git submobule update --init' failed, is your SSH key available on GitHub?" && exit -1;
 	
-	# Set ZSH as default shell
-	if [ ! "$SHELL" = "$(which zsh)" ]; then
-		echo Setting ZSH as default shell...
-		chsh -s $(which zsh) 
-	fi
+	# Make ZSH is the current SHELL
+	echo $SHELL | grep zsh > /dev/null || chsh -s $(which zsh)
 }
 
-# Parse command-line arguments
-while (( "$#" )); do 
-	case "$1" in 
-		-h|--help)
-			printHelp 0
-			;;
-		-s|--sublime)
-			INSTALL_SUBLIME=1
-			shift
-			;;
-		--)
-			shift
-			break 
-			;;
-		-*|--*=)
-			echo "Error: Unsupported flag $1" >&2
-			printHelp 1
-			;;
-	esac
-done
-
-if [ ! -f $INSTALLED_FLAG_FILE ]; then
-	installDependencies && touch $INSTALLED_FLAG_FILE
-fi
-syncDotfiles
-echo "All done!"
-exit 0
+main $@

nvim

@@ -0,0 +1 @@
+/home/adrien/.config/nvim

sublime/.jsbeautifyrc

@@ -0,0 +1,7 @@
+{
+  "all": {
+    // Maximum number of line breaks to be preserved in one chunk (0 disables)
+    "max_preserve_newlines": 2,
+  }
+
+}

sublime/AutoPep8.sublime-settings

@@ -5,7 +5,7 @@
     "list-fixes": "",
 
     // do not fix these errors / warnings(e.g. E4, W)
-    "ignore": "E24, E226, D",
+    "ignore": "E24,E226,D",
 
     // select errors / warnings(e.g. E4, W)
     "select": "",
@@ -14,7 +14,7 @@
     "indent-size": 4,
 
     "format_on_save": true,
-    "show_output_panel": true,
+    "show_output_panel": false,
     // Format/Preview menu items only appear for views
     // with syntax from `syntax_list`
     // value is base filename of the .tmLanguage syntax files

sublime/C++.sublime-settings

@@ -0,0 +1,7 @@
+// These settings override both User and Default settings for the C++ syntax
+{
+	// The number of spaces a tab is considered equal to
+    "tab_size": 2,
+    // Set to true to insert spaces when tab is pressed
+    "translate_tabs_to_spaces": true,
+}

sublime/CSS.sublime-settings

@@ -0,0 +1,5 @@
+// These settings override both User and Default settings for the CSS syntax
+{
+	"tab_size": 2,
+	"translate_tabs_to_spaces": true,
+}

sublime/Default (Linux).sublime-keymap

@@ -1,121 +1,206 @@
 [
-	// Open folder 
-	{ "keys": ["ctrl+shift+o"], "command": "prompt_open_folder" },
-	
-	// Switch case
-	{ "keys": ["ctrl+u"], "command": "swap_case"},
+    // Open folder 
+    {
+        "keys": ["ctrl+shift+o"],
+        "command": "prompt_open_folder"
+    },
 
-	// Change Ctrl+Shift behaviour (Firefox-like)
-	{ "keys": ["ctrl+tab"], "command": "next_view" },
-	{ "keys": ["ctrl+shift+tab"], "command": "prev_view" },
-	{ "keys": ["ctrl+pagedown"], "command": "next_view_in_stack" },
-	{ "keys": ["ctrl+pageup"], "command": "prev_view_in_stack" },
+    // Switch case
+    {
+        "keys": ["ctrl+u"],
+        "command": "swap_case"
+    },
 
-	// Lord, do I hate Ctrl+q ...
-	{ "keys": ["ctrl+q"], "command": "unbound"},
+    // Change Ctrl+Shift behaviour (Firefox-like)
+    {
+        "keys": ["ctrl+tab"],
+        "command": "next_view"
+    },
+    {
+        "keys": ["ctrl+shift+tab"],
+        "command": "prev_view"
+    },
+    {
+        "keys": ["ctrl+pagedown"],
+        "command": "next_view_in_stack"
+    },
+    {
+        "keys": ["ctrl+pageup"],
+        "command": "prev_view_in_stack"
+    },
 
+    // Lord, do I hate Ctrl+q ... Deactivated because of Layout
+    //{ "keys": ["ctrl+q"], "command": "unbound"},
 
-	// Allow Alt+C to comment:
-	{ "keys": ["alt+c"], "command": "toggle_comment", "args": { "block": false } },
-	{ "keys": ["alt+c"], "command": "toggle_comment", "args": { "block": true } },
-	{ "keys": ["ctrl+/"], "command": "toggle_comment", "args": { "block": false } },
-	{ "keys": ["ctrl+shift+/"], "command": "toggle_comment", "args": { "block": true } },
-	
-	// View settings
-	{
-		"keys": ["ctrl+alt+&"],
-		"command": "set_layout",
-		"args":
-		{
-			"cols": [0.0, 1.0],
-			"rows": [0.0, 1.0],
-			"cells": [[0, 0, 1, 1]]
-		}
-	},
-	{
-		"keys": ["ctrl+alt+é"],
-		"command": "set_layout",
-		"args":
-		{
-			"cols": [0.0, 0.5, 1.0],
-			"rows": [0.0, 1.0],
-			"cells": [[0, 0, 1, 1], [1, 0, 2, 1]]
-		}
-	},
-	{
-		"keys": ["ctrl+alt+\""],
-		"command": "set_layout",
-		"args":
-		{
-			"cols":	[0.0, 0.5, 1.0],
-			"rows": [0.0, 0.5, 1.0],
-			"cells":
-			[
-				[0, 0, 1, 1], [1, 0, 2, 1],
-				[0, 1, 2, 2]
-			]
-			// "cols": [0.0, 0.33, 0.66, 1.0],
-			// "rows": [0.0, 1.0],
-			// "cells": [[0, 0, 1, 1], [1, 0, 2, 1], [2, 0, 3, 1]]
-		}
-	},
-	{
-		"keys": ["alt+shift+4"],
-		"command": "set_layout",
-		"args":
-		{
-			"cols": [0.0, 0.25, 0.5, 0.75, 1.0],
-			"rows": [0.0, 1.0],
-			"cells": [[0, 0, 1, 1], [1, 0, 2, 1], [2, 0, 3, 1], [3, 0, 4, 1]]
-		}
-	},
-	{
-		"keys": ["ctrl+alt+("],
-		"command": "set_layout",
-		"args":
-		{
-			"cols": [0.0, 1.0],
-			"rows": [0.0, 0.5, 1.0],
-			"cells": [[0, 0, 1, 1], [0, 1, 1, 2]]
-		}
-	},
-	{
-		"keys": ["alt+shift+9"],
-		"command": "set_layout",
-		"args":
-		{
-			"cols": [0.0, 1.0],
-			"rows": [0.0, 0.33, 0.66, 1.0],
-			"cells": [[0, 0, 1, 1], [0, 1, 1, 2], [0, 2, 1, 3]]
-		}
-	},
-	{
-		"keys": ["ctrl+alt+'"],
-		"command": "set_layout",
-		"args":
-		{
-			"cols": [0.0, 0.5, 1.0],
-			"rows": [0.0, 0.5, 1.0],
-			"cells":
-			[
-				[0, 0, 1, 1], [1, 0, 2, 1],
-				[0, 1, 1, 2], [1, 1, 2, 2]
-			]
-		}
-	},
-	{
-	    "keys": ["ctrl+alt+o"],
-	    "command": "project_manager", "args": {"action": "new"}
-	},
-	{ "keys": ["ctrl+alt+s"], "command": "toggle_side_bar" },
+    // Allow Alt+C to comment:
+    {
+        "keys": ["alt+c"],
+        "command": "toggle_comment",
+        "args":
+        {
+            "block": false
+        }
+    },
+    {
+        "keys": ["alt+c"],
+        "command": "toggle_comment",
+        "args":
+        {
+            "block": true
+        }
+    },
+    {
+        "keys": ["ctrl+/"],
+        "command": "toggle_comment",
+        "args":
+        {
+            "block": false
+        }
+    },
+    {
+        "keys": ["ctrl+shift+/"],
+        "command": "toggle_comment",
+        "args":
+        {
+            "block": true
+        }
+    },
 
-	// LaTeX compilation set to Ctrl+Enter
-	// Doesn't work...
-	// {
-	// 	"keys": ["ctrl+enter"],
-	// 	"context": [
-	// 		{"key": "selector", "operator": "equal", "operand": "text.tex.latex"},
-	// 		{"key": "latextools.st_version", "operator": "equal", "operand": "<3080"}],
-	// 	"command": "latextools_build_selector"
-	// },
-]
+    // View settings
+    {
+        "keys": ["ctrl+alt+&"],
+        "command": "set_layout",
+        "args":
+        {
+            "cols": [0.0, 1.0],
+            "rows": [0.0, 1.0],
+            "cells": [
+                [0, 0, 1, 1]
+            ]
+        }
+    },
+    {
+        "keys": ["ctrl+alt+é"],
+        "command": "set_layout",
+        "args":
+        {
+            "cols": [0.0, 0.5, 1.0],
+            "rows": [0.0, 1.0],
+            "cells": [
+                [0, 0, 1, 1],
+                [1, 0, 2, 1]
+            ]
+        }
+    },
+    {
+        "keys": ["ctrl+alt+\""],
+        "command": "set_layout",
+        "args":
+        {
+            "cols": [0.0, 0.5, 1.0],
+            "rows": [0.0, 0.5, 1.0],
+            "cells": [
+                [0, 0, 1, 1],
+                [1, 0, 2, 1],
+                [0, 1, 2, 2]
+            ]
+            // "cols": [0.0, 0.33, 0.66, 1.0],
+            // "rows": [0.0, 1.0],
+            // "cells": [[0, 0, 1, 1], [1, 0, 2, 1], [2, 0, 3, 1]]
+        }
+    },
+    {
+        "keys": ["alt+shift+4"],
+        "command": "set_layout",
+        "args":
+        {
+            "cols": [0.0, 0.25, 0.5, 0.75, 1.0],
+            "rows": [0.0, 1.0],
+            "cells": [
+                [0, 0, 1, 1],
+                [1, 0, 2, 1],
+                [2, 0, 3, 1],
+                [3, 0, 4, 1]
+            ]
+        }
+    },
+    {
+        "keys": ["ctrl+alt+("],
+        "command": "set_layout",
+        "args":
+        {
+            "cols": [0.0, 1.0],
+            "rows": [0.0, 0.5, 1.0],
+            "cells": [
+                [0, 0, 1, 1],
+                [0, 1, 1, 2]
+            ]
+        }
+    },
+    {
+        "keys": ["alt+shift+9"],
+        "command": "set_layout",
+        "args":
+        {
+            "cols": [0.0, 1.0],
+            "rows": [0.0, 0.33, 0.66, 1.0],
+            "cells": [
+                [0, 0, 1, 1],
+                [0, 1, 1, 2],
+                [0, 2, 1, 3]
+            ]
+        }
+    },
+    {
+        "keys": ["ctrl+alt+'"],
+        "command": "set_layout",
+        "args":
+        {
+            "cols": [0.0, 0.5, 1.0],
+            "rows": [0.0, 0.5, 1.0],
+            "cells": [
+                [0, 0, 1, 1],
+                [1, 0, 2, 1],
+                [0, 1, 1, 2],
+                [1, 1, 2, 2]
+            ]
+        }
+    },
+    {
+        "keys": ["ctrl+alt+o"],
+        "command": "project_manager",
+        "args":
+        {
+            "action": "new"
+        }
+    },
+    {
+        "keys": ["ctrl+alt+s"],
+        "command": "toggle_side_bar"
+    },
+    {
+        "keys": ["ctrl+alt+h"],
+        "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...
+    // {
+    //  "keys": ["ctrl+enter"],
+    //  "context": [
+    //      {"key": "selector", "operator": "equal", "operand": "text.tex.latex"},
+    //      {"key": "latextools.st_version", "operator": "equal", "operand": "<3080"}],
+    //  "command": "latextools_build_selector"
+    // },
+]

sublime/Default.sublime-keymap

@@ -0,0 +1 @@
+[]

sublime/DocblockrPython.sublime-settings

@@ -0,0 +1,9 @@
+{
+    /**
+     * This option dictates which style of docstrings to use, when parsing docstrings
+     *
+     * Available Options:
+     * [PEP0257, docblock, google, numpy, sphinx]
+     */
+    "formatter": "numpy"
+}

sublime/HTML.sublime-settings

@@ -0,0 +1,7 @@
+// These settings override both User and Default settings for the C++ syntax
+{
+	// The number of spaces a tab is considered equal to
+    "tab_size": 2,
+    // Set to true to insert spaces when tab is pressed
+    "translate_tabs_to_spaces": true,
+}

sublime/HTMLPrettify.sublime-settings

@@ -0,0 +1,3 @@
+{
+
+}

sublime/LaTeXing.sublime-settings

@@ -0,0 +1,12 @@
+{
+    "foldable_environments": [
+        "table",
+        "figure",
+        "equation",
+        "section"
+    ],
+    "zotero": false,
+    "zotero_user_id": "3421821",
+    "zotero_user_key": "5d3MQLpPp8ra2irK6tMyBvaJ",
+    "open_pdf_on_load": false
+}

sublime/LanguageTool.sublime-settings

@@ -0,0 +1,15 @@
+
+{
+    "languagetool_server_remote": "https://languagetool.org/api/v2/check",
+    "languagetool_server_local": "http://localhost:8081/v2/check",
+    "default_server": "local",
+    "display_mode": "panel",
+    "languagetool_jar": "/home/adrien/src/LanguageTool-5.6/languagetool.jar",
+    "highlight-scope": "comment",
+    "ignored-scopes": [
+        "support.function.*.latex",
+        "meta.*.latex",
+        "comment.*.tex",
+        "keyword.control.tex"
+    ]
+}

sublime/MakeLocal.sublime-build

@@ -0,0 +1,4 @@
+{
+	"working_dir": "${file_path}",
+	"cmd": ["make"]
+}

sublime/NixPaper.sublime-build

@@ -0,0 +1,17 @@
+{
+	"selector": "text.tex.latex",
+	"working_dir": "$folder",
+	"cancel": {"kill": true},
+	"shell_cmd" : "nix-shell --run 'make paper'",
+	"file_regex": "^(?:W|E|B):\\s(.*):([0-9]+)",
+	"variants": [
+		{
+			"name": "Clean",
+			"shell_cmd" : "nix-shell --run 'make clean'",
+		},
+		{
+			"name": "Push",
+			"shell_cmd" : "aws --endpoint-url https://garage.deuxfleurs.fr s3 cp paper/main.pdf s3://adrien/main.pdf",
+		}
+	]
+}

sublime/Package Control.sublime-settings

@@ -5,32 +5,39 @@
 	],
 	"installed_packages":
 	[
-		"All Autocomplete",
 		"AutoPEP8",
+		"ayu",
 		"Compare Side-By-Side",
-		"Diffy",
+		"Dartlight",
+		"DocBlockr_Python",
 		"Dockerfile Syntax Highlighting",
 		"ExportHtml",
-		"Git",
 		"GitGutter",
-		"GoSublime",
-		"Javascript Beautify",
+		"Helium",
+		"HTML-CSS-JS Prettify",
 		"Language - French - Français",
+		"LanguageTool",
+		"LaTeXing",
 		"LaTeXTools",
 		"Markdown Extended",
-		"MarkdownPreview",
-		"MultiEditUtils",
+		"Markdown HTML Preview",
+		"Markdown Images",
+		"MarkdownLivePreview",
+		"Nix",
 		"Package Control",
 		"Pandoc",
 		"Predawn",
 		"Pretty JSON",
-		"Processing",
 		"ProjectManager",
-		"SublimeCodeIntel",
+		"RustFmt",
 		"SublimeLinter",
+		"SublimeLinter-cppcheck",
+		"SublimeLinter-pycodestyle",
 		"SublimeLinter-pyflakes",
-		"SublimeREPL",
 		"SwitchDictionary",
-		"WordCount"
-	]
+		"Terraform",
+		"WordingStatus",
+		"Diffable",
+	],
+	"submit_usage": false,
 }

sublime/Preferences.sublime-settings

@@ -39,21 +39,124 @@
 		"anonymization",
 		"mixnets",
 		"Grafana",
-		"Prometheus"
+		"Prometheus",
+		"décarbonée",
+		"décarbonées",
+		"pourcent",
+		"pouième",
+		"misclassifications",
+		"Bayes",
+		"Hoeffding",
+		"misclassifies",
+		"app",
+		"leverages",
+		"webservices",
+		"problematics",
+		"leveraging",
+		"leechers",
+		"leecher",
+		"premiere",
+		"tuple",
+		"booleans",
+		"uploader",
+		"anymore",
+		"byzantine",
+		"anonymise",
+		"anonymised",
+		"cloudlets",
+		"versioned",
+		"blockchain",
+		"blockchains",
+		"Bitcoin",
+		"Markovian",
+		"wearables",
+		"churnful",
+		"boxplots",
+		"timeout",
+		"proxemics",
+		"intermittency",
+		"datetime",
+		"geolocations",
+		"middlewares",
+		"squad",
+		"désanonymiser",
+		"fabriquants",
+		"anonymises",
+		"anonymisation",
+		"themself",
+		"scenarii",
+		"defense",
+		"unraveled",
+		"anonymising",
+		"désanonymisation",
+		"nuagique",
+		"app's",
+		"Deuxfleurs",
+		"setup",
+		"crowdsourcing",
+		"crowdsourced",
+		"geolocation",
+		"unlinkable",
+		"unlinkability",
+		"Rouvoy",
+		"jacente",
+		"plateforme",
+		"massification",
+		"seemlessly",
+		"testbed",
+		"adressabilité",
+		"Spirals",
+		"dynamicité",
+		"scalabilité",
+		"latencies",
+		"liveness",
+		"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_size": 10,
+	"font_face": "Fira Code",
+	"font_size": 12,
 	"ignored_packages":
 	[
-		"Vintage"
+		"ActionScript",
+		"AppleScript",
+		"ASP",
+		"AutoPEP8",
+		"ayu",
+		"C#",
+		"Clojure",
+		"Git Formats",
+		"HTML-CSS-JS Prettify",
+		"LaTeXTools",
+		"SublimeLinter",
+		"SublimeLinter-pycodestyle",
+		"Vintage",
+	],
+	"ignored_words":
+	[
+		"",
+		"Inria",
+		"cloud",
+		"critériées",
+		"critérées",
+		"marketisation",
+		"prequential",
 	],
 	"predawn_findreplace_small": true,
 	"predawn_quick_panel_small": true,
-	"predawn_sidebar_arrows": true,
+	"predawn_sidebar_arrows": false,
 	"predawn_sidebar_small": true,
 	"predawn_tabs_small": true,
-	"theme": "predawn-DEV.sublime-theme"
+	"theme": "predawn-DEV.sublime-theme",
+	"index_files": true,
 }

sublime/Rust.sublime-settings

@@ -0,0 +1,7 @@
+// These settings override both User and Default settings for the Rust syntax
+{
+	// The number of spaces a tab is considered equal to
+	"tab_size": 2,
+	// Set to true to insert spaces when tab is pressed
+	"translate_tabs_to_spaces": true,
+}

sublime/RustFmt.sublime-settings

@@ -0,0 +1,5 @@
+// RustFmt Settings - User
+{
+	"executable": ["rustfmt", "+nightly", "--edition", "2018"],
+	// "error_messages": false,
+}

sublime/SublimeLinter.sublime-settings

@@ -0,0 +1,23 @@
+// SublimeLinter Settings - User
+{
+    // Set to true to print extra information in the console.
+    "debug": true,
+    "linters": {
+        "cppcheck": {
+            // "@disable": false,
+            // "args": [],
+            "enable": "all",
+            "excludes": ["css"],
+            // "lint_mode": "save"
+            "std": ["c++11"]
+        },
+        // "pycodestyle": {
+        //     "executable": "~/.local/bin/pycodestyle"
+        // },
+        "pyflakes": {
+            "executable": "~/.local/bin/pyflakes",
+            // suppress all warnings
+            "filter_errors": "w: "
+        }
+    }
+}

sublime/nix.sublime-settings

@@ -0,0 +1,10 @@
+{
+	"extensions":
+	[
+		"nix"
+	], 
+
+	"tab_size": 2,
+	// Set to true to insert spaces when tab is pressed
+	"translate_tabs_to_spaces": true
+}

tmux.conf

@@ -1,9 +1,9 @@
 # KEY BINDINGS
-# Alex Auvolat + Adrien Luxey additions
+# Adrien Luxey
 
-###########################
-### Packages management ###
-###########################
+#######################
+# Packages management #
+#######################
 
 # Tmux Package Manager
 # Prefix + I => Install plugins (after adding them to tmux.conf)
@@ -11,51 +11,132 @@
 # Prefix + U => Update packages
 set -g @plugin 'tmux-plugins/tpm'
 
-# Tmux OneDark: http://github.com/odedlaz/tmux-onedark-themetheme
-#set -g @plugin 'odedlaz/tmux-onedark-theme'
-# Tmux-Themepack (feat Powerline)
-set -g @plugin 'jimeh/tmux-themepack'
-set -g @themepack 'powerline/default/blue'
-
 # Save and restore Tmux sessions
 # Prefix + Ctrl-s => Save current session
 # Prefix + Ctrl-r => Restore
-set -g @plugin 'tmux-plugins/tmux-resurrect'
+#set -g @plugin 'tmux-plugins/tmux-resurrect'
 
 # Continuous saving tmux environment (depends on Ressurect)
 # Also auto-starts tmux on boot and auto-restores last session
-set -g @plugin 'tmux-plugins/tmux-continuum'
+#set -g @plugin 'tmux-plugins/tmux-continuum'
 #set -g status-right 'Continuum status: #{continuum_status}'
-set -g @continuum-restore 'on' # Auto restore previous session
-set -g @continuum-save-interval '15' # save time in minutes
+#set -g @continuum-restore 'on' # Auto restore previous session
+#set -g @continuum-save-interval '15' # save time in minutes
 
 # Copy to system clipboard
 # Normal mode: 
-# 	Prefix + y => (yank) Copies text from command line to clipboard
+#   Prefix + y => (yank) Copies text from command line to clipboard
 # Copy mode:
-# 	y => copy selection to clipboard
-# 	Y => Put (copy a selection then paste it to cmd)
-set -g @plugin 'tmux-plugins/tmux-yank'
+#   y => copy selection to clipboard
+#   Y => Put (copy a selection then paste it to cmd)
+#set -g @plugin 'tmux-plugins/tmux-yank'
 
-# There seems to be cool things to make Vim and Tmux play well together too
+# Manage sessions, windows etc. with fzf
+#set -g @plugin 'sainnhe/tmux-fzf'
+
+# Opens stuff
+#set -g @plugin 'tmux-plugins/tmux-open'
+#set -g @open-S 'https://www.startpage.com/do/search?cat=web&cmd=process_search&language=english&engine0=v1all&abp=1&query='
+#set -g @open 'C-f'
+#set -g @open-editor 'C-e'
+
+###########
+# Theming #
+###########
+
+# Set current dir name as tab (window) name
+# * Shows pwd #{b:pane_current_path}
+# * Shows full path #{pane_current_path}
+#path="#(if [[ $HOME == #{pane_current_path} ]]; then echo \"~\" ; else echo #{b:pane_current_path}; fi)"
+#set -g status-interval 1
+#set-window-option -g window-status-separator ""
+#set-window-option -g window-status-current-format " #{b:pane_current_path} "
+#set-window-option -g window-status-format " #{b:pane_current_path} "
 
 
-#######################
-### Adrien's stuff  ###
-#######################
+# Tmux OneDark: http://github.com/odedlaz/tmux-onedark-themetheme
+set -g @plugin 'odedlaz/tmux-onedark-theme'
 
 # Make tmux display true colors
+#set -g default-terminal "screen-256color"
 set -g default-terminal "xterm-256color"
-set -ga terminal-overrides ",*256col*:Tc"
+# Creates a visual glitch with e.g. colored comments, don't use.
+#set -ga terminal-overrides ",*256col*:Tc"
+
+#set-option -g allow-rename off
+
+########
+# Misc #
+########
+
+set -g mouse on
+
+# Home/End keys handled in [n]vim 
+bind-key -n Home send Escape "OH"
+bind-key -n End send Escape "OF"
+
+# Set the display duration of message (in ms)
+set-option -g display-time 4000
 
 # Remember my path when splitting windows
 bind % split-window -h -c '#{pane_current_path}'  # Split panes horizontally
 bind '"' split-window -v -c '#{pane_current_path}'  # Split panes vertically
 
+# A big-ass history
+set -g history-limit 50000
 
-#####################
-### Alex's stuff  ###
-#####################
+# Fast key repetition with escape-time 0
+set -g escape-time 0
+
+######################
+# Vim Tmux Navigator #
+######################
+
+# Smart pane switching with awareness of Vim splits.
+# See: https://github.com/christoomey/vim-tmux-navigator
+is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
+    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?|fzf)(diff)?$'"
+bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h'  'select-pane -L'
+bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j'  'select-pane -D'
+bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k'  'select-pane -U'
+bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l'  'select-pane -R'
+
+tmux_version='$(tmux -V | sed -En "s/^tmux ([1-9]+(.[0-9]+)?).*/\1/p")'
+if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
+    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\'  'select-pane -l'"
+if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
+    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\'  'select-pane -l'"
+
+bind-key -T copy-mode-vi 'C-h' select-pane -L
+bind-key -T copy-mode-vi 'C-j' select-pane -D
+bind-key -T copy-mode-vi 'C-k' select-pane -U
+bind-key -T copy-mode-vi 'C-l' select-pane -R
+bind-key -T copy-mode-vi 'C-m' select-pane -l
+
+# Notes : 
+# prefix ~ --> show-messages (see previous messages)
+
+###################
+# Nested sessions #
+###################
+
+# F10 toggles tmux listening for keystrokes, allowing to switch betwen remote and local
+# https://www.freecodecamp.org/news/tmux-in-practice-local-and-nested-remote-tmux-sessions-4f7ba5db8795/
+bind -T root F10 \
+  set prefix None \;\
+  set key-table off \;\
+  display-message "Discarding keystrokes."\;\
+  if -F '#{pane_in_mode}' 'send-keys -X cancel' \;\
+  refresh-client -S
+bind -T off F10 \
+  set -u prefix \;\
+  set -u key-table \;\
+  display-message "Listening to keystrokes."\;\
+  refresh-client -S
+
+################
+# Alex's stuff #
+################
 
 setw -g mode-keys vi
 
@@ -88,19 +169,10 @@ bind l select-pane -R
 bind k select-pane -U
 bind j select-pane -D
 # switch windows using bindings C-q C-hl
-unbind ^H
-unbind ^L
+#unbind ^H
+#unbind ^L
 bind ^H previous-window
 bind ^L next-window
 
-# OTHER OPTIONS
-
-set -g mouse on
-
-set -g escape-time 0
-
-# don't rename windows automatically
-set-option -g allow-rename off
-
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run -b '~/.tmux/plugins/tpm/tpm'

tmux/plugins/tmux-continuum

@@ -1 +0,0 @@
-Subproject commit 4e2279688d8a577ed14f42c4e8af1acb58100a57

tmux/plugins/tmux-onedark-theme

@@ -1 +0,0 @@
-Subproject commit e35740e7a70a84af4fc0bdc40890a8b0de49b7ab

tmux/plugins/tmux-resurrect

@@ -1 +0,0 @@
-Subproject commit c3ffe89e525a4692d9fa53235bbce1280d1d8311

tmux/plugins/tmux-themepack

@@ -1 +0,0 @@
-Subproject commit 126150da5e89b262fec94dd7b3d8bcd0966646a9

tmux/plugins/tmux-yank

@@ -1 +0,0 @@
-Subproject commit 30bfd780061f1752d1133016f217a13add4d4e86

vim/bundle/Vundle.vim

@@ -1 +1 @@
-Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
+Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95

vim/bundle/vim-nix

@@ -0,0 +1 @@
+Subproject commit 1e8d3cc4d74f40fb384cd1739739543fe117ff61

vim/bundle/vim-tmux-navigator

@@ -0,0 +1 @@
+Subproject commit 7db70e08ea03b3e4d91f63713d76134512e28d7e

vimrc

@@ -11,9 +11,13 @@ call vundle#begin()
 " let Vundle manage Vundle, required
 Plugin 'VundleVim/Vundle.vim'
 
+Plugin 'christoomey/vim-tmux-navigator' " Vim Tmux Navigator 
+
 Plugin 'vim-airline/vim-airline' " Airline bar
 Plugin 'vim-airline/vim-airline-themes' " Airline themes
 
+Plugin 'LnL7/vim-nix' " Nix
+
 " Themes
 " Plugin 'arcticicestudio/nord-vim'
 
@@ -25,14 +29,70 @@ filetype plugin indent on    " required
 " End Vundle config "
 """""""""""""""""""""
 
+""""""""""""""
+" Navigation "
+""""""""""""""
+
+" Jump beginning/end of file: gg/G
+" Jump to line 30: 30G
+" Jump 50% up/down: Ctrl-d/Ctrl-u
+" Jump prev/next word: b/w
+
+" From https://stackoverflow.com/questions/33245317/vim-and-azerty-keyboards
+" 1. Move to the end of the line
+noremap m $
+" 2. Search backward for the word under the cursor
+noremap µ #
+" 3. Navigate to the help tag under the cursor
+" noremap ' <C-]>
+
+" Scroller comme un pro
+" N'utilise que j et k
+" Ctrl-e & Ctrl-y pour scroller dans un document
+set scrolloff=12
+
+" Ctrl+W +/-: increase/decrease height (ex. 20<C-w>+)
+" Ctrl+W >/<: increase/decrease width (ex. 30<C-w><)
+" Ctrl+W =: equalize width and height of all windows
+" Ctrl+W _: set height (ex. 50<C-w>_)
+" Ctrl+W |: set width (ex. 50<C-w>|)
+
+""""""""""""""""""""
+" Tmux integration "
+""""""""""""""""""""
+
+" auto-reload tmux conf when updated
+if has("autocmd")
+    autocmd bufwritepost ~/dotfiles/.tmux.conf execute ':!tmux source-file %'
+endif
+"""""""""""
+" Theming "
+"""""""""""
 
-" Styling
 syntax enable
 set background=dark
 colorscheme blues
-let g:airline_theme='minimalist' " The airline theme
+"let g:airline_theme='minimalist' " The airline theme
 let g:airline_powerline_fonts=1 " Make airline use powerline fonts (pretty arrows)
 
+""""""""
+" Misc "
+""""""""
+
+" Autoreload vimrc
+if has("autocmd")
+    autocmd! bufwritepost .vimrc source ~/.vimrc
+    autocmd! bufwritepost vimrc source ~/.vimrc
+endif
+
+" Allow saving of files as sudo when I forgot to start vim using sudo.
+cmap w!! w !sudo tee > /dev/null %
+
+" Map CAPSLOCK to Escape in insert mode?
+
+" Wrap move left/right to end of last line/beginning of the next one
+set whichwrap+=<,>,h,l,[,]
+
 " Do not create swap files
 set nobackup
 set noswapfile
@@ -40,12 +100,27 @@ set noundofile
 
 " Line numbering (hybrid: relative and absolute)
 set number relativenumber
-augroup numbertoggle
-  autocmd!
+augroup numbertoggle autocmd!
   autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
   autocmd BufLeave,FocusLost,InsertEnter   * set norelativenumber
 augroup END
 
+" jk to <ESC>
+inoremap jk <esc>
+
+" Yank vim text to system & selection clipboard with Ctrl+C
+" Paste with Ctrl+V
+" Requires `gvim` that is the following flags to your `vim --version`
+" +clipboard
+" +X11
+" +xterm_clipboard
+" From https://www.youtube.com/watch?v=E_rbfQqrm7g
+vnoremap <C-c> "*y :let @+=@*<CR>
+map <C-v> "+P
+
+" Toggle search high-lighting
+nnoremap <F3> :set hlsearch!<CR>
+
 " You wanna suffer? Disable arrow keys
 " noremap <Up> <NOP>
 " noremap <Down> <NOP>
@@ -57,6 +132,51 @@ augroup END
 " Adapted from https://github.com/jessfraz/.vim/blob/master/vimrc "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
+" ----------------------------------------- "
+" File Type settings                        "
+" ----------------------------------------- "
+
+au BufNewFile,BufRead *.vim setlocal noet ts=4 sw=4 sts=4
+au BufNewFile,BufRead *.md setlocal nospell noet ts=4 sw=4
+au BufNewFile,BufRead *.yml,*.yaml setlocal expandtab ts=2 sw=2
+au BufNewFile,BufRead *.cpp setlocal expandtab ts=2 sw=2
+au BufNewFile,BufRead *.hpp setlocal expandtab ts=2 sw=2
+au BufNewFile,BufRead *.json setlocal expandtab ts=2 sw=2
+au BufNewFile,BufRead *.jade setlocal expandtab ts=2 sw=2
+
+augroup filetypedetect
+  au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
+  au BufNewFile,BufRead .nginx.conf*,nginx.conf* setf nginx
+augroup END
+
+au FileType nginx setlocal noet ts=4 sw=4 sts=4
+
+" Go settings
+au BufNewFile,BufRead *.go setlocal noet ts=4 sw=4 sts=4
+" autocmd BufEnter *.go colorscheme nofrils-dark
+
+" scala settings
+autocmd BufNewFile,BufReadPost *.scala setl shiftwidth=2 expandtab
+
+" Markdown Settings
+au BufNewFile,BufRead *.txt setlocal noet ts=4 sw=4
+autocmd BufNewFile,BufReadPost *.md setl ts=4 sw=4 sts=4 expandtab
+
+" lua settings
+autocmd BufNewFile,BufRead *.lua setlocal noet ts=4 sw=4 sts=4
+
+" Dockerfile settings
+autocmd FileType dockerfile set noexpandtab
+
+" shell/config/systemd settings
+autocmd FileType fstab,systemd set noexpandtab
+autocmd FileType gitconfig,sh,toml set noexpandtab
+
+" python indent
+autocmd BufNewFile,BufRead *.py setlocal tabstop=4 softtabstop=4 shiftwidth=4 textwidth=80 smarttab expandtab
+
+"""""""""""""""""""
+
 set splitright                  " Split vertical windows right to the current windows
 set splitbelow                  " Split horizontal windows below to the current windows
 set encoding=utf-8              " Set default encoding to UTF-8
@@ -121,54 +241,6 @@ map q: :q
 let &t_SI .= "\<Esc>[?2004h"
 let &t_EI .= "\<Esc>[?2004l"
 
-" Allow saving of files as sudo when I forgot to start vim using sudo.
-cmap w!! w !sudo tee > /dev/null %
-
-" ----------------------------------------- "
-" File Type settings                        "
-" ----------------------------------------- "
-
-au BufNewFile,BufRead *.vim setlocal noet ts=4 sw=4 sts=4
-au BufNewFile,BufRead *.txt setlocal noet ts=4 sw=4
-"#au BufNewFile,BufRead *.md setlocal spell noet ts=4 sw=4
-au BufNewFile,BufRead *.md setlocal nospell noet ts=4 sw=4
-au BufNewFile,BufRead *.yml,*.yaml setlocal expandtab ts=2 sw=2
-au BufNewFile,BufRead *.cpp setlocal expandtab ts=2 sw=2
-au BufNewFile,BufRead *.hpp setlocal expandtab ts=2 sw=2
-au BufNewFile,BufRead *.json setlocal expandtab ts=2 sw=2
-au BufNewFile,BufRead *.jade setlocal expandtab ts=2 sw=2
-
-augroup filetypedetect
-  au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
-  au BufNewFile,BufRead .nginx.conf*,nginx.conf* setf nginx
-augroup END
-
-au FileType nginx setlocal noet ts=4 sw=4 sts=4
-
-" Go settings
-au BufNewFile,BufRead *.go setlocal noet ts=4 sw=4 sts=4
-" autocmd BufEnter *.go colorscheme nofrils-dark
-
-" scala settings
-autocmd BufNewFile,BufReadPost *.scala setl shiftwidth=2 expandtab
-
-" Markdown Settings
-autocmd BufNewFile,BufReadPost *.md setl ts=4 sw=4 sts=4 expandtab
-
-" lua settings
-autocmd BufNewFile,BufRead *.lua setlocal noet ts=4 sw=4 sts=4
-
-" Dockerfile settings
-autocmd FileType dockerfile set noexpandtab
-
-" shell/config/systemd settings
-autocmd FileType fstab,systemd set noexpandtab
-autocmd FileType gitconfig,sh,toml set noexpandtab
-
-" python indent
-autocmd BufNewFile,BufRead *.py setlocal tabstop=4 softtabstop=4 shiftwidth=4 textwidth=80 smarttab expandtab
-
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " End https://github.com/jessfraz/.vim/blob/master/vimrc "
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""

zshrc

@@ -1,3 +1,10 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
 # If you come from bash you might have to change your $PATH.
 # export PATH=$HOME/bin:/usr/local/bin:$PATH
 
@@ -10,31 +17,21 @@ export ZSH=$HOME/.oh-my-zsh
 #ZSH_THEME="random"
 #ZSH_THEME="avit"
 #ZSH_THEME="half-life"
-ZSH_THEME="agnoster"
+#ZSH_THEME="agnoster"
+ZSH_THEME="powerlevel10k/powerlevel10k"
+DEFAULT_USER=adrien
 
 # Uncomment the following line to use case-sensitive completion.
-#CASE_SENSITIVE="true"
 CASE_SENSITIVE="false"
 
-# Uncomment the following line to use hyphen-insensitive completion. Case
-# sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
-
 # Uncomment the following line to disable bi-weekly auto-update checks.
 # DISABLE_AUTO_UPDATE="true"
-
 # Uncomment the following line to change how often to auto-update (in days).
-# export UPDATE_ZSH_DAYS=13
-
-# Uncomment the following line to disable colors in ls.
-# DISABLE_LS_COLORS="true"
+export UPDATE_ZSH_DAYS=13
 
 # Uncomment the following line to disable auto-setting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
-# Uncomment the following line to enable command auto-correction.
-# ENABLE_CORRECTION="true"
-
 # Uncomment the following line to display red dots whilst waiting for completion.
 # COMPLETION_WAITING_DOTS="true"
 
@@ -43,14 +40,6 @@ CASE_SENSITIVE="false"
 # much, much faster.
 DISABLE_UNTRACKED_FILES_DIRTY="true"
 
-# Uncomment the following line if you want to change the command execution time
-# stamp shown in the history command output.
-# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# HIST_STAMPS="mm/dd/yyyy"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
@@ -61,7 +50,17 @@ source $ZSH/oh-my-zsh.sh
 
 # User configuration
 
-# export MANPATH="/usr/local/man:$MANPATH"
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+alias o="xdg-open > /dev/null 2>&1"
+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"
+alias ctrlc="xclip -selection clipboard"
+alias icat="kitty icat"
+
 
 # You may need to manually set your language environment
 export LANG=fr_FR.UTF-8
@@ -69,44 +68,20 @@ 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
-
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
-
-# ssh
-# export SSH_KEY_PATH="~/.ssh/rsa_id"
-
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-alias o="xdg-open > /dev/null 2>&1"
-
-# 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=/home/adrien/bin:/opt/texbin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/adrien/goroot/bin:/usr/local/go/bin:/home/adrien/goroot/bin:/home/adrien/.shadow/bin
-#export PATH=$PATH:/home/adrien/.shadow/bin
-export PATH=$PATH:/home/adrien/.local/bin
+export PATH=$PATH:$HOME/.local/bin
 if [ -d "$HOME/bin" ] ; then
     PATH="$PATH:$HOME/bin"
 fi
 
 # Enable Autojump (j)
-. /usr/share/autojump/autojump.sh
+if [ -f "/usr/share/autojump/autojump.sh" ]; then
+    . /usr/share/autojump/autojump.sh
+fi
+
+# If there is a local zshrc, source it too
+if [ -f ~/.zshrc.local ]; then
+    . ~/.zshrc.local
+fi
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh