commit be56bb251fa496238a65aaa7bd0c11960eb5e219
parent 0ba4ead86e4b9642e9df9945075aa573103f9d35
Author: Jack Sangdahl <jack@pngu.org>
Date: Fri, 20 Feb 2026 13:08:47 -0700
Uniform Neovim configuration, new packages
Update package list and zshrc function
Diffstat:
7 files changed, 67 insertions(+), 69 deletions(-)
diff --git a/.config/nvim/lua/configs/conform.lua b/.config/nvim/lua/configs/conform.lua
@@ -1,15 +1,16 @@
local options = {
formatters_by_ft = {
- css = { "prettier" },
- html = { "prettier" },
+ cpp = { "clang-format" },
+ c = { "clang-format" },
+ css = { "oxfmt" },
+ html = { "oxfmt" },
+ lua = { "stylua" },
+ markdown = { "oxfmt" },
python = {
"ruff_fix",
"ruff_format",
"ruff_organize_imports",
},
- cpp = { "clang-format" },
- c = { "clang-format" },
- lua = { "stylua" },
v = { "verible-verilog-format" },
},
format_on_save = {
diff --git a/.config/nvim/lua/configs/lazy.lua b/.config/nvim/lua/configs/lazy.lua
@@ -1,47 +1,47 @@
return {
- defaults = { lazy = true },
- install = { colorscheme = { "nvchad" } },
+ defaults = { lazy = true },
+ install = { colorscheme = { "nvchad" } },
- ui = {
- icons = {
- ft = "",
- lazy = " ",
- loaded = "",
- not_loaded = "",
- },
- },
+ ui = {
+ icons = {
+ ft = "",
+ lazy = " ",
+ loaded = "",
+ not_loaded = "",
+ },
+ },
- performance = {
- rtp = {
- disabled_plugins = {
- "2html_plugin",
- "tohtml",
- "getscript",
- "getscriptPlugin",
- "gzip",
- "logipat",
- "netrw",
- "netrwPlugin",
- "netrwSettings",
- "netrwFileHandlers",
- "matchit",
- "tar",
- "tarPlugin",
- "rrhelper",
- "spellfile_plugin",
- "vimball",
- "vimballPlugin",
- "zip",
- "zipPlugin",
- "tutor",
- "rplugin",
- "syntax",
- "synmenu",
- "optwin",
- "compiler",
- "bugreport",
- "ftplugin",
- },
- },
- },
+ performance = {
+ rtp = {
+ disabled_plugins = {
+ "2html_plugin",
+ "tohtml",
+ "getscript",
+ "getscriptPlugin",
+ "gzip",
+ "logipat",
+ "netrw",
+ "netrwPlugin",
+ "netrwSettings",
+ "netrwFileHandlers",
+ "matchit",
+ "tar",
+ "tarPlugin",
+ "rrhelper",
+ "spellfile_plugin",
+ "vimball",
+ "vimballPlugin",
+ "zip",
+ "zipPlugin",
+ "tutor",
+ "rplugin",
+ "syntax",
+ "synmenu",
+ "optwin",
+ "compiler",
+ "bugreport",
+ "ftplugin",
+ },
+ },
+ },
}
diff --git a/.config/nvim/lua/configs/lspconfig.lua b/.config/nvim/lua/configs/lspconfig.lua
@@ -1,12 +1,5 @@
require("nvchad.configs.lspconfig").defaults()
-local servers = {
- "html",
- "cssls",
- "clangd",
- "pylsp",
- "lua_ls",
- "verible",
-}
+local servers = { "basedpyright", "clangd", "cssls", "html", "lua_ls", "verible" }
vim.lsp.enable(servers)
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
@@ -1,4 +1,4 @@
-require "nvchad.options"
+require("nvchad.options")
local o = vim.o
-o.cursorlineopt ='both'
+o.cursorlineopt = "both"
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
@@ -14,13 +14,14 @@ return {
"nvim-treesitter/nvim-treesitter",
opts = {
ensure_installed = {
- "lua",
- "html",
- "css",
- "python",
- "cpp",
"c",
+ "cpp",
+ "css",
+ "bash",
+ "html",
+ "lua",
"make",
+ "python",
"verilog",
},
},
@@ -29,10 +30,13 @@ return {
"williamboman/mason.nvim",
opts = {
ensure_installed = {
- "ruff",
- "python-lsp-server",
- "prettier",
+ "basedpyright",
+ "clang-format",
+ "css-lsp",
+ "html-lsp",
"lua-language-server",
+ "oxfmt",
+ "ruff",
"stylua",
"verible",
},
diff --git a/.pkglist.txt b/.pkglist.txt
@@ -6,7 +6,6 @@ brightnessctl # To control keyboard/display brightness
broadcom-wl-dkms # Provides wl WiFi driver
chrony # Time syncrhonisation
chrony-openrc # Time syncrhonisation service
-clang # Compiler
cmake # Required for ZMK
cryptsetup # Required for dmcrypt/device-mapper separate swap partition
cryptsetup-openrc # Service for aforementioned
@@ -22,6 +21,7 @@ fzf # Used by Zoxide
git # VCS
grim # Screenshot tool
gtklock # Lockscreen
+imagemagick # Image utilities
imv # Display images
intel-ucode # CPU microcode
iwd # WiFi system
@@ -45,7 +45,7 @@ ninja # Required by ZMK
noto-fonts # Variety of common fonts
noto-fonts-cjk # Fonts of Asian dialects
noto-fonts-emoji # Emojis
-npm # Required by some Mason (neovim) packages (python-lsp-server & prettier)
+npm # Required by some Mason (Neovim) packages (oxfmt, {css,html}-lsp)
opendoas # /sbin/sudo alternative
openrc # Init system & service manager
openresolv # Name resolving required by IWD
diff --git a/.zshrc b/.zshrc
@@ -56,7 +56,7 @@ alias glp="git log --pretty=format:'%ad (%h) by %an, %s' --date=iso"
take() {
mkdir -p $1
- cd $1
+ z $1
}
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
