diff --git a/nvim/.config/nvim/fnl/modules/keybinds.fnl b/nvim/.config/nvim/fnl/modules/keybinds.fnl
index d933075..2f33f04 100644
--- a/nvim/.config/nvim/fnl/modules/keybinds.fnl
+++ b/nvim/.config/nvim/fnl/modules/keybinds.fnl
@@ -26,7 +26,7 @@
   {"<Space>" (cmd "Telescope find_files"  "find file")
    :r        (cmd "Telescope live_grep"   "ripgrep")
    :b        (cmd "Telescope buffers"     "select buffer")
-   :w        (cmd "w"                     "save file")
+   :s        (cmd "w"                     "save file")
    ":"       (cmd "Telescope commands"    "search commands")
 
    :t {:name "+toggle"
diff --git a/nvim/.config/nvim/fnl/modules/lsp.fnl b/nvim/.config/nvim/fnl/modules/lsp.fnl
index 114f4f2..0a319b8 100644
--- a/nvim/.config/nvim/fnl/modules/lsp.fnl
+++ b/nvim/.config/nvim/fnl/modules/lsp.fnl
@@ -31,7 +31,5 @@
                   ;(rust-tools.setup
                   ;  {:tools {:inlay_hints {:show_parameter_hints false}}}))}))
 
-(init-lsp :bashls)
 (init-lsp :clangd)
-(init-lsp :gopls)
 (init-lsp :vimls)
diff --git a/nvim/.config/nvim/fnl/modules/options.fnl b/nvim/.config/nvim/fnl/modules/options.fnl
index 201e9c0..6c09f1e 100644
--- a/nvim/.config/nvim/fnl/modules/options.fnl
+++ b/nvim/.config/nvim/fnl/modules/options.fnl
@@ -32,7 +32,14 @@
 (set nvim.o.smartindent true)
 (set nvim.o.expandtab true)
 
+(set nvim.wo.colorcolumn "+1")
 (set nvim.wo.cursorline true)
 (set nvim.wo.signcolumn "yes")
 
-(nvim.command "autocmd FileType * setlocal formatoptions-=cro")
+(defn make-wiki [name]
+  {:path (.. "~/docs/wiki/" name "/")})
+
+(tset vim.g "vimwiki_list" [(make-wiki "private")
+                            (make-wiki "veil")])
+
+;(nvim.command "autocmd FileType * setlocal formatoptions-=cro")
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 136b104..8adbba3 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -20,10 +20,13 @@ require('packer').startup(function ()
     -- TODO: look into diffview
     -- TODO: look into iamcco/markdown-preview.nvim
     -- TODO: look into vsnip (enable for compe)
+    use 'alisdair/vim-armasm'
     use 'ap/vim-css-color'
+    use 'arrufat/vala.vim'
     use 'editorconfig/editorconfig-vim'
     use 'folke/lsp-trouble.nvim'
     use 'folke/which-key.nvim'
+    use 'gentoo/gentoo-syntax'
     use 'github/copilot.vim'
     use 'glepnir/lspsaga.nvim'
     use 'godlygeek/tabular'
@@ -44,6 +47,7 @@ require('packer').startup(function ()
     use 'rust-lang/rust.vim'
     use 'simrat39/rust-tools.nvim'
     use 'tommcdo/vim-exchange'
+    use 'tpope/vim-abolish'
     use 'tpope/vim-fugitive'
     use 'tpope/vim-repeat'
     use 'tpope/vim-surround'
@@ -78,6 +82,11 @@ require('packer').startup(function ()
             'nvim-lua/popup.nvim',
         },
     }
+
+    use {
+        'vimwiki/vimwiki',
+        branch = 'dev',
+    }
 end)
 
 vim.g['aniseed#env'] = true