stuff

colors/zshell.lua

@@ -27,82 +27,82 @@ local function pick(light, dark)
 end
 
 local c = {
-  bg = "#15130F",
+  bg = "#1D1013",
-  bg_alt = "#1D1B17",
+  bg_alt = "#26181B",
-  bg_float = "#221F1A",
+  bg_float = "#2A1C1F",
-  bg_popup = "#2C2A25",
+  bg_popup = "#362629",
-  bg_cursorline = pick("#2C2A25", "#37342F"),
+  bg_cursorline = pick("#362629", "#413034"),
-  bg_fold = "#1D1B17",
+  bg_fold = "#26181B",
-  bg_visual = "#51482F",
+  bg_visual = "#7D2842",
-  bg_search = pick("#35491F", "#51482F"),
+  bg_search = pick("#007837", "#7D2842"),
-  bg_incsearch = "#514209",
+  bg_incsearch = "#C5205F",
-  bg_selection = "#514209",
+  bg_selection = "#C5205F",
-  bg_statusline = pick("#2C2A25", "#221F1A"),
+  bg_statusline = pick("#362629", "#2A1C1F"),
-  bg_statusline_nc = "#1D1B17",
+  bg_statusline_nc = "#26181B",
-  bg_tabline = "#1D1B17",
+  bg_tabline = "#26181B",
-  bg_tabsel = "#2C2A25",
+  bg_tabsel = "#362629",
 
-  fg = "#E8E2DA",
+  fg = "#F7DCE0",
-  fg_muted = "#CEC6B5",
+  fg_muted = "#E1BEC4",
-  fg_subtle = "#979081",
+  fg_subtle = "#A8898E",
-  fg_comment = pick("#979081", "#4B463A"),
+  fg_comment = pick("#A8898E", "#594045"),
   fg_strong = pick("#1A1B1F", "#F2F2F7"),
   fg_on_soft = pick("#17181C", "#F4F4F8"),
 
-  border = "#4B463A",
+  border = "#594045",
-  accent = "#DCC580",
+  accent = "#FFB1C2",
-  accent_container = "#514209",
+  accent_container = "#C5205F",
-  accent_fg = "#C5AF6D",
+  accent_fg = "#FFE0E5",
-  accent_solid_fg = "#3C2F00",
+  accent_solid_fg = "#66002B",
 
-  secondary = "#D2C6A5",
+  secondary = "#FFB1C2",
-  secondary_container = "#51482F",
+  secondary_container = "#7D2842",
-  secondary_fg = "#C4B897",
+  secondary_fg = "#FF96AF",
-  secondary_solid_fg = "#373019",
+  secondary_solid_fg = "#5F102C",
 
-  tertiary = "#B6CF98",
+  tertiary = "#79DB8E",
-  tertiary_container = "#35491F",
+  tertiary_container = "#007837",
-  tertiary_fg = "#A0B883",
+  tertiary_fg = "#99FDAC",
-  tertiary_solid_fg = "#23360E",
+  tertiary_solid_fg = "#003917",
 
   error = "#FFB4AB",
   error_container = "#93000A",
   error_fg = "#FFDAD6",
   error_solid_fg = "#690005",
 
-  ok = "#E8CB46",
+  ok = "#FFBBB2",
-  warn = "#FFE39D",
+  warn = "#FFDEDD",
-  info = "#AAAF6E",
+  info = "#B3A2D5",
-  hint = "#D6CC72",
+  hint = "#FFBA93",
-  add = "#E8CB46",
+  add = "#FFBBB2",
-  change = "#AAAF6E",
+  change = "#B3A2D5",
-  delete = "#BE8700",
+  delete = "#FF4F7A",
 
-  cursor_fg = "#3C2F00",
+  cursor_fg = "#66002B",
-  cursor_bg = "#DCC580",
+  cursor_bg = "#FFB1C2",
-  match_bg = "#35491F",
+  match_bg = "#007837",
-  match_fg = "#A0B883",
+  match_fg = "#99FDAC",
-  todo_bg = "#35491F",
+  todo_bg = "#007837",
-  todo_fg = "#A0B883",
+  todo_fg = "#99FDAC",
 
   -- Syntax accents must stay dynamic. These come from your generated palette
   -- instead of fixed hex values, so foregrounds change with the wallpaper too.
-  code_keyword = "#DB9F46",
+  code_keyword = "#EC8FA9",
-  code_func = "#D6CC72",
+  code_func = "#FFBA93",
-  code_string = "#E8CB46",
+  code_string = "#FFBBB2",
-  code_number = "#FFE39D",
+  code_number = "#FFDEDD",
-  code_const = "#BE8700",
+  code_const = "#FF4F7A",
-  code_type = "#DCC580",
+  code_type = "#FFB1C2",
-  code_special = "#B6CF98",
+  code_special = "#79DB8E",
-  code_preproc = "#D2C6A5",
+  code_preproc = "#FFB1C2",
-  code_builtin = "#DCC580",
+  code_builtin = "#FFB1C2",
-  code_param = "#FFE39D",
+  code_param = "#FFDEDD",
-  code_field = "#D2C6A5",
+  code_field = "#FFB1C2",
-  code_namespace = "#B6CF98",
+  code_namespace = "#79DB8E",
-  code_operator = pick("#DCC580", "#D2C6A5"),
+  code_operator = pick("#FFB1C2", "#FFB1C2"),
 
   line_current = pick("#232428", "#E7E7EC"),
-  ref_bg = pick("#37342F", "#2C2A25"),
+  ref_bg = pick("#413034", "#362629"),
 }
 
 -- Core UI -------------------------------------------------------------------

