From c835a308ca457f4f3973f6f0c91f78b3ef70a0f4 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Thu, 22 Aug 2019 15:22:49 +0200 Subject: [PATCH 1/7] Change vim line wrap limit --- nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/init.vim b/nvim/init.vim index 2ea54c4..4085ec8 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -154,7 +154,7 @@ set ignorecase set smartcase " 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+=c " Wrap comments set formatoptions+=mB " Don't break multibyte characters From 3e538c007fb8e024061e50a0e7e21e34da629643 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Thu, 22 Aug 2019 15:27:20 +0200 Subject: [PATCH 2/7] Add fzf marks and some aliases to zsh --- zsh/.zshrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index b9eded7..d939444 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -32,6 +32,7 @@ antigen bundle go # antigen bundle tmuxinator antigen bundle zsh-users/zsh-syntax-highlighting antigen bundle zsh-users/zsh-autosuggestions +antigen bundle urbainvaes/fzf-marks # For SSH, starting ssh-agent is annoying antigen bundle ssh-agent @@ -43,10 +44,13 @@ antigen bundle virtualenv antigen bundle virtualenv +antigen bundle "greymd/docker-zsh-completion" + antigen apply alias vim=nvim +alias sudo='sudo ' export EDITOR='nvim' -export PATH="/usr/local/opt/gnu-getopt/bin:$PATH" +alias ls="ls --color=always" test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" From 3968987a2b7a03b8c81587aac094a27ca26e09e3 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Fri, 23 Aug 2019 17:50:37 +0200 Subject: [PATCH 3/7] Update tpm --- tmux/.tmux.conf | 3 ++- tmux/plugins/tpm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 800a2bb..7dd9453 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,3 +1,4 @@ +set-environment -g PATH "/usr/local/bin:/bin:/usr/bin" set -g default-terminal "screen-256color" set -g history-limit 999999999 @@ -81,4 +82,4 @@ set -g @themepack 'powerline/double/red' # set -g @plugin 'git@bitbucket.com/user/plugin' # 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' diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm index 95f7833..26d9ace 160000 --- a/tmux/plugins/tpm +++ b/tmux/plugins/tpm @@ -1 +1 @@ -Subproject commit 95f78336c3972f3e6648b7b3db754f2224320a5e +Subproject commit 26d9ace1b47f4591b2afdf333442a498311b6ace From 7b14d1b921db7c3a1daa39263f8538d9c8f80261 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Thu, 29 Aug 2019 16:19:43 +0200 Subject: [PATCH 4/7] Update mac config --- zsh/.mac_config.example | 13 +++++++++++++ zsh/.zshrc | 7 ------- 2 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 zsh/.mac_config.example diff --git a/zsh/.mac_config.example b/zsh/.mac_config.example new file mode 100644 index 0000000..6a218b9 --- /dev/null +++ b/zsh/.mac_config.example @@ -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" diff --git a/zsh/.zshrc b/zsh/.zshrc index d939444..aeb4fa4 100644 --- a/zsh/.zshrc +++ b/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/.user_config ]] && source ~/.zsh/.user_config [[ -f ~/.zsh/.virtual_env_config.zsh ]] && source ~/.zsh/.virtual_env_config.zsh @@ -51,6 +47,3 @@ alias vim=nvim alias sudo='sudo ' export EDITOR='nvim' alias ls="ls --color=always" - -test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" - From cda9f0ca546660f1d796300237773c2825d9abf6 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Mon, 9 Sep 2019 13:02:22 +0200 Subject: [PATCH 5/7] Add delzip alias --- zsh/.zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/zsh/.zshrc b/zsh/.zshrc index aeb4fa4..2d678ab 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -47,3 +47,4 @@ alias vim=nvim alias sudo='sudo ' export EDITOR='nvim' alias ls="ls --color=always" +alias delzip="unzip -Z -1 MacDown.app.zip | xargs -I{} rm -rv {}" From d52b6b5b6fdb75f714bd7e6524ff497456cd0570 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Mon, 23 Dec 2019 21:38:30 +0100 Subject: [PATCH 6/7] Add vundle vim submodule for neovim --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index 03a3ba0..70255ad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,3 +9,7 @@ [submodule "bundle/Vundle.vim"] path = vim/bundle/Vundle.vim url = https://github.com/VundleVim/Vundle.vim.git + +[submodule "Vundle.vim"] + path = nvim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim.git From 175acc2bdcef1cec6be665145da626e34b01a649 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Mon, 23 Dec 2019 22:53:38 +0100 Subject: [PATCH 7/7] Add neovim link --- link_config.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/link_config.sh b/link_config.sh index 0cdaa76..8334c3b 100755 --- a/link_config.sh +++ b/link_config.sh @@ -9,3 +9,5 @@ for filename in .config/*; do ln -Ts $PWD/$filename $HOME/$filename done + +ln -Ts $PWD/nvim $HOME/.config/nvim