stuff

colors/zshell.lua

@@ -27,82 +27,82 @@ local function pick(light, dark)
 end
 
 local c = {
-  bg = "#1A1206",
+  bg = "#161219",
-  bg_alt = "#231A0D",
+  bg_alt = "#1E1A21",
-  bg_float = "#271E11",
+  bg_float = "#221E25",
-  bg_popup = "#32291A",
+  bg_popup = "#2D2830",
-  bg_cursorline = pick("#32291A", "#3D3324"),
+  bg_cursorline = pick("#2D2830", "#38333B"),
-  bg_fold = "#231A0D",
+  bg_fold = "#1E1A21",
-  bg_visual = "#733429",
+  bg_visual = "#543D68",
-  bg_search = pick("#B5893E", "#733429"),
+  bg_search = pick("#B2417A", "#543D68"),
-  bg_incsearch = "#7D2C1E",
+  bg_incsearch = "#894FBF",
-  bg_selection = "#7D2C1E",
+  bg_selection = "#894FBF",
-  bg_statusline = pick("#32291A", "#271E11"),
+  bg_statusline = pick("#2D2830", "#221E25"),
-  bg_statusline_nc = "#231A0D",
+  bg_statusline_nc = "#1E1A21",
-  bg_tabline = "#231A0D",
+  bg_tabline = "#1E1A21",
-  bg_tabsel = "#32291A",
+  bg_tabsel = "#2D2830",
 
-  fg = "#F1E0CA",
+  fg = "#E9E0EA",
-  fg_muted = "#DBC3A1",
+  fg_muted = "#CEC3D3",
-  fg_subtle = "#A38E6E",
+  fg_subtle = "#978D9D",
-  fg_comment = pick("#A38E6E", "#55442A"),
+  fg_comment = pick("#978D9D", "#4C4451"),
   fg_strong = pick("#1A1B1F", "#F2F2F7"),
   fg_on_soft = pick("#17181C", "#F4F4F8"),
 
-  border = "#55442A",
+  border = "#4C4451",
-  accent = "#FFB4A6",
+  accent = "#DEB7FF",
-  accent_container = "#7D2C1E",
+  accent_container = "#894FBF",
-  accent_fg = "#FFDAD4",
+  accent_fg = "#F7E7FF",
-  accent_solid_fg = "#5F150A",
+  accent_solid_fg = "#4A007F",
 
-  secondary = "#FFB4A6",
+  secondary = "#D8BCEF",
-  secondary_container = "#733429",
+  secondary_container = "#543D68",
-  secondary_fg = "#FFDAD4",
+  secondary_fg = "#C6AADD",
-  secondary_solid_fg = "#561E15",
+  secondary_solid_fg = "#3C2750",
 
-  tertiary = "#F0BE6D",
+  tertiary = "#FFB0D0",
-  tertiary_container = "#B5893E",
+  tertiary_container = "#B2417A",
-  tertiary_fg = "#000000",
+  tertiary_fg = "#FFE7EE",
-  tertiary_solid_fg = "#432C00",
+  tertiary_solid_fg = "#63003C",
 
   error = "#FFB4AB",
   error_container = "#93000A",
   error_fg = "#FFDAD6",
   error_solid_fg = "#690005",
 
-  ok = "#FFBD9D",
+  ok = "#FFBAC2",
-  warn = "#FFDFD5",
+  warn = "#FFDCF2",
-  info = "#B9AB66",
+  info = "#A9A5D8",
-  hint = "#FFBA8D",
+  hint = "#9DCEFF",
-  add = "#FFBD9D",
+  add = "#FFBAC2",
-  change = "#B9AB66",
+  change = "#A9A5D8",
-  delete = "#FF563E",
+  delete = "#DE4FFD",
 
-  cursor_fg = "#5F150A",
+  cursor_fg = "#4A007F",
-  cursor_bg = "#FFB4A6",
+  cursor_bg = "#DEB7FF",
-  match_bg = "#B5893E",
+  match_bg = "#B2417A",
-  match_fg = "#000000",
+  match_fg = "#FFE7EE",
-  todo_bg = "#B5893E",
+  todo_bg = "#B2417A",
-  todo_fg = "#000000",
+  todo_fg = "#FFE7EE",
 
   -- 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 = "#F18F8A",
+  code_keyword = "#CA98DE",
-  code_func = "#FFBA8D",
+  code_func = "#9DCEFF",
-  code_string = "#FFBD9D",
+  code_string = "#FFBAC2",
-  code_number = "#FFDFD5",
+  code_number = "#FFDCF2",
-  code_const = "#FF563E",
+  code_const = "#DE4FFD",
-  code_type = "#FFB4A6",
+  code_type = "#DEB7FF",
-  code_special = "#F0BE6D",
+  code_special = "#FFB0D0",
-  code_preproc = "#FFB4A6",
+  code_preproc = "#D8BCEF",
-  code_builtin = "#FFB4A6",
+  code_builtin = "#DEB7FF",
-  code_param = "#FFDFD5",
+  code_param = "#FFDCF2",
-  code_field = "#FFB4A6",
+  code_field = "#D8BCEF",
-  code_namespace = "#F0BE6D",
+  code_namespace = "#FFB0D0",
-  code_operator = pick("#FFB4A6", "#FFB4A6"),
+  code_operator = pick("#DEB7FF", "#D8BCEF"),
 
   line_current = pick("#232428", "#E7E7EC"),
-  ref_bg = pick("#3D3324", "#32291A"),
+  ref_bg = pick("#38333B", "#2D2830"),
 }
 
 -- Core UI -------------------------------------------------------------------

