Merge branch 'master' into beryllium

diff --git a/bash/.bash_profile b/bash/.bash_profile
index 8aa3b2f89f68e3ac5ab06cdb64c2b3f313f59053..c408f2d146db1de4a9dd6ba4cc36447cdf9cda5c 100644 (file)
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -1,4 +1,4 @@
-export EDITOR="/usr/bin/vim"
+export EDITOR="emc"
 export PAGER="/usr/bin/less -R"
 export PATH="/home/max/.local/bin:${PATH}"
 

diff --git a/emacs/.emacs b/emacs/.emacs
index c1f6a1b9c4d7f7e6e49a19a26f96dec6802e78ce..1bf96c906fd74f0c4cc3cf50cc6b4f4ffe5aaecf 100644 (file)
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -16,7 +16,7 @@
     ("4e753673a37c71b07e3026be75dc6af3efbac5ce335f3707b7d6a110ecb636a3" "b571f92c9bfaf4a28cb64ae4b4cdbda95241cd62cf07d942be44dc8f46c491f4" default)))
  '(package-selected-packages
    (quote
-    (zenburn-theme helm helm-config use-package flycheck company-jedi company org evil))))
+    (projectile helm-projectile zenburn-theme helm helm-config use-package flycheck company-jedi company org evil))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -41,6 +41,15 @@
   (helm-mode 1)
   (global-set-key (kbd "M-x") 'helm-M-x))
 
+(use-package projectile
+  :ensure t)
+
+(use-package helm-projectile
+  :ensure t
+  :config
+  (projectile-global-mode)
+  (setq projectile-completion-system 'helm)
+  (helm-projectile-on))
 
 (add-hook 'after-init-hook 'global-company-mode)
 

diff --git a/emacs/.local/bin/emc b/emacs/.local/bin/emc
new file mode 100755 (executable)
index 0000000..53a11bf
--- /dev/null
+++ b/emacs/.local/bin/emc
@@ -0,0 +1,2 @@
+#!/bin/sh
+emacsclient -a "" -t "$@"
\ No newline at end of file

diff --git a/git/.gitconfig b/git/.gitconfig
index f2d54ab53b8cc1020baef3cecd9b639e8742d924..2ac525185740d53e19058ce4b571f9c26a45b388 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -6,9 +6,9 @@
        diff = always
 [user]
        name = Maximilian Friedersdorff
-       email = maxf130@gmail.com
+       email = max@friedersdorff.com
 [core]
-       editor = vim
+       editor = emc
        excludesfile = /home/max/.gitignore
 [merge]
        tool = diffuse