diff --git a/.alacritty.toml b/.alacritty.toml index 3e6a248..f05c812 100644 --- a/.alacritty.toml +++ b/.alacritty.toml @@ -34,7 +34,7 @@ TERM = "xterm-256color" [font] builtin_box_drawing = true -size = 11.0 +size = 9.0 [font.normal] family = "Hack Nerd Font" diff --git a/.bashrc b/.bashrc index 135491d..4ba2c68 100644 --- a/.bashrc +++ b/.bashrc @@ -305,3 +305,4 @@ termpipe() { +. "$HOME/.cargo/env" diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index 3621e19..50e6056 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -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, +-- }, +-- } +-- } } } diff --git a/.config/nvim/after/plugin/lualine.lua b/.config/nvim/after/plugin/lualine.lua index 07d6383..224663d 100644 --- a/.config/nvim/after/plugin/lualine.lua +++ b/.config/nvim/after/plugin/lualine.lua @@ -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 = {}, diff --git a/.config/nvim/lua/erik/init.lua b/.config/nvim/lua/erik/init.lua index a03e15a..3326a23 100644 --- a/.config/nvim/lua/erik/init.lua +++ b/.config/nvim/lua/erik/init.lua @@ -2,3 +2,4 @@ require("erik.remap") require("erik.lazy") require("erik.colorscheme") require("erik.options") +require("erik.yaml") diff --git a/.config/nvim/lua/erik/options.lua b/.config/nvim/lua/erik/options.lua index 5e44f13..3a627a6 100644 --- a/.config/nvim/lua/erik/options.lua +++ b/.config/nvim/lua/erik/options.lua @@ -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 = " " diff --git a/.config/nvim/lua/erik/yaml.lua b/.config/nvim/lua/erik/yaml.lua new file mode 100644 index 0000000..8121282 --- /dev/null +++ b/.config/nvim/lua/erik/yaml.lua @@ -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, +})