diff --git a/dotfiles/neovim/formatter.lua b/dotfiles/neovim/formatter.lua index 5761bd3..5ac6341 100644 --- a/dotfiles/neovim/formatter.lua +++ b/dotfiles/neovim/formatter.lua @@ -62,6 +62,7 @@ require("formatter").setup({ yaml = { pConf }, markdown = { pConf }, typescriptreact = { pConf }, + graphql = { pConf }, ["markdown.mdx"] = { pConf }, -- terraform = { hclConf }, diff --git a/dotfiles/neovim/treesitter.lua b/dotfiles/neovim/treesitter.lua index 1abea45..5cf12fc 100644 --- a/dotfiles/neovim/treesitter.lua +++ b/dotfiles/neovim/treesitter.lua @@ -5,7 +5,7 @@ require("nvim-treesitter.configs").setup({ -- ensure_installed = 'maintained', highlight = { enable = true, - disable = { "nix", "markdown" }, + -- disable = { "nix", "markdown" }, }, -- TODO better mappings incremental_selection = { diff --git a/home-manager/neovim.nix b/home-manager/neovim.nix index 4d701de..8cd2dfe 100644 --- a/home-manager/neovim.nix +++ b/home-manager/neovim.nix @@ -222,7 +222,7 @@ in # if you only want some grammars do # (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [ p.python p.java ])) nvim-treesitter.withAllGrammars - # rainbow-delimiters-nvim + rainbow-delimiters-nvim # Helpers, needed by other plugins popup-nvim @@ -301,7 +301,7 @@ in # nterm-nvim custom-vim-plugs.nterm-nvim - custom-vim-plugs.baleia-nvim + baleia-nvim # (h.neovim.localVimPlugin (vimPluginsDir + /nterm.nvim)) # Git @@ -385,10 +385,13 @@ in # Clojure # nvim-paredit - vim-sexp - vim-sexp-mappings-for-regular-people + # vim-sexp + # vim-sexp-mappings-for-regular-people # nvim-parinfer - pkgs.parinfer-rust + parpar-nvim + nvim-parinfer + nvim-paredit + # pkgs.parinfer-rust conjure # vim-clojure-highlight # # vim-kibit diff --git a/nixos/common-configuration.nix b/nixos/common-configuration.nix index 24cda5a..df7584d 100644 --- a/nixos/common-configuration.nix +++ b/nixos/common-configuration.nix @@ -208,7 +208,7 @@ in # sort-directories-first=true # ''; - programs.bash.enableCompletion = true; + programs.bash.completion.enable = true; programs.fish.enable = true; programs.fish.vendor.completions.enable = true;