matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-25 21:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gh/master'

Browse Source
This commit is contained in:
David Tomaschik
2018-06-25 20:47:36 +02:00
parent 0b6fa6b0fa 8f4e4fe77b
commit ca63946c5e
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dotfiles/curlrc
View File

@@ -1,4 +1,3 @@
tlsv1 tlsv1
user-agent = "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0 Safari/537.36"
create-dirs create-dirs
referer = ";auto" referer = ";auto"

4
dotfiles/tmux.conf
View File

@@ -57,3 +57,7 @@ bind M \
set -g mouse-select-pane off \;\ set -g mouse-select-pane off \;\
set -g mouse-select-window off \;\ set -g mouse-select-window off \;\
display 'Mouse: OFF' display 'Mouse: OFF'
# tmux X clipboard integration
bind C-c run "tmux show-buffer | xsel -i -b"
bind C-v run "tmux set-buffer -- \"$(xsel -o -b)\"; tmux paste-buffer"

2
dotfiles/zpreztorc
View File

@@ -214,7 +214,7 @@ zstyle ':prezto:module:python:virtualenv' initialize 'yes'
zstyle ':prezto:module:tmux:auto-start' local 'no' zstyle ':prezto:module:tmux:auto-start' local 'no'
# Auto start a session when Zsh is launched in a SSH connection. # Auto start a session when Zsh is launched in a SSH connection.
zstyle ':prezto:module:tmux:auto-start' remote 'yes' zstyle ':prezto:module:tmux:auto-start' remote 'no'
# Integrate with iTerm2. # Integrate with iTerm2.
# zstyle ':prezto:module:tmux:iterm' integrate 'yes' # zstyle ':prezto:module:tmux:iterm' integrate 'yes'

20
dotfiles/zshrc
View File

@@ -32,6 +32,8 @@ fi
if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
fi fi
# noglob scp is so annoying
unalias scp
# Overrides to prezto # Overrides to prezto
unsetopt cdablevars unsetopt cdablevars
@@ -46,8 +48,17 @@ typeset -U path
# Keybindings # Keybindings
bindkey '^[[A' history-search-backward bindkey '^[[A' history-search-backward
bindkey '^[[B' history-search-forward bindkey '^[[B' history-search-forward
# ctrl-arrow keys
bindkey '^[[1;5C' forward-word bindkey '^[[1;5C' forward-word
bindkey '^[[1;5D' backward-word bindkey '^[[1;5D' backward-word
bindkey '^P' up-history
bindkey '^N' down-history
bindkey '^?' backward-delete-char
bindkey '^h' backward-delete-char
# ok, a few convenience bindings
bindkey '^w' backward-kill-word
bindkey '^r' history-incremental-search-backward
# Source extras and aliases if interactive # Source extras and aliases if interactive
if [[ $- == *i* ]] ; then if [[ $- == *i* ]] ; then
@@ -67,12 +78,3 @@ fi
# Load any local settings # Load any local settings
if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi
function start_esp {
if [ ! -d ${HOME}/tools/esp ] ; then
echo "ESP not installed!" >/dev/stderr
return 1
fi
export PATH="${PATH}:${HOME}/tools/esp/xtensa-esp32-elf/bin"
export IDF_PATH="${HOME}/tools/esp/esp-idf"
}