diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 4ac04a5..aef3219 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -20,4 +20,4 @@ set -x JIRA_API_TOKEN NDE2ODEyOTM5OTI2Ontw1zkanbJ8sAFMDUI1Y0QxOH7d
 #if status is-interactive
 #  cat ~/.cache/wal/sequences
 #end
-source ~/.config/nvim/plugins/falcon/exa/EXA_COLORS
+source ~/.local/share/nvim/site/pack/packer/start/falcon/exa/EXA_COLORS
diff --git a/.config/nvim/after/plugin/screenshot.rc.lua b/.config/nvim/after/plugin/screenshot.rc.lua
deleted file mode 120000
index 63741e1..0000000
--- a/.config/nvim/after/plugin/screenshot.rc.lua
+++ /dev/null
@@ -1 +0,0 @@
-../available/screenshot.rc.lua
\ No newline at end of file
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 45fe1ba..704cb02 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,150 +1,22 @@
 lua << EOF
+require('core.plugins')
 require('core.config')
 require('core.mappings')
---require('core.plugins')
 EOF
 
 
 "let mapleader = "\\"
 nmap <space> <leader>
 
-let autoload_plug_path = stdpath('config') . '/autoload/plug.vim'
-
-if !filereadable(autoload_plug_path)
-    silent exe '!curl -fL --create-dirs -o ' . autoload_plug_path .
-     \ ' https://raw.github.com/junegunn/vim-plug/master/plug.vim'
-    execute 'source ' . fnameescape(autoload_plug_path)
-    let plug_install = 1
-endif
-unlet autoload_plug_path
-
-
-call plug#begin('~/.config/nvim/plugins')
-
-" Code development helpers {{{
-"Plug 'nvim-treesitter/nvim-treesitter-textobjects'
-"Plug 'nvim-treesitter/playground'
-"Plug 'p00f/nvim-ts-rainbow'
-"Plug 'vim-test/vim-test'
-"Plug 'RRethy/vim-illuminate'
-Plug 'Saecki/crates.nvim' | Plug 'jose-elias-alvarez/null-ls.nvim'
-Plug 'andrewferrier/debugprint.nvim'
-Plug 'Civitasv/cmake-tools.nvim'
-Plug 'danymat/neogen'
-Plug 'ftilde/vim-ugdb'
-Plug 'jubnzv/virtual-types.nvim'
-Plug 'krady21/compiler-explorer.nvim'
-Plug 'mizlan/iswap.nvim'
-Plug 'neovim/nvim-lspconfig'
-Plug 'numToStr/Comment.nvim'
-Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-Plug 'p00f/clangd_extensions.nvim'
-Plug 'ray-x/lsp_signature.nvim'
-Plug 'romgrk/nvim-treesitter-context'
-Plug 'ftilde/vim-ugdb'
-" }}}
-
-" Completion {{{
-Plug 'hrsh7th/cmp-buffer'
-Plug 'hrsh7th/cmp-cmdline'
-Plug 'hrsh7th/cmp-nvim-lsp'
-Plug 'hrsh7th/cmp-path'
-Plug 'hrsh7th/nvim-cmp'
-Plug 'mstanciu552/cmp-matlab'
-Plug 'petertriho/cmp-git'
-" }}}
-
-" Snippets {{{
-"Plug 'fhill2/telescope-ultisnips.nvim'
-Plug 'dcampos/cmp-snippy'
-Plug 'dcampos/nvim-snippy'
-Plug 'honza/vim-snippets'
-" }}}
-
-" Files switch, jump and grep-like tools {{{
-"Plug 'inside/vim-search-pulse'
-Plug 'MunifTanjim/nui.nvim'
-Plug 'ggandor/leap.nvim'
-Plug 'kyazdani42/nvim-tree.lua'
-Plug 'kyazdani42/nvim-web-devicons'
-Plug 'numToStr/FTerm.nvim'
-Plug 'nvim-lua/plenary.nvim'
-Plug 'nvim-lua/popup.nvim'
-Plug 'nvim-telescope/telescope.nvim'
-Plug 'wellle/targets.vim'
-" }}}
-
-" Git integration {{{
-Plug 'lewis6991/gitsigns.nvim'
-Plug 'tpope/vim-fugitive'
-" }}}
-
-" Support for random filetypes {{{
-"Plug 'chrisbra/csv.vim'
-"Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
-"Plug 'vim-pandoc/vim-pandoc'
-"Plug 'weirongxu/plantuml-previewer.vim' |
-Plug 'aklt/plantuml-syntax'
-Plug 'kergoth/vim-bitbake' " Bitbake templates and syntax
-Plug 'toppair/peek.nvim', {'do': ':!deno task --quiet build:fast'}
-" }}}
-
-" Other plugins (external tools, etc) {{{
-"Plug 'JMcKiern/vim-shoot'
-"Plug 'MortenStabenau/matlab-vim'
-"Plug 'junegunn/goyo.vim'
-Plug 'folke/which-key.nvim'
-Plug 'nvim-lualine/lualine.nvim'
-Plug 'protex/better-digraphs.nvim'
-" }}}
-
-" Note taking {{{
-Plug 'nvim-neorg/neorg'
-Plug 'jakewvincent/mkdnflow.nvim'
-Plug 'AckslD/nvim-FeMaco.lua'
-" }}}
-
-" Appearance {{{
-"Plug 'jaredgorski/spacecamp'
-"Plug 'lifepillar/vim-gruvbox8'
-"Plug 'marko-cerovac/material.nvim'
-"Plug 'srcery-colors/srcery-vim'
-"Plug 'tanvirtin/monokai.nvim'
-Plug 'anuvyklack/fold-preview.nvim' | Plug 'anuvyklack/keymap-amend.nvim'
-Plug 'anuvyklack/pretty-fold.nvim'
-Plug 'anuvyklack/windows.nvim' | Plug 'anuvyklack/middleclass' | Plug 'anuvyklack/animation.nvim'
-Plug 'lukas-reineke/virt-column.nvim'
-Plug 'stevearc/dressing.nvim'
-Plug 'wuelnerdotexe/vim-enfocado'
-Plug 'fenetikm/falcon'
-" }}}
-
-" Testing phase {{{
-"Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
-"Plug 'euclio/vim-markdown-composer', {'do': ':!cargo build --release --locked'}
-"Plug 'https://git.sr.ht/%7Ewhynothugo/lsp_lines.nvim'
-"Plug 'kevinhwang91/nvim-ufo' | Plug 'kevinhwang91/promise-async'
-"Plug 'mfussenegger/nvim-dap'
-"Plug 'narutoxy/silicon.lua'
-"Plug 'nguyenvukhang/nvim-toggler'
-"Plug 'rgroli/other.nvim' " Currently doesn't support C/C++
-"Plug 'smolovk/projector.nvim'
-Plug 'Pocco81/true-zen.nvim'
-Plug 'frabjous/knap'
-Plug 'gorbit99/codewindow.nvim'
-Plug 'krivahtoo/silicon.nvim', { 'do': './install.sh' }
-Plug 'nat-418/boole.nvim'
-Plug 'nullchilly/fsread.nvim'
-Plug 'nyngwang/murmur.lua'
-Plug 'samodostal/image.nvim'
-Plug 'simrat39/symbols-outline.nvim'
-Plug 'ziontee113/icon-picker.nvim'
-Plug 'cbochs/grapple.nvim'
-Plug 'shortcuts/no-neck-pain.nvim'
-Plug 'debugloop/telescope-undo.nvim'
-" }}}
-
-call plug#end()
+"let autoload_plug_path = stdpath('config') . '/autoload/plug.vim'
+"
+"if !filereadable(autoload_plug_path)
+"    silent exe '!curl -fL --create-dirs -o ' . autoload_plug_path .
+"     \ ' https://raw.github.com/junegunn/vim-plug/master/plug.vim'
+"    execute 'source ' . fnameescape(autoload_plug_path)
+"    let plug_install = 1
+"endif
+"unlet autoload_plug_path
 
 "colorscheme enfocado
 "lua require('lualine').setup { options = { theme = 'enfocado' } }
