Compare commits

...

3 commits

Author SHA1 Message Date
6fd258d99a
update that lazy lock 2023-04-24 10:02:39 -05:00
5dd59d3a1e
just lua things 2023-04-24 09:59:25 -05:00
20a8e419aa
update lscolors 2023-04-24 09:57:20 -05:00
6 changed files with 82 additions and 78 deletions

View file

@ -1,57 +1,57 @@
{
"LazyVim": { "branch": "main", "commit": "7ce1b1519a45f48aa4b5f35b7b7a886b42fe56d8" },
"LuaSnip": { "branch": "master", "commit": "dc2e307287e9a9eabc18f0e3984c7e8cb164bb38" },
"alpha-nvim": { "branch": "main", "commit": "dafa11a6218c2296df044e00f88d9187222ba6b0" },
"bufferline.nvim": { "branch": "main", "commit": "ef4fdc5cea3473801dce89b5fdfe633380c80c65" },
"catppuccin": { "branch": "main", "commit": "f078aa49bef4cb9e7b86f07b607c6e98c95b9fb5" },
"LazyVim": { "branch": "main", "commit": "7b9145c12d15a81e40a721974a9a68994ccd8855" },
"LuaSnip": { "branch": "master", "commit": "e77fa9ad0b1f4fc6cddf54e51047e17e90c7d7ed" },
"alpha-nvim": { "branch": "main", "commit": "87c204040e3f5d4c1c95067b35905d8f8a2f2545" },
"bufferline.nvim": { "branch": "main", "commit": "4bba63157d881d1a274dd7369ba2774f35c8aaa2" },
"catppuccin": { "branch": "main", "commit": "939be5f7fcbc15abeaad9214bb253a4551f6f6e6" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
"cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
"dressing.nvim": { "branch": "master", "commit": "91b9ba8a9474d2c4156dc2f3e858e07ae8faecf0" },
"dressing.nvim": { "branch": "master", "commit": "f5d7fa1fa5ce6bcebc8f07922f39b1eda4d01e37" },
"flit.nvim": { "branch": "main", "commit": "f60e4b3d49bb5a5e97cfffe66f2e671eb422078e" },
"friendly-snippets": { "branch": "main", "commit": "8d91ba2dc2421a54981115f61b914974f938fa77" },
"gitsigns.nvim": { "branch": "main", "commit": "372d5cb485f2062ac74abc5b33054abac21d8b58" },
"friendly-snippets": { "branch": "main", "commit": "9590ff90759488674cf97fe5d5754a0733ab37bb" },
"gitsigns.nvim": { "branch": "main", "commit": "7dfe4be94b4f84a9931098f0f0f618d055e50bd5" },
"indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
"lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
"leap.nvim": { "branch": "main", "commit": "98a72ad93c629c49bd7127d342960cc1b159b620" },
"lazy.nvim": { "branch": "main", "commit": "903f0fe542fc35b74f3c09494f9c175346dfa76d" },
"leap.nvim": { "branch": "main", "commit": "0eb3611593e135150e2f7880ec67568ccb51c17a" },
"lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a8d5db8f227b9b236d1c54a9c6234bc033825ce7" },
"mason.nvim": { "branch": "main", "commit": "3fb2be48864b7850a26c54c04cedb54e95dcdf3f" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "463e5e7441c17c0f9fba35b3016e7691a78983b9" },
"mason.nvim": { "branch": "main", "commit": "9a68a4bd997b72cee4132459e0fd99eea0cdc627" },
"mini.ai": { "branch": "main", "commit": "fdb8dd34c326040f99b178536eeaee41d1efe643" },
"mini.bufremove": { "branch": "main", "commit": "93c7230e83f5acb8890cdb2abaf3557f09305b01" },
"mini.comment": { "branch": "main", "commit": "9ead47cef4266efa5145808b838762c658b74f74" },
"mini.indentscope": { "branch": "main", "commit": "43f6761c9a3e397b7c12b3c72f678bcf61efcfcf" },
"mini.pairs": { "branch": "main", "commit": "771c08bd313614c7e9a1904d277ac76eb226f674" },
"mini.surround": { "branch": "main", "commit": "cc962bae0890217f8473390abc8cef988519d370" },
"neo-tree.nvim": { "branch": "v2.x", "commit": "2b2f74828eeb02cf29d6b21aa32eedadadc94ca7" },
"neoconf.nvim": { "branch": "main", "commit": "6aaeb48336b369d7ed8ef243bfd0d76ec79362cd" },
"neodev.nvim": { "branch": "main", "commit": "864b35006d3de24c60e44b566de8018f919b13e6" },
"neo-tree.nvim": { "branch": "v2.x", "commit": "8d485aab32da9b8841d4af977f992b82b14af469" },
"neoconf.nvim": { "branch": "main", "commit": "270836254513b1dacc27efd76b9f805a9cee35c1" },
"neodev.nvim": { "branch": "main", "commit": "3d14bd6cb967741b9705cd06f05bfd0e1ef141e8" },
"nim.nvim": { "branch": "master", "commit": "87afde2ae995723e0338e1851c3b3c1cbd81d955" },
"noice.nvim": { "branch": "main", "commit": "1da4edfba3e9278e98fc9723d7235d9ab3889744" },
"nui.nvim": { "branch": "main", "commit": "bf5900f1b60bf6499755ac92315181a24a87a577" },
"null-ls.nvim": { "branch": "main", "commit": "f8ffcd7cb8fb3325c711d459152ef132b5b65aed" },
"nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
"nvim-lspconfig": { "branch": "master", "commit": "10fa01d553ce10646350461ac5ddc71f189e9d1a" },
"nvim-navic": { "branch": "master", "commit": "27124a773d362628b114cd12016e743dab4ccf3e" },
"nvim-notify": { "branch": "master", "commit": "50d037041ada0895aeba4c0215cde6d11b7729c4" },
"noice.nvim": { "branch": "main", "commit": "0f12ed399e79aa49f283aa954468b92be65e03ed" },
"nui.nvim": { "branch": "main", "commit": "ecd9def93891b9260b15b5fcef542eaabf4145c9" },
"null-ls.nvim": { "branch": "main", "commit": "920947793ce6e59616644cb4766d442121508bf3" },
"nvim-cmp": { "branch": "main", "commit": "e28fb7a730b1bd425fdddfdbd3d36bb84bd77611" },
"nvim-lspconfig": { "branch": "master", "commit": "591d5038552c6cdf6cfc595bc351ccdbb8e62045" },
"nvim-navic": { "branch": "master", "commit": "83dc174da915f9dbc9b51169e9b62a2e0d42b527" },
"nvim-notify": { "branch": "master", "commit": "159c6cf1be25a933f35e97499314c9faab55c98f" },
"nvim-spectre": { "branch": "master", "commit": "6e5ce371f93625c7dc43f5e2647d3647f2ea15e2" },
"nvim-treesitter": { "branch": "master", "commit": "ac4020c70722337c326bf65b645b162ee6e1796b" },
"nvim-treesitter": { "branch": "master", "commit": "77ffc7edbe19db9dc2a71081005e2961c8940096" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "8673926519ea61069f9c1366d1ad1949316d250e" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "729d83ecb990dc2b30272833c213cc6d49ed5214" },
"nvim-web-devicons": { "branch": "master", "commit": "defb7da4d3d313bf31982c52fd78e414f02840c9" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" },
"nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" },
"persistence.nvim": { "branch": "main", "commit": "c814fae5c37aa0aba9cd9da05df6e52b88d612c3" },
"plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
"telescope.nvim": { "branch": "master", "commit": "6258d50b09f9ae087317e392efe7c05a7323492d" },
"telescope.nvim": { "branch": "master", "commit": "f2645c13205abb9ee3dbcee68416645c69b863c8" },
"todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" },
"tokyonight.nvim": { "branch": "main", "commit": "1b0c88094548a62641ece1e668fa9a234e1c539e" },
"trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" },
"tokyonight.nvim": { "branch": "main", "commit": "ab0ac67f4f32f44c3480f4b81ed90e11cb4f3763" },
"trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" },
"vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" },
"vim-nix": { "branch": "master", "commit": "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee" },
"vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
"vim-startuptime": { "branch": "master", "commit": "6580cf539c33a212f4f5542068a3b4dd2b3ad834" },
"which-key.nvim": { "branch": "main", "commit": "4b73390eec680b4c061ea175eb32c0ff3412271d" },
"zk-nvim": { "branch": "main", "commit": "ff3a9661d9054a74d8baa51743c9dc11f8a215c3" }
"vim-startuptime": { "branch": "master", "commit": "00391e7f86a0fd0ebdb2afdf4336f6712925ce45" },
"which-key.nvim": { "branch": "main", "commit": "94cb020ff33a1e0e22fac1c41663d2c439741f17" },
"zk-nvim": { "branch": "main", "commit": "275578853dc76d282ee5b31f86cd3a4f02d91f2f" }
}

