diff --git a/.config/fish/.gitignore b/.config/fish/.gitignore
new file mode 100644
index 0000000..74ea91f
--- /dev/null
+++ b/.config/fish/.gitignore
@@ -0,0 +1 @@
+env.fish
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 746d821..6ff3758 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,13 +1,5 @@
 set fish_greeting
 
-if status is-interactive
-end
-
-set -Ux CODESTRAL_API_KEY "ZWftIpfTx8WRIryPLEAsxgvdSq5qFQzM"
-set -Ux GEMINI_API_KEY "AIzaSyDLj_88cpI9Lcn1cWt15ATbYmuZPH1ADZw"
-set -Ux ANTHROPIC_API_KEY "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"
-
-
 set -gx EDITOR nvim
 
 fx --comp fish | source
@@ -16,9 +8,11 @@ zoxide init fish | source
 
 fzf --fish | source
 
-
 # bun
 set --export BUN_INSTALL "$HOME/.bun"
 set --export PATH $BUN_INSTALL/bin $PATH
 
+# scripts
 set --export PATH ~/.scripts/ $PATH
+
+source ~/.config/fish/env.fish
diff --git a/.config/nvim/lua/plugins/aerial.lua b/.config/nvim/lua/plugins/aerial.lua
index 459007d..62a7115 100644
--- a/.config/nvim/lua/plugins/aerial.lua
+++ b/.config/nvim/lua/plugins/aerial.lua
@@ -46,14 +46,6 @@ return {
 				require("aerial").snacks_picker({
 					layout = {
 						cycle = true,
-						width = 1,
-						min_width = 1,
-						min_height = 1,
-						height = 1,
-						--- Use the default layout or vertical if the window is too narrow
-						preset = function()
-							return vim.o.columns >= 120 and "default" or "vertical"
-						end,
 					},
 				})
 			end,
diff --git a/.config/nvim/lua/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua
index b02da09..b820b59 100644
--- a/.config/nvim/lua/plugins/snacks.lua
+++ b/.config/nvim/lua/plugins/snacks.lua
@@ -17,6 +17,7 @@ return {
 		},
 		image = { enabled = false },
 		picker = {
+			layout = { fullscreen = true },
 			matcher = {
 				fuzzy = true, -- use fuzzy matching
 				smartcase = true, -- use smartcase
@@ -44,14 +45,14 @@ return {
 		{
 			"<leader><space>",
 			function()
-				Snacks.picker.buffers()
+				Snacks.picker.buffers({ matcher = { frecency = true } })
 			end,
 			desc = "Buffers",
 		},
 		{
 			"<leader>e",
 			function()
-				Snacks.explorer()
+				Snacks.explorer({ layout = { fullscreen = false } })
 			end,
 			desc = "File Explorer",
 		},
@@ -68,13 +69,14 @@ return {
 			"<leader>sf",
 			function()
 				Snacks.picker.files({
-					layout = "vscode",
+					matcher = { frecency = true },
+					layout = { preset = "select" },
 				})
 			end,
 			desc = "Find Files",
 		},
 		{
-			"<leader>sl",
+			"<leader>/",
 			function()
 				Snacks.picker.lines()
 			end,
@@ -111,23 +113,18 @@ return {
 		{
 			"<leader>sd",
 			function()
-				Snacks.picker.diagnostics({
-					layout = "bottom",
-					matcher = {
-						fuzzy = true,
-						ignorecase = false,
-						smartcase = true,
-					},
+				Snacks.picker.diagnostics_buffer({
+					matcher = { smartcase = true },
 				})
 			end,
-			desc = "Diagnostics",
+			desc = "Buffer Diagnostics",
 		},
 		{
 			"<leader>sD",
 			function()
-				Snacks.picker.diagnostics_buffer()
+				Snacks.picker.diagnostics()
 			end,
-			desc = "Buffer Diagnostics",
+			desc = "All Diagnostics",
 		},
 		{
 			"<leader>sh",
@@ -289,7 +286,7 @@ return {
 		{
 			"<leader>gg",
 			function()
-				Snacks.lazygit()
+				Snacks.lazygit({ win = { width = 0, height = 0 } })
 			end,
 			desc = "Lazygit",
 		},