Merge branch 'master' of vcs.murgi.de:dotfiles_fabian/dotfiles
This commit is contained in:
@@ -9,3 +9,5 @@
|
|||||||
for filename in .config/*; do
|
for filename in .config/*; do
|
||||||
ln -Ts $PWD/$filename $HOME/$filename
|
ln -Ts $PWD/$filename $HOME/$filename
|
||||||
done
|
done
|
||||||
|
|
||||||
|
ln -Ts $PWD/nvim $HOME/.config/nvim
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ set ignorecase
|
|||||||
set smartcase
|
set smartcase
|
||||||
|
|
||||||
" Line wrapping
|
" Line wrapping
|
||||||
set tw=120 " set textwidth of 80 characters
|
set tw=100 " set textwidth of 100 characters
|
||||||
set formatoptions-=t " Don't wrap code
|
set formatoptions-=t " Don't wrap code
|
||||||
set formatoptions+=c " Wrap comments
|
set formatoptions+=c " Wrap comments
|
||||||
set formatoptions+=mB " Don't break multibyte characters
|
set formatoptions+=mB " Don't break multibyte characters
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
set-environment -g PATH "/usr/local/bin:/bin:/usr/bin"
|
||||||
set -g default-terminal "screen-256color"
|
set -g default-terminal "screen-256color"
|
||||||
|
|
||||||
set -g history-limit 999999999
|
set -g history-limit 999999999
|
||||||
@@ -81,4 +82,4 @@ set -g @themepack 'powerline/double/red'
|
|||||||
# set -g @plugin 'git@bitbucket.com/user/plugin'
|
# set -g @plugin 'git@bitbucket.com/user/plugin'
|
||||||
|
|
||||||
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
||||||
run '~/.tmux/plugins/tpm/tpm >> /tmp/tpm_out 2>&1 >> /tmp/tpm_out'
|
run '~/.tmux/plugins/tpm/tpm' # >> /tmp/tpm_out 2>&1 >> /tmp/tpm_out'
|
||||||
|
|||||||
Submodule tmux/plugins/tpm updated: 95f78336c3...26d9ace1b4
13
zsh/.mac_config.example
Normal file
13
zsh/.mac_config.example
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
export LC_ALL=en_US.UTF-8
|
||||||
|
export LANG=en_US.UTF-8
|
||||||
|
export POWERLINE_CONFIG_COMMAND=/usr/local/bin/powerline-config
|
||||||
|
export JAVA_HOME=`/usr/libexec/java_home -v 1.8`
|
||||||
|
|
||||||
|
# Set path to work with pycharm ...
|
||||||
|
[[ "$PATH" =~ /usr/local/bin ]] || export PATH=$PATH:/usr/local/bin
|
||||||
|
PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
|
||||||
|
|
||||||
|
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
|
||||||
|
|
||||||
|
# Research
|
||||||
|
export PATH="/Users/fabian/Labor/Research/code_signing/02-tools:$PATH"
|
||||||
10
zsh/.zshrc
10
zsh/.zshrc
@@ -1,7 +1,3 @@
|
|||||||
# Set path to work with pycharm ...
|
|
||||||
[[ "$PATH" =~ /usr/local/bin ]] || export PATH=$PATH:/usr/local/bin
|
|
||||||
PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
|
|
||||||
|
|
||||||
[[ -f ~/.zsh/.powerline_config ]] && source ~/.zsh/.powerline_config
|
[[ -f ~/.zsh/.powerline_config ]] && source ~/.zsh/.powerline_config
|
||||||
[[ -f ~/.zsh/.user_config ]] && source ~/.zsh/.user_config
|
[[ -f ~/.zsh/.user_config ]] && source ~/.zsh/.user_config
|
||||||
[[ -f ~/.zsh/.virtual_env_config.zsh ]] && source ~/.zsh/.virtual_env_config.zsh
|
[[ -f ~/.zsh/.virtual_env_config.zsh ]] && source ~/.zsh/.virtual_env_config.zsh
|
||||||
@@ -32,6 +28,7 @@ antigen bundle go
|
|||||||
# antigen bundle tmuxinator
|
# antigen bundle tmuxinator
|
||||||
antigen bundle zsh-users/zsh-syntax-highlighting
|
antigen bundle zsh-users/zsh-syntax-highlighting
|
||||||
antigen bundle zsh-users/zsh-autosuggestions
|
antigen bundle zsh-users/zsh-autosuggestions
|
||||||
|
antigen bundle urbainvaes/fzf-marks
|
||||||
|
|
||||||
# For SSH, starting ssh-agent is annoying
|
# For SSH, starting ssh-agent is annoying
|
||||||
antigen bundle ssh-agent
|
antigen bundle ssh-agent
|
||||||
@@ -43,8 +40,11 @@ antigen bundle virtualenv
|
|||||||
|
|
||||||
antigen bundle virtualenv
|
antigen bundle virtualenv
|
||||||
|
|
||||||
|
antigen bundle "greymd/docker-zsh-completion"
|
||||||
|
|
||||||
antigen apply
|
antigen apply
|
||||||
alias vim=nvim
|
alias vim=nvim
|
||||||
|
alias sudo='sudo '
|
||||||
export EDITOR='nvim'
|
export EDITOR='nvim'
|
||||||
export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
|
export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
|
||||||
|
|
||||||
@@ -56,3 +56,5 @@ PERL5LIB="/home/fabian/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LI
|
|||||||
PERL_LOCAL_LIB_ROOT="/home/fabian/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
|
PERL_LOCAL_LIB_ROOT="/home/fabian/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
|
||||||
PERL_MB_OPT="--install_base \"/home/fabian/perl5\""; export PERL_MB_OPT;
|
PERL_MB_OPT="--install_base \"/home/fabian/perl5\""; export PERL_MB_OPT;
|
||||||
PERL_MM_OPT="INSTALL_BASE=/home/fabian/perl5"; export PERL_MM_OPT;
|
PERL_MM_OPT="INSTALL_BASE=/home/fabian/perl5"; export PERL_MM_OPT;
|
||||||
|
alias ls="ls --color=always"
|
||||||
|
alias delzip="unzip -Z -1 MacDown.app.zip | xargs -I{} rm -rv {}"
|
||||||
|
|||||||
Reference in New Issue
Block a user