diff --git a/config.org b/config.org
index 2c0ab2e..a799d1a 100644
--- a/config.org
+++ b/config.org
@@ -395,6 +395,44 @@ Requires counsel
 #+end_src
 
 
+* Latex
+  Requirements for Linux:
+  - Latex
+  - pdf-tools
+
+  #+begin_src emacs-lisp
+   (use-package pdf-tools
+     :ensure t
+     :config
+     (pdf-tools-install)
+     (setq TeX-view-program-selection '((output-pdf "pdf-tools")))
+     (setq TeX-view-program-list '(("pdf-tools" "Tex-pdf-tools-sync-view")))
+   )
+  #+end_src
+
+  For latex-preview-pane a patch might be necessary (as of 2017-10), see the issue [[https://github.com/jsinglet/latex-preview-pane/issues/37][here]]
+  Update 2018-03: It seems to work without this patch. I will keep it here in case something breaks again.
+  #+begin_src
+      latex-preview-pane-update-p()
+  ---  (doc-view-revert-buffer nil t)
+  +++  (revert-buffer-nil t 'preserve-modes)
+  #+end_src
+  After that M-x byte-compile-file
+
+  #+begin_src emacs-lisp
+   (use-package latex-preview-pane
+     :ensure t
+   )
+   (setq auto-mode-alist
+         (append '(("\\.tex$" . latex-mode)) auto-mode-alist))
+   ;; one of these works
+   (add-hook 'LaTeX-mode-hook 'latex-preview-pane-mode)
+   (add-hook 'latex-mode-hook 'latex-preview-pane-mode)
+
+   ;; necessary, because linum-mode isn't compatible and prints errors
+   (add-hook 'pdf-view-mode-hook (lambda () (linum-mode -1)))
+  #+end_src
+
 * Programming
 ** Common things
 List of plugins and settings which are shared between the language plugins
@@ -441,6 +479,31 @@ Colorize colors as text with their value
  )
 #+end_src
 
+** Magit
+   [[https://magit.vc/manual/magit/index.html][Link]]
+   I want to do git stuff here, not in a separate terminal window
+
+   Little crashcourse in magit:
+   - magit-init to init a git project
+   - magit-status (C-x g) to call the status window
+
+   in status buffer:
+   - s   stage files
+   - u   unstage files
+   - U   unstage all files
+   - a   apply changed to staging
+   - c c commit (type commit message, then C-c C-c to commit)
+   - b b switch to another branch
+   - P u git push
+   - F u git pull
+
+   #+begin_src emacs-lisp
+    (use-package magit
+      :ensure t
+      :defer t
+      :bind (("C-x g" . magit-status))
+    )
+   #+end_src
 ** Company Mode
 Complete Anything!