View file

@ -31,7 +31,7 @@ require("lazy").setup({
"gzip",
-- "matchit",
-- "matchparen",
-- "netrwPlugin",
"netrwPlugin",
"tarPlugin",
"tohtml",
"tutor",

View file

@ -46,7 +46,7 @@ return {
"shfmt",
"ruff",
"ruff-lsp",
"nimlsp",
-- "nimlsp",
"lua-language-server",
},
},

View file

@ -1,4 +1,4 @@
local wezterm = require "wezterm";
local wezterm = require("wezterm")
-- color variant hex codes
local colors = {
@ -28,7 +28,7 @@ local colors = {
surface0 = "#ccd0da",
crust = "#dce0e8",
mantle = "#e6e9ef",
base = "#eff1f5"
base = "#eff1f5",
},
frappe = {
rosewater = "#f2d5cf",
@ -56,7 +56,7 @@ local colors = {
surface0 = "#414559",
base = "#303446",
mantle = "#292c3c",
crust = "#232634"
crust = "#232634",
},
macchiato = {
rosewater = "#f4dbd6",
@ -84,7 +84,7 @@ local colors = {
surface0 = "#363a4f",
base = "#24273a",
mantle = "#1e2030",
crust = "#181926"
crust = "#181926",
},
mocha = {
rosewater = "#f5e0dc",
@ -112,8 +112,8 @@ local colors = {
surface0 = "#313244",
base = "#1e1e2e",
mantle = "#181825",
crust = "#11111b"
}
crust = "#11111b",
},
}
local catppuccin = {}
@ -134,7 +134,7 @@ function catppuccin.select(palette)
colors[palette].blue,
colors[palette].pink,
colors[palette].sky,
colors[palette].overlay2
colors[palette].overlay2,
},
brights = {
colors[palette].overlay1,
@ -144,41 +144,41 @@ function catppuccin.select(palette)
colors[palette].blue,
colors[palette].pink,
colors[palette].sky,
colors[palette].text
colors[palette].text,
},
tab_bar = {
background = colors[palette].base,
active_tab = {
bg_color = colors[palette].surface2,
fg_color = colors[palette].text
fg_color = colors[palette].text,
},
inactive_tab = {
bg_color = colors[palette].base,
fg_color = colors[palette].text
fg_color = colors[palette].text,
},
inactive_tab_hover = {
bg_color = colors[palette].surface2,
fg_color = colors[palette].text
fg_color = colors[palette].text,
},
new_tab = {
bg_color = colors[palette].base,
fg_color = colors[palette].text
fg_color = colors[palette].text,
},
new_tab_hover = {
bg_color = colors[palette].surface2,
fg_color = colors[palette].text,
italic = true
}
italic = true,
},
},
visual_bell = colors[palette].surface0,
indexed = {
[16] = colors[palette].peach,
[17] = colors[palette].rosewater
[17] = colors[palette].rosewater,
},
scrollbar_thumb = colors[palette].surface2,
split = colors[palette].crust,
-- nightbuild only
compose_cursor = colors[palette].flamingo
compose_cursor = colors[palette].flamingo,
}
end
@ -187,23 +187,26 @@ local function scheme_for_appearance(appearance, options)
if appearance:find("Dark") then
return catppuccin.select(options.sync_flavours.dark)
else
return catppuccin.select(options.sync_flavours.light)
-- return catppuccin.select(options.sync_flavours.light)
return catppuccin.select(options.sync_flavours.dark)
end
end
function catppuccin.setup(options)
-- default to not syncing with the OS theme
local should_sync = true
if options.sync == false then should_sync = false end
if options.sync == false then
should_sync = false
end
-- default options
options = {
sync = should_sync,
sync_flavours = options.sync_flavours or {
light = "latte",
dark = "mocha"
dark = "mocha",
},
flavour = options.flavour or "mocha"
flavour = options.flavour or "mocha",
}
-- if sync is enabled, hook into the window-config-reloaded event

