diff options
| author | Alan Pearce | 2018-11-29 20:33:11 +0100 |
|---|---|---|
| committer | Alan Pearce | 2018-11-29 20:33:11 +0100 |
| commit | e7b0cb6d8e65d9e3c2f2deb25a0a3b07d5ddf148 (patch) | |
| tree | e0f4c10f2f66d439adc04581938d44f4d70f3f1f | |
| parent | 7df53b0e90eede96330518a72355a69b4c2f824a (diff) | |
| parent | 4edb1f0958aa3cc5850b01ef46ee6d5ba8003e20 (diff) | |
| download | nixfiles-e7b0cb6d8e65d9e3c2f2deb25a0a3b07d5ddf148.tar.lz nixfiles-e7b0cb6d8e65d9e3c2f2deb25a0a3b07d5ddf148.tar.zst nixfiles-e7b0cb6d8e65d9e3c2f2deb25a0a3b07d5ddf148.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | emacs/.emacs.d/main.el | 4 | ||||
| -rw-r--r-- | git/.config/git/config | 2 | ||||
| -rw-r--r-- | zsh/.config/zsh/.zshrc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el index f3e5b8fa..85f7042e 100644 --- a/emacs/.emacs.d/main.el +++ b/emacs/.emacs.d/main.el @@ -234,9 +234,7 @@ (size-indication-mode t) (require 'f) -(setq frame-title-format (list "Emacs" - '(buffer-file-name " — %f") - '(dired-directory (" — " dired-directory)))) +(setq frame-title-format (list "Emacs")) ;;;;; Spaceline diff --git a/git/.config/git/config b/git/.config/git/config index e3c8d401..8280589a 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -46,7 +46,7 @@ [difftool "icdiff"] cmd = icdiff --line-numbers $LOCAL $REMOTE [diff "sopsdiffer"] - textconf = "sops -d" + textconv = sops -d [gpg] program = gpg diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index f3e3c779..4a87bedc 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -65,6 +65,8 @@ alias lal="ll -A" alias lla="lal" alias llr="ll -t" +alias https="http --default-scheme https" + zmodload zsh/terminfo bindkey -e |