diff --git a/home/bin/executable_linux-create-joplin-html b/home/bin/executable_linux-create-joplin-html
new file mode 100644
index 00000000..86154582
--- /dev/null
+++ b/home/bin/executable_linux-create-joplin-html
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⡆⠀⠀⠀⠀⠀⠀⠀⠀⠀
+#⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀
+#⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠸⣧⠀⠀⠀⠀⠀⠀⠀⠀
+#⠠⢤⣤⣤⣤⣤⣤⣴⡿⠀⠀⢻⣦⣤⣤⣤⣤⣤⡤⠄ Tyler Starr (starr-dusT)
+#⠀⠀⠙⠻⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⣠⣴⠟⠋⠀⠀ https://github.com/starr-dusT/dotfiles
+#⠀⠀⠀⠀⠀⠙⣿⡆⠀⠀⠀⠀⠰⣿⠋⠀⠀⠀⠀⠀ https://tstarr.us
+#⠀⠀⠀⠀⠀⢰⡟⠀⣀⣴⣦⣀⠀⢻⡆⠀⠀⠀⠀⠀
+#⠀⠀⠀⠀⢀⣾⣧⡾⠛⠁⠈⠙⠷⣼⣿⡀⠀⠀⠀⠀
+#⠀⠀⠀⠀⡸⠟⠁⠀⠀⠀⠀⠀⠀⠈⠛⢧⠀⠀⠀⠀
+# Create html bookmarks from "Bookmarks" note in Joplin
+
+tempdir=$(mktemp -d)
+joplin sync
+joplin export --note Bookmarks --format=md ${tempdir}
+joplin export --note "Watch Later" --format=md ${tempdir}
+pandoc --standalone "${tempdir}/Personal/Web/Bookmarks.md" > /tmp/Bookmarks.html
+pandoc --standalone "${tempdir}/Personal/Web/Watch Later.md" > /tmp/Watch_Later.html
diff --git a/home/dot_config/nvim/after/plugin/keymap/vimwiki.lua b/home/dot_config/nvim/after/plugin/keymap/vimwiki.lua
deleted file mode 100644
index d62390b7..00000000
--- a/home/dot_config/nvim/after/plugin/keymap/vimwiki.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local wk = require("which-key")
-
-wk.register({
-    w = {
-        name = "+vimwiki",
-        i = { "<cmd>VimwikiDiaryIndex<CR>", "Diary Index" },
-        s = { "<cmd>VimwikiUISelect<CR>", "Select Index" },
-        t = { "<cmd>VimwikiTabIndex<CR>", "Index Tab" },
-        w = { "<cmd>VimwikiIndex<CR>", "Index" },
-        ["<space>"] = {
-            name = "+diary",
-            i = { "<cmd>VimwikiDiaryGenerateLinks<CR>", "Generate Links" },
-            m = { "<cmd>VimwikiMakeTomorrowDiaryNote<CR>", "Make Tomorrow Note" },
-            t = { "<cmd>VimwikiTabMakeDiaryNote<CR>", "Make Today Note" },
-            w = { "<cmd>VimwikiDiaryNote<CR>", "Today Note" },
-            y = { "<cmd>VimwikiMakeYesterdayDiaryNote<CR>", "Make Yesterday Note" }
-        }
-    },
-}, { prefix = "<leader>" })
diff --git a/home/dot_config/nvim/lua/tstarr/init.lua b/home/dot_config/nvim/lua/tstarr/init.lua
index dec09f2e..7af5bb1b 100644
--- a/home/dot_config/nvim/lua/tstarr/init.lua
+++ b/home/dot_config/nvim/lua/tstarr/init.lua
@@ -1,6 +1,5 @@
 require("tstarr.set")
 require("tstarr.packer")
 require("tstarr.telescope")
-require("tstarr.vimwiki")
 require("tstarr.which-key")
 require("tstarr.iron")
