Compare commits

..

No commits in common. "51b5ccef1747bf90eae01eba5640b58c20160123" and "58268b258e66573383d0a72a43f72b5206164b25" have entirely different histories.

4 changed files with 37 additions and 43 deletions

View File

@ -234,17 +234,15 @@ input {
# #
# An example of an ALSA output: # An example of an ALSA output:
# #
audio_output { #audio_output {
type "alsa" # type "alsa"
name "My ALSA Device" # name "My ALSA Device"
# device "iec958:CARD=S9,DEV=0"
# device "sysdefault:CARD=S9"
# device "hw:0,0" # optional # device "hw:0,0" # optional
# mixer_type "hardware" # optional # mixer_type "hardware" # optional
# mixer_device "default" # optional # mixer_device "default" # optional
# mixer_control "PCM" # optional # mixer_control "PCM" # optional
# mixer_index "0" # optional # mixer_index "0" # optional
} #}
# #
# An example of an OSS output: # An example of an OSS output:
# #
@ -310,14 +308,13 @@ audio_output {
# Please see README.Debian if you want mpd to play through the pulseaudio # Please see README.Debian if you want mpd to play through the pulseaudio
# daemon started as part of your graphical desktop session! # daemon started as part of your graphical desktop session!
# #
# audio_output { audio_output {
# type "pulse" type "pulse"
# name "MPD pulse output" name "MPD pulse output"
# enabled "yes" server "127.0.0.1" # optional
# server "127.0.0.1" # optional mixer_type "software"
# mixer_type "software"
# sink "alsa_output.pci-0000_00_1b.0.analog-stereo" # optional # sink "alsa_output.pci-0000_00_1b.0.analog-stereo" # optional
# } }
audio_output { audio_output {
type "fifo" type "fifo"

View File

@ -122,18 +122,12 @@ bindkey -M vicmd 'k' history-substring-search-up
bindkey -M vicmd 'j' history-substring-search-down bindkey -M vicmd 'j' history-substring-search-down
# }}} End configuration added by Zim install # }}} End configuration added by Zim install
#
# nvm
#
source /usr/share/nvm/init-nvm.sh
# #
# tmux # tmux
# #
# >>> tmux initialization >>>
#
if [ -z "$TMUX" ]; then if [ -z "$TMUX" ]; then
# we're not in a tmux session # we're not in a tmux session
@ -163,26 +157,31 @@ if [ -z "$TMUX" ]; then
tmux attach tmux attach
fi fi
fi fi
# <<< tmux initialization <<<
# #
# fuzzy file search # fuzzy file search
# #
# >>> fzf initialization >>>
#
# [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh # [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
# <<< fzf initialization <<<
# #
# ocaml # ocaml
# #
# >>> opam configuration >>>
#
test -r /home/jeff/.opam/opam-init/init.zsh && . /home/jeff/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true test -r /home/jeff/.opam/opam-init/init.zsh && . /home/jeff/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
# <<< opam configuration <<<
# #
# conda # conda
# #
# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !! # !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/home/jeff/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" __conda_setup="$('/home/jeff/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -195,12 +194,13 @@ else
fi fi
fi fi
unset __conda_setup unset __conda_setup
# <<< conda initialize <<<
# #
# direnv # direnv
# #
# >>> direnv configuration >>>
setopt PROMPT_SUBST setopt PROMPT_SUBST
show_virtual_env() { show_virtual_env() {
@ -211,15 +211,15 @@ show_virtual_env() {
PS1='$(show_virtual_env)'$PS1 PS1='$(show_virtual_env)'$PS1
eval "$(direnv hook zsh)" eval "$(direnv hook zsh)"
# <<< direnv configuration <<<
# #
# starship # starship
# #
# >>> starship >>>
# eval "$(starship init zsh)" # eval "$(starship init zsh)"
# <<< starship <<<
# #
# gnome-keyring-daemon # gnome-keyring-daemon
@ -227,13 +227,10 @@ eval "$(direnv hook zsh)"
eval $(gnome-keyring-daemon --start) 2>/dev/null eval $(gnome-keyring-daemon --start) 2>/dev/null
export SSH_AUTH_SOCK export SSH_AUTH_SOCK
# #
# passwordstore # passwordstore
# #
if [[ $(curl -s -w "%{http_code}\n" -L "https://git.jefflance.me/" -o /dev/null) = "200" ]]; then
# >>> passwordstore update >>>
echo -ne "\npasswordstore: " && pass git pull echo -ne "\npasswordstore: " && pass git pull
else # <<< passwordstore update <<<
echo -ne "\npasswordstore: serveur hors ligne"
fi