From 65d623577e4a283d2b4d66dac7bfba3d7c8a84e6 Mon Sep 17 00:00:00 2001
From: mprodges <mprodrigues@csphy.pw>
Date: Tue, 22 Feb 2022 12:21:50 +0000
Subject: [PATCH] Assorted modifications to programming environment:

  Enable geiser and guile geiser.
  Add lsp-mode.
  Small tweaks to javascript modes.
  Add elpy.
---
 elisp/extras.el     | 21 +++++++++++++++++----
 elisp/javascript.el |  3 ---
 elisp/typescript.el |  1 -
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/elisp/extras.el b/elisp/extras.el
index 167e1a0..fd68dc9 100644
--- a/elisp/extras.el
+++ b/elisp/extras.el
@@ -112,6 +112,9 @@
 ;; git
 (use-package magit)
 
+;; language server
+(use-package lsp-mode)
+
 ;;R
 (use-package auto-complete)
 (use-package ess
@@ -122,12 +125,12 @@
 (use-package js2-mode
   :config
   (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode)))
-(use-package js2-refactor)
-(use-package xref-js2)
+;(use-package js2-refactor)
+;(use-package xref-js2)
 (use-package rjsx-mode)
 (use-package company)
-(use-package company-tern)
-(load "~/.emacs.d/elisp/javascript.el")
+;(use-package company-tern)
+;(load "~/.emacs.d/elisp/javascript.el")
 
 ;;Typescript
 (use-package tide
@@ -146,6 +149,10 @@
   :config
   (load "~/.emacs.d/elisp/org-brain-setup.el"))
 
+;;Geiser
+(use-package geiser)
+(use-package geiser-guile)
+
 ;;Common Lisp
 (use-package slime
   :disabled
@@ -163,6 +170,12 @@
 ;; Racket
 (use-package racket-mode)
 
+;; Python
+(use-package elpy
+  :ensure t
+  :init
+  (elpy-enable))
+
 ;;Ivy related stuff
 (use-package ivy)
 (use-package ivy-bibtex)
diff --git a/elisp/javascript.el b/elisp/javascript.el
index 76802ed..6797634 100644
--- a/elisp/javascript.el
+++ b/elisp/javascript.el
@@ -1,6 +1,3 @@
-;(require 'js2-mode)
-;(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
-
 ;; Better imenu
 (add-hook 'js2-mode-hook #'js2-imenu-extras-mode)
 
diff --git a/elisp/typescript.el b/elisp/typescript.el
index 61da4e2..e57cc70 100644
--- a/elisp/typescript.el
+++ b/elisp/typescript.el
@@ -7,7 +7,6 @@
   (tide-hl-identifier-mode +1)
   ;; company is an optional dependency. You have to
   ;; install it separately via package-install
-  ;; `M-x package-install [ret] company`
   (company-mode +1))
 
 ;; aligns annotation to the right hand side