fix: gq with null-ls

README.md

@@ -26,8 +26,8 @@ configuration may be difficult to translate to a non-Nix system.
 | Terminal     | [Kitty](https://sw.kovidgoyal.net/kitty/)                                        | [Link](./modules/common/applications/kitty.nix)    |
 | Shell        | [Fish](https://fishshell.com/)                                                   | [Link](./modules/common/shell/fish)                |
 | Shell Prompt | [Starship](https://starship.rs/)                                                 | [Link](./modules/common/shell/starhip.nix)         |
-| Colorscheme  | [Gruvbox](https://github.com/morhetz/gruvbox)                                    | [Link](./colorscheme/gruvbox)                      |
+| Colorscheme  | [Gruvbox](https://github.com/morhetz/gruvbox)                                    | [Link](./colorscheme/gruvbox/default.nix)          |
-| Wallpaper    | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix)
+| Wallpaper    | [Road](https://gitlab.com/exorcist365/wallpapers/-/blob/master/gruvbox/road.jpg) | [Link](./hosts/tempest/default.nix)                |
 | Text Editor  | [Neovim](https://neovim.io/)                                                     | [Link](./modules/common/neovim/config)             |
 | Browser      | [Firefox](https://www.mozilla.org/en-US/firefox/new/)                            | [Link](./modules/common/applications/firefox.nix)  |
 | E-Mail       | [Aerc](https://aerc-mail.org/)                                                   | [Link](./modules/common/mail/aerc.nix)             |

modules/common/neovim/config/lsp.nix

@@ -50,6 +50,7 @@
 
         on_attach = function(client, bufnr)
             if client.supports_method("textDocument/formatting") then
+                -- Auto-format on save
                 vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })
                 vim.api.nvim_create_autocmd("BufWritePre", {
                     group = augroup,
@@ -58,6 +59,12 @@
                         vim.lsp.buf.format({ bufnr = bufnr })
                     end,
                 })
+                -- Use internal formatting for bindings like gq.
+                vim.api.nvim_create_autocmd("LspAttach", {
+                    callback = function(args)
+                        vim.bo[args.buf].formatexpr = nil
+                    end,
+                })
             end
         end,
     })

modules/common/shell/utilities.nix

@@ -46,7 +46,10 @@ in {
 
       programs.bat = {
         enable = true; # cat replacement
-        config = { theme = config.theme.colors.batTheme; };
+        config = {
+          theme = config.theme.colors.batTheme;
+          pager = "less -R"; # Don't auto-exit if one screen
+        };
       };
 
       programs.fish.shellAbbrs = {