init.lua

@@ -40,4 +40,4 @@ vim.filetype.add {
 	},
 }
 
-vim.cmd.colorscheme "zshell"
+vim.cmd.colorscheme "tokyodark"

lua/autocmd.lua

@@ -4,7 +4,7 @@ autocmd("LspAttach", {
 	callback = function(args)
 		local client = vim.lsp.get_client_by_id(args.data.client_id)
 		if client then
-			vim.lsp.document_color.enable(false, args.buf, { "background" })
+			vim.lsp.document_color.enable(false, { bufnr = args.buf })
 		end
 	end,
 })

lua/lualine/themes/zshell.lua

@@ -6,19 +6,19 @@ local function pick(light, dark)
 end
 
 local c = {
-  bg = "#1A1206",
+  bg = "#161219",
-  bg_alt = "#231A0D",
+  bg_alt = "#1E1A21",
-  bg_mid = pick("#32291A", "#271E11"),
+  bg_mid = pick("#2D2830", "#221E25"),
-  fg = "#F1E0CA",
+  fg = "#E9E0EA",
-  fg_muted = "#DBC3A1",
+  fg_muted = "#CEC3D3",
   fg_strong = pick("#15161A", "#F4F4F8"),
 
-  normal = "#7D2C1E",
+  normal = "#894FBF",
-  insert = "#733429",
+  insert = "#543D68",
-  visual = "#B5893E",
+  visual = "#B2417A",
   replace = "#93000A",
-  command = pick("#FFDFD5", "#B9AB66"),
+  command = pick("#FFDCF2", "#A9A5D8"),
-  inactive = "#231A0D",
+  inactive = "#1E1A21",
 
   normal_fg = pick("#15161A", "#F4F4F8"),
   insert_fg = pick("#15161A", "#F4F4F8"),

lua/mappings.lua

@@ -117,5 +117,5 @@ map({ "n", "v" }, "<leader>ap", require("actions-preview").code_actions)
 map("n", "K", require("pretty_hover").hover)
 
 -- winbar
-local dbar_api = require "dropbar.api"
+-- local dbar_api = require "dropbar.api"
-map("n", "<leader>b", dbar_api.pick)
+-- map("n", "<leader>b", dbar_api.pick)

lua/plugins/init.lua

@@ -161,12 +161,12 @@ return {
 			require "config.harpoon"
 		end,
 	},
-	-- {
+	{
-	-- 	"catgoose/nvim-colorizer.lua",
+		"catgoose/nvim-colorizer.lua",
-	-- 	config = function()
+		config = function()
-	-- 		require("config.colorizer")
+			require "config.colorizer"
-	-- 	end,
+		end,
-	-- },
+	},
 	{
 		"ziglang/zig.vim",
 	},
@@ -196,12 +196,6 @@ return {
 			vim.g.minimal_italic_comments = true
 		end,
 	},
-	{
-		"ThePrimeagen/refactoring.nvim",
-		config = function()
-			require "config.refactoring"
-		end,
-	},
 	{
 		"Yazeed1s/minimal.nvim",
 		config = function()
@@ -255,9 +249,9 @@ return {
 	-- {
 	-- 	"artemave/workspace-diagnostics.nvim",
 	-- },
-	{
+	-- {
-		require "config.dev-tools",
+	-- 	require "config.dev-tools",
-	},
+	-- },
 	{
 		"Fildo7525/pretty_hover",
 		event = "LspAttach",
@@ -267,9 +261,9 @@ return {
 		"knubie/vim-kitty-navigator",
 		build = "cp ./*.py ~/.config/kitty/",
 	},
-	{
+	-- {
-		require "config.dropbar",
+	-- 	require "config.dropbar",
-	},
+	-- },
 	{
 		"lewis6991/gitsigns.nvim",
 		config = function()