diff --git a/home/dot_config/nvim/lua/tstarr/packer.lua b/home/dot_config/nvim/lua/tstarr/packer.lua
index 0e00ae18..d787e8d8 100644
--- a/home/dot_config/nvim/lua/tstarr/packer.lua
+++ b/home/dot_config/nvim/lua/tstarr/packer.lua
@@ -35,7 +35,6 @@ return require('packer').startup(function(use)
     use ('saadparwaiz1/cmp_luasnip')
     use ('alker0/chezmoi.vim')
     use ('nathangrigg/vim-beancount')
-    use ('vimwiki/vimwiki')
     use ('folke/which-key.nvim')
     use ('hkupty/iron.nvim')
     use("mickael-menu/zk-nvim")
diff --git a/home/dot_config/nvim/lua/tstarr/vimwiki.lua b/home/dot_config/nvim/lua/tstarr/vimwiki.lua
deleted file mode 100644
index 69b1a831..00000000
--- a/home/dot_config/nvim/lua/tstarr/vimwiki.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-vim.g.vimwiki_list = {
-  {
-    path = '~/documents/vimwiki/main',
-    syntax = 'markdown',
-    ext = '.md'
-  }
-}
-
-vim.g.vimwiki_ext2syntax = {
-  ['.md'] = 'markdown',
-  ['.markdown'] = 'markdown',
-  ['.mdown'] = 'markdown',
-}
-
-vim.g.vimwiki_global_ext = 0  -- don't treat all md files as vimwiki
-vim.g.vimwiki_markdown_link_ext = 1
diff --git a/home/dot_config/sway/config.tmpl b/home/dot_config/sway/config.tmpl
index 22f2d1ad..c52e81aa 100644
--- a/home/dot_config/sway/config.tmpl
+++ b/home/dot_config/sway/config.tmpl
@@ -21,7 +21,7 @@ set $tag3 "3:web"
 set $tag4 "4:dev"  
 set $tag5 "5:web"  
 set $tag6 "6:web"  
-set $tag7 "7:web" 
+set $tag7 "7:note" 
 set $tag8 "8:comm"
 
 set $e exec swaymsg mode default
@@ -104,9 +104,8 @@ for_window [app_id="file"] floating enable, \
 #----- BINDING APPLICATIONS TO WORKSPACE
 #-------------------------------------------------------------------------------
 
-assign [class="Steam"]              "1:game"
-for_window [class="Steam"]          move container to workspace "1:game"
-for_window [class="discord"]        move container to workspace $tag8
+for_window [class="Steam"] move container to workspace "1:game"
+for_window [class="discord"] move container to workspace $tag8
 for_window [title="launcher"] floating enable
 
 #-------------------------------------------------------------------------------
@@ -198,9 +197,12 @@ mode open {
     bindsym b exec brave, $e
     bindsym s exec steam || flatpak run com.valvesoftware.Steam, $e
     bindsym d exec discord || flatpak run com.discordapp.Discord, $e
+    bindsym j exec joplin-desktop, $e, exec ~/.config/sway/scripts/joplin.sh
     bindsym Escape mode default
 }
 
+for_window [con_mark="SCRATCHPAD_jop"] border pixel 1
+
 # Scratchpads commands
 bindsym $mod+c mode scratch
 mode scratch {
diff --git a/home/dot_config/sway/scripts/executable_joplin.sh b/home/dot_config/sway/scripts/executable_joplin.sh
new file mode 100644
index 00000000..609792d7
--- /dev/null
+++ b/home/dot_config/sway/scripts/executable_joplin.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+while ! [[ $(swaymsg -t get_tree | grep '"class": "Joplin"') ]]
+do
+    sleep .05
+done
+swaymsg '[class="Joplin"]' move container to workspace "7:note"
diff --git a/home/dot_config/zk/config.toml b/home/dot_config/zk/config.toml
new file mode 100644
index 00000000..13bded54
--- /dev/null
+++ b/home/dot_config/zk/config.toml
@@ -0,0 +1,100 @@
+# NOTE SETTINGS
+[note]
+
+# Language used when writing notes.
+# This is used to generate slugs or with date formats.
+language = "en"
+
+# The default title used for new note, if no `--title` flag is provided.
+default-title = "Untitled"
+
+# Template used to generate a note's filename, without extension.
+filename = "{{id}}-{{slug title}}"
+
+# The file extension used for the notes.
+extension = "md"
+
+# Template used to generate a note's content.
+# If not an absolute path, it is relative to .zk/templates/
+template = "default.md"
+
+# Length of the generated IDs.
+id-length = 4
+
+# Letter case for the random IDs, among lower, upper or mixed.
+id-case = "lower"
+
+# EXTRA VARIABLES
+[extra]
+author = "tstarr"
+
+[group.daily]
+# Directories listed here will automatically use this group when creating notes.
+paths = ["journal/daily"]
+
+[group.daily.note]
+# %Y-%m-%d is actually the default format, so you could use {{format-date now}} instead.
+filename = "{{format-date now '%Y-%m-%d'}}"
+extension = "md"
+template = "daily.md"
+
+# MARKDOWN SETTINGS
+[format.markdown]
+
+# Format used to generate links between notes.
+link-format = "markdown"
+
+# Indicates whether a link's path will be percent-encoded.
+link-encode-path = true
+
+# Indicates whether a link's path file extension will be removed.
+link-drop-extension = true
+
+# Enable support for #hashtags.
+hashtags = false
+
+# Enable support for :colon:separated:tags:.
+colon-tags = true 
+
+# EXTERNAL TOOLS
+[tool]
+
+# Default editor used to open notes. When not set, the EDITOR or VISUAL
+editor = "nvim"
+
+# Default shell used by aliases and commands.
+shell = "/bin/bash"
+
+# Pager used to scroll through long output.
+pager = "less -FIRX"
+
+# Command used to preview a note during interactive fzf mode.
+fzf-preview = "bat -p --color always {-1}"
+
+# LSP
+[lsp]
+[lsp.diagnostics]
+
+# Warn for dead links between notes.
+dead-link = "error"
+
+# NAMED FILTERS
+[filter]
+recents = "--sort created- --created-after 'last two weeks'"
+
+# COMMAND ALIASES
+[alias]
+
+# Admin
+commit = '~/.config/zk/scripts/commit.sh $ZK_NOTEBOOK_DIR' 
+push = 'git push origin master'
+conf = 'chezmoi edit ~/.config/zk/config.toml"'
+
+# Note Creation/Deletion/Editing
+ei = "zk edit --interactive && zk commit"
+daily = 'zk new --no-input "journal/daily" && zk commit'
+del = 'zk list --interactive --format "{{path}}" | xargs rm && zk commit'
+bookmark = '~/.config/zk/scripts/bookmark.sh $ZK_NOTEBOOK_DIR && zk commit'
+
+# Note Searching
+recipe = "zk edit --interactive --tag recipe"
diff --git a/home/dot_config/zk/scripts/executable_bookmark.sh b/home/dot_config/zk/scripts/executable_bookmark.sh
new file mode 100644
index 00000000..2b0ea0d3
--- /dev/null
+++ b/home/dot_config/zk/scripts/executable_bookmark.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+cd "$1"
+echo "Input bookmark name: "
+read name
+link=$(wl-paste)
+echo "- [${name}](${link})" >> "$(zk list --match-strategy exact --match "title: 'Bookmarks'" --format "{{path}}")"
+cd -
diff --git a/home/dot_config/zk/scripts/executable_commit.sh b/home/dot_config/zk/scripts/executable_commit.sh
new file mode 100644
index 00000000..e23fefbd
--- /dev/null
+++ b/home/dot_config/zk/scripts/executable_commit.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Usage: zk-commit <directory of zk>
+
+something_changed=`git status --porcelain`
+if [ -n "$something_changed" ]; then
+    git -C "$1" add .
+    message=$(git -c color.status=false status | sed -n -r -e '1,/Changes to be committed:/ d' \
+                                                           -e '1,3 d' \
+                                                           -e '/^Untracked files:/,$ d' \
+                                                           -e 's/^\s*//' \
+                                                           -e '/./p')
+    git -C "$1" commit -m "$message"
+    exit 0
+fi
+
+# If there are no changes exit with failure 
+exit 1
diff --git a/home/dot_config/zk/scripts/executable_hierarchy.sh b/home/dot_config/zk/scripts/executable_hierarchy.sh
new file mode 100644
index 00000000..231f3905
--- /dev/null
+++ b/home/dot_config/zk/scripts/executable_hierarchy.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo "TODO"
diff --git a/home/dot_zshrc b/home/dot_zshrc
index 75d98bac..e5bbee62 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -73,3 +73,6 @@ export NNN_FCOLORS='0000E6310000000000000000'
 export NNN_PLUG='g:getdrop'
 export NNN_FIFO="/tmp/nnn.fifo"
 export NNN_TRASH=1
+
+# zk
+alias cz="cd ~/documents/zet"
diff --git a/provision/nixos/hosts/bulwark/home-configuration.nix b/provision/nixos/hosts/bulwark/home-configuration.nix
index 3b5e7a48..26125c20 100644
--- a/provision/nixos/hosts/bulwark/home-configuration.nix
+++ b/provision/nixos/hosts/bulwark/home-configuration.nix
@@ -8,6 +8,7 @@
     chezmoi
     rbw 
     zk
+    bat
     joplin
     joplin-desktop
   ];
diff --git a/provision/nixos/hosts/kestrel/configuration.nix b/provision/nixos/hosts/kestrel/configuration.nix
index d35267bd..e4a4fe57 100644
--- a/provision/nixos/hosts/kestrel/configuration.nix
+++ b/provision/nixos/hosts/kestrel/configuration.nix
@@ -66,7 +66,7 @@
 
   xdg.portal = {
     enable = true;
-    gtkUsePortal = true;
+    xdgOpenUsePortal = true;
     extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr ];
   };
 
