summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs20
-rw-r--r--.xmodmap5
2 files changed, 25 insertions, 0 deletions
diff --git a/.emacs b/.emacs
index 0f6a10a..ee06e23 100644
--- a/.emacs
+++ b/.emacs
@@ -21,6 +21,7 @@
'(ansi-color-names-vector
["#757575" "#CD5542" "#4A8F30" "#7D7C21" "#4170B3" "#9B55C3" "#68A5E9" "gray43"])
'(beacon-color "#cc6666")
+ '(column-number-mode t)
'(cua-mode t nil (cua-base))
'(custom-enabled-themes (quote (ample)))
'(custom-safe-themes
@@ -80,3 +81,22 @@
(ac-config-default)
+
+(add-to-list 'load-path "/some/path/neotree")
+(require 'neotree)
+(global-set-key [f8] 'neotree-toggle)
+
+(setq c-default-style "k&r"
+ c-basic-offset 4)
+
+(add-hook 'c-mode-common-hook '(lambda () (c-toggle-auto-state 1)))
+
+(add-to-list 'auto-mode-alist '("\\.ino\\'" . c++-mode))
+
+
+(setq backup-directory-alist
+ `(("." . ,(concat user-emacs-directory "backups"))))
+
+
+(require 'evil)
+ (evil-mode 1)
diff --git a/.xmodmap b/.xmodmap
new file mode 100644
index 0000000..ab61d66
--- /dev/null
+++ b/.xmodmap
@@ -0,0 +1,5 @@
+! Swap caps lock and escape
+remove Lock = Caps_Lock
+keysym Escape = Caps_Lock
+keysym Caps_Lock = Escape
+add Lock = Caps_Lock \ No newline at end of file