From 319d7a1bcfb23e5761c2df5ab6997a2eb0dd8695 Mon Sep 17 00:00:00 2001
From: Samuel Ortion <samuel+git@ortion.fr>
Date: Sun, 16 Jul 2023 15:16:14 +0200
Subject: [PATCH] Amend fish config with starship

---
 .aliases      |  2 ++
 .aliases.fish | 10 +++++-----
 .zshrc        |  4 +++-
 Makefile      |  3 +++
 starship.toml |  8 ++++----
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.aliases b/.aliases
index 7a76946..53fa1ce 100644
--- a/.aliases
+++ b/.aliases
@@ -2,6 +2,8 @@ alias o="evince2"
 
 alias pro="cd ~/Documents/Projects"
 alias doc="cd ~/Documents"
+alias vim="nvim"
+alias activenv="mamba activate hic2023py3.11"
 
 alias int="cd ~/Documents/cours/licence/L3/stage/pasteur/project/"
 
diff --git a/.aliases.fish b/.aliases.fish
index a1a2ab5..4cffea5 100644
--- a/.aliases.fish
+++ b/.aliases.fish
@@ -1,6 +1,7 @@
 alias o="evince2"
 
 alias vim="nvim"
+alias activenv="conda activate hic2023py3.11"
 
 alias pro="cd ~/Documents/Projects"
 alias doc="cd ~/Documents"
@@ -11,12 +12,11 @@ export templates_dir="~/Documents/Projects/templates"
 alias new.td='copier "$templates_dir/latex/td.template"'
 alias new.cm='copier "$templates_dir/latex/cm.template"'
 alias new.letter='copier "$templates_dir/latex/letter.template"'
-alias taquin.sync="rsync -azvu  '/home/sortion/Documents/cours/licence/L3/S6/intelligence artificielle/DM/DM2/taquin/' leon.talpa:/home/sortion/Documents/Projects/taquin/ && rsync -azvu  leon.talpa:/home/sortion/Documents/Projects/taquin/ '/home/sortion/Documents/cours/licence/L3/S6/intelligence artificielle/DM/DM2/taquin/'"
 
-function pdfcompress 
-   gs -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dPDFSETTINGS=/screen -dEmbedAllFonts=true -dSubsetFonts=true -dColorImageDownsampleType=/Bicubic -dColorImageResolution=144 -dGrayImageDownsampleType=/Bicubic -dGrayImageResolution=144 -dMonoImageDownsampleType=/Bicubic -dMonoImageResolution=144 -sOutputFile="$2" "$1"; 
+function pdfcompress
+    gs -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dPDFSETTINGS=/screen -dEmbedAllFonts=true -dSubsetFonts=true -dColorImageDownsampleType=/Bicubic -dColorImageResolution=144 -dGrayImageDownsampleType=/Bicubic -dGrayImageResolution=144 -dMonoImageDownsampleType=/Bicubic -dMonoImageResolution=144 -sOutputFile="$2" "$1"
 end
 
-function colorinvert 
-        convert "$1" -channel RGB -negate "$(echo $1 | sed 's/\./-inv\./')"
+function colorinvert
+    convert "$1" -channel RGB -negate "$(echo $1 | sed 's/\./-inv\./')"
 end
diff --git a/.zshrc b/.zshrc
index b87f565..bd49e2a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -10,7 +10,7 @@ antigen use oh-my-zsh
 
 antigen bundle nerdfonts
 
-antigen theme ys
+# antigen theme ys
 
 antigen bundle zsh-users/zsh-syntax-highlighting
 
@@ -20,6 +20,8 @@ antigen bundle git
 
 antigen apply
 
+source <(/home/sortion/.cargo/bin/starship init zsh --print-full-init)
+
 if [[ -x /usr/bin/fortune ]]; then
         fortune
 fi
diff --git a/Makefile b/Makefile
index 1ec6c69..7290590 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,9 @@ fishcfg:
 	cp ./.aliases.fish ~/.aliases.fish
 	cp starship.toml ~/.config/starship.toml
 
+nvim:
+	
+
 antigen:
 	git clone https://github.com/zsh-users/antigen.git
 
diff --git a/starship.toml b/starship.toml
index 893e049..b9451ef 100644
--- a/starship.toml
+++ b/starship.toml
@@ -14,9 +14,9 @@ $character"""
 style = "bright-blue"
 
 [character]
-success_symbol = "[❯](purple)"
-error_symbol = "[❯](red)"
-vimcmd_symbol = "[❮](green)"
+success_symbol = "[❯](bright-purple)"
+error_symbol = "[❯](bright-red)"
+vimcmd_symbol = "[❮](bright-green)"
 
 [git_branch]
 format = "[$branch]($style)"
@@ -24,7 +24,7 @@ style = "bright-black"
 
 [git_status]
 format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)"
-style = "cyan"
+style = "bright-cyan"
 conflicted = "​"
 untracked = "​"
 modified = "​"