Skip to content

Commit

Permalink
chore: theme update
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Ford authored and Alex Ford committed Jul 9, 2024
1 parent 9781694 commit 62555c4
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 30 deletions.
4 changes: 2 additions & 2 deletions .wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require("mousemaps")
local wezterm = require("wezterm")
local config = require("config")

config.color_scheme = "Tokyo Night Storm"
-- config.color_scheme = "Tokyo Night Storm"
-- config.color_scheme = "Tokyo Night Moon"
-- config.color_scheme = "Tokyo Night Night"
-- config.color_scheme = "Catppuccin Frappe"
config.color_scheme = "Catppuccin Frappe"
-- config.color_scheme = "Catppuccin Macchiato"
-- config.color_scheme = "Catppuccin Mocha"
-- config.color_scheme = "Catppuccin Pink Mocha"
Expand Down
43 changes: 22 additions & 21 deletions nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"CopilotChat.nvim": { "branch": "canary", "commit": "82923efe22b604cf9c0cad0bb2a74aa9247755ab" },
"LazyVim": { "branch": "main", "commit": "f3c93701e72fcd18322404c062c384f824b9ca6f" },
"LazyVim": { "branch": "main", "commit": "d6bda2469787c566801fc0d00e6146c645cbb09f" },
"SchemaStore.nvim": { "branch": "main", "commit": "a1be387e7c5d5f4f503515b170b79626a0644b4a" },
"bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" },
"catppuccin": { "branch": "main", "commit": "1d76b57bb22069a6477030edd68b52f3b07a9e48" },
"catppuccin": { "branch": "main", "commit": "2d3419c2aead379b7d1854d32458f20ffaa58562" },
"cellular-automaton.nvim": { "branch": "main", "commit": "11aea08aa084f9d523b0142c2cd9441b8ede09ed" },
"clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" },
"cmake-tools.nvim": { "branch": "master", "commit": "4be3c229fe932043fd83ad52fdf0ba9af7297789" },
Expand All @@ -19,43 +19,44 @@
"crates.nvim": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" },
"dashboard-nvim": { "branch": "master", "commit": "e6e33b848f0e2fe5c13f6553c568764555c390a3" },
"dial.nvim": { "branch": "master", "commit": "750f802879c90ea51f92b68c35fa562ee575804a" },
"edgy.nvim": { "branch": "main", "commit": "e26aedb26b976583c2f7294620a5b49727c4135e" },
"drop.nvim": { "branch": "main", "commit": "1737bffd0ab6796d247068fa3da5a4acbb4e7b72" },
"edgy.nvim": { "branch": "main", "commit": "64009ec349a36f5df9bda25582a537192ec076cf" },
"firenvim": { "branch": "master", "commit": "c6e37476ab3b58cf01ababfe80ec9335798e70e5" },
"flash.nvim": { "branch": "main", "commit": "ec0bf2842189f65f60fd40bf3557cac1029cc932" },
"friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
"friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" },
"fzf-lua": { "branch": "main", "commit": "975534f4861e2575396716225c1202572645583d" },
"gitsigns.nvim": { "branch": "main", "commit": "220446c8c86a280180d852efac60991eaf1a21d4" },
"gitsigns.nvim": { "branch": "main", "commit": "375c44bdfdde25585466a966f00c2e291db74f2d" },
"glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
"gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" },
"guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" },
"headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
"inc-rename.nvim": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" },
"indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
"kube-utils-nvim": { "branch": "main", "commit": "ed4a61af9ed26f4e0425baabdbf5c3d3bdcbff3e" },
"lazy.nvim": { "branch": "main", "commit": "436d09af7d3d9e1ff39dc2cf51be800a7ab45be9" },
"lazy.nvim": { "branch": "main", "commit": "d1de92dffab5a862332fdd1892889d362369c12f" },
"lazydev.nvim": { "branch": "main", "commit": "cea5d0fb556cdc35122d9cae772e7e0ed65b4505" },
"lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" },
"lualine.nvim": { "branch": "master", "commit": "e20896769ca3cd7e623f0d9f0f68c2155e1eeee2" },
"lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" },
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"markdown.nvim": { "branch": "main", "commit": "7b8110b675766810edcbe665f53479893b02f989" },
"markdown.nvim": { "branch": "main", "commit": "fca29031c0fa16b034741f64a042793dfb105aa2" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" },
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
"mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" },
"mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" },
"mini.animate": { "branch": "main", "commit": "320fb35460238c436407cd779f63abad98e84870" },
"mini.files": { "branch": "main", "commit": "acfc4e46f6722a0690ce640632c5b5515ddade70" },
"mini.hipatterns": { "branch": "main", "commit": "aa68eb143ce77a57b6416fb4bd71ee0adba5a517" },
"mini.icons": { "branch": "main", "commit": "6fc6877d58635a13efca456cb025f1dfbf59786d" },
"mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" },
"mini.icons": { "branch": "main", "commit": "45cca14d0b7028040f413e2f6c6ebeb91b3c7b23" },
"mini.surround": { "branch": "main", "commit": "28e2821bcccf4a1891d0ad2e49a056602ca03929" },
"neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" },
"neoconf.nvim": { "branch": "main", "commit": "dd0bca9133047330a81537fcbe597216702820f2" },
"neoconf.nvim": { "branch": "main", "commit": "e34cf5e359500e3c5fc35d5b137335fba94ed501" },
"neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" },
"neorg": { "branch": "main", "commit": "bb8e102b8ccf0332ec9d9bb97331eb24092d942e" },
"neorg": { "branch": "main", "commit": "db75bb60ba5e565051cf7bb18c8b1a519ed58d3a" },
"neotest": { "branch": "master", "commit": "26ed90509c377d10dbdebd25b7094a886323b32b" },
"neotest-elixir": { "branch": "master", "commit": "c5067bcc3ec6a0bba7b5694fa15aeb17f16aeb3c" },
"neotest-golang": { "branch": "main", "commit": "b521556e440ec833a58d77beca94bacbcb4a754e" },
"neotest-playwright": { "branch": "master", "commit": "f61463f5c74d53fc5975b7e086b7c6e9356d9215" },
"neotest-golang": { "branch": "main", "commit": "df4e6b371b67b3b4106af69421817703c2f765e5" },
"neotest-playwright": { "branch": "master", "commit": "6266945039dac27a354de33d2f2a66e75485d5e9" },
"neotest-plenary": { "branch": "master", "commit": "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584" },
"neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" },
"neotest-vitest": { "branch": "main", "commit": "353364aa05b94b09409cbef21b79c97c5564e2ce" },
Expand All @@ -77,8 +78,8 @@
"nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
"nvim-scrollbar": { "branch": "main", "commit": "d09f14aa16c9f2748e77008f9da7b1f76e4e7b85" },
"nvim-snippets": { "branch": "main", "commit": "5c978b3ba0c504dc9f94ca93d17029f26064d229" },
"nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" },
"nvim-treesitter": { "branch": "master", "commit": "64f6f0ab4e3f613aa682eb5fe29c5025db500ddd" },
"nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" },
"nvim-treesitter": { "branch": "master", "commit": "c1ad655b6a0c83ab48e55240f367e2bc0c15af31" },
"nvim-treesitter-context": { "branch": "master", "commit": "f56a1430f21334868a86eb980b12e0af55690e98" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
"nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" },
Expand All @@ -87,21 +88,21 @@
"oil.nvim": { "branch": "master", "commit": "10fbfdd37b6904c0776c5db1a27ab47eecba335e" },
"one-small-step-for-vimkind": { "branch": "main", "commit": "730189c92c6fd80eb92bb6c1886392a142dba273" },
"pathlib.nvim": { "branch": "main", "commit": "7a5a6facd29e306bc73a37719fa67c0d2226f852" },
"persistence.nvim": { "branch": "main", "commit": "a93748acdb2e7bc4389b3738b4c787b764c3b2a6" },
"persistence.nvim": { "branch": "main", "commit": "c45ff862b53ce07a853a753fb0b33e148dbb99d2" },
"playtime.nvim": { "branch": "main", "commit": "9e8b8e29cc1f394200247727ffce7c50688d9588" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"precognition.nvim": { "branch": "main", "commit": "2a566f03eb06859298eff837f3a6686dfa5304a5" },
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "5c9660801ce345cd3835e1947c12b54290ab7e71" },
"rainbow-delimiters.nvim": { "branch": "master", "commit": "b29da4a6061a88270e875b38367d82c04c856128" },
"rainbow_csv": { "branch": "master", "commit": "3dbbfd7d17536aebfb80f571255548495574c32b" },
"refactoring.nvim": { "branch": "master", "commit": "d07218748c48e756c27aa6859bfa6e62a3d271af" },
"rustaceanvim": { "branch": "master", "commit": "f16c6eacfb7556c69ffc229e220b8555378245f0" },
"screenkey.nvim": { "branch": "main", "commit": "6c9b5a8a38d56f425a44bb8e4d3d49e6bb0cfa7d" },
"tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" },
"telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" },
"tiny-devicons-auto-colors.nvim": { "branch": "main", "commit": "9be4af5b1bc1f26a11206ed7ce8bf44312e7941a" },
"todo-comments.nvim": { "branch": "main", "commit": "74abcc81254feee74aa129c0a219750686ebcefd" },
"tokyonight.nvim": { "branch": "main", "commit": "9714c1143287ecb9ca895a7eef0df7b67e8abcb3" },
"todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" },
"tokyonight.nvim": { "branch": "main", "commit": "78cc1ae48a26990dd028f4098892a5d6c041e194" },
"treesj": { "branch": "main", "commit": "6e8bd008bacd5ad001c3953017c1dca20709e915" },
"trouble.nvim": { "branch": "main", "commit": "4453fea6bb597830fbd58d2c484612f37b97bd8c" },
"ts-comments.nvim": { "branch": "main", "commit": "c1f3168f90c8442eec2f62e572ac86b25ca854ff" },
Expand Down
9 changes: 5 additions & 4 deletions nvim/lua/plugins/drop.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ end

