diff --git a/Makefile b/Makefile
index 988640b..5e36d91 100644
--- a/Makefile
+++ b/Makefile
@@ -49,11 +49,8 @@ tangle-next:
 	$(MAKE) generation
 	$(MAKE) next
 	$(MAKE) copy GEN=$(NEXT)
-	$(MAKE) set-last NEXT=$(NEXT)
-	@echo Tangled for hostname $(HOST)
-
-set-last:
 	@echo $(NEXT) > .last
+	@echo Tangled for hostname $(HOST)
 
 copy:
 	cd $(PWD)/generation/$(GEN) && find . -type f -exec rm -f $(DEST)/{} \;
diff --git a/dotprofile.org b/dotprofile.org
index 44470f9..57149b7 100644
--- a/dotprofile.org
+++ b/dotprofile.org
@@ -194,7 +194,8 @@ General clone into ~/src/TLD/some/dir from a git uri function.
 Tries to strip out miscellany that we don't need from the uri. Also allows
 wrapper functions that simplify usage.
 
-Note the gh and bb wrappers which make it easy to get repos from github and bitbucket.
+Note the bb, gh, and mt wrappers which make it easy to get repos from bitbucket,
+github, and my own sites respectively.
 
 Usage is simply:
 
@@ -263,6 +264,11 @@ try_git git://example.tld/some/random/path.git checks out to
     fi
   }
 
+  mt()
+  {
+    try_git "ssh://gitea@git.functionalidiot.com:2222/${1}" "${2:-master}"
+  }
+
   gh()
   {
     try_git "https://github.com/${1}" "${2:-master}"
@@ -398,6 +404,16 @@ alias kille=emacsclient -e "(kill-emacs)"
 #+BEGIN_SRC sh :tangle (tangle/file ".profile" (bound-and-true-p macos-p))
 alias o='open -a'
 #+END_SRC
+
+Pock crap
+#+BEGIN_SRC sh :tangle (tangle/file ".profile" (bound-and-true-p macos-p))
+  fixpock()
+  {
+    close Pock
+    open -a Pock
+  }
+#+END_SRC
+
 ** git
 #+BEGIN_SRC sh :tangle (tangle/file ".profile" (bound-and-true-p git-p))
 alias g=git
diff --git a/emacs.org b/emacs.org
index 9394785..bd02ac9 100644
--- a/emacs.org
+++ b/emacs.org
@@ -414,27 +414,28 @@ Also have the scratch buffer be empty instead of have the derp message I never r
 List of fonts in order of preference. Set preferred font list when we're in a
 gui emacs session.
 
+FIXME
+
 #+BEGIN_SRC emacs-lisp :tangle no
-    (defvar my/gui-fonts
-      '(
-        "ComicCode"
-        "Comic Code"
-        "PragmataPro"
-        "Pragmata Pro" ;; Seems to register differently on osx than X
-        "Source Code Pro"
-        "Menlo"
-        "Monaco"
-        )
+  (defvar my/gui-fonts
+    '(
+      "ComicCode"
+      "Comic Code"
+      "PragmataPro"
+      "Pragmata Pro" ;; Seems to register differently on osx than X
+      "Source Code Pro"
+      "Menlo"
+      "Monaco"
       )
-   (with-no-warnings
-     (when window-system
-       (if (find-font (font-spec :name (car my/gui-fonts)))
-           (progn (set-frame-font (car my/gui-fonts))
-                  (set-face-attribute 'default nil :height 180))
-         (when (eq system-type 'darwin)
-      (progn (set-gui-font (cdr my/gui-fonts))))
-       )
-     )
+    )
+  (with-no-warnings
+    (when window-system
+      (if (find-font (font-spec :name (car my/gui-fonts)))
+          (progn (set-frame-font (car my/gui-fonts))
+                 (set-face-attribute 'default nil :height 180))
+        (progn (set-gui-font (cdr my/gui-fonts))))
+      )
+    )
 #+END_SRC
 
 *** tty
@@ -659,7 +660,7 @@ Highlight matching ()'s []'s etc...
     )
 #+END_SRC
 
-*** org-mode and ob
+*** org-mode
 
 Org-mode keybindings and settings, pretty sparse really.
 
@@ -677,27 +678,40 @@ Org-mode keybindings and settings, pretty sparse really.
       '(org-hide-leading-stars t)
       '(org-hide-emphasis-markers t)
       '(org-confirm-babel-evaluate nil)
+      '(org-src-strip-leading-and-trailing-blank-lines t)
+      '(org-src-preserve-indentation t)
       '(org-capture-templates
-        '(("t" "Todo" entry (file+headline "~/src/bitbucket.org/mitchty/org/gtd.org" "Tasks")
+        '(("t" "Todo" entry (file+headline "~/src/org/gtd.org" "Tasks")
            "* TODO %?\n  %i\n  %a")
-          ("n" "Note" entry (file+datetree "~/src/bitbucket.org/mitchty/org/notes.org")
+          ("n" "Note" entry (file+datetree "~/src/org/notes.org")
            "* %?\nRandom Note entered on %U\n  %i\n  %a")
-          ("m" "Todo from email" entry (file+headline "~/src/bitbucket.org/mitchty/org/gtd.org" "INBOX")
+          ("m" "Todo from email" entry (file+headline "~/src/org/gtd.org" "INBOX")
            "* TODO %?, Link: %a")
-          ("u" "Url" entry (file+headline "~/src/bitbucket.org/mitchty/org/urls.org" "Urls")
+          ("u" "Url" entry (file+headline "~/src/org/urls.org" "Urls")
            "* %u\n\n %i" :prepend t)
-           )))
+           ))
+      )
 
      ;; typing stuff like the mode for a snippet is for chumps
      (add-to-list 'org-structure-template-alist '("el" "#+BEGIN_SRC emacs-lisp\n?\n#+END_SRC" ""))
      (add-to-list 'org-structure-template-alist '("hs" "#+BEGIN_SRC haskell\n?\n#+END_SRC" ""))
      (add-to-list 'org-structure-template-alist '("pl" "#+BEGIN_SRC perl\n?\n#+END_SRC" ""))
      (add-to-list 'org-structure-template-alist '("py" "#+BEGIN_SRC python\n?\n#+END_SRC" ""))
-     (add-to-list 'org-structure-template-alist '("rb" "#+BEGIN_SRC ruby\n?\n#+END_SRC" ""))
-     ;; LATER
-     ;; (add-to-list 'org-structure-template-alist '("rs" "#+BEGIN_SRC rust\n?\n#+END_SRC" ""))
      (add-to-list 'org-structure-template-alist '("sh" "#+BEGIN_SRC sh\n?\n#+END_SRC" ""))
 
+     (org-babel-do-load-languages 'org-babel-load-languages
+                                  (append org-babel-load-languages
+                                          '(
+                                            (C . t)
+                                            (ditaa . t)
+                                            (emacs-lisp . t)
+                                            (haskell . t)
+                                            (latex . t)
+                                            (perl . t)
+                                            (python . t)
+                                            (ruby  . t)
+                                            (shell . t)
+                                            )))
      (add-hook 'after-init-hook (lambda () (org-reload)))
     )
   )
