diff --git a/flake.nix b/flake.nix
index c047479..2fd0c4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,15 +14,17 @@
           ./hardware/desktop.nix
           ./profiles/base.nix
           ./users
-          ({
-            networking.hostName = "nixos-desktop";
-            # Allow to externally control MPD
-            networking.firewall.allowedTCPPorts = [ 6600 ];
+          (
+            {
+              networking.hostName = "nixos-desktop";
+              # Allow to externally control MPD
+              networking.firewall.allowedTCPPorts = [ 6600 ];
 
-            nix.registry.nixpkgs.flake = nixpkgs;
+              nix.registry.nixpkgs.flake = nixpkgs;
 
-            system.stateVersion = "19.09";
-          })
+              system.stateVersion = "19.09";
+            }
+          )
         ];
     };
 
@@ -34,38 +36,39 @@
           ./hardware/clevo-nl51ru.nix
           ./profiles/base.nix
           ./users
-          ({
-            networking.hostName = "froidmpa-laptop";
+          (
+            {
+              networking.hostName = "froidmpa-laptop";
 
-            nix.registry.nixpkgs.flake = nixpkgs;
+              nix.registry.nixpkgs.flake = nixpkgs;
 
-            home-manager.users.froidmpa = { pkgs, config, ... }: {
-              services.network-manager-applet.enable = true;
-              services.blueman-applet.enable = true;
-              services.grobi = {
-                enable = true;
-                executeAfter = [ "${pkgs.systemd}/bin/systemctl --user restart stalonetray" "${pkgs.feh}/bin/feh --bg-fill ~/.wallpaper.png" ];
-                rules = [
-                  {
-                    name = "Work HDMI";
-                    outputs_connected = [ "HDMI-1" ];
-                    configure_single = "HDMI-1";
-                    primary = true;
-                    atomic = true;
-                  }
-                  {
-                    name = "Fallback";
-                    configure_single = "eDP-1";
-                  }
-                ];
+              home-manager.users.froidmpa = { pkgs, config, ... }: {
+                services.network-manager-applet.enable = true;
+                services.blueman-applet.enable = true;
+                services.grobi = {
+                  enable = true;
+                  executeAfter = [ "${pkgs.systemd}/bin/systemctl --user restart stalonetray" "${pkgs.feh}/bin/feh --bg-fill ~/.wallpaper.png" ];
+                  rules = [
+                    {
+                      name = "Work HDMI";
+                      outputs_connected = [ "HDMI-1" ];
+                      configure_single = "HDMI-1";
+                      primary = true;
+                      atomic = true;
+                    }
+                    {
+                      name = "Fallback";
+                      configure_single = "eDP-1";
+                    }
+                  ];
+                };
               };
-            };
 
-            system.stateVersion = "21.05";
-          })
+              system.stateVersion = "21.05";
+            }
+          )
 
         ];
     };
-
   };
 }
diff --git a/users/default.nix b/users/default.nix
index 9ae5752..b6ef19d 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -8,11 +8,13 @@
       packageOverrides = pkgs: {
         ncmpcpp = pkgs.ncmpcpp.override { visualizerSupport = true; };
         firefox = pkgs.firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; };
-        lutris-unwrapped = pkgs.lutris-unwrapped.overridePythonAttrs (oldAttrs: rec {
-          patches = [
-            ./lutris_sort_new_with_model_fix.patch
-          ];
-        });
+        lutris-unwrapped = pkgs.lutris-unwrapped.overridePythonAttrs (
+          oldAttrs: rec {
+            patches = [
+              ./lutris_sort_new_with_model_fix.patch
+            ];
+          }
+        );
       };
     };
 
@@ -52,7 +54,7 @@
       };
       unclutter.enable = true;
       pasystray.enable = true;
-      dunst = import ./froidmpa/dunst.nix { };
+      dunst = import ./froidmpa/dunst.nix {};
       screen-locker = {
         enable = true;
         inactiveInterval = 5;
@@ -102,17 +104,21 @@
             TIME
             COMM
           ];
-        } // (with config.lib.htop; leftMeters [
-          (bar "LeftCPUs2")
-          (bar "CPU")
-          (bar "Memory")
-          (bar "Swap")
-        ]) // (with config.lib.htop; rightMeters [
-          (bar "RightCPUs2")
-          (text "Tasks")
-          (text "LoadAverage")
-          (text "Uptime")
-        ]);
+        } // (
+          with config.lib.htop; leftMeters [
+            (bar "LeftCPUs2")
+            (bar "CPU")
+            (bar "Memory")
+            (bar "Swap")
+          ]
+        ) // (
+          with config.lib.htop; rightMeters [
+            (bar "RightCPUs2")
+            (text "Tasks")
+            (text "LoadAverage")
+            (text "Uptime")
+          ]
+        );
       };
       broot = {
         enable = true;
@@ -131,13 +137,15 @@
       vscode = {
         enable = true;
         package = pkgs.vscodium;
-        extensions = (with pkgs.vscode-extensions; [
-          bbenoist.nix
-          arrterian.nix-env-selector
-          scala-lang.scala
-          scalameta.metals
-          hashicorp.terraform
-        ]);
+        extensions = (
+          with pkgs.vscode-extensions; [
+            jnoortheen.nix-ide
+            arrterian.nix-env-selector
+            scala-lang.scala
+            scalameta.metals
+            hashicorp.terraform
+          ]
+        );
       };
     };
 
@@ -232,6 +240,9 @@
         sbt
         geckodriver
 
+        rnix-lsp
+        nixpkgs-fmt
+
         zsh-syntax-highlighting
         ranger
         R