From 48fef75a6fb7a8f6102d182c906d9672609445b9 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Fri, 10 Dec 2021 13:10:17 +0700 Subject: [PATCH] Slime stuff, evil-goggles, remove exercism alias --- .config/fish/functions/exercism.fish | 3 --- .emacs.d/init.el | 40 +++++++++++++++++++++------- 2 files changed, 31 insertions(+), 12 deletions(-) delete mode 100644 .config/fish/functions/exercism.fish diff --git a/.config/fish/functions/exercism.fish b/.config/fish/functions/exercism.fish deleted file mode 100644 index b666a4c..0000000 --- a/.config/fish/functions/exercism.fish +++ /dev/null @@ -1,3 +0,0 @@ -function exercism --description 'alias exercism exercism --token=4d706f28-1697-432c-beec-565a707b51da' - command exercism --token=4d706f28-1697-432c-beec-565a707b51da $argv; -end diff --git a/.emacs.d/init.el b/.emacs.d/init.el index f307170..159de4b 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -17,8 +17,9 @@ (set-terminal-coding-system 'utf-8) (set-keyboard-coding-system 'utf-8) (define-key key-translation-map (kbd "ESC") (kbd "C-g")) -(auto-fill-mode) -(setq fill-column 80) + +(add-hook 'text-mode-hook (lambda () (setq fill-column 90) (turn-on-auto-fill))) + (put 'narrow-to-region 'disabled nil) (require 'server) @@ -36,7 +37,7 @@ (setq visible-bell nil ring-bell-function 'joe/flash-mode-line) (setq-default display-line-numbers 'relative) -(dolist (mode '(org-mode-hook term-mode-hook vterm-mode-hook eshell-mode-hook dired-mode-hook shell-mode-hook magit-mode-hook)) +(dolist (mode '(org-mode-hook term-mode-hook eww-mode-hook vterm-mode-hook eshell-mode-hook dired-mode-hook shell-mode-hook magit-mode-hook)) (add-hook mode (lambda () (display-line-numbers-mode 0)))) (make-variable-buffer-local 'global-hl-line-mode) @@ -124,7 +125,9 @@ all of the evil keybindings in buffers like magit, without compromises." '(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id) '(frame-background-mode 'dark) '(package-selected-packages - '(mini-frame magit ranger multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets sudoku select-themes fsharp-mode eglot-fsharp fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters csharp-mode doom-themes marginalia eglot selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) + '(slime dired-single evil-goggles mini-frame magit ranger multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets + sudoku select-themes fsharp-mode eglot-fsharp fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters csharp-mode + doom-themes marginalia eglot selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) '(window-divider-mode nil)) (custom-set-faces ;; custom-set-faces was added by Custom. @@ -155,8 +158,6 @@ all of the evil keybindings in buffers like magit, without compromises." (setq ls-lisp-dirs-first t) (setq dired-listing-switches "-ahlgo -v --group-directories-first")) -(put 'dired-find-alternate-file 'disabled nil) - (defun joe/dired-open-with-wsl-open () "Open file under cursor with wsl-open which should launch it on the windows side." (interactive) @@ -179,11 +180,11 @@ all of the evil keybindings in buffers like magit, without compromises." (bookmark-set) (bookmark-save)) - (add-hook 'dired-mode-hook (lambda () (rename-buffer (concat "Dired - " dired-directory)) (all-the-icons-dired-mode) + (evil-define-key 'normal dired-mode-map (kbd "-") (lambda () (interactive) (find-alternate-file ".."))) (evil-define-key 'normal dired-mode-map (kbd "o") (lambda () (interactive) (joe/dired-open-file))) (evil-define-key 'normal dired-mode-map (kbd "s") @@ -191,7 +192,7 @@ all of the evil keybindings in buffers like magit, without compromises." (evil-define-key 'normal dired-mode-map (kbd "") (lambda () (interactive) (dired-find-alternate-file))))) - +;; (require 'dired-jump) (evil-define-key 'normal 'global (kbd "-") 'dired-jump) ;; (evil-define-key 'normal 'global (kbd "-") 'ranger) @@ -341,6 +342,9 @@ all of the evil keybindings in buffers like magit, without compromises." (setq marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil)) +(require 'nav-flash) +(nav-flash-show) + (setq recentf-max-menu-items 1000) (defun joe/recentf-open-files () "Use `completing-read' to open a recent file." @@ -348,9 +352,12 @@ all of the evil keybindings in buffers like magit, without compromises." (let ((files (mapcar 'abbreviate-file-name recentf-list))) (find-file (completing-read "Find recent file: " files nil t)))) +(run-at-time (current-time) 300 'recentf-save-list) + (require 'smartparens) (smartparens-global-mode +1) (show-paren-mode +1) +(sp-pair "'" nil :actions :rem) (require 'vterm) (setq vterm-shell "/bin/fish") @@ -366,6 +373,22 @@ all of the evil keybindings in buffers like magit, without compromises." (require 'find-file-in-project) (setq ffip-use-rust-fd 't) +(require 'evil-goggles) +(setq evil-goggles-duration 0.1) +(setq evil-goggles-pulse nil) +(setq evil-goggles-async-duration 0.25) + +(require 'slime) +(setq inferior-lisp-program "/usr/bin/sbcl") + +(add-hook 'slime-mode-hook + (lambda () + ;; (setq global-hl-line-mode nil) + (evil-define-key 'normal slime-repl-mode-map (kbd "(") 'slime-repl-previous-prompt) + (evil-define-key 'normal slime-repl-mode-map (kbd ")") 'slime-repl-next-prompt) + (evil-define-key 'normal slime-repl-mode-map (kbd "C-j") 'evil-window-down) + (evil-define-key 'normal slime-repl-mode-map (kbd "C-k") 'evil-window-up))) + ;; ;; Mini-frame doesn't seem to be working on Wayland, ;; a window just pops up over emacs, it's annoying @@ -426,7 +449,6 @@ all of the evil keybindings in buffers like magit, without compromises." ;; ))) ;; '(send-mail-function (quote smtpmail-send-it))) -;; (setq inferior-lisp-program "/usr/bin/sbcl") ;; (setq slime-contribs '(slime-fancy slime-company)) ; (use-package company