diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 3f9f278..40d2bb5 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,25 +1,26 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" },
+  "blink.cmp": { "branch": "main", "commit": "a9a0f96c6a1029884e37dfd74a88a075b40366dd" },
   "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
-  "conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" },
-  "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
+  "conform.nvim": { "branch": "master", "commit": "339b3e4519ec49312d34fcfa275aa15bfaa67025" },
+  "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
   "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "hurl.nvim": { "branch": "main", "commit": "bc8d748a3754f63d50ee8dfd54e20de80f22754c" },
+  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
+  "hurl.nvim": { "branch": "main", "commit": "438360f62e73e8d149f0374d9d1d75c1441807e3" },
   "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
-  "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
+  "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
   "luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" },
   "mini.map": { "branch": "main", "commit": "4c58e755d75f9999abcd3b3c6e934734b6a8b098" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
   "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
-  "nvim-lspconfig": { "branch": "master", "commit": "040001d85e9190a904d0e35ef5774633e14d8475" },
+  "nvim-lspconfig": { "branch": "master", "commit": "f1405c1ea5d7a1051a8ced3110d7cf3b8524041b" },
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
   "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
-  "nvim-treesitter": { "branch": "master", "commit": "fa915a30c5cdf1d18129e9ef6ac2ee0fa799904f" },
+  "nvim-treesitter": { "branch": "master", "commit": "2a75d8065cff33216e106b651eb0f58b90375717" },
   "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6317aca1fd86cc8e8c5ad30029ae7640d566cec6" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
   "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
diff --git a/.config/nvim/lua/nvwynd/keymaps.lua b/.config/nvim/lua/nvwynd/keymaps.lua
index 1b8c039..19a5406 100644
--- a/.config/nvim/lua/nvwynd/keymaps.lua
+++ b/.config/nvim/lua/nvwynd/keymaps.lua
@@ -31,7 +31,7 @@ map("n", "<leader>fsg", telescope.live_grep, { desc = "[F]ind [S]tring [G]lobal"
 map("n", "<leader>fgg", telescope.git_files, { desc = "[F]ind [G]it" })
 map("n", "<leader>fgs", telescope.git_status, { desc = "[F]ind [G]it [S]tatus" })
 map("n", "<leader>fgh", telescope.git_stash, { desc = "[F]ind [G]it Stas[H]" })
-map("n", "<leader>fgc", "<cmd>Telescope git_commits<cr>", { desc = "[F]ind [G]it [C]ommits" })
+map("n", "<leader>fgc", telescope.git_commits, { desc = "[F]ind [G]it [C]ommits" })
 map("n", "<leader><leader>", function()
 	telescope.buffers({
 		sort_mru = true,
diff --git a/.config/nvim/lua/nvwynd/plugins/completion.lua b/.config/nvim/lua/nvwynd/plugins/completion.lua
index 8329092..1be4a63 100644
--- a/.config/nvim/lua/nvwynd/plugins/completion.lua
+++ b/.config/nvim/lua/nvwynd/plugins/completion.lua
@@ -3,7 +3,15 @@ return {
 		"saghen/blink.cmp",
 		dependencies = "rafamadriz/friendly-snippets",
 		version = "v0.*",
+		---@module 'blink.cmp'
+		---@type blink.cmp.Config
 		opts = {
+			enabled = function()
+				return not vim.tbl_contains({ "markdown" }, vim.bo.filetype)
+					and vim.bo.buftype ~= "prompt"
+					and vim.b.completion ~= false
+			end,
+
 			keymap = { preset = "enter" },
 
 			appearance = {
@@ -14,6 +22,15 @@ return {
 			signature = { enabled = true },
 
 			completion = {
+				list = {
+					selection = "manual",
+				},
+				accept = {
+					auto_brackets = { enabled = false },
+				},
+				-- ghost_text = {
+				-- 	enabled = true,
+				-- },
 				menu = {
 					draw = {
 						columns = { { "kind_icon" }, { "label", "label_description", gap = 1 }, { "kind" } },
diff --git a/.config/nvim/lua/nvwynd/plugins/util.lua b/.config/nvim/lua/nvwynd/plugins/util.lua
index 1bccabf..6e5d4af 100644
--- a/.config/nvim/lua/nvwynd/plugins/util.lua
+++ b/.config/nvim/lua/nvwynd/plugins/util.lua
@@ -102,6 +102,12 @@ return {
 		},
 	},
 
+	{
+		"akinsho/git-conflict.nvim",
+		version = "*",
+		config = {},
+	},
+
 	-- {
 	-- 	"3rd/image.nvim",
 	-- 	event = "VeryLazy",
diff --git a/.zshrc b/.zshrc
index bcb7cd0..5a58670 100644
--- a/.zshrc
+++ b/.zshrc
@@ -96,7 +96,7 @@ alias ytmp3="yt-dlp -x --audio-format mp3"
 alias ytdv="yt-dlp"
 alias docker-clean="docker system prune -a --filter \"until=72h\""
 alias flatpak-clean="flatpak uninstall --user --unused"
-alias system-clean="docker-clean && flatpak-cean && cargo clean-all"
+alias system-clean="docker-clean && flatpak-clean && cargo clean-all"
 
 # git shortcuts
 alias gst="git status"
diff --git a/dot.toml b/dot.toml
index 692fd5e..758a837 100644
--- a/dot.toml
+++ b/dot.toml
@@ -38,6 +38,6 @@ path = "~/.local/bin/best-gif.sh"
 [[dots]]
 path = "~/.local/bin/make-gif.sh"
 
-[[dots]]
-path = "~/.config/nushell/*"
-ignore = ["history.txt", "/completions$"]
+# [[dots]]
+# path = "~/.config/nushell/*"
+# ignore = ["history.txt", "/completions$"]