From 5518c572321d56eed58aa69d788fc0b4935caaab Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <anthony@anthonycicchetti.com>
Date: Sat, 20 Mar 2021 17:55:50 -0400
Subject: [PATCH] Various additions

`magit` is better, some compdef stuff, a `~-dotfiles` bookmark
---
 bin/magit        | 2 +-
 emacs/init.el    | 3 +++
 zsh/funcs/rustup | 7 +++++++
 zsh/zshrc        | 4 +++-
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 zsh/funcs/rustup

diff --git a/bin/magit b/bin/magit
index 862760a..90ecb78 100755
--- a/bin/magit
+++ b/bin/magit
@@ -1 +1 @@
-emacsclient -c --eval '(let ((display-buffer-alist `(("^\\*magit: " display-buffer-same-window) ,display-buffer-alist))) (magit-status))'
\ No newline at end of file
+emacsclient -a="" -c --eval '(let ((display-buffer-alist `(("^\\*magit: " display-buffer-same-window) ,display-buffer-alist))) (magit-status))'
\ No newline at end of file
diff --git a/emacs/init.el b/emacs/init.el
index 95b4734..1f2f235 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -66,6 +66,9 @@
  '(package-selected-packages
    '(lsp-mode yaml-mode evil-lispy treemacs-magit treemacs-evil treemacs lsp-pyright lsp-ui rustic flycheck origami groovy-mode avy editorconfig org-crypt tree-sitter-langs tree-sitter centaur-tabs dashboard page-break-lines wakatime-mode super-save ox-pandoc evil-surround evil-collection undo-tree toc-org evil-org org-plus-contrib evil-goggles evil-expat evil-commentary auto-package-update lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel auto-complete evil magit evil-magit))
  '(ring-bell-function 'ignore)
+ '(rustic-format-trigger 'on-compile)
+ '(rustic-indent-method-chain t)
+ '(rustic-indent-where-clause t)
  '(treemacs-collapse-dirs 3)
  '(treemacs-filewatch-mode t)
  '(treemacs-follow-mode t)
diff --git a/zsh/funcs/rustup b/zsh/funcs/rustup
new file mode 100644
index 0000000..6f3b276
--- /dev/null
+++ b/zsh/funcs/rustup
@@ -0,0 +1,7 @@
+if [[ $(command -v rustup) ]]; then
+    if [[ ( $ZNAP_USED = 1) ]]; then
+        znap compdef _rustup  'rustup completions zsh'
+        znap compdef _cargo   'rustup completions zsh cargo'
+    fi
+fi
+
diff --git a/zsh/zshrc b/zsh/zshrc
index f1786d5..17a4d3a 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -15,6 +15,8 @@ export KEYTIMEOUT=1
 typeset -U path
 typeset -U fpath
 
+hash -d -- -dotfiles=~/.dotfiles
+
 fpath=(~/bin ~/.zshcompletions $fpath)
 zstyle :compinstall filename '/home/anthonys/.zshrc'
 zstyle ":completion:*" complete _complete _ignored _approximate _expand
@@ -36,7 +38,7 @@ zle -N down-line-or-beginning-search
 
 
 export COMPLETION_WAITING_DOTS="true"
-export VISUAL='editc'
+export VISUAL='emacsclient -c -a=""'
 export EDITOR='editn'
 path=("$HOME/bin" "$HOME/go/bin" $path)