Current state

This commit is contained in:
Erik Stambaugh 2025-04-14 14:34:31 -07:00
parent e3607e29a6
commit 51f164b23b
7 changed files with 67 additions and 22 deletions

View file

@ -34,7 +34,7 @@ TERM = "xterm-256color"
[font]
builtin_box_drawing = true
size = 11.0
size = 9.0
[font.normal]
family = "Hack Nerd Font"

View file

@ -305,3 +305,4 @@ termpipe() {
. "$HOME/.cargo/env"

View file

@ -15,7 +15,7 @@ require('mason-lspconfig').setup({
-- https://github.com/williamboman/mason-lspconfig.nvim?tab=readme-ov-file
ensure_installed = {
"pylsp",
-- "pylsp",
"pyright",
},
handlers = {
@ -29,23 +29,23 @@ require('mason-lspconfig').setup({
require "lspconfig".pylsp.setup {
on_attach = on_attach,
settings = {
pylsp = {
plugins = {
flake8 = {
enabled = false,
maxLineLength = 119,
},
mypy = {
enabled = true,
},
pycodestyle = {
enabled = false,
},
pyflakes = {
enabled = false,
},
}
}
-- pylsp = {
-- plugins = {
-- flake8 = {
-- enabled = false,
-- maxLineLength = 119,
-- },
-- mypy = {
-- enabled = true,
-- },
-- pycodestyle = {
-- enabled = false,
-- },
-- pyflakes = {
-- enabled = false,
-- },
-- }
-- }
}
}

View file

@ -24,7 +24,12 @@ require('lualine').setup {
sections = {
lualine_a = {'mode'},
lualine_b = {'branch', 'diff', 'diagnostics'},
lualine_c = {'filename'},
lualine_c = {
{
'filename',
path=1,
}
},
lualine_x = {'encoding', 'fileformat', 'filetype'},
lualine_y = {'progress'},
lualine_z = {'location'}
@ -37,7 +42,33 @@ require('lualine').setup {
lualine_y = {},
lualine_z = {}
},
tabline = {},
tabline = {
lualine_a = {
{
'buffers',
show_filename_only=true,
symbols = {
modified = '', -- Text to show when the buffer is modified
alternate_file = '󰓡', -- Text to show to identify the alternate file
directory = '', -- Text to show when the buffer is a directory
},
}
},
lualine_b = {},
lualine_c = {},
lualine_x = {},
lualine_y = {},
lualine_z = {'tabs'}
},
-- tabline = {
-- lualine_a = {'buffers'},
-- lualine_b = {'branch'},
-- lualine_c = {'filename'},
-- lualine_x = {},
-- lualine_y = {},
-- lualine_z = {'tabs'}
-- },
-- tabline = {},
winbar = {},
inactive_winbar = {},
extensions = {},

View file

@ -2,3 +2,4 @@ require("erik.remap")
require("erik.lazy")
require("erik.colorscheme")
require("erik.options")
require("erik.yaml")

View file

@ -7,7 +7,7 @@ vim.opt.updatetime = 50
vim.opt.signcolumn = "no" -- no no no
vim.opt.mouse = nil -- leave my cursor out of this
vim.opt.mouse = "" -- leave my cursor out of this
vim.opt.clipboard = "unnamedplus" -- yank to system clipboard
@ -23,10 +23,14 @@ vim.opt.formatoptions:prepend ( "r" )
vim.opt.shiftwidth = 4
vim.opt.tabstop = 4
vim.opt.backspace = { "indent", "eol", "start" }
vim.opt.softtabstop = 0
vim.opt.compatible = false
vim.opt.whichwrap = "<,>,h,l,[,]"
-- -- whitespace
-- vim.opt.listchars.tab = " "
-- vim.opt.listchars.trail = " "

View file

@ -0,0 +1,8 @@
vim.api.nvim_create_autocmd("FileType", {
pattern = "yaml",
callback = function()
vim.opt_local.indentexpr = ""
vim.opt_local.autoindent = false
vim.opt_local.smartindent = false
end,
})