diff --git a/.config/git/config b/.config/git/config
index 9df2297..074f858 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,7 +1,7 @@
 [user]
     name = Daniel Yrovas
     email = dan@danielyrovas.com
-    signingkey = 502473574FB06D96
+    signingkey = C181BAC70BDE7C00
 [init]
     defaultBranch = trunk
 [ui "color"]
@@ -14,6 +14,7 @@
     tool = nvim -d
 [alias]
     c = commit
+    cm = commit -m '$2' && git push
     s = status
     st = status -u
     lg = log --oneline
diff --git a/.config/lvim/.gitignore b/.config/lvim/.gitignore
new file mode 100644
index 0000000..d7ad043
--- /dev/null
+++ b/.config/lvim/.gitignore
@@ -0,0 +1 @@
+plugin/
diff --git a/.config/lvim/after/ftplugin/c.lua b/.config/lvim/after/ftplugin/c.lua
new file mode 100644
index 0000000..8f88095
--- /dev/null
+++ b/.config/lvim/after/ftplugin/c.lua
@@ -0,0 +1 @@
+vim.cmd("setlocal tabstop=2 shiftwidth=2")
diff --git a/.config/lvim/after/ftplugin/py.lua b/.config/lvim/after/ftplugin/py.lua
new file mode 100644
index 0000000..d3435c2
--- /dev/null
+++ b/.config/lvim/after/ftplugin/py.lua
@@ -0,0 +1 @@
+vim.cmd [[setlocal tabstop=4 shiftwidth=4]]
diff --git a/.config/lvim/config.sample.lua b/.config/lvim/config.sample.lua
new file mode 100644
index 0000000..a7cf620
--- /dev/null
+++ b/.config/lvim/config.sample.lua
@@ -0,0 +1,150 @@
+--[[
+lvim is the global options object
+
+Linters should be
+filled in as strings with either
+a global executable or a path to
+an executable
+]]
+-- THESE ARE EXAMPLE CONFIGS FEEL FREE TO CHANGE TO WHATEVER YOU WANT
+
+-- general
+lvim.log.level = "warn"
+lvim.format_on_save = true
+lvim.colorscheme = "tokyonight"
+
+-- keymappings [view all the defaults by pressing <leader>Lk]
+lvim.leader = "space"
+-- add your own keymapping
+lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
+-- unmap a default keymapping
+-- lvim.keys.normal_mode["<C-Up>"] = false
+-- edit a default keymapping
+-- lvim.keys.normal_mode["<C-q>"] = ":q<cr>"
+
+-- Change Telescope navigation to use j and k for navigation and n and p for history in both input and normal mode.
+-- we use protected-mode (pcall) just in case the plugin wasn't loaded yet.
+-- local _, actions = pcall(require, "telescope.actions")
+-- lvim.builtin.telescope.defaults.mappings = {
+--   -- for input mode
+--   i = {
+--     ["<C-j>"] = actions.move_selection_next,
+--     ["<C-k>"] = actions.move_selection_previous,
+--     ["<C-n>"] = actions.cycle_history_next,
+--     ["<C-p>"] = actions.cycle_history_prev,
+--   },
+--   -- for normal mode
+--   n = {
+--     ["<C-j>"] = actions.move_selection_next,
+--     ["<C-k>"] = actions.move_selection_previous,
+--   },
+-- }
+
+-- Use which-key to add extra bindings with the leader-key prefix
+-- lvim.builtin.which_key.mappings["P"] = { "<cmd>Telescope projects<CR>", "Projects" }
+-- lvim.builtin.which_key.mappings["t"] = {
+--   name = "+Trouble",
+--   r = { "<cmd>Trouble lsp_references<cr>", "References" },
+--   f = { "<cmd>Trouble lsp_definitions<cr>", "Definitions" },
+--   d = { "<cmd>Trouble lsp_document_diagnostics<cr>", "Diagnostics" },
+--   q = { "<cmd>Trouble quickfix<cr>", "QuickFix" },
+--   l = { "<cmd>Trouble loclist<cr>", "LocationList" },
+--   w = { "<cmd>Trouble lsp_workspace_diagnostics<cr>", "Diagnostics" },
+-- }
+
+-- TODO: User Config for predefined plugins
+-- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
+lvim.builtin.alpha.active = true
+lvim.builtin.alpha.mode = "dashboard"
+lvim.builtin.notify.active = true
+lvim.builtin.terminal.active = true
+lvim.builtin.nvimtree.setup.view.side = "left"
+lvim.builtin.nvimtree.show_icons.git = 1
+
+-- if you don't want all the parsers change this to a table of the ones you want
+lvim.builtin.treesitter.ensure_installed = {
+  "bash",
+  "c",
+  "cpp",
+  "javascript",
+  "json",
+  "lua",
+  "python",
+  "typescript",
+  "tsx",
+  "css",
+  "rust",
+  "java",
+  "yaml",
+}
+
+lvim.builtin.treesitter.ignore_install = { "haskell" }
+lvim.builtin.treesitter.highlight.enabled = true
+
+-- generic LSP settings
+
+-- ---@usage disable automatic installation of servers
+-- lvim.lsp.automatic_servers_installation = false
+
+-- ---@usage Select which servers should be configured manually. Requires `:LvimCacheReset` to take effect.
+-- See the full default list `:lua print(vim.inspect(lvim.lsp.override))`
+-- vim.list_extend(lvim.lsp.override, { "pyright" })
+
+-- ---@usage setup a server -- see: https://www.lunarvim.org/languages/#overriding-the-default-configuration
+-- local opts = {} -- check the lspconfig documentation for a list of all possible options
+-- require("lvim.lsp.manager").setup("pylsp", opts)
+
+-- -- you can set a custom on_attach function that will be used for all the language servers
+-- -- See <https://github.com/neovim/nvim-lspconfig#keybindings-and-completion>
+-- lvim.lsp.on_attach_callback = function(client, bufnr)
+
+--     vim.api.nvim_buf_set_option(bufnr, ...)
+--   end
+--   --Enable completion triggered by <c-x><c-o>
+--   buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
+-- end
+
+-- -- set a formatter, this will override the language server formatting capabilities (if it exists)
+-- local formatters = require "lvim.lsp.null-ls.formatters"
+-- formatters.setup {
+--   { command = "black", filetypes = { "python" } },
+--   { command = "isort", filetypes = { "python" } },
+--   {
+--     -- each formatter accepts a list of options identical to https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md#Configuration
+--     command = "prettier",
+--     ---@usage arguments to pass to the formatter
+--     -- these cannot contain whitespaces, options such as `--line-width 80` become either `{'--line-width', '80'}` or `{'--line-width=80'}`
+--     extra_args = { "--print-with", "100" },
+--     ---@usage specify which filetypes to enable. By default a providers will attach to all the filetypes it supports.
+--     filetypes = { "typescript", "typescriptreact" },
+--   },
+-- }
+
+-- -- set additional linters
+-- local linters = require "lvim.lsp.null-ls.linters"
+-- linters.setup {
+--   { command = "flake8", filetypes = { "python" } },
+--   {
+--     -- each linter accepts a list of options identical to https://github.com/jose-elias-alvarez/null-ls.nvim/blob/main/doc/BUILTINS.md#Configuration
+--     command = "shellcheck",
+--     ---@usage arguments to pass to the formatter
+--     -- these cannot contain whitespaces, options such as `--line-width 80` become either `{'--line-width', '80'}` or `{'--line-width=80'}`
+--     extra_args = { "--severity", "warning" },
+--   },
+--   {
+--     command = "codespell",
+--     ---@usage specify which filetypes to enable. By default a providers will attach to all the filetypes it supports.
+--     filetypes = { "javascript", "python" },
+--   },
+-- }
+
+-- Additional Plugins
+lvim.plugins = {
+    {"folke/tokyonight.nvim"},
+    { "folke/trouble.nvim", cmd = "TroubleToggle", },
+}
+
+-- Autocommands (https://neovim.io/doc/user/autocmd.html)
+-- lvim.autocommands.custom_groups = {
+--   { "BufWinEnter", "*.lua", "setlocal ts=8 sw=8" },
+-- }
diff --git a/.config/lvim/lua/conf/dictionary.lua b/.config/lvim/lua/conf/dictionary.lua
new file mode 100644
index 0000000..19b820e
--- /dev/null
+++ b/.config/lvim/lua/conf/dictionary.lua
@@ -0,0 +1,11 @@
+local status_ok, dic = pcall (require, "cmp_dictionary")
+if not status_ok then
+  return
+end
+dic.setup {
+  dic = {
+    ["*"] = { "/usr/share/dict/words"}
+  },
+  first_case_insensitive = true,
+  async = true,
+}
diff --git a/.config/lvim/snips/lua.lua b/.config/lvim/snips/lua.lua
new file mode 100644
index 0000000..409ad02
--- /dev/null
+++ b/.config/lvim/snips/lua.lua
@@ -0,0 +1,18 @@
+local ls = require('luasnip')
+local f = ls.function_node
+local i = ls.insert_node
+-- local rep = require('luasnip.extras').rep
+local fmt = require('luasnip.extras.fmt').fmt
+-- local snips = {
+-- snip.parser.parse_snippet("lf", "local $1 = function($2)\n  $0\nend"),
+-- s("req", fmt("local {} = require('{}')", { i(1, "module") , rep(1)})),
+-- }
+return {
+  req = fmt(
+    [[local {} = require "{}"]],
+    { f(function(import_name)
+      local parts = vim.split(import_name[1][1], ".", true)
+      return parts[#parts] or ""
+    end, { 1 }), i(1) }
+  ),
+}
diff --git a/.config/lvim/snips/rust.lua b/.config/lvim/snips/rust.lua
new file mode 100644
index 0000000..62cc052
--- /dev/null
+++ b/.config/lvim/snips/rust.lua
@@ -0,0 +1,63 @@
+local ls = require "luasnip"
+
+local i = ls.insert_node
+local t = ls.text_node
+local c = ls.choice_node
+local fmt = require("luasnip.extras.fmt").fmt
+
+return {
+  main = fmt(
+    [[
+    fn main() {{
+    }}
+    ]],
+    {}
+  ),
+
+  modtest = fmt(
+    [[
+      #[cfg(test)]
+      mod test {{
+          use super::*;
+          {}
+      }}
+    ]],
+    i(0)
+  ),
+
+  test = fmt(
+    [[
+      #[test]
+      fn {}(){}{{
+          {}
+      }}
+    ]],
+    {
+      i(1, "testname"),
+      c(2, {
+        t "",
+        t " -> Result<()> ",
+        -- fmt(" -> {}<()> ", { i(nil, "Result") }),
+      }),
+      i(0),
+    }
+  ),
+
+  eq = fmt("assert_eq!({}, {});{}", { i(1), i(2), i(0) }),
+
+  enum = {
+    t { "#[derive(Debug, PartialEq)]", "enum " },
+    i(1, "Name"),
+    t { " {", "  " },
+    i(0),
+    t { "", "}" },
+  },
+
+  struct = {
+    t { "#[derive(Debug, PartialEq)]", "struct " },
+    i(1, "Name"),
+    t { " {", "    " },
+    i(0),
+    t { "", "}" },
+  },
+}