merge

dot_config/fish/config.fish

@@ -69,6 +69,7 @@ alias j "z"
 alias c "cargo"
 alias cr "cargo run"
 alias cb "cargo build"
+alias ct "cargo test"
 alias cwr "cargo watch -x run"
 alias ct "cargo test"
 alias rp "rustup"
@@ -105,8 +106,6 @@ if test -e /nix
   set -x NIX_PATH "$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/root/channels"
 end
 
-# Load keychain if installed
-if command --search keychain > /dev/null
-  keychain -q --nogui $HOME/.ssh/id_ed25519
-  . $HOME/.keychain/$hostname-fish
-end
+# proto
+set -gx PROTO_HOME "$HOME/.proto"
+set -gx PATH "$PROTO_HOME/bin" $PATH

dot_doom.d/init.el

@@ -39,7 +39,7 @@
        minimap           ; show a map of the code on the side
        (modeline +light)          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
-       ;;neotree           ; a project drawer, like NERDTree for vim
+       neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
        ;;tabs              ; a tab bar for Emacs

dot_gitconfig

@@ -4,9 +4,13 @@
 	signingkey = 0x6F33B647A7AC80CE
 [core]
 	editor = vim
+<<<<<<< Updated upstream
 	autocrlf = input
+=======
+>>>>>>> Stashed changes
 [push]
 	default = simple
+	autoSetupRemote = true
 [pull]
 	rebase = true
 [rebase]