summaryrefslogtreecommitdiff
path: root/zsh
diff options
context:
space:
mode:
Diffstat (limited to 'zsh')
-rw-r--r--zsh/.zprofile3
-rw-r--r--zsh/.zshenv3
-rw-r--r--zsh/.zshrc19
-rw-r--r--zsh/gitHelp15
4 files changed, 32 insertions, 8 deletions
diff --git a/zsh/.zprofile b/zsh/.zprofile
index 2a73493..dad305e 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -1,2 +1,5 @@
+curl -m 3 -s "$CAL_PERSO" | grep -v END:VCALENDAR >/tmp/calendar.ics
+curl -m 3 -s "$CAL_SCHOOL" | grep -v BEGIN:VCALENDAR >> /tmp/calendar.ics
+icstocal /tmp/calendar.ics /tmp/calendar >/dev/null
[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec sx
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 9b82ff7..a020302 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,3 +1,6 @@
+[ -f "$ZDOTDIR/paliasrc" ] && source "$ZDOTDIR/paliasrc" # Private aliases
+[ -f "$ZDOTDIR/epitaliasrc" ] && source "$ZDOTDIR/epitaliasrc" # Private aliases
+
export PATH="$HOME/.config/scripts:$PATH"
export TERMINAL="st"
export EDITOR="nvim"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index dc2013b..ad2d299 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,23 +1,22 @@
-[ -f "$ZDOTDIR/paliasrc" ] && source "$ZDOTDIR/paliasrc" # Private aliases
-[ -f "$ZDOTDIR/epitaliasrc" ] && source "$ZDOTDIR/epitaliasrc" # Private aliases
+autoload -U colors && colors # Load colors
+PS1="%B%F{214}%n %F{209}%~ %f%F{45} %f%b "
+RPS1="%f(%B%(?.%F{green}0%f.%F{red}%?%f)%b%)"
-# quand
+# To do
cat ~/todo
-autoload -U colors && colors # Load colors
-PS1="%B%(?.0.%F{red}%?) %F{blue}%n %F{green}%~ %f$%b "
-
alias ls="ls -a --color=auto"
alias shut="sudo openrc-shutdown -p now"
alias shutr="sudo openrc-shutdown -r now"
-alias upd="sudo pacman -Syuu"
+alias upd="sudo pacman -Syuu; setxkbmap fr"
alias ins="sudo pacman -Syu"
alias uins="sudo pacman -Rns"
alias c="clear; cat ~/todo"
# git
+alias aled="cat $XDG_CONFIG_HOME/zsh/gitHelp"
alias {clone,cloner}="git clone"
alias {tirer,tir,poule}="git pull"
alias {statut,sta}="git status"
@@ -29,12 +28,15 @@ alias {difference,ference}="git diff"
alias {tronc,tr}="git log"
alias {resto,restau}="git restore"
alias {étiquette,etiqu}="git tag"
+alias branche="git branch"
alias bri5="xrandr --output eDP-1 --brightness 0.5"
alias bri6="xrandr --output eDP-1 --brightness 0.6"
alias ascii="ascii -d"
+alias sudo="sudo "
alias lf="lfub"
alias vmk="v Makefile"
+alias cmk="xsel -bo > Makefile"
alias cf="$HOME/.config/"
alias cspt="$HOME/.config/scripts"
alias cz="$HOME/.config/zsh"
@@ -47,6 +49,7 @@ alias py="python3"
alias wtr="curl wttr.in/Lyon"
alias doc="$HOME/Documents"
alias usbmnt="sudo mount /dev/sdb1 $HOME/usb"
+alias sss="ssh root@140.82.10.231"
autoload -U compinit
zstyle ':completion:*' menu select
@@ -60,7 +63,7 @@ autoload -Uz vcs_info
precmd_vcs_info() { vcs_info }
precmd_functions+=( precmd_vcs_info )
setopt prompt_subst
-RPROMPT=\$vcs_info_msg_0_
+# RPROMPT=\$vcs_info_msg_0_
zstyle ':vcs_info:git:*' formats '%F{cyan}(%b)%f'
zstyle ':vcs_info:*' enable git
diff --git a/zsh/gitHelp b/zsh/gitHelp
new file mode 100644
index 0000000..4d4d686
--- /dev/null
+++ b/zsh/gitHelp
@@ -0,0 +1,15 @@
+# Trouduction de Git
+
+clone / cloner : "git clone"
+tirer / tir / poule : "git pull"
+statut / sta : "git status"
+ajouter / aj : "git add"
+atome_de_code / ato : "git commit -m" # voir bitoduc.fr, Commit
+pousser / pous : "git push"
+poussétiquettes / poussE : "git push --follow-tags"
+difference / ference / "git diff"
+tronc / tr : "git log"
+resto / restau : "git restore"
+étiquette / etiqu : "git tag"
+branche : "git branch"
+