return {
{
"catdadcode/drop.nvim",
"folke/drop.nvim",
lazy = false,
enabled = false,
opts = function(_, opts)
local thanksgiving_day = require("drop").calculate_us_thanksgiving(os.date("%Y"))
local thanksgiving_day = require("drop.util").calculate_us_thanksgiving(os.date("%Y"))
opts.theme = pickTheme()
opts.holidays = {
halloween = {
Expand All @@ -41,9 +41,10 @@ return {
end_date = { month = 12, day = 25 },
},
}
-- opts.filetypes = { "dashboard" }
opts.filetypes = {}
opts.filetypes = { "dashboard" }
-- opts.filetypes = {}
opts.screensaver = (1000 * 60) * 20 --minutes
return opts
end,
},
}
6 changes: 3 additions & 3 deletions nvim/lua/plugins/theme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ return {
priority = 10000,
name = "catppuccin",
opts = {
-- flavour = "frappe",
flavour = "frappe",
-- flavour = "macchiato",
flavour = "mocha",
-- flavour = "mocha",
transparent_background = true,
-- color_overrides = {
-- mocha = {
Expand Down Expand Up @@ -45,5 +45,5 @@ return {
transparent = true,
},
},
{ "LazyVim/LazyVim", opts = { colorscheme = "tokyonight" } },
{ "LazyVim/LazyVim", opts = { colorscheme = "catppuccin" } },
}

0 comments on commit 62555c4

Please sign in to comment.