diff --git a/provision/nixos/hosts/kestrel/home-configuration.nix b/provision/nixos/hosts/kestrel/home-configuration.nix
index 39f0af52..82692ca0 100644
--- a/provision/nixos/hosts/kestrel/home-configuration.nix
+++ b/provision/nixos/hosts/kestrel/home-configuration.nix
@@ -15,6 +15,7 @@
     chezmoi
     rbw 
     zk
+    bat
     joplin
     joplin-desktop
   ];
diff --git a/provision/nixos/modules/devel/tooling.nix b/provision/nixos/modules/devel/tooling.nix
index 6db07d90..9ba8b2f5 100644
--- a/provision/nixos/modules/devel/tooling.nix
+++ b/provision/nixos/modules/devel/tooling.nix
@@ -16,6 +16,8 @@ in {
       tmuxp
       lazygit
       git-annex
+      pandoc
+      gollum
     ];
   };
 }
diff --git a/provision/nixos/modules/gaming/steam.nix b/provision/nixos/modules/gaming/steam.nix
index 2020a057..c4b083ce 100644
--- a/provision/nixos/modules/gaming/steam.nix
+++ b/provision/nixos/modules/gaming/steam.nix
@@ -21,6 +21,8 @@ in {
       pkgs.dolphin-emu
       pkgs-unstable.sunshine
       pkgs-unstable.moonlight-qt
+      pkgs-unstable.joplin
+      pkgs-unstable.joplin-desktop
     ];
   };