This commit is contained in:
2025-01-18 15:51:24 -05:00
parent 02842aae26
commit a6d7e8a5d6
9 changed files with 112 additions and 120 deletions

View File

@@ -1 +1,3 @@
require("vxclutch")
-- greetings

View File

@@ -1,6 +1,5 @@
{
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
"brightburn.vim": { "branch": "master", "commit": "fc0d2fafc51e86d6065acd54b5e82e686019ff2f" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
@@ -16,7 +15,6 @@
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.nvim": { "branch": "main", "commit": "44a3ab2bc6b40edeb7a76359826c9779d5c70cb5" },
"nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" },
"nvim-treesitter": { "branch": "master", "commit": "5da195ac3dfafd08d8b10756d975f0e01e1d563a" },
"nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },

View File

@@ -1,7 +1,19 @@
vim.g.mapleader = " "
require("vxclutch.set")
require("vxclutch.remap")
require("vxclutch.lazy_init")
require "vxclutch.set"
require "vxclutch.lazy_init"
require "vxclutch.remap"
vim.api.nvim_set_hl(0, "Function", { bold = false }) -- Must be called last.
require("nvim-colorizer").setup()
local augroup = vim.api.nvim_create_augroup
local autocmd = vim.api.nvim_create_autocmd
local VxclutchGroup = augroup('Vxclutch', {})
autocmd('BufEnter', {
group = VxclutchGroup,
callback = function()
if vim.bo.filetype == "zig" then
vim.cmd.colorscheme("tokyonight-night")
else
vim.cmd.colorscheme("rose-pine-moon")
end
end
})

View File

@@ -1,59 +0,0 @@
-- taken directly from ThePrimeagen/init.lua
function ColorMyPencils(color)
color = color or "rose-pine-moon"
vim.cmd.colorscheme(color)
vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
end
return {
{
"erikbackman/brightburn.vim",
},
{
"folke/tokyonight.nvim",
lazy = false,
opts = {},
config = function()
ColorMyPencils()
end,
},
{
"folke/tokyonight.nvim",
config = function()
require("tokyonight").setup {
-- your configuration comes here
-- or leave it empty to use the default settings
style = "storm", -- The theme comes in three styles, storm, moon, a darker variant night and day
transparent = true, -- Enable this to disable setting the background color
terminal_colors = true, -- Configure the colors used when opening a :terminal in Neovim
styles = {
-- Style to be applied to different syntax groups
-- Value is any valid attr-list value for :help nvim_set_hl
comments = { italic = false },
keywords = { italic = false },
-- Background styles. Can be "dark", "transparent" or "normal"
sidebars = "dark", -- style for sidebars, see below
floats = "dark", -- style for floating windows
},
}
end,
},
{
"rose-pine/neovim",
name = "rose-pine",
config = function()
require("rose-pine").setup {
disable_background = true,
styles = {
italic = false,
},
}
ColorMyPencils()
end,
},
}

View File

@@ -0,0 +1,33 @@
function ColorMyPencils(color)
color = color or "rose-pine"
vim.cmd.colorscheme(color)
end
return {
{
"folke/tokyonight.nvim",
config = function()
require("tokyonight").setup({
style = "storm",
transparent = true,
terminal_colors = true,
styles = {
comments = { italic = false },
keywords = { italic = false },
sidebars = "dark",
floats = "dark",
},
})
end,
},
{
"rose-pine/neovim",
name = "rose-pine",
config = function()
require("rose-pine").setup({ disable_background = true })
vim.cmd("colorscheme rose-pine")
ColorMyPencils()
end,
},
}

View File

@@ -1,3 +1,5 @@
vim.g.mapleader = " "
local function map(mode, lhs, rhs, opts)
local options = { noremap = true, silent = true }
if opts then
@@ -17,8 +19,8 @@ map("v", "K", ":m '>-2<CR>gv=gv")
map("n", "<C-d>", "<C-d>zz")
map("n", "<C-u>", "<C-u>zz")
-- Tile navigation --
map("n", "-", ":Oil<CR>")
-- File navigation --
map("n", "<leader>pv", ":Oil<CR>")
-- Terminal --
map("t", "<C-k>", "<C-\\><C-n><C-w><C-k>")

View File

@@ -19,7 +19,6 @@ opt.tabstop = 2
opt.expandtab = true
-- cursor --
opt.cursorline = true
opt.guicursor = ""
opt.scrolloff = 8
@@ -29,3 +28,10 @@ vim.cmd('autocmd BufEnter * setlocal formatoptions-=cro')
opt.signcolumn = "yes"
opt.termguicolors = true
opt.colorcolumn = "80"
opt.wrap = false
-- Changes --
vim.opt.swapfile = false
vim.opt.backup = false
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
vim.opt.undofile = true

View File

@@ -1,6 +0,0 @@
column_width = 120
line_endings = "Unix"
indent_type = "Spaces"
indent_width = 2
quote_style = "AutoPreferDouble"
call_parentheses = "None"

View File

@@ -1,20 +1,19 @@
local wezterm = require "wezterm"
local wezterm = require("wezterm")
local config = wezterm.config_builder()
local config = {}
if wezterm.target_triple:find("windows") then
config.default_prog = { 'wsl.exe', '-d', 'Fedora', '--cd', '~' }
config.default_prog = { "wsl.exe", "-d", "Fedora", "--cd", "~" }
config.keys = {
{
key = 'F11',
mods = 'NONE',
key = "F11",
mods = "NONE",
action = wezterm.action.ToggleFullScreen,
},
}
end
config.hide_tab_bar_if_only_one_tab = true
config.scrollback_lines = 10000
config.window_padding = {
left = 0,
right = 0,
@@ -22,38 +21,43 @@ config.window_padding = {
bottom = 0,
}
-- Adjusted colors for similarity to the image
config.colors = {
background = '#000000', -- Darker background
foreground = '#c0caf5', -- Light foreground
cursor_bg = '#c0caf5', -- Cursor color
cursor_fg = '#0f111a',
cursor_border = '#c0caf5',
config.color_scheme = "vx-rose-pine"
config.color_schemes = {
['vx-rose-pine'] = {
foreground = '#e0def4',
background = '#000000', -- Default Rose-Pine background
cursor_bg = '#e0def4',
cursor_border = '#e0def4',
cursor_fg = '#191724',
selection_bg = '#524f67',
selection_fg = '#e0def4',
ansi = {
'#32344a', -- black
'#f7768e', -- red
'#9ece6a', -- green
'#e0af68', -- yellow
'#7aa2f7', -- blue
'#bb9af7', -- magenta
'#7dcfff', -- cyan
'#a9b1d6', -- white
'#191724', -- Base
'#eb6f92', -- Love
'#f6c177', -- Gold
'#ebbcba', -- Rose
'#9ccfd8', -- Pine
'#c4a7e7', -- Iris
'#31748f', -- Foam
'#e0def4', -- Text
},
brights = {
'#444b6a', -- bright black
'#ff7a93', -- bright red
'#b9f27c', -- bright green
'#ff9e64', -- bright yellow
'#7da6ff', -- bright blue
'#c69ff7', -- bright magenta
'#7dcfff', -- bright cyan
'#c0caf5', -- bright white
'#6e6a86', -- Subtle
'#eb6f92', -- Love
'#f6c177', -- Gold
'#ebbcba', -- Rose
'#9ccfd8', -- Pine
'#c4a7e7', -- Iris
'#31748f', -- Foam
'#e0def4', -- Text
},
},
}
config.font = wezterm.font("Iosevka") -- Match font as close as possible
config.font_size = 18.0 -- Slightly reduced size for a compact view
config.line_height = 1.1 -- Adjusted line height
config.font = wezterm.font("Iosevka Slab")
config.font_size = 18.0
config.line_height = 1.1
return config