fix: move to nixfmt-rfc-style instead of nixpkgs-fmt

programs/fish/default.nix

@@ -28,9 +28,13 @@
       zoxide init --cmd cd fish | source
     '';
 
-    shellAbbrs = { z = "zoxide"; };
+    shellAbbrs = {
+      z = "zoxide";
+    };
 
-    shellAliases = { del = "trash_file"; };
+    shellAliases = {
+      del = "trash_file";
+    };
 
     functions = {
       fish_prompt.body = ''

programs/git.nix

@@ -47,9 +47,13 @@
         gpgsign = true;
       };
 
-      tag = { gpgsign = true; };
+      tag = {
+        gpgsign = true;
+      };
 
-      difftool = { prompt = true; };
+      difftool = {
+        prompt = true;
+      };
 
       mergetool = {
         # https://www.git-scm.com/docs/git-mergetool#Documentation/git-mergetool.txt---no-prompt
@@ -75,9 +79,13 @@
         signingkey = "A1D3A2B4E14BD7C0445BB749A5767B54367CFBDF";
       };
 
-      pull = { ff = "only"; };
+      pull = {
+        ff = "only";
+      };
 
-      init = { defaultBranch = "main"; };
+      init = {
+        defaultBranch = "main";
+      };
 
       credential = {
         helper = "/usr/libexec/git-core/git-credential-libsecret";

programs/hyprland/default.nix

@@ -247,7 +247,7 @@
       bind = $mainMod SHIFT, J, movewindow, d
       bindm = $mainMod, mouse:272, movewindow
       bindm = $mainMod, mouse:273, resizewindow
-      
+
       # Volume changes
       binde = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%+
       binde = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%-

programs/mangohud.nix

@@ -15,8 +15,15 @@
       gpu_fan = true;
       gpu_junction_temp = true;
       gpu_load_change = true;
-      gpu_load_color = [ "39F900" "FDFD09" "B22222" ];
-      gpu_load_value = [ 60 90 ];
+      gpu_load_color = [
+        "39F900"
+        "FDFD09"
+        "B22222"
+      ];
+      gpu_load_value = [
+        60
+        90
+      ];
       gpu_mem_clock = true;
       gpu_mem_temp = true;
       gpu_power = true;
@@ -26,8 +33,15 @@
 
       # CPU Statistics
       cpu_load_change = true;
-      cpu_load_color = [ "39F900" "FDFD09" "B22222" ];
-      cpu_load_value = [ 60 90 ];
+      cpu_load_color = [
+        "39F900"
+        "FDFD09"
+        "B22222"
+      ];
+      cpu_load_value = [
+        60
+        90
+      ];
       cpu_mhz = true;
       cpu_power = true;
       cpu_stats = true;
@@ -46,8 +60,15 @@
       # FPS Statistics
       fps = true;
       fps_color_change = true;
-      fps_value = [ 60 90 ];
-      fps_color = [ "B22222" "FDFD09" "39F900" ];
+      fps_value = [
+        60
+        90
+      ];
+      fps_color = [
+        "B22222"
+        "FDFD09"
+        "39F900"
+      ];
       frametime = true;
       frame_timing = true; # Display graphs
       histogram = true; # ^

programs/neovim/default.nix

@@ -34,7 +34,7 @@
 
       # Nix
       nil
-      nixpkgs-fmt
+      nixfmt-rfc-style
 
       # TypeScript
       (callPackage ../vtsls/package.nix { })

programs/neovim/lua/plugins/none-ls.lua

@@ -12,9 +12,7 @@ return {
     -- https://github.com/nvimtools/none-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics
     config.sources = {
       -- Set a formatter
-      -- null_ls.builtins.formatting.stylua,
-      -- null_ls.builtins.formatting.prettier,
-      null_ls.builtins.formatting.nixpkgs_fmt,
+      null_ls.builtins.formatting.nixfmt,
       null_ls.builtins.formatting.prettier,
       null_ls.builtins.formatting.stylua,
     }

programs/vtsls/package.nix

@@ -1,7 +1,8 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
-, importNpmLock
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  importNpmLock,
 }:
 
 buildNpmPackage rec {
@@ -28,4 +29,12 @@ buildNpmPackage rec {
   npmConfigHook = importNpmLock.npmConfigHook;
 
   dontNpmPrune = true;
+
+  meta = with lib; {
+    description = "LSP wrapper around TypeScript extension bundled with VSCode.";
+    homepage = "https://github.com/yioneko/vtsls";
+    license = licenses.mit;
+    maintainers = with maintainers; [ wizardlink ];
+    platforms = platforms.all;
+  };
 }

programs/waybar.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   programs.waybar = {
     enable = true;
 
@@ -92,7 +93,13 @@
           critical-threshold = 90;
           interval = 5;
           format = "{icon} {temperatureC}°";
-          format-icons = [ "" "" "" "" "" ];
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+            ""
+          ];
           tooltip = false;
         };
 
@@ -110,7 +117,13 @@
           format-charging-full = " {capacity}%";
           format-full = "{icon} {capacity}%";
           format-alt = "{icon} {power}W";
-          format-icons = [ "" "" "" "" "" ];
+          format-icons = [
+            ""
+            ""
+            ""
+            ""
+            ""
+          ];
           tooltip = false;
         };