diff --git a/.bashrc b/.bashrc
index 79939fb..f491d46 100644
--- a/.bashrc
+++ b/.bashrc
@@ -14,6 +14,6 @@ eval "$(starship init bash)"
 
 alias reboot-to-windows='sudo grub-reboot "Windows Boot Manager (on /dev/nvme1n1p1)" && sudo reboot'
 export PATH=~/.npm-global/bin:~/.local/bin:$PATH
-export SSH_AUTH_SOCK=~/.1password/agent.sock
+export SSH_AUTH_SOCK=/home/pmcc/.bitwarden-ssh-agent.sock
 
 alias claude="/home/pmcc/.claude/local/claude"
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml
index 760ee0a..0a96f99 100644
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@@ -1,3 +1,6 @@
+[env]
+term = "xterm-256color"
+
 [terminal.shell]
 program = "/usr/bin/tmux"
 args = ["new-session", "-A", "-D", "-s", "main"]
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
new file mode 100644
index 0000000..077fd59
--- /dev/null
+++ b/.config/nvim/init.lua
@@ -0,0 +1,80 @@
+-- Bootstrap lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not (vim.uv or vim.loop).fs_stat(lazypath) then
+  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+  if vim.v.shell_error ~= 0 then
+    vim.api.nvim_echo({
+      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+      { out, "WarningMsg" },
+      { "\nPress any key to exit..." },
+    }, true, {})
+    vim.fn.getchar()
+    os.exit(1)
+  end
+end
+vim.opt.rtp:prepend(lazypath)
+
+vim.g.mapleader= " "
+vim.o.termguicolors = true
+vim.o.number = true
+vim.o.relativenumber = true
+vim.o.signcolumn = "yes"
+vim.o.expandtab = true
+vim.o.tabstop = 2
+vim.o.softtabstop = 2
+vim.o.shiftwidth = 2
+vim.o.termguicolors = true
+
+-- Setup lazy.nvim
+require("lazy").setup({
+  spec = {
+    {
+      "catppuccin/nvim",
+      name = "catppuccin",
+      priority = 1000
+    },
+    {
+      "nvim-telescope/telescope.nvim",
+      tag = "0.1.8",
+      dependencies = { "nvim-lua/plenary.nvim" }
+    },
+    {
+      "nvim-treesitter/nvim-treesitter",
+      build = ":TSUpdate"
+    },
+    {
+      "neovim/nvim-lspconfig"
+    },
+  },
+  -- Configure any other settings here. See the documentation for more details.
+  -- colorscheme that will be used when installing plugins.
+  install = { colorscheme = { "catppuccin" } },
+  -- automatically check for plugin updates
+  checker = { enabled = true },
+})
+
+require("catppuccin").setup({
+  auto_integrations = true,
+  flavour = "mocha",
+  background = {
+    light = "mocha",
+    dark = "mocha",
+  },
+})
+
+vim.cmd("colorscheme catppuccin-mocha")
+
+local builtin = require("telescope.builtin")
+vim.keymap.set("n", "<C-t>", builtin.find_files, {})
+vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+
+local config = require("nvim-treesitter.configs")
+config.setup({
+  ensure_installed = {"lua", "javascript", "c", "zig", "vim", "rasi", "cpp", "markdown", "markdown_inline"},
+  highlight = { enable = true },
+  indent = { enable = true },
+})
+
+vim.lsp.enable("zls")
+vim.lsp.enable("clangd")
diff --git a/.tmux.conf b/.tmux.conf
index e3da1c6..94b31ed 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -12,9 +12,10 @@ set -s escape-time 10
 # Increase scrollback buffer size
 set -g history-limit 50000
 
-# Better colors and terminal support
-set -g default-terminal "tmux-256color"
-set -ga terminal-overrides ",*256col*:Tc"
+# True color settings
+set -g default-terminal "$TERM"
+set -ag terminal-overrides ",$TERM:Tc"
+
 
 # Status bar configuration
 set -g status-interval 60