From 703f1c92cd096ea5c81764034871fda93303869a Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Sun, 15 Sep 2019 18:45:15 +0200
Subject: More configuration for emacs

---
 X/.Xmodmap       |  4 ----
 emacs/loader.org | 11 ++++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/X/.Xmodmap b/X/.Xmodmap
index 0553230..e69de29 100644
--- a/X/.Xmodmap
+++ b/X/.Xmodmap
@@ -1,4 +0,0 @@
-clear lock
-clear control
-keycode 66 = Control_L
-add control = Control_L Control_R
diff --git a/emacs/loader.org b/emacs/loader.org
index ac58a8e..31d891a 100644
--- a/emacs/loader.org
+++ b/emacs/loader.org
@@ -262,12 +262,13 @@ preferred style. This is just personal preference though.
   (setq-default indent-tabs-mode nil)
   (setq-default tab-width 4)
   (setq tab-width 4)
-  (defvaralias 'python-indent-offset 'tab-width)
-  (defvaralias 'c-basic-offset 'tab-width)
+  (setq-default python-indent-offset 4)
+  (setq-default c-basic-offset 4)
+  (setq-default python-indent 4)
 #+END_SRC
 
 #+RESULTS:
-: tab-width
+: 4
 
 Set the line number display very high so that it is always shown in the modeline.
 #+BEGIN_SRC emacs-lisp
@@ -1148,6 +1149,7 @@ Elpy package for python, which provides an IDE type environment for python.
     (elpy-enable)
     (setq py-python-command "python3")
     (setq python-shell-interpreter "python3"))
+    (setq tab-width 4)
 
   (with-eval-after-load 'python
     (defun python-shell-completion-native-try ()
@@ -1160,6 +1162,9 @@ Elpy package for python, which provides an IDE type environment for python.
          nil "_"))))
 #+END_SRC
 
+#+RESULTS:
+: python-shell-completion-native-try
+
 *** JSON
 JSON files should be opened in js-mode.
 #+BEGIN_SRC emacs-lisp
-- 
cgit