dotfiles

commit 44dd3ae6ade432c0477442bcac02ba25bba493a0
parent c6ab4811765cd5ccdb225a0b1b9915cf78bd9912
Author: Yuval Langer <yuval.langer@gmail.com>
Date:   Mon, 25 Sep 2017 19:00:29 +0300

Various

Diffstat:
M
dotfiles.org
 | 
34
+++++++---------------------------
M
myinit.org
 | 
27
+++++++++++----------------

2 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/dotfiles.org b/dotfiles.org
@@ -49,7 +49,7 @@ You might find mirrors in the following addresses:
   alias gc='g c'
   alias gd='g d'
 
-  alias ec="emacsclient"
+  alias e="emacsclient -a= -c"
 
   alias hebdate="hdate --hebrew|cut -f 3 -d ','|grep -v '^$'"
   alias emptify="truncate -c -s 0"
@@ -294,30 +294,6 @@ You might find mirrors in the following addresses:
   qrencode -o - "$@" | feh -
 #+end_src
 
-**** pip3i
-
-#+begin_src sh :tangle ~/bin/pip3i :tangle-mode '#o700'
-  #!/bin/sh
-
-  pip3 install --user --upgrade $@
-#+end_src
-
-**** pip3ls
-
-#+begin_src sh :tangle ~/bin/pip3ls :tangle-mode '#o700'
-  #!/bin/sh
-
-  pip3 freeze --user
-#+end_src
-
-**** pip3up
-
-#+begin_src sh :tangle ~/bin/pip3up :tangle-mode '#o700'
-  #!/bin/sh
-
-  pip3i `pip3ls | sed "s#==.*##"`
-#+end_src
-
 **** glock
 
 #+begin_src sh :tangle ~/bin/glock :tangle-mode '#o700'
@@ -342,6 +318,7 @@ You might find mirrors in the following addresses:
   userpip="$HOME/.local/bin/pip"
 
   pip3 install -U --user pip
+  pip install -U --user pip
   "$userpip" install -U --user pipsi
   "$userpip" install -U --user pip-tools
 
@@ -349,9 +326,11 @@ You might find mirrors in the following addresses:
   pip-compile -v "$HOME/requirements.in"
   "$userpip" install --user --upgrade -r "$HOME/requirements.txt"
 
-  while read -r i
+  while read -r a_line
   do
-      pipsi upgrade "$i"
+      declare -A row="$a_line"
+      pipsi install --python "${row[python]}" "${row[package]}" || pipsi install "${row[package]}"
+      pipsi upgrade "${row[package]}"
   done < "$HOME/pipsi-list"
 #+end_src
 
@@ -362,6 +341,7 @@ You might find mirrors in the following addresses:
 
   pee 'xsel -b' xsel
 #+END_SRC
+
 *** git
 **** gitconfig
 
diff --git a/myinit.org b/myinit.org
@@ -264,7 +264,7 @@ Brings up some help in the middle of a key sequence.
 #+BEGIN_SRC emacs-lisp
   (req-package org
     :loader :elpa
-    :require ob-ditaa ob-ipython
+    :require ob-ditaa ob-ipython htmlize
 
     :config
     ;; Don't prompt me to confirm every time I want to evaluate a block.
@@ -288,11 +288,6 @@ Brings up some help in the middle of a key sequence.
      '('("haskell" . "hs")))
 
 
-    (add-hook 'org-babel-after-execute-hook
-              'org-display-inline-images 'append
-              )
-
-
     (defun org-babel-tangle-block ()
       (interactive)
       (let ((current-prefix-arg '(4)))
@@ -457,7 +452,7 @@ Org bullets makes things look pretty.
 
 *** Python
 
-**** General variables
+**** COMMENT General variables
 
 #+BEGIN_SRC elisp
   (setq python-shell-interpreter "ipython")
@@ -465,7 +460,7 @@ Org bullets makes things look pretty.
   (setq python-shell-interpreter-interactive-arg "-i --simple-prompt")
 #+END_SRC
 
-**** python-x
+**** COMMENT python-x
 
 #+BEGIN_SRC emacs-lisp
   (req-package python-x
@@ -490,11 +485,12 @@ Org bullets makes things look pretty.
     :config
     (pyvenv-mode)
     (pyvenv-tracking-mode)
-    (setq pyvenv-virtualenvwrapper-python "/usr/bin/env python")
+    ;; Let's try commenting this out.
+    ;; (setq pyvenv-virtualenvwrapper-python "/usr/bin/env python")
     )
 #+END_SRC
 
-**** live-py-mode
+**** COMMENT live-py-mode
 
 #+BEGIN_SRC emacs-lisp
   (req-package live-py-mode
@@ -511,12 +507,12 @@ Org bullets makes things look pretty.
     :config
     (elpy-enable)
     (elpy-use-ipython)
-    (setq elpy-disable-backend-error-display nil)
-    (setq elpy-project-root "~/foo/ants/")
+    ;; XXX
+    ;; (setq elpy-disable-backend-error-display nil)
     )
 #+END_SRC
 
-**** COMMENT ob-ipython
+**** ob-ipython
 
 org-babel for Jupyter.
 
@@ -527,9 +523,8 @@ org-babel for Jupyter.
     :config
     ;; display/update images in the buffer after I evaluate.
     (add-hook 'org-babel-after-execute-hook
-              'org-display-inline-images 'append)
-
-    (setq ob-ipython-driver-path "~/.emacs.d/elpa/ob-ipython-20170628.1116/driver.py")
+              'org-display-inline-images 'append
+              )
     )
 #+END_SRC