diff --git a/flake.lock b/flake.lock
index 9214140..3cf375f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -52,11 +52,11 @@
     "bypass-paywalls-clean": {
       "flake": false,
       "locked": {
-        "lastModified": 1709556839,
-        "narHash": "sha256-LbsaYISpsjCI8DXPu2toBI3uMK+Xau1sWuzA2xsQ6Pg=",
+        "lastModified": 1712562887,
+        "narHash": "sha256-aX/h8cepKd9E+9ZtKnqRWLIdxTwl6q1a0v8+8fNK+/0=",
         "owner": "magnolia1234",
         "repo": "bpc-uploads",
-        "rev": "0ca7c6a857e4e6c3e508228168e8de70e21cee3a",
+        "rev": "e58e8597347a8e2a656e2c4f10e259e7fcc8b52c",
         "type": "gitlab"
       },
       "original": {
@@ -105,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709771483,
-        "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=",
+        "lastModified": 1711763326,
+        "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6",
+        "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709967935,
-        "narHash": "sha256-ZLLdGWs9njivxZsfSzfQN05g6WIyIe24bPb61y7FVqo=",
+        "lastModified": 1712612224,
+        "narHash": "sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "72818e54ec29427f8d9f9cfa6fc859d01ca6dc66",
+        "rev": "79eab0e82cb126bf4ac170f44af82479f0895ab5",
         "type": "github"
       },
       "original": {
@@ -163,11 +163,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710031437,
-        "narHash": "sha256-XauWQSnMUwJOHgW/ByZP1kOrJyNSJxV4aNoBlo8lnoc=",
+        "lastModified": 1712623312,
+        "narHash": "sha256-6NlzHMtxCdlF+Zq1Y10YnVr5M/AgMcVhEMZlxlQyeNo=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "e9883b75736b2d33787c9326d27d719a644b1c35",
+        "rev": "49b3ee7dbb9fdbb6388bd5d47895a9a9992b771e",
         "type": "github"
       },
       "original": {
@@ -231,11 +231,11 @@
     "hmts-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1706900289,
-        "narHash": "sha256-kw3YJ21nhs/x9Jp7kvnL+9FuiSgLB1hO/ON3QeeZx9g=",
+        "lastModified": 1710430870,
+        "narHash": "sha256-bsOQX56ciQ8ni7Zh4ZNtTvptvy/YaDPG318AsEaZRpE=",
         "owner": "calops",
         "repo": "hmts.nvim",
-        "rev": "ba1239972a1f56b94252d4f85a43e777ac419662",
+        "rev": "473d74cf54da8f51aaa9993ec3e6bfae278eb47b",
         "type": "github"
       },
       "original": {
@@ -251,11 +251,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709988192,
-        "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=",
+        "lastModified": 1712688495,
+        "narHash": "sha256-NrVLXkpT9ZigiI8md6NIzHS+3lE4QTj30IgXG57O9iM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030",
+        "rev": "b00d0e4fe9cba0047f54e77418ddda5f17e6ef2c",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
     "kitty-scrollback-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1710038457,
-        "narHash": "sha256-/6uDN3wE6uO4yxj7tNtLXjaMse2DCQsehpTnoEyBA/U=",
+        "lastModified": 1712336907,
+        "narHash": "sha256-wDNYvNa9UEHg6lRKaonN+6vg4XJ4umUaVriziEJejKE=",
         "owner": "mikesmithgh",
         "repo": "kitty-scrollback.nvim",
-        "rev": "c3014974e4cd498a534ff814761ef794ebb85d01",
+        "rev": "2d4c6970e9b6155b857755a5499cdce313d923b3",
         "type": "github"
       },
       "original": {
@@ -323,7 +323,7 @@
     "nextcloud-snappymail": {
       "flake": false,
       "locked": {
-        "lastModified": 1710042081,
+        "lastModified": 1712695892,
         "narHash": "sha256-UeZXoZFEPJj7zEVNTXJ3IYNt/wI7VFq3Pjh1ubMHCBo=",
         "type": "tarball",
         "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.32.0-nextcloud.tar.gz"
@@ -356,11 +356,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1709426687,
-        "narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=",
+        "lastModified": 1712450863,
+        "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c",
+        "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f",
         "type": "github"
       },
       "original": {
@@ -377,11 +377,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709887845,
-        "narHash": "sha256-803UIoB8+vGkm/VK/g55aBAAOf/ncTGvxXyjTF4ydm0=",
+        "lastModified": 1712537332,
+        "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "bef32a05496d9480b02be586fa7827748b9e597b",
+        "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933",
         "type": "github"
       },
       "original": {
@@ -392,11 +392,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709703039,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "lastModified": 1712608508,
+        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
         "type": "github"
       },
       "original": {
@@ -408,11 +408,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1710037658,
-        "narHash": "sha256-6i7th4IX+2E1KX7FEJ4XgYtvQAooLa6YRsUIVRDu0PU=",
+        "lastModified": 1712692796,
+        "narHash": "sha256-q3Tx4kS+nH4IDcEsZSv8o2IuCn475mGhCYBXxfxZ2gY=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "ff870a7e359c3f34fc1144c6c35f76003d6c17e7",
+        "rev": "ee4ce451f46a08778d1a9f9837eff0750714b08b",
         "type": "github"
       },
       "original": {
@@ -424,11 +424,11 @@
     "nvim-lint-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1709238483,
-        "narHash": "sha256-fYaiUFNaaSPejKBecKB7ifp/soREWYIh3avemU5qJJE=",
+        "lastModified": 1712680602,
+        "narHash": "sha256-FgHWOiF+oMXVISP/k2rt7epEEjFS/sYLnEpe85B5Ox0=",
         "owner": "mfussenegger",
         "repo": "nvim-lint",
-        "rev": "e824adb9bc01647f71e55457353a68f0f37f9931",
+        "rev": "4055dc856d5ac8f6b85748006fd8fa6457e086e8",
         "type": "github"
       },
       "original": {
@@ -457,11 +457,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1709951243,
-        "narHash": "sha256-1lWdTSZt/J4geoQKLkZLQ5Yh992XpZ4cFHw4AGEJFPY=",
+        "lastModified": 1712366921,
+        "narHash": "sha256-6pbOeklf+otsJIjt9IUyUfuTAedShnwERYq1IfhyrJs=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "041dbd18f440207ad161503a384e7c82d575db66",
+        "rev": "81eb8d519233c105f30dc0a278607e62b20502fd",
         "type": "github"
       },
       "original": {
@@ -473,11 +473,11 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1709968077,
-        "narHash": "sha256-5cHJMqbiBAbkis9exMAH5Y2ALynaSVmQT8NQTR4VztM=",
+        "lastModified": 1712690702,
+        "narHash": "sha256-iWP5nIswAs+7oNBhJpPzBqJ5BLXEt8+kHPi22RtAK3Q=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "7ff51f53b0efb6228df2e8539b51bb2e737b77f3",
+        "rev": "c16f66cca0c38b4e21371d8330b7f2ad6404f6dc",
         "type": "github"
       },
       "original": {
@@ -660,11 +660,11 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1707951703,
-        "narHash": "sha256-SU5wBy81aANd7oUZvYR14Vd53Ml/cBSwDtO6uG34CaE=",
+        "lastModified": 1710290046,
+        "narHash": "sha256-6Rfxh8Y6dg2wyQ9jYnbOaXm1SVfQDQ1B1tNqgpz6sY4=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "975bc70ad95dbbf2733872bc2e0a059c055db983",
+        "rev": "f3f26f47a126797c011c311cec9d449d855c3eab",
         "type": "github"
       },
       "original": {
@@ -693,11 +693,11 @@
     "tree-sitter-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1708499929,
-        "narHash": "sha256-kzyn6XF4/PN8civ/0UV+ancCMkh7DF2B7WUYxix6aaM=",
+        "lastModified": 1710150044,
+        "narHash": "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU=",
         "owner": "MunifTanjim",
         "repo": "tree-sitter-lua",
-        "rev": "04c9579dcb917255b2e5f8199df4ae7f587d472f",
+        "rev": "a24dab177e58c9c6832f96b9a73102a0cfbced4a",
         "type": "github"
       },
       "original": {
@@ -726,11 +726,11 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1709753184,
-        "narHash": "sha256-SqPd9O1OqBEOA+WPLfP3J2vuHWt53G5gI/9FWKQx2/Y=",
+        "lastModified": 1712321561,
+        "narHash": "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "03e88c170cb23142559a406b6e7621c4af3128f5",
+        "rev": "a22761025cdac6c314b7e3aa48fb44fa9e594d6a",
         "type": "github"
       },
       "original": {
@@ -759,11 +759,11 @@
     "tree-sitter-vimdoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1709370081,
-        "narHash": "sha256-v+hSI/6ocC2KxH8ogCexNcxxhcZsl7OvV9197zBCKr4=",
+        "lastModified": 1711210668,
+        "narHash": "sha256-spj8h1ZDY+6sWi+FCALapBsG+ig9H1u3bjkI2+UP0ds=",
         "owner": "neovim",
         "repo": "tree-sitter-vimdoc",
-        "rev": "016ad75faa854e4e13bc40c517015183b795eed9",
+        "rev": "a75a932449675bbd260213a95f4cd8b3193286f0",
         "type": "github"
       },
       "original": {
@@ -797,11 +797,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709980437,
-        "narHash": "sha256-rp1MwfRaZl7TPM4E5i1HxQGJCCfMcIa7dOzTX3SW7ro=",
+        "lastModified": 1710519878,
+        "narHash": "sha256-0dbc10OBFUVYyXC+C+N6vRUd8xyBSRxkcZ4Egipbx0M=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "e0b9e6c8ff35c7a28cb6baa02d85a9737a2ee4e9",
+        "rev": "aef95bdb6800a3a2af7aa7083d6df03067da6592",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 82288b0..152a6d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -353,28 +353,46 @@
 
           # Used to run commands and edit files in this repo
           default = pkgs.mkShell {
-            buildInputs = with pkgs; [ git stylua nixfmt shfmt shellcheck ];
+            buildInputs = with pkgs; [
+              git
+              stylua
+              nixfmt-rfc-style
+              shfmt
+              shellcheck
+            ];
           };
+        }
+      );
 
-        });
+      checks = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system overlays; };
+        in
+        {
+          neovim =
+            pkgs.runCommand "neovim-check-health" { buildInputs = [ inputs.self.packages.${system}.neovim ]; }
+              ''
+                mkdir -p $out
+                export HOME=$TMPDIR
+                nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
 
-      checks = forAllSystems (system:
-        let pkgs = import nixpkgs { inherit system overlays; };
-        in {
-          neovim = pkgs.runCommand "neovim-check-health" {
-            buildInputs = [ inputs.self.packages.${system}.neovim ];
-          } ''
-            mkdir -p $out
-            export HOME=$TMPDIR
-            nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
+                # Check for errors inside the health log
+                if $(grep "ERROR" $out/health.log); then
+                  cat $out/health.log
+                  exit 1
+                fi
+              '';
+        }
+      );
 
-            # Check for errors inside the health log
-            if $(grep "ERROR" $out/health.log); then
-              cat $out/health.log
-              exit 1
-            fi
-          '';
-        });
+      formatter = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system overlays; };
+        in
+        pkgs.nixfmt-rfc-style
+      );
 
       # Templates for starting other projects quickly
       templates = rec {
diff --git a/modules/common/neovim/config/lsp.nix b/modules/common/neovim/config/lsp.nix
index 838b3ed..aac4d78 100644
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@@ -71,7 +71,7 @@
         lua.command = "${pkgs.stylua}/bin/stylua";
         black.command = "${pkgs.black}/bin/black";
         fish_indent.command = "${pkgs.fish}/bin/fish_indent";
-        nixfmt.command = "${pkgs.nixfmt}/bin/nixfmt";
+        nixfmt.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
         rustfmt = {
           command = "${pkgs.rustfmt}/bin/rustfmt";
           prepend_args = [ "--edition" "2021" ];
diff --git a/modules/common/programming/nix.nix b/modules/common/programming/nix.nix
index 20a297d..6ad9b57 100644
--- a/modules/common/programming/nix.nix
+++ b/modules/common/programming/nix.nix
@@ -7,12 +7,9 @@
     home-manager.users.${config.user} = {
 
       home.packages = with pkgs; [
-        nixfmt # Nix file formatter
+        nixfmt-rfc-style # Nix file formatter
         nil # Nix language server
       ];
-
     };
-
   };
-
 }
diff --git a/templates/basic/flake.nix b/templates/basic/flake.nix
index dadd0fb..9a0aae3 100644
--- a/templates/basic/flake.nix
+++ b/templates/basic/flake.nix
@@ -9,11 +9,16 @@
         "aarch64-linux"
         "aarch64-darwin"
       ];
-    in {
-      devShells = forAllSystems (system:
-        let pkgs = import nixpkgs { inherit system; };
-        in {
-          default = pkgs.mkShell { buildInputs = with pkgs; [ nixfmt ]; };
-        });
+    in
+    {
+      devShells = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in
+        {
+          default = pkgs.mkShell { buildInputs = with pkgs; [ nixfmt-rfc-style ]; };
+        }
+      );
     };
 }