From 5173373b8435c3c098ff0565c17e2fe09df35224 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 26 Nov 2018 15:27:42 +0100
Subject: git: fix sops setup

---
 git/.config/git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/.config/git/config b/git/.config/git/config
index e3c8d40..8280589 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
 
-- 
cgit 1.4.1


From fd19e064aa2eb62a6faeaf9aef2f46b31f6848df Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 27 Nov 2018 11:03:06 +0100
Subject: Add https alias meeting

---
 zsh/.config/zsh/.zshrc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index f3e3c77..4a87bed 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
-- 
cgit 1.4.1


From 4edb1f0958aa3cc5850b01ef46ee6d5ba8003e20 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 27 Nov 2018 11:03:20 +0100
Subject: Emacs: simplify frame-title

---
 emacs/.emacs.d/main.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index e01d4aa..4c59b83 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -236,9 +236,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
 
-- 
cgit 1.4.1