Guix and emacs config cleanup

emacs/.emacs.d/modules/jg-core.el

@@ -28,8 +28,8 @@
 (setq initial-scratch-message nil)
 
 ;; Disable menu, tool and scroll bars
-(menu-bar-mode -1)  
-(tool-bar-mode -1) 
+(menu-bar-mode -1)
+(tool-bar-mode -1)
 (scroll-bar-mode -1)
 
 ;; line numbers

emacs/.emacs.d/modules/jg-dev.el

@@ -30,7 +30,7 @@
 
 (use-package company
   :after lsp-mode
-  :hook (lsp-mode . company-mode)
+  :hook (lsp-mode company)
   :bind (:map company-active-map
          ("<tab>" . company-complete-selection))
         (:map lsp-mode-map
@@ -40,7 +40,7 @@
   (company-idle-delay 0.0))
 
 (use-package lsp-ui
-  :hook (lsp-mode . lsp-ui-mode)
+  :hook (lsp-mode lsp-ui)
   :custom
   (lsp-ui-doc-position 'bottom)
   :commands lsp-ui-mode)
@@ -77,7 +77,7 @@
   :ensure nil
   :hook (python-mode . lsp-deferred)
   :custom
-  ;; NOTE: Set these if Python 3 is called "python3" on your system!
+  ;; Look for python3 rather than python
   (python-shell-interpreter "python3")
   (dap-python-executable "python3")
   (dap-python-debugger 'debugpy)

emacs/.emacs.d/modules/jg-package.el

@@ -2,9 +2,11 @@
 
 (require 'package)
 
+;;;; Code:
+
 (setq package-archives '(("melpa" . "https://melpa.org/packages/")
                          ("org" . "https://orgmode.org/elpa/")
-                         ("elpa" . "https://elpa.gnu.org/packages/")    ))
+                         ("elpa" . "https://elpa.gnu.org/packages/")))
 
 (package-initialize)
 (unless package-archive-contents
@@ -16,3 +18,4 @@
 (setq use-package-always-ensure t)
 
 (provide 'jg-package)
+;;; jg-package.el ends here