update with yadm and add diff-so-fancy

.config/aerc/binds.conf

@@ -69,6 +69,10 @@ H = :toggle-headers<Enter>
 J = :next<Enter>
 K = :prev<Enter>
 
+# my custom:
+l = q:next<Enter><Enter>
+h = qk<Enter>
+
 [compose]
 # Keybindings used when the embedded terminal is not selected in the compose
 # view

.config/fish/functions/cat.fish

@@ -1,6 +1,7 @@
 function cat --wraps=ccat --description 'alias cat=ccat'
-  if which ccat > /dev/null
-    ccat  $argv;
+	if which ccat > /dev/null
+		ccat  $argv;
   else
-		cat $argv;
+	  /usr/bin/cat $argv;
+	end
 end

.config/fish/functions/y.fish

@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function y --wraps=yadm --description 'alias y=yadm'
+  yadm  $argv;
+end

.config/yadm/encrypt

@@ -0,0 +1,2 @@
+.config/aerc/accounts.conf
+.gitconfig-priv

.config/yadm/files.gpg

@@ -0,0 +1 @@
+Œ
	ÛD¦Ïâæ-µûÒÁ>
{‰ï@¨¡X$ö˽ö3È+òj¦—XTe<54>’©TŠvøÇ5"D„¬×ÆýmNdÚøu’]{ˆ<“oƒ„N*K¯b7'Ϊ	;ñ	bEKZJW>ž:¥å¦	’h‚u†€–ø_mVYjdÆ…¯Çœ]X¡<58>°ìÅ3ŠÎÉ–ÁG<C381>.Ǽ<>×{ñˆY²UÛžlíxÇÊBÑálŸ&çúXÀ¬a˜›¿muFCi¡y%·(5Æä.›ÿ†
‡Zó¿Ï<C2BF>jüe™ùSòyÐì!¼ãuò»{Ž$Léî´&Ã\~º9&s§¡¶ãPõÆ»æf0À(T©Î¤l$W-ëÑâ9ÅVZ	<09>Ìþ‘œøàíó•FçK³o“1qÝÞ)PÂëFC wð†ñW/B[y0£(²äd<C3A4>2ý9Ì>sŽš¬AÆ+ LIþ70iLÈ™ií2yÁ`£²V®ÅF«ÈàV…›šl!=Pã	’XÕ¬O·¨+yå¸îÂy'foqnuèqR<>ñú
q?–;{ë@Y9_	¬+(ŸÌoMª°\<1F>±RºFÖ¯fмtGó3
`¦œþ%AC«6SZG³ÂÑ·I)E™©ÔäW[eeyNè}²{ÕZìá#~žZ[…±W)ƘF̃¸ÇY±T”ïYñzãbrkZ#ºU…‡Î øM·h

.gitconfig

@@ -2,6 +2,7 @@
 	editor = nvim
 	autocrlf = input
 	excludesfile = /home/hedy/.gitignore_global
+	pager = diff-so-fancy | less --tabs=4 -RFX
 
 [user]
 	name = Hedy Li
@@ -28,8 +29,10 @@
 
 [help]
 	autocorrect = 30
+
 [pull]
 	rebase = false
+
 [sendemail]
         smtpserver = smtp.gmail.com
         smtpuser = hedyhyry@gmail.com
@@ -39,3 +42,19 @@
 
 [include]
 	path = ~/.gitconfig-priv
+
+# diff-so-fancy
+[color]
+	ui = true
+[color "diff-highlight"]
+	oldNormal = red bold
+	oldHighlight = red bold 52
+	newNormal = green bold
+	newHighlight = green bold 22
+[color "diff"]
+	meta = 11
+	frag = magenta bold
+	commit = yellow bold
+	old = red bold
+	new = green bold
+	whitespace = red reverse

README.md

@@ -1,12 +1,17 @@
 # dotfiles
-Welcome, these are for Ubuntu/Debian and/or WSL
+
+I mostly use these for Ubuntu/Debian and sometimes with WSL, but it should work for other
+Linux distros, feel free to pick and choose. Because the only OS specific thing (I think)
+is [this fish function](.config/fish/functions/apt-up.fish) which updates packages with apt.
+
 
 ### Basics
+- Manager: yadm
 - Shell: fish
 - Theme: Dracula
 - Email: aerc
 - Browser:
-   - Chrome :p
+   - Chrome :P
    - w3m
 - Gemini/Gopher browser: bombadillo
 - Editor:
@@ -15,6 +20,8 @@ Welcome, these are for Ubuntu/Debian and/or WSL
 
 ### Notes for setup
 
+(Will eventually put them into setup script)
+
 **Python**
 - git fame
 - termdown
@@ -22,9 +29,11 @@ Welcome, these are for Ubuntu/Debian and/or WSL
 
 **Shell/Misc**
 - exa
-- qalc (apt)
+- qalc
 - trash-cli
+- git-diff: diff-so-fancy
 
 ### Todo
 - [ ] Add links for above
-- [ ] Write copy/sync scripts
+- [ ] Put fish aliases into separate place
+- [ ] Write setup scripts that check requirements

sync

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# local to repo
-# WORK IN PROGRESS!
-
-for var in "$@"
-do
-    dest=$(cat paths.json | jq '.'$var -r)
-	src=$dest
-	[ -d $dest ] && src=$dest'/*'
-    cp ~/$src $dest
-done