diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 5f3d57e..38bb513 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1 +1,18 @@
-require("nicolaivds")
+local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  vim.fn.system({
+    'git',
+    'clone',
+    '--filter=blob:none',
+    'https://github.com/folke/lazy.nvim.git',
+    '--branch=stable',
+    lazypath,
+  })
+end
+vim.opt.rtp:prepend(lazypath)
+
+require('vim-options')
+require('lazy').setup('plugins')
+
+
+
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index c92f358..dbe7471 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,4 +1,11 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
-  "plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }
+  "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
+  "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
+  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
+  "nvim-treesitter": { "branch": "master", "commit": "d14bc4bd15a7b9b5a9e7977c6a28f2cab6c4ad4a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }
 }
diff --git a/.config/nvim/lua/nicolaivds/init.lua b/.config/nvim/lua/nicolaivds/init.lua
deleted file mode 100644
index b45ec38..0000000
--- a/.config/nvim/lua/nicolaivds/init.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-require("nicolaivds.set")
-require("nicolaivds.remap")
-require("nicolaivds.lazy_init")
-
-vim.g.netrw_browse_split = 0
-vim.g.netrw_banner = 0
-vim.g.netrw_winsize = 25
diff --git a/.config/nvim/lua/nicolaivds/lazy/init.lua b/.config/nvim/lua/nicolaivds/lazy/init.lua
deleted file mode 100644
index 1db5ecb..0000000
--- a/.config/nvim/lua/nicolaivds/lazy/init.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-    {
-        "nvim-lua/plenary.nvim",
-        name = "plenary"
-    },
-}
diff --git a/.config/nvim/lua/nicolaivds/lazy_init.lua b/.config/nvim/lua/nicolaivds/lazy_init.lua
deleted file mode 100644
index 34c8274..0000000
--- a/.config/nvim/lua/nicolaivds/lazy_init.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("lazy").setup({
-    spec = "nicolaivds.lazy",
-    change_detection = { notify = false }
-})
diff --git a/.config/nvim/lua/nicolaivds/remap.lua b/.config/nvim/lua/nicolaivds/remap.lua
deleted file mode 100644
index 79fb48c..0000000
--- a/.config/nvim/lua/nicolaivds/remap.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-vim.g.mapleader = " "
-vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
-
-vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
-vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-
-vim.keymap.set("n", "J", "mzJ`z")
-vim.keymap.set("n", "<C-d>", "<C-d>zz")
-vim.keymap.set("n", "<C-u>", "<C-u>zz")
-vim.keymap.set("n", "n", "nzzzv")
-vim.keymap.set("n", "N", "Nzzzv")
-
--- greatest remap ever
-vim.keymap.set("x", "<leader>p", [["_dP]])
-
--- next greatest remap ever : asbjornHaland
-vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
-vim.keymap.set("n", "<leader>Y", [["+Y]])
-
-vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
-
--- This is going to get me cancelled
-vim.keymap.set("i", "<C-c>", "<Esc>")
---- vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
-vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
-
-vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
-vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
-vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
-vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
-
-vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
-vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
-
-vim.keymap.set("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>");
-
-vim.keymap.set("n", "<leader><leader>", function()
-    vim.cmd("so")
-end)
-
diff --git a/.config/nvim/lua/nicolaivds/set.lua b/.config/nvim/lua/nicolaivds/set.lua
deleted file mode 100644
index 18acbf1..0000000
--- a/.config/nvim/lua/nicolaivds/set.lua
+++ /dev/null
@@ -1,32 +0,0 @@
-vim.opt.guicursor = ""
-
-vim.opt.nu = true
-vim.opt.relativenumber = true
-
-vim.opt.tabstop = 4
-vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.expandtab = true
-
-vim.opt.smartindent = true
-
-vim.opt.wrap = false
-
-vim.opt.swapfile = false
-vim.opt.backup = false
-vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
-vim.opt.undofile = true
-
-vim.opt.hlsearch = false
-vim.opt.incsearch = true
-
-vim.opt.termguicolors = true
-
-vim.opt.scrolloff = 8
-vim.opt.signcolumn = "yes"
-vim.opt.isfname:append("@-@")
-
-vim.opt.updatetime = 50
-
-vim.opt.colorcolumn = "80"
-
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
new file mode 100644
index 0000000..a2b4f84
--- /dev/null
+++ b/.config/nvim/lua/plugins.lua
@@ -0,0 +1,2 @@
+return {}
+
diff --git a/.config/nvim/lua/plugins/catpuccin.lua b/.config/nvim/lua/plugins/catpuccin.lua
new file mode 100644
index 0000000..9a41f32
--- /dev/null
+++ b/.config/nvim/lua/plugins/catpuccin.lua
@@ -0,0 +1,9 @@
+return { 
+  'catppuccin/nvim', 
+  lazy = false,
+  name = 'catppuccin', 
+  priority = 1000,
+  config = function()
+    vim.cmd.colorscheme 'catppuccin'   
+  end
+}
diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
new file mode 100644
index 0000000..ff1ed55
--- /dev/null
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -0,0 +1,14 @@
+return {
+  'nvim-lualine/lualine.nvim',
+  dependencies = { 'nvim-tree/nvim-web-devicons' },
+  event = "VeryLazy",
+  opts = {
+    options = {
+      icons_enabled = true,
+      theme = 'auto',
+      component_seperator = '|',
+      section_separators = { left = '', right = '' },
+    }
+  }
+}
+ 
diff --git a/.config/nvim/lua/plugins/neo-tree.lua b/.config/nvim/lua/plugins/neo-tree.lua
new file mode 100644
index 0000000..efdbfde
--- /dev/null
+++ b/.config/nvim/lua/plugins/neo-tree.lua
@@ -0,0 +1,13 @@
+return {
+  'nvim-neo-tree/neo-tree.nvim',
+  branch = 'v3.x',
+  dependencies = {
+    'nvim-lua/plenary.nvim',
+    'nvim-tree/nvim-web-devicons',
+    'MunifTanjim/nui.nvim',
+  },
+  config = function()
+    vim.keymap.set('n', '<C-n>', ':Neotree filesystem reveal left<CR>', {})
+  end
+}
+
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
new file mode 100644
index 0000000..f868dd2
--- /dev/null
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -0,0 +1,9 @@
+b { 
+  'nvim-telescope/telescope.nvim', tag = '0.1.5', 
+  dependencies = { 'nvim-lua/plenary.nvim' },
+  config = function()
+    local builtin = require('telescope.builtin')
+    vim.keymap.set('n', '<C-p>', builtin.find_files, {})
+    vim.keymap.set('n', '<leader>fg', builtin.live_grep, {}) -- ripgrep is needed for this to work
+  end
+}
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
new file mode 100644
index 0000000..b065fe6
--- /dev/null
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -0,0 +1,12 @@
+return { 
+  'nvim-treesitter/nvim-treesitter', 
+  build = ':TSUpdate', 
+  config = function()
+    local config = require('nvim-treesitter.configs')
+    config.setup({
+      ensure_installed = { 'lua', 'javascript', 'typescript', 'rust' },
+      highlight = { enable = true },
+      indent = { enable = true }
+    })
+  end
+}
diff --git a/.config/nvim/lua/vim-options.lua b/.config/nvim/lua/vim-options.lua
new file mode 100644
index 0000000..47d4058
--- /dev/null
+++ b/.config/nvim/lua/vim-options.lua
@@ -0,0 +1,7 @@
+vim.cmd('set expandtab')
+vim.cmd('set tabstop=2')
+vim.cmd('set softtabstop=2')
+vim.cmd('set shiftwidth=2')
+vim.g.mapleader = ' '
+
+