@@ -731,51 +745,21 @@ Org-mode keybindings and settings, pretty sparse really.
                                  (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
       )
     )
-#+END_SRC
-
-Note ob is a builtin not really an external package.
-
-#+BEGIN_SRC emacs-lisp
-  (use-package ob
-    :custom (org-confirm-babel-evaluate nil)
-    :after org
-    :config
-    (use-package ob-async :defer 10) ;; For whatever reason not deferring causes issues.
-    (org-babel-do-load-languages 'org-babel-load-languages
-                                 (append org-babel-load-languages
-                                         '(
-                                           (C . t)
-                                           (calc . t)
-                                           (ditaa . t)
-                                           (emacs-lisp . t)
-                                           (haskell . t)
-                                           (latex . t)
-                                           (perl . t)
-                                           (python . t)
-                                           (ruby  . t)
-                                           ;; (rust . t)
-                                           (shell . t)
-                                           )))
-    :hook ((org-babel-after-execute . org-display-inline-images)))
-#+END_SRC
-
-
-#+BEGIN_SRC emacs-lisp :tangle no
-   (use-package org-roam
-         :after org
-         :defer 10
-         :hook
-         (after-init . org-roam-mode)
-         :init
-         (custom-set-variables '(org-roam-directory "~/.emacs.d"))
-         :bind (:map org-roam-mode-map
-                 (("C-c n l" . org-roam)
-                  ("C-c n f" . org-roam-find-file)
-                  ("C-c n j" . org-roam-jump-to-index)
-                  ("C-c n b" . org-roam-switch-to-buffer)
-                  ("C-c n g" . org-roam-graph))
-                 :map org-mode-map
-                 (("C-c n i" . org-roam-insert))))
+  (use-package org-roam
+        :after org
+        :hook
+        (after-init . org-roam-mode)
+        :custom
+        (org-roam-directory "~/.emacs.d")
+        :bind (:map org-roam-mode-map
+                (("C-c n l" . org-roam)
+                 ("C-c n f" . org-roam-find-file)
+                 ("C-c n j" . org-roam-jump-to-index)
+                 ("C-c n b" . org-roam-switch-to-buffer)
+                 ("C-c n g" . org-roam-graph))
+                :map org-mode-map
+                (("C-c n i" . org-roam-insert))))
+  (use-package ob-async :after org)
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp :tangle no
diff --git a/git.org b/git.org
index 4e083e3..343fbf5 100644
--- a/git.org
+++ b/git.org
@@ -126,6 +126,14 @@ handy over the years.
     show-merge = !sh -c "merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge"
 #+END_SRC
 
+#+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
+  [alias]
+    # create a pull request branch based off a pull request, lets you git diff
+    # even if someone rebases a pull request.
+    p = !sh -c 'git branch ${1:-$(git defremote)}pr$0@$(iso8601 -s) $(git ls-remote -q ${1:-$(git defremote)} | grep refs/pull-requests/$0/from | cut -c1-8)'
+    rvers = !sh -c 'commitish=${0:-HEAD} && git describe --first-parent --tags --long --match="cray-*" $commitish | sed -e "s/^cray-//" -e "s/-/./" -e "s/-g.*//"'
+#+END_SRC
+
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
   [alias]
     rembranch = !sh -xc "remote=${1:-origin} && git ls-remote --symref -q $remote HEAD | head -n1 | awk '{print $2}' | sed -e 's|refs/heads/||'"
@@ -189,6 +197,18 @@ Forgot why this was here, some version git changed the default push behavior.
     default = simple
 #+END_SRC
 
+** lfs
+
+So much junk is using it, so... just make it a default bit of the gitconfig.
+
+#+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))
+  [filter "lfs"]
+    clean = git-lfs clean -- %f
+    smudge = git-lfs smudge -- %f
+    process = git-lfs filter-process
+    required = true
+#+END_SRC
+
 ** url rewrites
 
 Don't use git:// (ssh) to connect to github.
@@ -222,7 +242,6 @@ HUNK PADDING
 HUNK PADDING
 HUNK PADDING
 
-
 END HUNK PADDING
 END HUNK PADDING
 END HUNK PADDING
diff --git a/nix.org b/nix.org
index 8c45a02..9244c48 100644
--- a/nix.org
+++ b/nix.org
@@ -15,8 +15,7 @@ Nix user config.nix setup.
   {
     packageOverrides = pkgs: with pkgs;
     let in rec {
-      # TODO: do I still care about this?
-      # custom-pinentry = pinentry.override { gtk2 = null; ncurses = null; };
+      custom-pinentry = pinentry.override { gtk2 = null; ncurses = null; };
       custom-youtube-dl = python27Packages.youtube-dl.override { pandoc = null; };
 
       default = buildEnv {
@@ -26,14 +25,13 @@ Nix user config.nix setup.
           aria
           aspell
           aspellDicts.en
-          # TODO: New installs have this conflict with another package, still neeeded?
-          # cacert
+          cacert
           clang
           cloc
           cscope
           ctags
           curl
-          # custom-pinentry
+          custom-pinentry
           custom-youtube-dl
           diffutils
           docbook5
diff --git a/options/streamer.el b/options/streamer.el
new file mode 100644
index 0000000..87db09e
--- /dev/null
+++ b/options/streamer.el
@@ -0,0 +1,11 @@
+;;-*-mode: emacs-lisp; coding: utf-8;-*-
+;;(setq testing t)
+(setq macos-p t)
+(setq nix-p t)
+(setq tmux-p t)
+(setq git-p t)
+(setq emacs-p t)
+(setq zsh-p t)
+(setq mosh-p t)
+(setq haskell-p t)
+(setq perl-p t)