From c88ee088e8314f4fb6815ed41e8600dc80640e8a Mon Sep 17 00:00:00 2001
From: Anthony Cicchetti <anthony@anthonycicchetti.com>
Date: Fri, 19 Jun 2020 17:05:23 -0400
Subject: [PATCH] fix emacs and tmux

---
 emacs/init.el  | 13 ++++++++-----
 tmux/tmux.conf |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index 76359b0..5a0c64c 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -11,7 +11,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel ## auto-complete evil-magit evil magit))))
+    (lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel auto-complete evil magit evil-magit))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -28,7 +28,7 @@
 (define-key evil-normal-state-map (kbd "C-k") 'evil-scroll-up)
 (define-key evil-normal-state-map (kbd "C-j") 'evil-scroll-down)
 (evil-mode 1)
-(require 'evil-magit)
+; (require 'evil-magit)
 
 ;; Rainbow Delims
 (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)
@@ -38,7 +38,7 @@
 
 ;; smartparens
 (require 'smartparens-config)
-(add-hook 'prog-mode-hook #'smartparens-mode)
+(add-hook 'prog-mode-hook #'smartparens-mode )
 
 
 (setq cider-font-lock-dynamically '(macro core function var))
@@ -57,8 +57,11 @@
   ;; Make whitespace-mode and whitespace-newline-mode use “¶” for end of line char and “▷” for tab.
   (setq whitespace-display-mappings
 	;; all numbers are unicode codepoint in decimal. e.g. (insert-char 182 1)
-	'(
+	(quote (
 	  (space-mark 32 [183] [46]) ; SPACE 32 「 」, 183 MIDDLE DOT 「·」, 46 FULL STOP 「.」
 	  (newline-mark 10 [182 10]) ; LINE FEED,
 	  (tab-mark 9 [8614])	     ; tab
-	  )))
+	  )
+	)
+  )
+)
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 95edb7a..1988e55 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -71,7 +71,8 @@ bind -Tcopy-mode-vi 'v' send -X begin-selection
 
 # Mac OS X fix for pbcopy, pbpaste, and launchctl
 # set-option -g default-command "safe-reattach-to-user-namespace -l $SHELL"
-bind -Tcopy-mode-vi 'y' send -X copy-pipe-and-cancel "safe-reattach-to-user-namespace pbcopy"
+# the first part checks whether we're macOS or not, and then uses either safe-reattach... or xclip depending on detected OS
+if-shell 'test "$(uname)" = "Darwin"' 'bind -Tcopy-mode-vi "y" send -X copy-pipe-and-cancel "safe-reattach-to-user-namespace pbcopy"' 'bind -Tcopy-mode-vi "y" send -X copy-pipe-and-cancel "xclip -in -selection clipboard &> /dev/null"'
 
 # split-windows
 bind | split-window -h -c "#{pane_current_path}"