Merge remote-tracking branch 'origin/master'
3 files changed, 4 insertions(+), 4 deletions(-)
M emacs/.emacs.d/main.el → emacs/.emacs.d/main.el
@@ -234,9 +234,7 @@ (line-number-mode -1) (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
M git/.config/git/config → git/.config/git/config
@@ -46,7 +46,7 @@ prompt = false [difftool "icdiff"] cmd = icdiff --line-numbers $LOCAL $REMOTE [diff "sopsdiffer"] - textconf = "sops -d" + textconv = sops -d [gpg] program = gpg
M zsh/.config/zsh/.zshrc → 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