View file

@ -3,29 +3,29 @@ local catppuccin = require("colors/catppuccin").setup({})
local keys = require("keys")
-- add wezterm to title for wm usage
wezterm.on("format-window-title", function()
return " - Wezterm"
return " - Wezterm"
end)
local padding = 10
return {
-- window_background_opacity = 0.9,
window_padding = {
left = padding,
right = padding,
top = padding,
bottom = padding,
},
font = wezterm.font("MonoLisa Nerd Font"),
adjust_window_size_when_changing_font_size = false,
initial_cols = 80,
colors = catppuccin,
use_fancy_tab_bar = false,
hide_tab_bar_if_only_one_tab = true,
tab_bar_at_bottom = true,
disable_default_key_bindings = true,
bold_brightens_ansi_colors = true,
default_gui_startup_args = { "start", "--always-new-process" },
keys = keys.keys,
key_tables = keys.key_tables,
-- window_background_opacity = 0.9,
window_padding = {
left = padding,
right = padding,
top = padding,
bottom = padding,
},
font = wezterm.font("MonoLisa Nerd Font"),
adjust_window_size_when_changing_font_size = false,
initial_cols = 80,
colors = catppuccin,
use_fancy_tab_bar = false,
hide_tab_bar_if_only_one_tab = true,
tab_bar_at_bottom = true,
disable_default_key_bindings = true,
bold_brightens_ansi_colors = true,
default_gui_startup_args = { "start", "--always-new-process" },
keys = keys.keys,
key_tables = keys.key_tables,
}

File diff suppressed because one or more lines are too long