diff --git a/nix/base/env.nix b/nix/base/env.nix index 5166603..4fb53bd 100644 --- a/nix/base/env.nix +++ b/nix/base/env.nix @@ -12,5 +12,8 @@ environment.sessionVariables = { NIXOS_OZONE_WL = "1"; GOPATH = "$HOME/.go"; + FLAKE = "home/dashie/gits/dotFiles/nix"; + # don't ask... marksman somehow requires this + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1; }; } diff --git a/nix/programs/common.nix b/nix/programs/common.nix index b3fbd05..9f73918 100644 --- a/nix/programs/common.nix +++ b/nix/programs/common.nix @@ -101,12 +101,6 @@ in enable = true; enableFishIntegration = true; }; - home.sessionVariables = - { - FLAKE = "home/dashie/gits/dotFiles/nix"; - # don't ask... marksman somehow requires this - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1; - }; sops = { gnupg = { diff --git a/nix/programs/nvim/lua/plugins/lsp.lua b/nix/programs/nvim/lua/plugins/lsp.lua index 64c3f09..73be574 100644 --- a/nix/programs/nvim/lua/plugins/lsp.lua +++ b/nix/programs/nvim/lua/plugins/lsp.lua @@ -219,7 +219,12 @@ return { require("conform").format({ async = true, lsp_fallback = true }) end, mode = "", - desc = "Format buffer", + numberdesc = "Format buffer", + }, + }, + formatters = { + mdformat = { + prepend_args = { "--number" }, }, }, formatters_by_ft = {