diff --git a/bootstrap.sh b/arch.os
similarity index 80%
rename from bootstrap.sh
rename to arch.os
index 01fa878..284f347 100755
--- a/bootstrap.sh
+++ b/arch.os
@@ -1,9 +1,7 @@
-#!bin/bash
+#!/bin/bash
 
-# Install the packages that the dotfiles need to function properly
-
-# Dev utils
-yay -S neovim-git nvm neovim kitty ranger ripgrep
+# Dev utilsv
+yay -S neovim-git nvm  kitty ranger ripgrep
 
 # Manjaro/i3 visuals with Yay
 yay -S ttf-twemoji xotf-nerd-fonts-monacob-mono xidlehook sysstat i3blocks mpris-ctl flameshot perl rofi
diff --git a/bootstrap.js b/bootstrap.js
new file mode 100755
index 0000000..eaaa5df
--- /dev/null
+++ b/bootstrap.js
@@ -0,0 +1,63 @@
+import fs from 'fs';
+import { parseArgs } from 'node:util';
+import subProcess from 'child_process';
+
+const VERSION_MAJOR = 1;
+const VERSION_MINOR = 0;
+const VERSION_PATCH = 1;
+
+// Install the packages that the dotfiles need to function properly
+
+console.log('Ben\'s amazing dotfiles installer!');
+console.log(`Version v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}`);
+
+const {
+    values: { 
+        host, os 
+    }
+} = parseArgs({
+    options: {
+        host: {
+            type: 'string',
+            short: 'h',
+        },
+        os: {
+            type: 'string',
+            short: 'o',
+        },
+    },
+});
+
+const panic = (error) => {
+    console.error('Error: ' + error);
+    console.error('usage: bootstrap -h <host> -o <os>');
+    process.exit(0);
+}
+
+if (!host || !os) {
+    panic('Incorrect usage');
+}
+
+// check we have the host
+const dir = fs.readdirSync('.', { withFileTypes: true }).filter(d => d.isDirectory() && !d.name.startsWith('.')).map(d => d.name);
+if (!dir.includes(host)) {
+    panic(`Host ${host} does not exist`);
+}
+
+// check we have the os 
+const targetInstallScript = os + '.os';
+const installScripts = fs.readdirSync('.').filter(f => f.endsWith('.os'));
+if (!installScripts.includes(targetInstallScript)) {
+    panic(`OS ${os} does not exist`);
+}
+
+console.log('Installing dependencies...');
+//const installOutput = subProcess.spawn('./' + targetInstallScript, {
+    //detached: true,
+//});
+//console.log(installOutput.toString());
+
+const parentDir = 'common';
+const targetDir = host;
+
+
diff --git a/home/.config/nvim/README.md b/home/.config/nvim/README.md
new file mode 100644
index 0000000..1a04f7f
--- /dev/null
+++ b/home/.config/nvim/README.md
@@ -0,0 +1,87 @@
+# Short Intro
+
+![Screenshot](./assets/nvim-screenshot.png)
+
+This is my NeoVim config (for version 0.7.2 and greater).
+
+## Features
+
+Here's a short list of features that this config offers (through the use of 3rd party plugins).
+
+* Autocompletion 
+* Highlighting 
+* Navigation
+    * Find definition/declaration/implementation...
+    * Find all references (of variables, methods, classes...)
+    * Jump cursor focus forward/backward in time
+    * Project tree view (NvimTree)
+    * Switch between tabs
+* Searching
+    * Search by file name
+    * Search by file contents
+    * Search through NeoVim's help
+* Refactoring (code actions)
+    * Rename (variable, method, class...)
+    * Automatically import
+    * Simplify code
+    * Infer type info
+* Diagnostics
+    * Show errors/warnings/hints/info
+    * Diagnostic panel
+    * Integration with status line
+* Git
+    * Highlight edited lines in number column
+    * Navigate between hunks (changes)
+    * Stage/unstage hunks
+    * Preview old code
+    * Status line integration
+* Misc
+    * Special start page
+    * Indent guide lines
+    * Motions for surrounding characters (brackets, parentheses...)
+    * Easy commenting out code
+    * Pretty status line
+    * Default colorscheme
+    * Enabled mouse integration
+    * Keymappings for 10 finger typing on Slovene keyboard 
+
+## Installation
+
+I will make the whole installation process more friendly in the future,
+but for now just follow these steps.
+
+1. Download this repo
+```bash
+git clone git@github.com:optimizacija/neovim-config.git
+```
+2. Put the contents of this repo where NeoVim can find them. On Linux this is most likely `$HOME/.config/nvim`.
+3. Create a *data* folder. This is where NeoVim will search for its packages, including Packer.
+    - On Linux this is `$HOME/.local/share/nvim`. Otherwise check the output of `:lua print(vim.fn.stdpath('data'))`.
+4. Open NeoVim and let it install Packer and all the dependencies (ignore the errors).
+5. Open NeoVim again and wait for nvim-treesitter to install all of its dependencies (ignore the errors).
+
+If you're updating an existing config and you're facing some issues,
+I would recommend that you remove the contents of *data* folder and retry the installation. (It has helped me in the past)
+
+
+## Icons
+Icons and other special characters are used all around the config to give NeoVim a prettier look.
+However, your terminal will not display these icons correctly unless it uses the correct font.
+
+Install one of the icon fonts listed [here](https://www.nerdfonts.com/). Just follow their instructions for your specific OS.
+After installation is complete, don't forget to configure your terminal to start using the new font. 
+Each terminal does this differently, so be sure to checkout [Arch Wiki](https://wiki.archlinux.org/) if you run into any troubles.
+
+
+## TODOS
+
+I'm working on this config in my spare time, but lately other side projects are getting in the way. I'll try to update it when I can, but also feel free to contribute by submitting a PR with your changes.
+
+Minor:
+- improve telescope functionality (support regex)
+
+Major:
+- autoformat (prettier)
+
+Misc:
+- open previously opened project files
diff --git a/home/.config/nvim/lua/keymappings.lua b/home/.config/nvim/lua/keymappings.lua
index 8e6efe9..ad4472d 100644
--- a/home/.config/nvim/lua/keymappings.lua
+++ b/home/.config/nvim/lua/keymappings.lua
@@ -73,5 +73,5 @@ vim.api.nvim_set_keymap('n', 'gf', '<Cmd>lua vim.lsp.buf.references()<CR>', opts
 
 -- autocomplete
 -- if autocomplete popup menu opens pressing enter will complete the first match
-vim.api.nvim_set_keymap('i', '<Tab>', 'v:lua.smart_tab()', {expr = true, noremap = true})
+--vim.api.nvim_set_keymap('i', '<Tab>', 'v:lua.smart_tab()', {expr = true, noremap = true})
 vim.api.nvim_set_keymap('i', '<CR>', 'pumvisible() ? "<C-n><Esc>a" : "<CR>"', {expr = true, noremap = true, silent = true})
diff --git a/home/.config/nvim/lua/plugin-config/barbar.lua b/home/.config/nvim/lua/plugin-config/barbar.lua
new file mode 100644
index 0000000..95cf494
--- /dev/null
+++ b/home/.config/nvim/lua/plugin-config/barbar.lua
@@ -0,0 +1,5 @@
+-- tab movement
+local opts = {noremap = true, silent = true}
+vim.api.nvim_set_keymap('', 'J', '<Cmd>BufferPrevious<CR>', opts)
+vim.api.nvim_set_keymap('', 'Č', '<Cmd>BufferNext<CR>', opts)
+vim.api.nvim_set_keymap('', 'X', '<Cmd>BufferClose<CR>', opts)
diff --git a/home/.config/nvim/lua/plugin-config/codewindow.lua b/home/.config/nvim/lua/plugin-config/codewindow.lua
new file mode 100644
index 0000000..012e834
--- /dev/null
+++ b/home/.config/nvim/lua/plugin-config/codewindow.lua
@@ -0,0 +1,17 @@
+local codewindow = require('codewindow')
+codewindow.setup {
+  active_in_terminals = false, -- Should the minimap activate for terminal buffers
+  auto_enable = false, -- Automatically open the minimap when entering a (non-excluded) buffer (accepts a table of filetypes)
+  exclude_filetypes = { "NvimTree" }, -- Choose certain filetypes to not show minimap on
+  max_minimap_height = nil, -- The maximum height the minimap can take (including borders)
+  max_lines = nil, -- If auto_enable is true, don't open the minimap for buffers which have more than this many lines.
+  minimap_width = 20, -- The width of the text part of the minimap
+  use_lsp = true, -- Use the builtin LSP to show errors and warnings
+  use_treesitter = true, -- Use nvim-treesitter to highlight the code
+  use_git = true, -- Show small dots to indicate git additions and deletions
+  width_multiplier = 2, -- How many characters one dot represents
+  z_index = 1, -- The z-index the floating window will be on
+  show_cursor = true, -- Show the cursor position in the minimap
+  window_border = 'single' -- The border style of the floating window (accepts all usual options)
+}
+codewindow.apply_default_keybinds()
diff --git a/home/.config/nvim/lua/plugin-config/lspsaga.lua b/home/.config/nvim/lua/plugin-config/lspsaga.lua
index 6ef19af..bda58fd 100644
--- a/home/.config/nvim/lua/plugin-config/lspsaga.lua
+++ b/home/.config/nvim/lua/plugin-config/lspsaga.lua
@@ -1,8 +1,64 @@
-local opts = { noremap = true, silent = true }
+local keymap = vim.keymap.set
 
-vim.api.nvim_set_keymap('n', 'ga', '<Cmd>lua require("lspsaga.codeaction").code_action()<CR>', opts) -- eg. autoimport
-vim.api.nvim_set_keymap('v', 'ga', ':<C-U>lua require("lspsaga.codeaction").range_code_action()<CR>', opts) -- eg. autoimport
-vim.api.nvim_set_keymap('n', 'h', '<Cmd>lua require("lspsaga.hover").render_hover_doc()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'gr', '<Cmd>lua require("lspsaga.rename").rename()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'gn', '<Cmd>lua require"lspsaga.diagnostic".lsp_jump_diagnostic_prev()<CR>', opts)
-vim.api.nvim_set_keymap('n', 'gN', '<Cmd>lua require"lspsaga.diagnostic".lsp_jump_diagnostic_next()<CR>', opts)
+-- LSP finder - Find the symbol's definition
+-- If there is no definition, it will instead be hidden
+-- When you use an action in finder like "open vsplit",
+-- you can use <C-t> to jump back
+keymap("n", "gh", "<cmd>Lspsaga lsp_finder<CR>")
+
+-- Code action
+keymap({"n","v"}, "<leader>ca", "<cmd>Lspsaga code_action<CR>")
+
+-- Rename all occurrences of the hovered word for the entire file
+keymap("n", "gr", "<cmd>Lspsaga rename<CR>")
+
+-- Rename all occurrences of the hovered word for the selected files
+keymap("n", "gr", "<cmd>Lspsaga rename ++project<CR>")
+
+-- Peek definition
+-- You can edit the file containing the definition in the floating window
+-- It also supports open/vsplit/etc operations, do refer to "definition_action_keys"
+-- It also supports tagstack
+-- Use <C-t> to jump back
+keymap("n", "gp", "<cmd>Lspsaga peek_definition<CR>")
+
+-- Go to definition
+keymap("n", "gd", "<cmd>Lspsaga goto_definition<CR>")
+
+-- Diagnostic jump
+-- You can use <C-o> to jump back to your previous location
+keymap("n", "[e", "<cmd>Lspsaga diagnostic_jump_prev<CR>")
+keymap("n", "]e", "<cmd>Lspsaga diagnostic_jump_next<CR>")
+
+-- Diagnostic jump with filters such as only jumping to an error
+keymap("n", "[E", function()
+  require("lspsaga.diagnostic"):goto_prev({ severity = vim.diagnostic.severity.ERROR })
+end)
+keymap("n", "]E", function()
+  require("lspsaga.diagnostic"):goto_next({ severity = vim.diagnostic.severity.ERROR })
+end)
+
+-- Toggle outline
+keymap("n","<leader>o", "<cmd>Lspsaga outline<CR>")
+
+-- Hover Doc
+-- If there is no hover doc,
+-- there will be a notification stating that
+-- there is no information available.
+-- To disable it just use ":Lspsaga hover_doc ++quiet"
+-- Pressing the key twice will enter the hover window
+keymap("n", "K", "<cmd>Lspsaga hover_doc<CR>")
+
+-- If you want to keep the hover window in the top right hand corner,
+-- you can pass the ++keep argument
+-- Note that if you use hover with ++keep, pressing this key again will
+-- close the hover window. If you want to jump to the hover window
+-- you should use the wincmd command "<C-w>w"
+keymap("n", "K", "<cmd>Lspsaga hover_doc ++keep<CR>")
+
+-- Call hierarchy
+keymap("n", "<Leader>ci", "<cmd>Lspsaga incoming_calls<CR>")
+keymap("n", "<Leader>co", "<cmd>Lspsaga outgoing_calls<CR>")
+
+-- Floating terminal
+keymap({"n", "t"}, "<A-d>", "<cmd>Lspsaga term_toggle<CR>")
diff --git a/home/.config/nvim/lua/plugins.lua b/home/.config/nvim/lua/plugins.lua
index a09bfa5..745002b 100644
--- a/home/.config/nvim/lua/plugins.lua
+++ b/home/.config/nvim/lua/plugins.lua
@@ -22,6 +22,9 @@ local packer = require('packer').startup(function(use)
     }
   }
 
+  -- speedy searching
+  use 'ggandor/leap.nvim'
+
   -- telescope - searching / navigation
   use {
     'nvim-telescope/telescope.nvim',
@@ -56,12 +59,20 @@ local packer = require('packer').startup(function(use)
   use 'folke/lsp-colors.nvim'
 
   -- better LSP UI (for code actions, rename etc.)
-  use 'tami5/lspsaga.nvim'
+  use({
+    "glepnir/lspsaga.nvim",
+    branch = "main",
+    config = function()
+      require("lspsaga").setup({})
+    end,
+    requires = { {"nvim-tree/nvim-web-devicons"} }
+  })
 
   -- better find and replace
   use 'nvim-lua/plenary.nvim'
   use 'windwp/nvim-spectre'
 
+
   -- VISUAL CHANGES
 
   -- start page
@@ -80,7 +91,6 @@ local packer = require('packer').startup(function(use)
   -- show startup time
   use 'dstein64/vim-startuptime'
 
-  use 'kyazdani42/nvim-web-devicons'
 
   -- UX improvements
   use({
@@ -90,7 +100,6 @@ local packer = require('packer').startup(function(use)
       "rcarriga/nvim-notify",
     }
   })
-
   use 'stevearc/dressing.nvim'
 
   use 'rcarriga/nvim-notify'
@@ -124,7 +133,7 @@ local packer = require('packer').startup(function(use)
   end
 end)
 
--- small plugin pre-init goes here
+require('leap').add_default_mappings()-- small plugin pre-init goes here
 require("indent_blankline").setup {
   char = "│",
   filetype_exclude = { "help", "alpha", "dashboard", "neo-tree", "Trouble", "lazy" },
diff --git a/home/.config/nvim/plugin/packer_compiled.lua b/home/.config/nvim/plugin/packer_compiled.lua
index e16cecc..0dbeb75 100644
--- a/home/.config/nvim/plugin/packer_compiled.lua
+++ b/home/.config/nvim/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
 end
 
 time([[Luarocks path setup]], true)
-local package_path_str = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/benk/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+local package_path_str = "/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/ben/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
 if not string.find(package.path, package_path_str, 1, true) then
   package.path = package.path .. ';' .. package_path_str
 end
@@ -76,177 +76,192 @@ time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
   catppuccin = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/catppuccin",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/catppuccin",
     url = "https://github.com/catppuccin/nvim"
   },
   ["cmp-buffer"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-buffer",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-buffer",
     url = "https://github.com/hrsh7th/cmp-buffer"
   },
   ["cmp-cmdline"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-cmdline",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-cmdline",
     url = "https://github.com/hrsh7th/cmp-cmdline"
   },
   ["cmp-nvim-lsp"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
     url = "https://github.com/hrsh7th/cmp-nvim-lsp"
   },
   ["cmp-path"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-path",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-path",
     url = "https://github.com/hrsh7th/cmp-path"
   },
   ["cmp-vsnip"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/cmp-vsnip",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/cmp-vsnip",
     url = "https://github.com/hrsh7th/cmp-vsnip"
   },
   ["codewindow.nvim"] = {
+    config = { "\27LJ\2\nW\0\0\3\0\4\0\b6\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\0019\1\3\0B\1\1\1K\0\1\0\27apply_default_keybinds\nsetup\15codewindow\frequire\0" },
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/codewindow.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/codewindow.nvim",
     url = "https://github.com/gorbit99/codewindow.nvim"
   },
   ["dressing.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/dressing.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/dressing.nvim",
     url = "https://github.com/stevearc/dressing.nvim"
   },
   ["galaxyline.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/galaxyline.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/galaxyline.nvim",
     url = "https://github.com/glepnir/galaxyline.nvim"
   },
   ["gitsigns.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
     url = "https://github.com/lewis6991/gitsigns.nvim"
   },
   ["indent-blankline.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
     url = "https://github.com/lukas-reineke/indent-blankline.nvim"
   },
+  ["leap.nvim"] = {
+    loaded = true,
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/leap.nvim",
+    url = "https://github.com/ggandor/leap.nvim"
+  },
   ["lsp-colors.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/lsp-colors.nvim",
     url = "https://github.com/folke/lsp-colors.nvim"
   },
   ["lsp-trouble.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/lsp-trouble.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/lsp-trouble.nvim",
     url = "https://github.com/folke/lsp-trouble.nvim"
   },
   ["lspsaga.nvim"] = {
+    config = { "\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\flspsaga\frequire\0" },
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
-    url = "https://github.com/tami5/lspsaga.nvim"
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
+    url = "https://github.com/glepnir/lspsaga.nvim"
   },
   ["mini.indentscope"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/mini.indentscope",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/mini.indentscope",
     url = "https://github.com/echasnovski/mini.indentscope"
   },
   ["mini.starter"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/mini.starter",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/mini.starter",
     url = "https://github.com/echasnovski/mini.starter"
   },
   nerdcommenter = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nerdcommenter",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nerdcommenter",
     url = "https://github.com/scrooloose/nerdcommenter"
   },
   ["noice.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/noice.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/noice.nvim",
     url = "https://github.com/folke/noice.nvim"
   },
   ["nui.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nui.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nui.nvim",
     url = "https://github.com/MunifTanjim/nui.nvim"
   },
   ["nvim-bqf"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-bqf",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-bqf",
     url = "https://github.com/kevinhwang91/nvim-bqf"
   },
   ["nvim-cmp"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-cmp",
     url = "https://github.com/hrsh7th/nvim-cmp"
   },
   ["nvim-lsp-installer"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer",
     url = "https://github.com/williamboman/nvim-lsp-installer"
   },
   ["nvim-lspconfig"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
     url = "https://github.com/neovim/nvim-lspconfig"
   },
   ["nvim-notify"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-notify",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-notify",
     url = "https://github.com/rcarriga/nvim-notify"
   },
   ["nvim-spectre"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-spectre",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-spectre",
     url = "https://github.com/windwp/nvim-spectre"
   },
   ["nvim-treesitter"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
     url = "https://github.com/nvim-treesitter/nvim-treesitter"
   },
   ["nvim-web-devicons"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
-    url = "https://github.com/kyazdani42/nvim-web-devicons"
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+    url = "https://github.com/nvim-tree/nvim-web-devicons"
   },
   ["packer.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/packer.nvim",
     url = "https://github.com/wbthomason/packer.nvim"
   },
   ["plenary.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/plenary.nvim",
     url = "https://github.com/nvim-lua/plenary.nvim"
   },
   ["telescope.nvim"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/telescope.nvim",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/telescope.nvim",
     url = "https://github.com/nvim-telescope/telescope.nvim"
   },
   ["vim-illuminate"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-illuminate",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-illuminate",
     url = "https://github.com/RRethy/vim-illuminate"
   },
   ["vim-startuptime"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-startuptime",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-startuptime",
     url = "https://github.com/dstein64/vim-startuptime"
   },
   ["vim-surround"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-surround",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-surround",
     url = "https://github.com/tpope/vim-surround"
   },
   ["vim-vsnip"] = {
     loaded = true,
-    path = "/home/benk/.local/share/nvim/site/pack/packer/start/vim-vsnip",
+    path = "/home/ben/.local/share/nvim/site/pack/packer/start/vim-vsnip",
     url = "https://github.com/hrsh7th/vim-vsnip"
   }
 }
 
 time([[Defining packer_plugins]], false)
+-- Config for: codewindow.nvim
+time([[Config for codewindow.nvim]], true)
+try_loadstring("\27LJ\2\nW\0\0\3\0\4\0\b6\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\0019\1\3\0B\1\1\1K\0\1\0\27apply_default_keybinds\nsetup\15codewindow\frequire\0", "config", "codewindow.nvim")
+time([[Config for codewindow.nvim]], false)
+-- Config for: lspsaga.nvim
+time([[Config for lspsaga.nvim]], true)
+try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\flspsaga\frequire\0", "config", "lspsaga.nvim")
+time([[Config for lspsaga.nvim]], false)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..ecae911
--- /dev/null
+++ b/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "dotfiles",
+  "type": "module",
+  "version": "1.0.0",
+  "description": "",
+  "main": "bootstrap.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/benkyd/dotfiles.git"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/benkyd/dotfiles/issues"
+  },
+  "homepage": "https://github.com/benkyd/dotfiles#readme"
+}
diff --git a/ubuntu.os b/ubuntu.os
new file mode 100755
index 0000000..e69de29