lua/config/lspconfig.lua

@@ -134,23 +134,17 @@ cmp.setup {
 		["<C-f>"] = cmp.mapping.scroll_docs(4),
 		["<C-Space>"] = cmp.mapping.complete(),
 		["<C-e>"] = cmp.mapping.close(),
-		["<CR>"] = cmp.mapping {
+		["<CR>"] = cmp.mapping(function(fallback)
-			i = function(fallback)
+			if cmp.visible() then
-				if cmp.visible() and cmp.get_active_entry() then
+				cmp.confirm { select = true }
-					cmp.confirm {
+			else
-						behavior = cmp.ConfirmBehavior.Replace,
+				fallback()
-						select = false,
+			end
-					}
+		end, { "i", "s" }),
-				else
+		-- ["<CR>"] = cmp.mapping.confirm {
-					fallback()
+		-- 	behavior = cmp.ConfirmBehavior.Insert,
-				end
+		-- 	select = true,
-			end,
+		-- },
-			s = cmp.mapping.confirm { select = true },
-			c = cmp.mapping.confirm {
-				behavior = cmp.ConfirmBehavior.Replace,
-				select = true,
-			},
-		},
 		["<Tab>"] = cmp.mapping(function(fallback)
 			if cmp.visible() then
 				cmp.select_next_item()
@@ -251,7 +245,7 @@ lspconfig("texlab", {
 })
 
 lspconfig("qmlls", {
-	cmd = { "qmlls6" },
+	cmd = { "qmlls6", "-E" },
 	filetypes = { "qml" },
 	single_file_support = true,
 	root_dir = function(bufnr, on_dir)

lua/config/telescope.lua

@@ -1,7 +1,14 @@
-require("telescope").setup ({
+require("telescope").setup {
+	defaults = {
+		cache_picker = {
+			num_pickers = -1,
+			limit_entries = 1000,
+			ignore_empty_prompt = true,
+		},
+	},
 	pickers = {
 		colorscheme = {
 			enable_preview = true,
-		}
+		},
-	}
+	},
-})
+}

lua/functions/telescope-pickers.lua

@@ -0,0 +1,30 @@
+local M = {}
+
+local builtin = require "telescope.builtin"
+local state = require "telescope.state"
+
+function M.resume_or_start(picker_name, picker_func, opts)
+	return function()
+		opts = opts or {}
+
+		local cached_pickers = state.get_global_key "cached_pickers" or {}
+		local picker_index = nil
+
+		for i, cached_picker in ipairs(cached_pickers) do
+			if
+				cached_picker.prompt_title == (opts.prompt_title or picker_name)
+			then
+				picker_index = i
+				break
+			end
+		end
+
+		if picker_index then
+			builtin.resume { cache_index = picker_index }
+		else
+			picker_func(opts)
+		end
+	end
+end
+
+return M

lua/lualine/themes/zshell.lua

@@ -6,19 +6,19 @@ local function pick(light, dark)
 end
 
 local c = {
-  bg = "#15130F",
+  bg = "#1D1013",
-  bg_alt = "#1D1B17",
+  bg_alt = "#26181B",
-  bg_mid = pick("#2C2A25", "#221F1A"),
+  bg_mid = pick("#362629", "#2A1C1F"),
-  fg = "#E8E2DA",
+  fg = "#F7DCE0",
-  fg_muted = "#CEC6B5",
+  fg_muted = "#E1BEC4",
   fg_strong = pick("#15161A", "#F4F4F8"),
 
-  normal = "#514209",
+  normal = "#C5205F",
-  insert = "#51482F",
+  insert = "#7D2842",
-  visual = "#35491F",
+  visual = "#007837",
   replace = "#93000A",
-  command = pick("#FFE39D", "#AAAF6E"),
+  command = pick("#FFDEDD", "#B3A2D5"),
-  inactive = "#1D1B17",
+  inactive = "#26181B",
 
   normal_fg = pick("#15161A", "#F4F4F8"),
   insert_fg = pick("#15161A", "#F4F4F8"),

lua/mappings.lua

@@ -1,4 +1,6 @@
 local map = vim.keymap.set
+local builtin = require "telescope.builtin"
+local pickers = require "functions.telescope-pickers"
 
 map("n", "<Tab>", "<Cmd>BufferLineCycleNext<CR>")
 map("n", "<S-Tab>", "<Cmd>BufferLineCyclePrev<CR>")
@@ -39,7 +41,7 @@ map(
 map(
 	"n",
 	"<leader>g",
-	require("telescope.builtin").live_grep,
+	pickers.resume_or_start("Live Grep", builtin.live_grep),
 	{ desc = "Telescope grep" }
 )
 map(

lua/plugins/init.lua

@@ -26,6 +26,7 @@ return {
 		"nvim-telescope/telescope.nvim",
 		dependencies = {
 			"nvim-lua/plenary.nvim",
+			{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
 		},
 		config = function()
 			require "config.telescope"

lua/plugins/neoformat.vim

@@ -6,6 +6,6 @@ let g:neoformat_enabled_json = ['prettier']
 let g:neoformat_enabled_yaml = ['prettier']
 let g:neoformat_enabled_lua = ['stylua']
 let g:neoformat_enabled_rust = ['rustfmt']
-let g:neoformat_enabled_cpp = ['uncrustify']
+let g:neoformat_enabled_cpp = ['clangformat']
 let g:neoformat_enabled_markdown = ['prettier']
 let g:neoformat_enabled_qml = ['qmlformat']