diff --git a/.aliases b/.aliases index 6426d02..2ea76fd 100644 --- a/.aliases +++ b/.aliases @@ -2,10 +2,8 @@ alias o="xdg-open" alias pro="cd ~/Documents/Projects" alias doc="cd ~/Documents" -alias vim="nvim" -alias int="cd ~/Documents/cours/licence/L3/stage/pasteur/projects/" alias blog="cd ~/Documents/Projects/myself/log/" -alias cours="cd ~/Documents/cours/master/M1/S1/" +alias course="cd ~/Documents/course/master/M1/T1/" # Print field name from header with the field rank csv_fields() { diff --git a/.gitmodules b/.gitmodules index 94c1f8c..c04ac41 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "liquidprompt/lp-mouse"] path = liquidprompt/lp-mouse url = git@github.com:UncleSamulus/lp-mouse.git +[submodule "liquidprompt/lp-dotmatrix"] + path = liquidprompt/lp-dotmatrix + url = https://github.com/nojhan/lp-dotmatrix diff --git a/.loadenv.sh b/.loadenv.sh index 376f7e4..ba29251 100644 --- a/.loadenv.sh +++ b/.loadenv.sh @@ -16,23 +16,8 @@ if type vivid >/dev/null; then export LS_COLORS="$(vivid -m 8-bit generate one-dark)" fi -eval $(thefuck --alias) - -# >>> conda initialize >>> -# !! Contents within this block are managed by 'conda init' !! -__conda_setup="$('/home/$USER/.local/share/mambaforge/bin/conda' 'shell.zsh' 'hook' 2>/dev/null)" -if [ $? -eq 0 ]; then - eval "$__conda_setup" -else - if [ -f "/home/$USER/.local/share/mambaforge/etc/profile.d/conda.sh" ]; then - . "/home/$USER/.local/share/mambaforge/etc/profile.d/conda.sh" - else - export PATH="/home/$USER/.local/share/mambaforge/bin:$PATH" - fi +if type thefuck > /dev/null; then + eval $(thefuck --alias) fi -unset __conda_setup -if [ -f "/home/$USER/.local/share/mambaforge/etc/profile.d/mamba.sh" ]; then - . "/home/$USER/.local/share/mambaforge/etc/profile.d/mamba.sh" -fi -# <<< conda initialize <<< + diff --git a/.zshrc b/.zshrc index 3a9d56d..1688022 100644 --- a/.zshrc +++ b/.zshrc @@ -30,24 +30,21 @@ antigen bundle nojhan/liquidprompt antigen apply -source ~/.antigen/bundles/nojhan/liquidprompt/liquidprompt +export DOTMATRIX_SPACED=1 -# source ~/.antigen/bundles/nojhan/liquidprompt/themes/powerline/powerline.theme && lp_theme powerline +source ~/.antigen/bundles/nojhan/liquidprompt/liquidprompt source ~/.dotfiles/liquidprompt/lp-mouse/preset.conf -source ~/.antigen/bundles/nojhan/lp-dotmatrix/presets/variant-chevron.conf +source ~/.dotfiles/liquidprompt/lp-dotmatrix/presets/variant-chevron.conf -source ~/.antigen/bundles/nojhan/lp-dotmatrix/presets/colors_green-red.conf +source ~/.dotfiles/liquidprompt/lp-dotmatrix/presets/colors-green-red.conf -source ~/.antigen/bundles/nojhan/lp-dotmatrix/dotmatrix.theme && lp_theme dotmatrix - -# source <(/home/sortion/.cargo/bin/starship init zsh --print-full-init) - -export DOTMATRIX_SPACED=1 +source ~/.dotfiles/liquidprompt/lp-dotmatrix/dotmatrix.theme && lp_theme dotmatrix # if [ "$TMUX" = "" ]; then tmux; fi if type fortune > /dev/null; then fortune fi + diff --git a/Makefile b/Makefile index 6dfd420..8f99f10 100644 --- a/Makefile +++ b/Makefile @@ -1,30 +1,17 @@ all: pull install pull: - git pull + git pull origin main -install: antigen source emacs nvim +install: antigen source -source: fish +source: cp ~/.dotfiles/.aliases ~/.aliases cp ~/.dotfiles/.zshrc ~/.zshrc cp ~/.dotfiles/.loadenv.sh ~/.loadenv.sh cp ~/.dotfiles/.vimrc ~/.vimrc cp ~/.dotfiles/.gitconfig ~/.gitconfig - cp ~/.dotfiles/.latexmkrc ~/.latexmkrc - - -fish: - mkdir -p ~/.config/fish - cp ./.config/fish/config.fish ~/.config/fish/config.fish - cp ./.aliases.fish ~/.aliases.fish - cp ./.config/starship.toml ~/.config/starship.toml - -nvim: - git clone ssh://gitea@forge.chapril.org:222/sortion/nvim.conf ~/.config/nvim/ - -emacs: - git clone ssh://gitea@forge.chapril.org:222/sortion/.emacs.d.git ~/.emacs.d/ + cp ~/.dotfiles/.latexmkrc ~/.latexmk antigen: git clone https://github.com/zsh-users/antigen.git diff --git a/liquidprompt/lp-dotmatrix b/liquidprompt/lp-dotmatrix new file mode 160000 index 0000000..be28a24 --- /dev/null +++ b/liquidprompt/lp-dotmatrix @@ -0,0 +1 @@ +Subproject commit be28a24b202084526ab286b0dd83435d3c112600