From 3bf2a073a78bff61769ad46ec7621716dcdf01f3 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@xchg.sh>
Date: Mon, 31 May 2021 18:11:12 -0700
Subject: [PATCH] improve emacs

---
 dotfiles/emacs.d/elisp/custom.el                     |  2 +-
 dotfiles/emacs.d/elisp/modes/python-mode-settings.el | 10 ++++++----
 dotfiles/emacs.d/elisp/package.el                    |  3 ---
 dotfiles/emacs.d/init.el                             |  9 +++++++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/dotfiles/emacs.d/elisp/custom.el b/dotfiles/emacs.d/elisp/custom.el
index 81a994f..4f759e5 100644
--- a/dotfiles/emacs.d/elisp/custom.el
+++ b/dotfiles/emacs.d/elisp/custom.el
@@ -15,7 +15,7 @@
  ;; If there is more than one, they won't work right.
  '(lisp-indent-function 'common-lisp-indent-function)
  '(package-selected-packages
-   '(arjen-grey-theme oceanic-theme company-lsp projectile smex grizzl flycheck-pos-tip flycheck material-theme expand-region wrap-region rainbow-delimiters powerline linum-relative golden-ratio fill-column-indicator autopair exec-path-from-shell ws-butler yaml-mode python-mode protobuf-mode paredit nasm-mode meson-mode markdown-mode magit gradle-mode gitignore-mode feature-mode counsel company-jedi jedi-core company-emacs-eclim company-irony company ag))
+   '(python-pytest rvm rinari slime elpy clang-format+ cmake-mode cmake-ide lsp-python-ms lsp-ui lsp-mode ivy arjen-grey-theme oceanic-theme company-lsp projectile smex grizzl flycheck-pos-tip flycheck material-theme expand-region wrap-region rainbow-delimiters powerline linum-relative golden-ratio fill-column-indicator autopair exec-path-from-shell ws-butler yaml-mode python-mode protobuf-mode paredit nasm-mode meson-mode markdown-mode magit gradle-mode gitignore-mode feature-mode counsel company-jedi jedi-core company-emacs-eclim company-irony company ag))
  '(safe-local-variable-values
    '((eval setq flycheck-command-wrapper-function
       (lambda
diff --git a/dotfiles/emacs.d/elisp/modes/python-mode-settings.el b/dotfiles/emacs.d/elisp/modes/python-mode-settings.el
index 441e795..01d25b2 100644
--- a/dotfiles/emacs.d/elisp/modes/python-mode-settings.el
+++ b/dotfiles/emacs.d/elisp/modes/python-mode-settings.el
@@ -30,9 +30,10 @@
 (setq jedi:complete-on-dot t)
 
 ;; Enable pyenv integration.
-(use-package pyenv-mode
-    :config
-  (pyenv-mode))
+(if (executable-find "pyenv")
+    (use-package pyenv-mode
+	:config
+      (pyenv-mode)))
 
 ;; Disable elpy default virtualenv (use the pyenv one)
 (setq elpy-rpc-virtualenv-path 'current)
@@ -50,7 +51,8 @@
 			      (flycheck-mode t)))
 
 ;; Activate pyenv automatically if a .python-version is supplied
-(add-hook 'python-mode-hook 'pyenv-activate-current-project)
+(if (executable-find "pyenv")
+    (add-hook 'python-mode-hook 'pyenv-activate-current-project))
 
 ;; Add company-jedi hook to python mode
 (add-hook 'python-mode-hook (lambda ()
diff --git a/dotfiles/emacs.d/elisp/package.el b/dotfiles/emacs.d/elisp/package.el
index 335ea39..cad70f0 100644
--- a/dotfiles/emacs.d/elisp/package.el
+++ b/dotfiles/emacs.d/elisp/package.el
@@ -65,9 +65,6 @@
                       exec-path-from-shell
                       ;;;;;;;;;;;;;;;;;;;;
 
-                      ;; Editing Utility
-                      autopair
-
 		      ;; Keeps things indented even when you don't want it to
 		      aggressive-indent
                       ;;;;;;;;;;;;;;;;;;
diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index d74f63e..4a54480 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -69,6 +69,15 @@ There are two things you can do about this warning:
 (setq inhibit-startup-screen t)
 
 ;;--------------------------------------------------------------------------------------
+;; Quit Beeping
+;;--------------------------------------------------------------------------------------
+
+(setq visible-bell t)
+
+;; ... and the flashing
+(setq ring-bell-function 'ignore)
+
+;;--------------------------------------------------------------------------------------
 ;; Emacs 27+ Configs
 ;;--------------------------------------------------------------------------------------