From 78b5cf28a93d36d8141c61a3cbaf0e765c6b9449 Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Fri, 7 Jun 2024 17:32:19 +0200 Subject: [PATCH] feat(nix): add formatting for Nix files --- fish/config.fish | 4 ++++ nvim/lua/plugins/formatting.lua | 4 ++++ nvim/lua/plugins/mason.lua | 1 + setup/rust.sh | 1 + 4 files changed, 10 insertions(+) diff --git a/fish/config.fish b/fish/config.fish index 55f1ab8..130e5f1 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -34,6 +34,10 @@ set PATH ~/.dotfiles/private/bin $PATH set PATH ~/.local/bin $PATH set PATH ~/.asdf/shims $PATH +set -x LIBRARY_PATH (brew --prefix)/opt/libiconv/lib +set -x CPATH (brew --prefix)/opt/libiconv/include +set -x PKG_CONFIG_PATH (brew --prefix)/opt/libiconv/lib/pkgconfig + # Homebrew Command Not Found set HB_CNF_HANDLER (brew --repository)"/Library/Taps/homebrew/homebrew-command-not-found/handler.fish" if test -f $HB_CNF_HANDLER diff --git a/nvim/lua/plugins/formatting.lua b/nvim/lua/plugins/formatting.lua index ba62f0e..603874f 100644 --- a/nvim/lua/plugins/formatting.lua +++ b/nvim/lua/plugins/formatting.lua @@ -24,6 +24,9 @@ return { args = { "--fix-to-stdout", "--stdin", "--stdin-filename", "$FILENAME" }, stdin = true, }, + nixpkgs_fmt = { + command = "nixpkgs-fmt", + }, }, formatters_by_ft = { -- ["*"] = { "codespell" }, @@ -40,6 +43,7 @@ return { lua = { "stylua" }, markdown = { { "prettierd", "prettier" } }, mdx = { { "prettierd", "prettier" } }, + nix = { "nixpkgs_fmt" }, python = { "isort", "black" }, ruby = { "rubyfmt", "rubocop" }, eruby = { "htmlbeautifier" }, diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua index accefa3..62d5957 100644 --- a/nvim/lua/plugins/mason.lua +++ b/nvim/lua/plugins/mason.lua @@ -24,6 +24,7 @@ return { "isort", "json-lsp", "lua-language-server", + "nixpkgs-fmt", "prettier", "prettierd", "pyright", diff --git a/setup/rust.sh b/setup/rust.sh index f92299a..3a11314 100755 --- a/setup/rust.sh +++ b/setup/rust.sh @@ -5,3 +5,4 @@ asdf install rust latest asdf global rust latest cargo install stylua +cargo install nixpkgs-fmt