diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index ca9fa0e..5be87c4 100644
--- a/.config/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
@@ -102,7 +102,7 @@ map("v", "<A-k>", ":<C-u>execute \"'<,'>move '<-\" . (v:count1 + 1)<cr>gv=gv", {
 map("v", "<", "<gv")
 map("v", ">", ">gv")
 
-map({ "n", "o", "v" }, "<CR>", function()
+map({ "n", "v" }, "<CR>", function()
 	if vim.treesitter.get_parser(nil, nil, { error = false }) then
 		require("vim.treesitter._select").select_parent(vim.v.count1)
 	else
@@ -110,7 +110,7 @@ map({ "n", "o", "v" }, "<CR>", function()
 	end
 end, { desc = "Select parent treesitter node or outer incremental lsp selections" })
 
-map({ "n", "o", "v" }, "<S-CR>", function()
+map({ "n", "v" }, "<S-CR>", function()
 	if vim.treesitter.get_parser(nil, nil, { error = false }) then
 		require("vim.treesitter._select").select_child(vim.v.count1)
 	else
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index ba7ccb6..d0433d6 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -23,7 +23,7 @@ vim.opt.relativenumber = false -- add numbers to each line on the left side
 vim.opt.cursorline = true -- highlight cursor line underneath the cursor horizontally
 vim.opt.splitbelow = true -- open new vertical split bottom
 vim.opt.splitright = true -- open new horizontal splits right
-vim.opt.termguicolors = true -- enabl 24-bit RGB color in the TUI
+vim.opt.termguicolors = true -- enable 24-bit RGB color in the TUI
 vim.opt.showmode = false -- we are experienced, wo don't need the "-- INSERT --" mode hint
 vim.opt.wrap = false
 -- Sets how neovim will display certain whitespace characters in the editor.
diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua
index 8bb611a..ad70848 100644
--- a/.config/nvim/lua/plugins/blink.lua
+++ b/.config/nvim/lua/plugins/blink.lua
@@ -1,22 +1,20 @@
-vim.pack.add({ "https://github.com/saghen/blink.cmp" })
+vim.pack.add({ { src = "https://github.com/saghen/blink.cmp", version = vim.version.range("v1.x") } })
 
 local Blink = require("blink.cmp")
 
 Blink.setup({
 	fuzzy = {
-		implementation = "rust",
-		prebuilt_binaries = { force_version = "1.*", ignore_version_mismatch = true },
 		frecency = {
 			enabled = true,
 			unsafe_no_lock = false,
 		},
-		use_proximity = true,
-		sorts = {
-			"exact",
-			"score",
-			"sort_text",
-			"label",
-		},
+		-- use_proximity = true,
+		-- sorts = {
+		-- 	"exact",
+		-- 	"score",
+		-- 	"sort_text",
+		-- 	"label",
+		-- },
 	},
 	keymap = {
 		preset = "enter",
@@ -35,13 +33,13 @@ Blink.setup({
 			auto_show = true,
 			auto_show_delay_ms = 0,
 			window = {
-				border = "rounded",
+				border = "none",
 				scrollbar = false,
 			},
 		},
 		menu = {
-			border = "rounded",
-			draw = { gap = 2 },
+			border = "none",
+			-- draw = { gap = 2 },
 			scrollbar = false,
 		},
 	},
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
index 72761f6..84cf686 100644
--- a/.config/nvim/lua/plugins/init.lua
+++ b/.config/nvim/lua/plugins/init.lua
@@ -1,4 +1,4 @@
-require("plugins.nord")
+require("plugins.onedark")
 require("plugins.mason")
 require("plugins.lspconfig")
 require("plugins.lazydev")
diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
index e3f0d8a..b62ca93 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -5,7 +5,7 @@ local Lualine = require("lualine")
 Lualine.setup({
 	options = {
 		icons_enabled = true,
-		theme = "auto",
+		theme = "onedark",
 		component_separators = { left = "", right = "" },
 		section_separators = { left = "", right = "" },
 		disabled_filetypes = {
@@ -25,7 +25,12 @@ Lualine.setup({
 	sections = {
 		lualine_a = { "mode" },
 		lualine_b = { "branch", "diff", "diagnostics" },
-		lualine_c = { "filename" },
+		lualine_c = {
+			{
+				"filename",
+				path = 1, -- 0 = filename only, 1 = relative path, 2 = absolute path, 3 = absolute path + shorten
+			},
+		},
 		lualine_x = { "encoding", "fileformat", "filetype" },
 		lualine_y = { "progress" },
 		lualine_z = { "location" },
diff --git a/.config/nvim/lua/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua
index ea87adc..866ccef 100644
--- a/.config/nvim/lua/plugins/snacks.lua
+++ b/.config/nvim/lua/plugins/snacks.lua
@@ -55,8 +55,8 @@ Snacks.setup({
 			grep = { exclude = exclude },
 			lsp_symbols = { exclude = exclude },
 			explorer = {
-				ignored = true,
-				hidden = true,
+				ignored = false,
+				hidden = false,
 				exclude = exclude,
 				replace_netrw = true,
 				supports_live = true,
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
index ab0bd9a..598872f 100644
--- a/.config/nvim/lua/plugins/treesitter.lua
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -5,12 +5,12 @@ local ts = require("nvim-treesitter")
 -- Installs treesitter for filetype if available
 -- enables highlighting and indentation
 vim.api.nvim_create_autocmd("FileType", {
-	pattern = { "*" },
+	pattern = { ".*" },
 	callback = function(args)
 		local ft = vim.bo[args.buf].filetype
 		local lang = vim.treesitter.language.get_lang(ft)
 
-		if not vim.treesitter.language.add(lang) then
+		if not lang or not vim.treesitter.language.add(lang) then
 			local available = vim.g.ts_available or ts.get_available()
 			if not vim.g.ts_available then
 				vim.g.ts_available = available
@@ -28,3 +28,5 @@ vim.api.nvim_create_autocmd("FileType", {
 		end
 	end,
 })
+
+vim.treesitter.language.register("bash", "env")
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
index 177e2f4..c00f070 100644
--- a/.config/nvim/nvim-pack-lock.json
+++ b/.config/nvim/nvim-pack-lock.json
@@ -14,11 +14,12 @@
       "src": "https://github.com/rmagatti/auto-session"
     },
     "blink.cmp": {
-      "rev": "679a2ffad4bae720bb12e6bcdf57b0dd8b8a80f8",
-      "src": "https://github.com/saghen/blink.cmp"
+      "rev": "78336bc89ee5365633bcf754d93df01678b5c08f",
+      "src": "https://github.com/saghen/blink.cmp",
+      "version": "1.0.0 - 2.0.0"
     },
     "conform.nvim": {
-      "rev": "086a40dc7ed8242c03be9f47fbcee68699cc2395",
+      "rev": "dca1a190aa85f9065979ef35802fb77131911106",
       "src": "https://github.com/stevearc/conform.nvim"
     },
     "flash.nvim": {
@@ -30,24 +31,20 @@
       "src": "https://github.com/rafamadriz/friendly-snippets"
     },
     "grug-far.nvim": {
-      "rev": "dc4684e163971bb1f5bfb93fbd4bb3e892bf9b15",
+      "rev": "21790e59dd0109a92a70cb874dd002af186314f5",
       "src": "https://github.com/MagicDuck/grug-far.nvim"
     },
     "i18n.nvim": {
       "rev": "128959499a9425bb4f1a5574fd92a23be00cb442",
       "src": "https://github.com/yelog/i18n.nvim"
     },
-    "incr.nvim": {
-      "rev": "87aa1f6de5c10e60d57b0bc151573a5c50ac9fe6",
-      "src": "https://github.com/daliusd/incr.nvim"
-    },
     "js-i18n.nvim": {
       "rev": "124f22f91d51e85641ba10e9a32f3b858394c2dd",
       "src": "https://github.com/nabekou29/js-i18n.nvim",
       "version": "'v0.5.4'"
     },
     "kanagawa.nvim": {
-      "rev": "aef7f5cec0a40dbe7f3304214850c472e2264b10",
+      "rev": "8ad3b4cdcc804b332c32db8f9743667e1bb82b99",
       "src": "https://github.com/rebelot/kanagawa.nvim"
     },
     "lazydev.nvim": {
@@ -55,15 +52,15 @@
       "src": "https://github.com/folke/lazydev.nvim"
     },
     "lualine.nvim": {
-      "rev": "47f91c416daef12db467145e16bed5bbfe00add8",
+      "rev": "131a558e13f9f28b15cd235557150ccb23f89286",
       "src": "https://github.com/nvim-lualine/lualine.nvim"
     },
     "mason.nvim": {
-      "rev": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65",
+      "rev": "cb8445f8ce85d957416c106b780efd51c6298f89",
       "src": "https://github.com/mason-org/mason.nvim"
     },
     "nord.nvim": {
-      "rev": "07647ad23e5b7fc1599a841dcd8f173b9aeb0419",
+      "rev": "87394d4fc35c901bbe38326a78d31ab1ead826b6",
       "src": "https://github.com/gbprod/nord.nvim"
     },
     "nvim-autopairs": {
@@ -71,31 +68,39 @@
       "src": "https://github.com/windwp/nvim-autopairs"
     },
     "nvim-lspconfig": {
-      "rev": "8e2084bf5e40c79c1f42210a6ef96a0a4793a763",
+      "rev": "f7e89f3d19fb436e1fbeff3bf4291eef35da94e3",
       "src": "https://github.com/neovim/nvim-lspconfig"
     },
     "nvim-surround": {
-      "rev": "19e39478ccf5fa2eefdb3595af2f2927d0ff2416",
+      "rev": "9291040de8cd8a4439eb64c441e8d5d2bf884a5a",
       "src": "https://github.com/kylechui/nvim-surround"
     },
     "nvim-treesitter": {
-      "rev": "539abf6da5ee8702e37b82cc953131dadd570da2",
+      "rev": "4916d6592ede8c07973490d9322f187e07dfefac",
       "src": "https://github.com/nvim-treesitter/nvim-treesitter"
     },
     "nvim-web-devicons": {
-      "rev": "d7462543c9e366c0d196c7f67a945eaaf5d99414",
+      "rev": "4fc505ac7bd7692824a142e96e5f529c133862f8",
       "src": "https://github.com/nvim-tree/nvim-web-devicons"
     },
+    "onedark.nvim": {
+      "rev": "df4792accde9db0043121f32628bcf8e645d9aea",
+      "src": "https://github.com/navarasu/onedark.nvim"
+    },
+    "oxocarbon.nvim": {
+      "rev": "a7ba74849a00546a311f8c146320b433900393e7",
+      "src": "https://github.com/nyoom-engineering/oxocarbon.nvim"
+    },
     "plenary.nvim": {
-      "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
+      "rev": "74b06c6c75e4eeb3108ec01852001636d85a932b",
       "src": "https://github.com/nvim-lua/plenary.nvim"
     },
     "render-markdown.nvim": {
-      "rev": "c7188a8f9d2953696b6303caccbf39c51fa2c1b1",
+      "rev": "3f3eea97b80839f629c951ca660ffd125bfa5b34",
       "src": "https://github.com/MeanderingProgrammer/render-markdown.nvim"
     },
     "smear-cursor.nvim": {
-      "rev": "c85bdbb25db096fbcf616bc4e1357bd61fe2c199",
+      "rev": "9e9378d6ee34bb3782e0e8c63d9ec8ca618b479b",
       "src": "https://github.com/sphamba/smear-cursor.nvim"
     },
     "snacks.nvim": {
diff --git a/.config/sway/config b/.config/sway/config
index 2d13744..2061089 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -105,7 +105,7 @@ output $laptop {
     adaptive_sync on
 }
 
-bindswitch --reload --locked lid:on output $laptop disable
+bindswitch --reload --locked lid:on exec ~/.scripts/lid.fish
 bindswitch --reload --locked lid:off output $laptop enable
 
 workspace 1 output $typecmonitor
diff --git a/.config/waybar/config b/.config/waybar/config
index 49869e4..80f3345 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -60,6 +60,7 @@
     "format-disconnected": "⚠  Disconnected"
   },
   "pulseaudio": {
+    "reverse-scrolling": true,
     "reverse-mouse-scrolling": true,
     "format": "{icon}  {volume}% {format_source}",
     "format-bluetooth": "{volume}% {icon} {format_source}",
diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua
index 73cdaf6..672301f 100644
--- a/.config/wezterm/wezterm.lua
+++ b/.config/wezterm/wezterm.lua
@@ -6,7 +6,7 @@ local act = wezterm.action
 local config = wezterm.config_builder()
 
 -- For example, changing the color scheme:
-config.color_scheme = "nord"
+config.color_scheme = "OneDark (base16)"
 config.alternate_buffer_wheel_scroll_speed = 10
 config.initial_cols = 240
 config.initial_rows = 500
@@ -23,12 +23,18 @@ config.mouse_bindings = {
 		action = act.ScrollByLine(10),
 	},
 }
-config.font = wezterm.font({ family = "Iosevka Nerd Font", weight = "Regular", style = "Italic" })
+config.font = wezterm.font({ family = "FiraMono Nerd Font" })
 config.font_size = 12
 
 config.use_fancy_tab_bar = false
 config.hide_tab_bar_if_only_one_tab = true
 
+config.default_cursor_style = "BlinkingBlock"
+config.animation_fps = 60
+config.front_end = "WebGpu"
+-- config.cursor_blink_ease_in = "Constant"
+-- config.cursor_blink_ease_out = "Constant"
+
 config.window_padding = {
 	left = 0,
 	right = 0,