Merge branch 'ruslan' of ssh://charles/mnt/andrew/code/dotfiles into ruslan

diff --git a/atom/.atom/config.cson b/atom/.atom/config.cson
index 2753d6d2b9540fef4790c42892d323ddef2b51ef..5caf11445aa9729390bcb369506bf661e03f3614 100644 (file)
--- a/atom/.atom/config.cson
+++ b/atom/.atom/config.cson
@@ -35,6 +35,14 @@
     markdownItConfig: {}
     mathConfig:
       enableLatexRenderingByDefault: true
+      numberEquations: true
+    pandocConfig:
+      pandocArguments: [
+        "--standalone"
+      ]
+      pandocBibliography: true
+      pandocMarkdownFlavor: "markdown-latex_macros"
+      pandocRemoveReferences: false
     previewConfig:
       activatePreviewWithEditor: true
     renderer: "pandoc"

diff --git a/zsh/.zshrc b/zsh/.zshrc
index dc9400db792191ac6c1a73549a2564c6aa721f9e..39ec8338093e3346445e8ddefb64dbfbea56982b 100755 (executable)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,6 +1,3 @@
-# Path to oh-my-zsh installation
-export ZSH=/home/andrew/.oh-my-zsh
-
 # ---
 # Keybinds
 # ---