diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl
index 57a428c..68468ba 100644
--- a/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl
+++ b/nvim/.config/nvim/fnl/dotfiles/plugin/telescope.fnl
@@ -19,6 +19,8 @@
                         :--follow])
 
 (telescope.load_extension :projects)
+(telescope.load_extension :yank_history)
+
 (telescope.setup {:defaults {: vimgrep_arguments}
                   :pickers {:buffers {:mappings {:n {:d :delete_buffer}}}}
                   :extensions {:projects {:projects {}}}})
@@ -43,3 +45,4 @@
 (util.lnnoremap :fsr "Telescope lsp_references")
 (util.lnnoremap :fsS "Telescope lsp_document_symbols")
 (util.lnnoremap :fss "Telescope lsp_workspace_symbols")
+(util.lnnoremap :fy "Telescope yank_history")
diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/yanky.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/yanky.fnl
new file mode 100644
index 0000000..3de52fb
--- /dev/null
+++ b/nvim/.config/nvim/fnl/dotfiles/plugin/yanky.fnl
@@ -0,0 +1,37 @@
+(module dotfiles.plugin.yanky {autoload {nvim aniseed.nvim
+                                         a aniseed.core
+                                         ;; util dotfiles.util
+                                         yanky yanky}
+                               ;; require {minpac minpac}
+                               })
+
+(yanky.setup {:ring {:history_length 100
+                     :storage :shada
+                     :sync_with_numbered_registers true
+                     :cancel_event :update}
+              :system_clipboard {:sync_with_ring true}})
+
+(vim.keymap.set :n :p "<Plug>(YankyPutAfter)")
+(vim.keymap.set :n :P "<Plug>(YankyPutBefore)")
+(vim.keymap.set :n :gp "<Plug>(YankyGPutAfter)")
+(vim.keymap.set :n :gP "<Plug>(YankyGPutBefore)")
+(vim.keymap.set :n :<c-n> "<Plug>(YankyCycleForward)")
+(vim.keymap.set :n :<c-p> "<Plug>(YankyCycleBackward)")
+
+(vim.keymap.set :n "]p" "<Plug>(YankyPutIndentAfterLinewise)")
+(vim.keymap.set :n "[p" "<Plug>(YankyPutIndentBeforeLinewise)")
+(vim.keymap.set :n "]P" "<Plug>(YankyPutIndentAfterLinewise)")
+(vim.keymap.set :n "[P" "<Plug>(YankyPutIndentBeforeLinewise)")
+
+(vim.keymap.set :n :>p "<Plug>(YankyPutIndentAfterShiftRight)")
+(vim.keymap.set :n :<p "<Plug>(YankyPutIndentAfterShiftLeft)")
+(vim.keymap.set :n :>P "<Plug>(YankyPutIndentBeforeShiftRight)")
+(vim.keymap.set :n :<P "<Plug>(YankyPutIndentBeforeShiftLeft)")
+
+(vim.keymap.set :n :=p "<Plug>(YankyPutAfterFilter)")
+(vim.keymap.set :n :=P "<Plug>(YankyPutBeforeFilter)")
+
+(vim.keymap.set :x :p "<Plug>(YankyPutAfter)")
+(vim.keymap.set :x :P "<Plug>(YankyPutBefore)")
+(vim.keymap.set :x :gp "<Plug>(YankyGPutAfter)")
+(vim.keymap.set :x :gP "<Plug>(YankyGPutBefore)")
diff --git a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl
index b752095..7843a71 100644
--- a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl
+++ b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl
@@ -28,6 +28,7 @@
                 :dhruvasagar/vim-table-mode {}
                 :folke/lsp-colors.nvim {}
                 :folke/which-key.nvim {:mod :whichkey}
+                :gbprod/yanky.nvim {:mod :yanky}
                 :hashivim/vim-terraform {}
                 :hrsh7th/nvim-cmp {:requires [:hrsh7th/cmp-buffer
                                               :hrsh7th/cmp-emoji