Switch from ~/src/org to ~/org for org files

Will help with syncing things for work keeping global org sync out of ~/src

default.nix

@@ -0,0 +1,15 @@
+with import <nixpkgs> { };
+let
+  t = terraform.withPlugins (p: [
+    p.libvirt
+    p.local
+    p.null
+    p.random
+    p.shell
+    p.template
+    p.tls
+  ]);
+in
+mkShell {
+  buildInputs = [ gnumake ];
+}

emacs.org

@@ -805,7 +805,7 @@ validate the agenda changes.
 ;;   (interactive)
 ;;   (progn
 ;;     (setq url (read-string "url: "))
-;;     (setq reffile (capture-date-file "~/src/org/ref/url"))
+;;     (setq reffile (capture-date-file "~/org/ref/url"))
 ;;     (append-to-file
 ;;      (format "#+TITLE: %s\n#+ROAM_KEY: %s\n\n\n* Content\n%s"
 ;;              (org-web-tools--html-title url) url (mt/insert-url-as-org url))
@@ -858,10 +858,10 @@ validate the agenda changes.
              (shell . t)
              )))
   :custom
-  (org-directory "~/src/org")
+  (org-directory "~/org")
   ;; Don't sort-lines ^^^
   (org-agenda-span 'fortnight)
-  (org-archive-directory "~/src/org/attic")
+  (org-archive-directory "~/org/attic")
   (org-confirm-babel-evaluate nil)
   (org-default-notes-file (concat org-directory "/notes.org"))
   (org-fontify-done-headline t)
@@ -873,23 +873,23 @@ validate the agenda changes.
   (org-src-strip-leading-and-trailing-blank-lines t)
   ;; Ref https://orgmode.org/manual/Template-elements.html for more detail.
   (org-agenda-files
-   (list "~/src/org"
+   (list "~/org"
          "~/src/git.mitchty.net/mitchty/dotfiles"))
   ;;      "#+TITLE: %a\n#+ROAM_KEY: %U\n\n [[%U][%U]]\n"
   (org-capture-templates
    '(
 ;; TODO: make this crap work somehow
      ;; ("w" "website"
-     ;;  entry (file (capture-date-file "~/src/org/ref/url" "org"))
+     ;;  entry (file (capture-date-file "~/org/ref/url" "org"))
      ;;  ;; "#+TITLE: %a\n#+ROAM_KEY: %U\n\n%? [[%U][%U]]\n"
      ;;  "%?"
      ;;  :prepend t :empty-lines 1)
      ;; ("u" "unsorted note"
-     ;;  entry (file capture-date-file "~/src/org/unsorted" "org")
+     ;;  entry (file capture-date-file "~/org/unsorted" "org")
      ;;  "\n* %?\nRandom Note entered on %U\n  %i\n  %a\n"
      ;;  :prepend t :empty-lines 1)
      ;; ("r" "ref url"
-     ;;  entry (file capture-date-file "~/src/org/ref/url")
+     ;;  entry (file capture-date-file "~/org/ref/url")
      ;;  "\n* %?\nRandom Note entered on %U\n  %i\n  %a\n"
      ;;  :prepend t :empty-lines 1)
      ("d" "deadline"
@@ -931,25 +931,25 @@ Ref:
 
 Starting out simple..ish.
 
-#+BEGIN_SRC emacs-lisp
+#+BEGIN_SRC emacs-lisp :tangle no
 (use-package org-roam
  :after org
  :ensure t
  :hook after-init
  :custom
- (org-roam-directory "~/src/org")
- (org-roam-index-file "~/src/org/roam.org")
+ (org-roam-directory "~/org")
+ (org-roam-index-file "~/org/roam.org")
  (org-roam-tag-sources '(prop all-directories))
  (org-roam-capture-templates
   '(("d" "default" plain (function org-roam--capture-get-point)
         "%?"
-        :file-name "~/src/org/${slug}"
+        :file-name "~/org/${slug}"
         :unnarrowed t
         :head "#+TITLE: ${title}\n")))
  (org-roam-capture-ref-templates
   '(("r" "ref" plain (function org-roam-capture--get-point)
      "%?"
-     :file-name "~/src/org/ref/${slug}")
+     :file-name "~/org/ref/${slug}")
      :unnarrowed t
      :head "#+TITLE: ${title}\n#+ROAM_KEY: ${ref}\n- source :: ${ref}\n"))
  :bind

git.org

@@ -131,7 +131,7 @@ handy over the years.
   # 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.*//"'
+  rvers = !sh -c 'commitish=${0:-HEAD} && git describe --first-parent --tags --long $commitish | sed -e "s/-/./" -e "s/-g.*//"'
 #+END_SRC
 
 #+BEGIN_SRC conf :tangle (tangle/file ".gitconfig" (bound-and-true-p git-p))