Merge 8a2e721e00 into cc14a1c1f6

docs/release-notes/rl-0.7.md

@@ -39,6 +39,10 @@ everyone.
 
 ## Changelog {#sec-release-0.7-changelog}
 
+[nezia1](https://github.com/nezia1):
+
+- Replace [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt) with [nixfmt](https://github.com/NixOS/nixfmt) (nixfmt-rfc-style). 
+
 [ItsSorae](https://github.com/ItsSorae):
 
 - Add support for [typst](https://typst.app/) under `vim.languages.typst` This
@@ -80,13 +84,16 @@ everyone.
 
 [ocaml-lsp]: https://github.com/ocaml/ocaml-lsp
 [new-file-template.nvim]: https://github.com/otavioschwanck/new-file-template.nvim
+[neo-tree.nvim]: https://github.com/nvim-neo-tree/neo-tree.nvim
 
 - Add [ocaml-lsp] support
 
 - Fix "Emac" typo
 
 - Add [new-file-template.nvim] to automatically fill new file contents using
-  templates.
+  templates
+
+- Make [neo-tree.nvim] display file icons properly by enabling `visuals.nvimWebDevicons`
 
 [diniamo](https://github.com/diniamo):
 

modules/plugins/filetree/neo-tree/config.nix

@@ -20,6 +20,8 @@ in {
         "neo-tree-nvim"
       ];
 
+      visuals.nvimWebDevicons.enable = true;
+
       pluginRC.neo-tree = entryAnywhere ''
         require("neo-tree").setup(${toLuaObject cfg.setupOpts})
       '';

modules/plugins/languages/nix.nix

@@ -27,12 +27,12 @@
   servers = {
     rnix = {
       package = pkgs.rnix-lsp;
-      internalFormatter = cfg.format.type == "nixpkgs-fmt";
+      internalFormatter = cfg.format.type == "nixfmt";
       lspConfig = ''
         lspconfig.rnix.setup{
           capabilities = capabilities,
         ${
-          if (cfg.format.enable && cfg.format.type == "nixpkgs-fmt")
+          if (cfg.format.enable && cfg.format.type == "nixfmt")
           then useFormat
           else noFormat
         },
@@ -62,10 +62,10 @@
                 command = {"${cfg.format.package}/bin/alejandra", "--quiet"},
               },
             ''}
-          ${optionalString (cfg.format.type == "nixpkgs-fmt")
+          ${optionalString (cfg.format.type == "nixfmt")
             ''
               formatting = {
-                command = {"${cfg.format.package}/bin/nixpkgs-fmt"},
+                command = {"${cfg.format.package}/bin/nixfmt"},
               },
             ''}
             },
@@ -90,9 +90,9 @@
       '';
     };
 
-    nixpkgs-fmt = {
-      package = pkgs.nixpkgs-fmt;
-      # Never need to use null-ls for nixpkgs-fmt
+    nixfmt = {
+      package = pkgs.nixfmt-rfc-style;
+      # Never need to use null-ls for nixfmt
     };
   };