diff --git a/.config/nvim/lua/core/plugins.lua b/.config/nvim/lua/core/plugins.lua
new file mode 100644
index 0000000..fd509c5
--- /dev/null
+++ b/.config/nvim/lua/core/plugins.lua
@@ -0,0 +1,147 @@
+vim.cmd [[ packadd packer.nvim ]]
+
+--git clone --depth 1 https://github.com/wbthomason/packer.nvim\
+-- ~/.local/share/nvim/site/pack/packer/start/packer.nvim
+
+return require'packer'.startup( function(use)
+-- Code development helpers {{{
+--use 'nvim-treesitter/nvim-treesitter-textobjects'
+--use 'nvim-treesitter/playground'
+--use 'p00f/nvim-ts-rainbow'
+--use 'vim-test/vim-test'
+--use 'RRethy/vim-illuminate'
+use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
+use {'mizlan/iswap.nvim', requires = 'nvim-treesitter/nvim-treesitter'}
+use {'Saecki/crates.nvim', requires = 'jose-elias-alvarez/null-ls.nvim'}
+use 'andrewferrier/debugprint.nvim'
+use 'Civitasv/cmake-tools.nvim'
+use 'danymat/neogen'
+use 'ftilde/vim-ugdb'
+use 'jubnzv/virtual-types.nvim'
+use 'krady21/compiler-explorer.nvim'
+use 'neovim/nvim-lspconfig'
+use 'numToStr/Comment.nvim'
+use 'p00f/clangd_extensions.nvim'
+use 'ray-x/lsp_signature.nvim'
+use {'romgrk/nvim-treesitter-context', requires = 'nvim-treesitter/nvim-treesitter'}
+-- }}}
+
+-- Completion {{{
+use 'hrsh7th/cmp-buffer'
+use 'hrsh7th/cmp-cmdline'
+use 'hrsh7th/cmp-nvim-lsp'
+use 'hrsh7th/cmp-path'
+use 'hrsh7th/nvim-cmp'
+use 'mstanciu552/cmp-matlab'
+use 'petertriho/cmp-git'
+-- }}}
+
+-- Snippets {{{
+--use 'fhill2/telescope-ultisnips.nvim'
+use 'dcampos/cmp-snippy'
+use 'dcampos/nvim-snippy'
+use 'honza/vim-snippets'
+-- }}}
+
+-- Files switch, jump and grep-like tools {{{
+--use 'inside/vim-search-pulse'
+use 'MunifTanjim/nui.nvim'
+use 'ggandor/leap.nvim'
+use 'kyazdani42/nvim-tree.lua'
+use 'kyazdani42/nvim-web-devicons'
+use 'numToStr/FTerm.nvim'
+use 'nvim-lua/plenary.nvim'
+use 'nvim-lua/popup.nvim'
+use 'nvim-telescope/telescope.nvim'
+use 'wellle/targets.vim'
+-- }}}
+
+-- Git integration {{{
+use 'lewis6991/gitsigns.nvim'
+use 'tpope/vim-fugitive'
+-- }}}
+
+-- Support for random filetypes {{{
+--use 'chrisbra/csv.vim'
+--use 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
+--use 'vim-pandoc/vim-pandoc'
+--use 'weirongxu/plantuml-previewer.vim' |
+use 'aklt/plantuml-syntax'
+use 'kergoth/vim-bitbake' -- Bitbake templates and syntax
+use {'toppair/peek.nvim', run = 'deno task --quiet build:fast'}
+-- }}}
+
+-- Other plugins (external tools, etc) {{{
+--use 'JMcKiern/vim-shoot'
+--use 'MortenStabenau/matlab-vim'
+--use 'junegunn/goyo.vim'
+use 'folke/which-key.nvim'
+use 'nvim-lualine/lualine.nvim'
+use 'protex/better-digraphs.nvim'
+-- }}}
+
+-- Note taking {{{
+use 'nvim-neorg/neorg'
+use 'jakewvincent/mkdnflow.nvim'
+use 'AckslD/nvim-FeMaco.lua'
+-- }}}
+
+-- Appearance {{{
+--use 'jaredgorski/spacecamp'
+--use 'lifepillar/vim-gruvbox8'
+--use 'marko-cerovac/material.nvim'
+--use 'srcery-colors/srcery-vim'
+--use 'tanvirtin/monokai.nvim'
+use{ 'anuvyklack/pretty-fold.nvim',
+   config = function()
+      require('pretty-fold').setup()
+      require('pretty-fold').ft_setup('cpp', {
+        process_comment_signs = false,
+        --comment_signs = {
+        --   '//', -- C++ Doxygen comments
+        --},
+      }
+    )
+   end
+}
+use {'anuvyklack/windows.nvim', requires = {'anuvyklack/middleclass', 'anuvyklack/animation.nvim'}}
+use { 'anuvyklack/fold-preview.nvim',
+   requires = 'anuvyklack/keymap-amend.nvim',
+   config = function()
+      require('fold-preview').setup({
+         -- Your configuration goes here.
+      })
+   end
+}
+use 'lukas-reineke/virt-column.nvim'
+use 'stevearc/dressing.nvim'
+use 'wuelnerdotexe/vim-enfocado'
+use 'fenetikm/falcon'
+-- }}}
+
+-- Testing phase {{{
+--use 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
+--use 'euclio/vim-markdown-composer', {'do': ':!cargo build --release --locked'}
+--use 'https://git.sr.ht/%7Ewhynothugo/lsp_linesdenvim'
+--use 'kevinhwang91/nvim-ufo' | use 'kevinhwang91/promise-async'
+--use 'mfussenegger/nvim-dap'
+--use 'narutoxy/silicon.lua'
+--use 'nguyenvukhang/nvim-toggler'
+--use 'rgroli/other.nvim' " Currently doesn't support C/C++
+--use 'smolovk/projector.nvim'
+use 'Pocco81/true-zen.nvim'
+use 'frabjous/knap'
+use 'gorbit99/codewindow.nvim'
+use {'krivahtoo/silicon.nvim', run = './install.sh' }
+use 'nat-418/boole.nvim'
+use 'nullchilly/fsread.nvim'
+use 'nyngwang/murmur.lua'
+use 'samodostal/image.nvim'
+use 'simrat39/symbols-outline.nvim'
+use 'ziontee113/icon-picker.nvim'
+use 'cbochs/grapple.nvim'
+use 'shortcuts/no-neck-pain.nvim'
+use 'debugloop/telescope-undo.nvim'
+use 'edluffy/specs.nvim'
+-- }}}
+end )
diff --git a/.config/nvim/lua/core/temp.lua b/.config/nvim/lua/core/temp.lua
index 5303077..2de1791 100644
--- a/.config/nvim/lua/core/temp.lua
+++ b/.config/nvim/lua/core/temp.lua
@@ -2,14 +2,6 @@ require("virt-column").setup { }
 require('compiler-explorer').setup()
 require("symbols-outline").setup()
 
-require('pretty-fold').setup()
-require('pretty-fold').ft_setup('cpp', {
-   process_comment_signs = false,
-   --comment_signs = {
-   --   '//', -- C++ Doxygen comments
-   --},
-})
-require('fold-preview').setup()
 --require('lsp_lines').setup()
 
 require('image').setup {