anthonycicc/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Wiki Activity

fix emacs and tmux

Browse source
This commit is contained in:
Anthony Cicchetti 2020-06-19 17:05:23 -04:00
parent 973f335277
commit c88ee088e8
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
emacs/init.el
View file

@ -11,7 +11,7 @@
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(package-selected-packages '(package-selected-packages
(quote (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
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; 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-k") 'evil-scroll-up)
(define-key evil-normal-state-map (kbd "C-j") 'evil-scroll-down) (define-key evil-normal-state-map (kbd "C-j") 'evil-scroll-down)
(evil-mode 1) (evil-mode 1)
(require 'evil-magit) ; (require 'evil-magit)
;; Rainbow Delims ;; Rainbow Delims
(add-hook 'prog-mode-hook #'rainbow-delimiters-mode) (add-hook 'prog-mode-hook #'rainbow-delimiters-mode)
@ -38,7 +38,7 @@
;; smartparens ;; smartparens
(require 'smartparens-config) (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)) (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. ;; Make whitespace-mode and whitespace-newline-mode use “¶” for end of line char and “▷” for tab.
(setq whitespace-display-mappings (setq whitespace-display-mappings
;; all numbers are unicode codepoint in decimal. e.g. (insert-char 182 1) ;; 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 「.」 (space-mark 32 [183] [46]) ; SPACE 32 「 」, 183 MIDDLE DOT 「·」, 46 FULL STOP 「.」
(newline-mark 10 [182 10]) ; LINE FEED, (newline-mark 10 [182 10]) ; LINE FEED,
(tab-mark 9 [8614]) ; tab (tab-mark 9 [8614]) ; tab
))) )
)
)
)

3
tmux/tmux.conf
View file

@ -71,7 +71,8 @@ bind -Tcopy-mode-vi 'v' send -X begin-selection
# Mac OS X fix for pbcopy, pbpaste, and launchctl # Mac OS X fix for pbcopy, pbpaste, and launchctl
# set-option -g default-command "safe-reattach-to-user-namespace -l $SHELL" # 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 # split-windows
bind | split-window -h -c "#{pane_current_path}" bind | split-window -h -c "#{pane_current_path}"