diff --git a/nvim/bundle/Vundle.vim b/nvim/bundle/Vundle.vim index 9a38216..b255382 160000 --- a/nvim/bundle/Vundle.vim +++ b/nvim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d +Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95 diff --git a/nvim/init.vim b/nvim/init.vim index 22604e3..a399665 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -191,7 +191,7 @@ nmap T let g:ycm_collect_identifiers_from_tags_files = 1 " Read from tag files let g:ycm_global_ycm_extra_conf = '~/.config/nvim/.ycm_extra_conf.py' " Standard conf let g:ycm_enable_diagnostic_signs = 0 " Do not show semantic error bar -let g:ycm_server_python_interpreter = '/usr/bin/python3' +let g:ycm_server_python_interpreter = 'python' let g:ycm_key_list_select_completion = ['', '', ''] let g:ycm_key_list_previous_completion = ['', '', ''] diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index bbb8b0b..cc27e61 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -1,5 +1,5 @@ set-environment -g PATH "/usr/local/bin:/bin:/usr/bin" -set -g default-terminal "screen-256color" +set -g default-terminal "xterm-256color" set -g history-limit 999999999 @@ -53,6 +53,10 @@ bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D" bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U" bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R" +# Nano +bind-key C-x send-keys C-x +bind-key C-o send-keys C-o + # Copying # move x clipboard into tmux paste buffer bind C-p run "tmux set-buffer \"$(xclip -o)\"; tmux paste-buffer" @@ -75,7 +79,7 @@ set -g @plugin 'tmux-plugins/tmux-sidebar' set -g @plugin 'tmux-plugins/tmux-open' set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'jimeh/tmux-themepack' -set -g @themepack 'powerline/double/red' +set -g @themepack 'powerline/double/blue' # Other examples: # set -g @plugin 'github_username/plugin_name' diff --git a/zsh/.zshrc b/zsh/.zshrc index 3655c6a..d72aaa3 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -57,5 +57,12 @@ PERL_LOCAL_LIB_ROOT="/home/fabian/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ PERL_MB_OPT="--install_base \"/home/fabian/perl5\""; export PERL_MB_OPT; PERL_MM_OPT="INSTALL_BASE=/home/fabian/perl5"; export PERL_MM_OPT; alias ls="ls --color=always" -alias delzip="unzip -Z -1 $1.zip | xargs -I{} rm -rv {}" export PATH="$PATH:${HOME}/Labor/tls-in-muas/starttls-research/99-Tools:/home/fabian/go/bin" +# For ccache +export CCACHE_CPP2=YES + +delzip() { + unzip -Z -1 "$@" | xargs -I{} rm -rf {} +} +# mitmproxy +export MITMPROXY_SSLKEYLOGFILE="~/.mitmproxy/sslkeylogfile.txt"