all repos — nixfiles @ e7b0cb6d8e65d9e3c2f2deb25a0a3b07d5ddf148

System and user configuration, managed by nix and home-manager

Merge remote-tracking branch 'origin/master'
Alan Pearce alan@alanpearce.eu
Thu, 29 Nov 2018 20:33:11 +0100
commit

e7b0cb6d8e65d9e3c2f2deb25a0a3b07d5ddf148

parent

7df53b0e90eede96330518a72355a69b4c2f824a

3 files changed, 4 insertions(+), 4 deletions(-)

jump to
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