aboutsummaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorAnton Bobov <abobov@gmail.com>2019-09-08 23:04:01 +0500
committerAnton Bobov <abobov@gmail.com>2019-09-08 23:04:01 +0500
commit20f920203a4334b6e88b988932d79d5fb6a4e476 (patch)
tree4ceb7e7d8f075243a94638c23dcf32f69b473776 /files
parent971f21a27e125b8d9daf369dcb705d00b08e727f (diff)
Updates.
Diffstat (limited to 'files')
-rw-r--r--files/.gitconfig2
-rw-r--r--files/.zsh/rc/S10_zshopts4
-rw-r--r--files/.zsh/rc/S50_aliases3
m---------files/.zsh/zsh-completions0
4 files changed, 7 insertions, 2 deletions
diff --git a/files/.gitconfig b/files/.gitconfig
index fca7a34..f740f38 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -66,6 +66,8 @@
tabsize = 2
[pull]
rebase = true
+[push]
+ followTags = true
[guitool "meld"]
cmd = meld $FILENAME
noconsole = yes
diff --git a/files/.zsh/rc/S10_zshopts b/files/.zsh/rc/S10_zshopts
index 4c815ba..b086e1d 100644
--- a/files/.zsh/rc/S10_zshopts
+++ b/files/.zsh/rc/S10_zshopts
@@ -34,12 +34,13 @@ setopt hash_dirs
setopt hash_list_all
setopt hist_find_no_dups
setopt hist_ignore_all_dups
-setopt no_hist_ignore_space
+setopt hist_ignore_space
setopt hist_no_functions
setopt hist_no_store
setopt hist_reduce_blanks
setopt hist_save_no_dups
setopt hist_verify
+setopt share_history
setopt no_hup
setopt no_ignore_eof
@@ -51,7 +52,6 @@ setopt notify
setopt no_rm_star_silent
setopt no_rm_star_wait
-setopt share_history
setopt vi
setopt zle
diff --git a/files/.zsh/rc/S50_aliases b/files/.zsh/rc/S50_aliases
index b415263..b57aa61 100644
--- a/files/.zsh/rc/S50_aliases
+++ b/files/.zsh/rc/S50_aliases
@@ -27,6 +27,7 @@ alias mv='mv --interactive'
alias v='vim'
alias t='tmux'
+alias ta='tmux attach-session'
alias mux='tmuxinator'
@@ -124,6 +125,8 @@ elif $(which libreoffice >/dev/null) ; then
alias 2pdf='libreoffice --headless --convert-to pdf'
fi
+alias http='http --timeout=9999999'
+
#[[ -s /etc/grc.zsh ]] && source /etc/grc.zsh
# vim: et ft=zsh :
diff --git a/files/.zsh/zsh-completions b/files/.zsh/zsh-completions
-Subproject b1b095cb1635124cc4ec8b67f491630ff6f7fac
+Subproject b512d57b6d0d2b85368a8068ec1a13288a93d26