Merge branch 'master' of git.awful.club:jowj/chd

.config/hammerspoon/init.lua

@@ -82,7 +82,7 @@ end)
 
 -- stolen from @mrled
 appCuts = {
-  c = 'Microsoft Edge',
+  c = 'Brave Browser',
   e = 'Emacs',
   d = 'Dash',
   f = 'Firefox',
@@ -92,7 +92,8 @@ appCuts = {
   o = 'Calendar.app',
   p = 'Bitwarden',
   t = 'iTerm.app',
-  z = 'Zoom.us'
+  z = 'Zoom.us',
+  v = 'Visual Studio Code'  
 }
 
 modalHotKey = dofile(os.getenv("HOME") .. "/.config/hammerspoon/modalHotKey.lua")

.emacs.d/init.el

@@ -37,3 +37,4 @@
 (when (eq system-type 'gnu/linux)
   (keychain-refresh-environment)
   )
+(put 'upcase-region 'disabled nil)

.emacs.d/jlj-python.el

@@ -21,6 +21,16 @@
 (use-package flycheck
   :ensure t)
 
+(use-package python-black
+  :demand t
+  :after python
+  :hook (python-mode . python-black-on-save-mode-enable-dwim))
+
+(use-package py-isort
+    :ensure t
+    :after python
+    )
+
 ; helps with LSP, generally.
 (yas-global-mode 1)
 
@@ -31,7 +41,13 @@
   (setq company-idle-delay 0)
   (setq company-minimum-prefix-length 1))
 
-(use-package project :ensure t)
+;; this is hardcoded like this to force a load of the CORRECT project.el function.
+;; reference this url: https://github.com/joaotavora/eglot/issues/549
+
+(load-file "~/.emacs.d/elpa/project-0.8.1/project.el") 
+
+(use-package project
+  :ensure t)
 
 (use-package eglot
   :ensure t
@@ -47,4 +63,15 @@
   (venv-initialize-eshell) ;; if you want eshell support
   (setq venv-location "~/.local/share/virtualenvs/"))
 
+(defun jlj/python_format ()
+    "Format python buffer with isort and black."
+    (interactive)
+    (py-isort-buffer)
+    (python-black-buffer)
+    (save-buffer))
+
+(add-hook 'python-mode-hook
+    (lambda () (local-set-key (kbd "C-c r") 'jlj/python_format)))
+
 ;;; jlj-python.el ends here
+