diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c485957..68e01eb 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -23,6 +23,8 @@ require("paq") {
     "neovim/nvim-lspconfig";
     "ziglang/zig.vim";
 
+    "kristijanhusak/orgmode.nvim";
+
     "hrsh7th/nvim-compe";
 }
 
@@ -48,5 +50,10 @@ vim.cmd("syntax off");
 vim.cmd("source ~/.config/nvim/dumb.vim");
 o.hlsearch = true;
 
+require('orgmode').setup({
+  org_agenda_files = {'~/org/*'},
+  org_default_notes_file = '~/org/refile.org',
+})
+
 vim.api.nvim_set_keymap("i", "<CR>", "compe#confirm({ 'keys': '<CR>', 'select': v:true })", { expr = true })
 
diff --git a/.cvsrc b/.cvsrc
index 763dcbd..48ac15d 100644
--- a/.cvsrc
+++ b/.cvsrc
@@ -1,7 +1,4 @@
-#cvs -q -dqbit@10.0.1.99:/cvs
-#cvs -q -danoncvs@anoncvs1.usa.openbsd.org:/cvs
 #cvs -q -dabieber@cvs.openbsd.org:/cvs
-#cvs -q -danoncvs@anoncvs3.usa.openbsd.org:/cvs
 cvs -q -danoncvs@obsdacvs.cs.toronto.edu:/cvs
 diff -upN
 update -Pd
diff --git a/.emacs.d/readme.org b/.emacs.d/readme.org
index b5dd119..ad63681 100644
--- a/.emacs.d/readme.org
+++ b/.emacs.d/readme.org
@@ -1358,21 +1358,34 @@ I publish some of my notes [[https://suah.dev/p][on suah.dev/p]]. Also some reci
     (setq org-capture-templates my-org-capture-templates))
 
 #+end_src
+
 ** org-roam
 
 #+begin_src emacs-lisp
-  ;; (use-package org-roam
-  ;;   :hook
-  ;;   (after-init . org-roam-mode)
-  ;;   :custom
-  ;;   (org-roam-directory "~/org-roam")
-  ;;   :bind (:map org-roam-mode-map
-  ;;               (("C-c n l" . org-roam)
-  ;;                ("C-c n f" . org-roam-find-file)
-  ;;                ("C-c n g" . org-roam-graph-show))
-  ;;               :map org-mode-map
-  ;;               (("C-c n i" . org-roam-insert))
-  ;;               (("C-c n I" . org-roam-insert-immediate))))
+  (use-package org-roam
+    :ensure t
+    :init
+    (setq org-roam-v2-ack t)
+    :custom
+    (org-roam-directory "~/roam")
+    (org-roam-dailies-directory "journal/")
+    (org-roam-completion-everywhere t)
+    (org-roam-dailies-capture-templates
+     '(("d" "default" entry "* %<%I:%M %p>: %?"
+        :if-new (file+head "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>\n"))))
+    :bind (("C-c n l" . org-roam-buffer-toggle)
+           ("C-c n f" . org-roam-node-find)
+           ("C-c n i" . org-roam-node-insert)
+           :map org-mode-map
+           ("C-M-i" . completion-at-point)
+           :map org-roam-dailies-map
+           ("Y" . org-roam-dailies-capture-yesterday)
+           ("T" . org-roam-dailies-capture-tomorrow))
+    :bind-keymap
+    ("C-c n d" . org-roam-dailies-map)
+    :config
+    (require 'org-roam-dailies)
+    (org-roam-db-autosync-mode))
 #+end_src
 
 ** org-brain
@@ -1443,3 +1456,14 @@ Custom agenda commands for various things.
 	  (org-agenda-ndays 7)
 	  (org-agenda-log-mode-items '(state))))))
 #+end_src
+
+** GOT
+
+#+begin_src emacs-lisp
+  (use-package vc-got
+    :load-path "/home/qbit/.emacs.d/site-lisp/vc-got-1.0/"
+    :defer t
+    :init
+    (add-to-list 'vc-handled-backends 'Got)
+    (add-to-list 'vc-directory-exclusion-list ".got"))
+#+end_src
diff --git a/.kshrc b/.kshrc
index 7dd952d..d0d4ecc 100644
--- a/.kshrc
+++ b/.kshrc
@@ -3,7 +3,9 @@ BROWSER=$(which xdg-open 2>/dev/null)
 OHMYKSH_DIR=${HOME}/src/ohmyksh
 OHMYPATCHES=~/patches
 
-export GOT_AUTHOR BROWSER OHMYKSH_DIR OHMYPATCHES
+PKG_PATH="$(cat /etc/installurl)/snapshots/packages/%a"
+
+export GOT_AUTHOR BROWSER OHMYKSH_DIR OHMYPATCHES PKG_PATH
 
 . ${OHMYKSH_DIR}/ohmy.ksh
 
@@ -45,6 +47,7 @@ alias lookman='man -k'
 alias gomuks='env GOMUKS_CACHE_HOME=~/.gomuks gomuks'
 alias jfd='doas /usr/sbin/sysupgrade'
 alias goupdate='make MODGO_VERSION=latest modgo-gen-modules'
+alias scp='scp -s'
 
 # the q prompt auto-loads the git-prompt extension
 set_prompt q
diff --git a/.xsession b/.xsession
index 9468233..ed81a53 100755
--- a/.xsession
+++ b/.xsession
@@ -6,11 +6,9 @@ mv ~/.cache ~/.tcache && \
 	mkdir ~/.cache
 rm -rf ~/.tcache &
 
-# Make ~/Downloads a temp dir
-rm -rf ~/Downloads
-DL_CACHE="/tmp/${USER}_downloads"
-mkdir $DL_CACHE
-ln -sf $DL_CACHE ${HOME}/Downloads
+mv ~/Downloads ~/.tdownloads && \
+	mkdir ~/Downloads
+rm -rf ~/.tdownloads &
 
 # Disable coredumps
 ulimit -Sc 0