diff --git a/flake.lock b/flake.lock
index 80badfa..243f3ac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726665257,
-        "narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=",
+        "lastModified": 1725199881,
+        "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e",
+        "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     },
     "catppuccin": {
       "locked": {
-        "lastModified": 1726952185,
-        "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
+        "lastModified": 1727910534,
+        "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
+        "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03",
         "type": "github"
       },
       "original": {
@@ -181,11 +181,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726153070,
-        "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
+        "lastModified": 1727826117,
+        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
+        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
         "type": "github"
       },
       "original": {
@@ -233,11 +233,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1728033094,
-        "narHash": "sha256-6v9Nj+8PnALQE3CW6tSu8gmFB9U9UFIRHeo2VIlWblE=",
+        "lastModified": 1728119511,
+        "narHash": "sha256-kJHt+BoDTc9aYXnmy7X+kQto9cT77lDKHAYp5FyY4OY=",
         "owner": "shazow",
         "repo": "foundry.nix",
-        "rev": "84be75ae73447a8c67ab8a0be2bc24d7bee87940",
+        "rev": "c45f6bc1f2110b1d209e116be203648a06a02f80",
         "type": "github"
       },
       "original": {
@@ -291,11 +291,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727514110,
-        "narHash": "sha256-0YRcOxJG12VGDFH8iS8pJ0aYQQUAgo/r3ZAL+cSh9nk=",
+        "lastModified": 1728092656,
+        "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "85f7a7177c678de68224af3402ab8ee1bcee25c8",
+        "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
         "type": "github"
       },
       "original": {
@@ -377,11 +377,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727246346,
-        "narHash": "sha256-TcUaKtya339Asu+g6KTJ8h7KiKcKXKp2V+At+7tksyY=",
+        "lastModified": 1728041527,
+        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1e22ef1518fb175d762006f9cae7f6312b8caedb",
+        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
         "type": "github"
       },
       "original": {
@@ -398,11 +398,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727383923,
-        "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
+        "lastModified": 1728041527,
+        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
+        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
         "type": "github"
       },
       "original": {
@@ -511,11 +511,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725997860,
-        "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=",
+        "lastModified": 1725188252,
+        "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876",
+        "rev": "c12ab785ce1982f82594aff03b3104c598186ddd",
         "type": "github"
       },
       "original": {
@@ -536,38 +536,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727219120,
-        "narHash": "sha256-wmT+JpnDk6EjgASU2VGfS0nnu6oKA4Cw25o5fzpDD/Q=",
+        "lastModified": 1724966483,
+        "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "db956287d3aa194dda91d05c8eb286de2a569edf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprutils_2": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "xdph",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "xdph",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1727300645,
-        "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
+        "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
         "type": "github"
       },
       "original": {
@@ -588,38 +561,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726840673,
-        "narHash": "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ=",
+        "lastModified": 1721324119,
+        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "b68dab23fc922eae99306988133ee80a40b39ca5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "type": "github"
-      }
-    },
-    "hyprwayland-scanner_2": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "xdph",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "xdph",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1726874836,
-        "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
+        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
         "type": "github"
       },
       "original": {
@@ -694,11 +640,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727507295,
-        "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=",
+        "lastModified": 1727999297,
+        "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70",
+        "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b",
         "type": "github"
       },
       "original": {
@@ -738,11 +684,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1726755586,
-        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+        "lastModified": 1725103162,
+        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
         "type": "github"
       },
       "original": {
@@ -770,11 +716,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1726937504,
-        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+        "lastModified": 1728018373,
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
         "type": "github"
       },
       "original": {
@@ -786,11 +732,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1727348695,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "lastModified": 1728018373,
+        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
         "type": "github"
       },
       "original": {
@@ -813,11 +759,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1727557953,
-        "narHash": "sha256-xe8JQaNOPTyzWsSlLu2yC6qw4SjOMHrXk4Iq+pIgLhM=",
+        "lastModified": 1728118042,
+        "narHash": "sha256-UL738XeO0WlfqcCsA25vVjeqoBHyXqmOcy3uq6qtgHI=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "2c4e4681db658deeceb2f781136d7ba1d0009521",
+        "rev": "aeb6ae37a78db5499a78dca5dbe2e8bf2bf5fce6",
         "type": "github"
       },
       "original": {
@@ -835,11 +781,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727452028,
-        "narHash": "sha256-ehl/A4HQFRyqj1Fk7cl+dgSf/2Fb1jLwWJtZaMU6RfU=",
+        "lastModified": 1728017046,
+        "narHash": "sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d+EaJ8c=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "9f7426e532ef8dfc839c4a3fcc567b13a20a70d3",
+        "rev": "ba81d9c1eae20fc3a1cd066062a05ac2e799e629",
         "type": "github"
       },
       "original": {
@@ -851,11 +797,11 @@
     "nvchad-starter": {
       "flake": false,
       "locked": {
-        "lastModified": 1727828331,
-        "narHash": "sha256-cb0glXaPYU31Nai8hSCD60DKvU0rH1i769bT7sBxcQ0=",
+        "lastModified": 1728120198,
+        "narHash": "sha256-aRelT5eqYpuoJgygkWCAl2uwkjdeWmDJ9aujyMFj7i4=",
         "owner": "naps62",
         "repo": "nvchad-starter",
-        "rev": "76da790a27dbe470a9cb8d7e6e7c874fc0656cc7",
+        "rev": "9981dee65a037f762edee79d8e6c39efee6206e4",
         "type": "github"
       },
       "original": {
@@ -874,11 +820,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728010959,
-        "narHash": "sha256-X+v33SZtir3yMUgeGn8ggFHqpiZ12VOxcf65NvVlrZU=",
+        "lastModified": 1728096945,
+        "narHash": "sha256-W5DPDBb/+SqmtBdInHVgbgBe2GhYD0wnnPcnMpuCrRc=",
         "owner": "nix-community",
         "repo": "nix4nvchad",
-        "rev": "e7ce4ed7a6d7f1c1e529a8cfe8096f96d8448fb0",
+        "rev": "5c4d85b9b16dab043630f8e4f1e428490e6cfdfa",
         "type": "github"
       },
       "original": {
@@ -971,11 +917,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727431250,
-        "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
+        "lastModified": 1727984844,
+        "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
+        "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
         "type": "github"
       },
       "original": {
@@ -1009,8 +955,6 @@
           "hyprland",
           "hyprlang"
         ],
-        "hyprutils": "hyprutils_2",
-        "hyprwayland-scanner": "hyprwayland-scanner_2",
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -1021,11 +965,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727109343,
-        "narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=",
+        "lastModified": 1725203932,
+        "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea",
+        "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 7e084fe..c3477dd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,12 @@
 {
   description = "naps62's nix config";
 
-  nixConfig = { experimental-features = [ "nix-command" "flakes" ]; };
+  nixConfig = {
+    experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
+  };
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -29,37 +34,59 @@
       url = "github:naps62/nvchad-starter";
       flake = false;
     };
-    foundry = { url = "github:shazow/foundry.nix/monthly"; };
+    foundry = {
+      url = "github:shazow/foundry.nix/monthly";
+    };
     utils.url = "github:numtide/flake-utils";
   };
 
   outputs =
-    { self, systems, nixpkgs, home-manager, utils, catppuccin, ... }@inputs:
+    {
+      self,
+      systems,
+      nixpkgs,
+      home-manager,
+      utils,
+      catppuccin,
+      ...
+    }@inputs:
     let
       inherit (self) outputs;
-      pkgsFor = nixpkgs.lib.genAttrs (import systems) (system:
+      pkgsFor = nixpkgs.lib.genAttrs (import systems) (
+        system:
         import nixpkgs {
           inherit system;
           config.allowUnfree = true;
           overlays = [ inputs.foundry.overlay ];
-        });
+        }
+      );
 
       x86 = pkgsFor.x86_64-linux;
       aarch64 = pkgsFor.aarch64-linux;
 
-      mkNixOS = name:
+      mkNixOS =
+        name:
         nixpkgs.lib.nixosSystem {
-          modules = [ ./hosts/${name} catppuccin.nixosModules.catppuccin ];
-          specialArgs = { inherit inputs outputs; };
+          modules = [
+            ./hosts/${name}
+            catppuccin.nixosModules.catppuccin
+          ];
+          specialArgs = {
+            inherit inputs outputs;
+          };
         };
 
-      mkHome = name: pkgs:
+      mkHome =
+        name: pkgs:
         home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [ ./home/${name} ];
-          extraSpecialArgs = { inherit inputs outputs catppuccin; };
+          extraSpecialArgs = {
+            inherit inputs outputs catppuccin;
+          };
         };
-    in {
+    in
+    {
       nixosConfigurations = {
         laptop = mkNixOS "laptop";
         arrakis = mkNixOS "arrakis";
@@ -75,10 +102,15 @@
         pi = mkHome "pi" aarch64;
       };
 
-      devShells = let
-        forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ];
-        forEachPkg = f: forEachSystem (sys: f pkgsFor.${sys});
-      in forEachPkg (pkgs: import ./shell.nix { inherit pkgs; });
+      devShells =
+        let
+          forEachSystem = nixpkgs.lib.genAttrs [
+            "x86_64-linux"
+            "aarch64-linux"
+          ];
+          forEachPkg = f: forEachSystem (sys: f pkgsFor.${sys});
+        in
+        forEachPkg (pkgs: import ./shell.nix { inherit pkgs; });
     };
 }
 # Note: Can also be referenced withou
diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix
index 5db64bc..f6fe2fa 100644
--- a/home/common/programs/hyprland/default.nix
+++ b/home/common/programs/hyprland/default.nix
@@ -1,13 +1,14 @@
 { config, pkgs, ... }: let
   rofiLaunchers = import ../../../pkgs/rofi-launchers/package.nix {};
 in {
+  imports = [./rofi.nix];
+
   home.sessionVariables = {
     HYPRCURSOR_THEME = "Phinger Cursors";
     HYPRCURSOR_SIZE = 32;
     ELECTRON_OZONE_PLATFORM_HINT = "auto";
     XCURSOR_SIZE = 32;
   };
-  home.packages = with pkgs; [rofi (callPackage ../../../pkgs/rofi-launchers/package.nix {})];
 
   wayland.windowManager.hyprland = {
     enable = true;
diff --git a/home/common/programs/hyprland/rofi.nix b/home/common/programs/hyprland/rofi.nix
index 85a335e..9644b9f 100644
--- a/home/common/programs/hyprland/rofi.nix
+++ b/home/common/programs/hyprland/rofi.nix
@@ -1,3 +1,3 @@
 {pkgs,...}:{
-  home.packages = with pkgs; [rofi (callPackage ../../../../../../pkgs/rofi-launchers/package.nix {})];
+  home.packages = with pkgs; [rofi (callPackage ../../../../pkgs/rofi-launchers/package.nix {})];
   }
diff --git a/home/common/programs/neovim/default.nix b/home/common/programs/neovim/default.nix
index c6cbee7..11f3958 100644
--- a/home/common/programs/neovim/default.nix
+++ b/home/common/programs/neovim/default.nix
@@ -1,5 +1,16 @@
-{ inputs, pkgs, ... }: {
+{ inputs, pkgs, ... }:
+{
   imports = [ inputs.nvchad4nix.homeManagerModule ];
-  home.sessionVariables = { EDITOR = "nvim"; };
-  programs.nvchad = { enable = true; };
+  home.sessionVariables = {
+    EDITOR = "nvim";
+  };
+  home.packages = with pkgs; [
+    nixfmt-rfc-style
+    biome
+    stylua
+  ];
+
+  programs.nvchad = {
+    enable = true;
+  };
 }
diff --git a/hosts/common/features/docker.nix b/hosts/common/features/docker.nix
index c9cef99..2182736 100644
--- a/hosts/common/features/docker.nix
+++ b/hosts/common/features/docker.nix
@@ -1,4 +1,5 @@
-{ config, lib, ... }: {
+{ config, lib, ... }:
+{
   virtualisation.docker = {
     enable = true;
     rootless = {
diff --git a/hosts/common/features/fonts.nix b/hosts/common/features/fonts.nix
index 2af242e..fc63959 100644
--- a/hosts/common/features/fonts.nix
+++ b/hosts/common/features/fonts.nix
@@ -1,4 +1,10 @@
-{ inputs, pkgs, fonts, ... }: {
+{
+  inputs,
+  pkgs,
+  fonts,
+  ...
+}:
+{
   fonts = {
     enableDefaultPackages = true;
     packages = with pkgs; [
@@ -6,7 +12,12 @@
       libertine
       fira-code
       fira-code-symbols
-      (nerdfonts.override { fonts = [ "FiraCode" "VictorMono" ]; })
+      (nerdfonts.override {
+        fonts = [
+          "FiraCode"
+          "VictorMono"
+        ];
+      })
     ];
 
     fontconfig = {
diff --git a/hosts/common/features/hyprland.nix b/hosts/common/features/hyprland.nix
index f7d06db..db4bfc0 100644
--- a/hosts/common/features/hyprland.nix
+++ b/hosts/common/features/hyprland.nix
@@ -2,7 +2,8 @@
 let
   tuigreet = "${pkgs.greetd.tuigreet}/bin/tuigreet";
   hyprland-session = "${pkgs.hyprland}/share/wayland-sessions";
-in {
+in
+{
   programs.hyprland.enable = true;
 
   environment.systemPackages = [ pkgs.hyprcursor ];
@@ -11,8 +12,7 @@ in {
     enable = true;
     settings = {
       default_session = {
-        command =
-          "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}";
+        command = "${tuigreet} --time --remember --remember-session --sessions ${hyprland-session}";
         user = "greeter";
       };
     };
diff --git a/hosts/common/features/networking.nix b/hosts/common/features/networking.nix
index 47fe91c..49d7255 100644
--- a/hosts/common/features/networking.nix
+++ b/hosts/common/features/networking.nix
@@ -1,3 +1,8 @@
-{ inputs, pkgs, ... }: {
-  networking = { networkmanager = { enable = true; }; };
+{ inputs, pkgs, ... }:
+{
+  networking = {
+    networkmanager = {
+      enable = true;
+    };
+  };
 }
diff --git a/hosts/common/features/nvidia.nix b/hosts/common/features/nvidia.nix
index f35d12c..0d5f8ef 100644
--- a/hosts/common/features/nvidia.nix
+++ b/hosts/common/features/nvidia.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   hardware.opengl.enable = true;
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia = {
diff --git a/hosts/common/features/pipewire.nix b/hosts/common/features/pipewire.nix
index fcbb1ad..d8e4a5b 100644
--- a/hosts/common/features/pipewire.nix
+++ b/hosts/common/features/pipewire.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }:
+{
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
diff --git a/hosts/common/features/syncthing.nix b/hosts/common/features/syncthing.nix
index 50f387e..4e5d9b0 100644
--- a/hosts/common/features/syncthing.nix
+++ b/hosts/common/features/syncthing.nix
@@ -1 +1,4 @@
-{ pkgs, ... }: { environment.systemPackages = [ pkgs.syncthing ]; }
+{ pkgs, ... }:
+{
+  environment.systemPackages = [ pkgs.syncthing ];
+}
diff --git a/hosts/common/global/cli-tools.nix b/hosts/common/global/cli-tools.nix
index a24a6e5..97096bb 100644
--- a/hosts/common/global/cli-tools.nix
+++ b/hosts/common/global/cli-tools.nix
@@ -1,4 +1,5 @@
-{ inputs, pkgs, ... }: {
+{ inputs, pkgs, ... }:
+{
   environment.systemPackages = [
     pkgs.btop
     pkgs.fzf
diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix
index cc92e69..25ce4cb 100644
--- a/hosts/common/global/default.nix
+++ b/hosts/common/global/default.nix
@@ -1,4 +1,5 @@
-{ inputs, pkgs, ... }: {
+{ inputs, pkgs, ... }:
+{
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./nix.nix
@@ -6,9 +7,15 @@
     ./ssh.nix
   ];
 
-  environment.systemPackages = [ pkgs.home-manager pkgs.zsh pkgs.asdf-vm ];
+  environment.systemPackages = [
+    pkgs.home-manager
+    pkgs.zsh
+    pkgs.asdf-vm
+  ];
 
-  time = { timeZone = "Europe/Lisbon"; };
+  time = {
+    timeZone = "Europe/Lisbon";
+  };
 
   i18n = {
     defaultLocale = "en_US.UTF-8";
diff --git a/hosts/common/global/nix.nix b/hosts/common/global/nix.nix
index 63f3f50..47ebf9c 100644
--- a/hosts/common/global/nix.nix
+++ b/hosts/common/global/nix.nix
@@ -1,9 +1,21 @@
-{ inputs, lib, nixpkgs, ... }: {
+{
+  inputs,
+  lib,
+  nixpkgs,
+  ...
+}:
+{
   nix = {
     settings = {
-      trusted-users = [ "'root" "@wheel" ];
+      trusted-users = [
+        "'root"
+        "@wheel"
+      ];
       auto-optimise-store = lib.mkDefault true;
-      experimental-features = [ "nix-command" "flakes" ];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
       warn-dirty = false;
     };
     gc = {
diff --git a/hosts/common/global/ssh.nix b/hosts/common/global/ssh.nix
index 31d58e0..eefe655 100644
--- a/hosts/common/global/ssh.nix
+++ b/hosts/common/global/ssh.nix
@@ -1 +1,4 @@
-{ inputs, pkgs, ... }: { environment.systemPackages = [ pkgs.openssh ]; }
+{ inputs, pkgs, ... }:
+{
+  environment.systemPackages = [ pkgs.openssh ];
+}
diff --git a/hosts/common/main-programs.nix b/hosts/common/main-programs.nix
index 54a5fcb..031a352 100644
--- a/hosts/common/main-programs.nix
+++ b/hosts/common/main-programs.nix
@@ -1,4 +1,5 @@
-{ inputs, pkgs, ... }: {
+{ inputs, pkgs, ... }:
+{
   environment.systemPackages = [
     # desktop apps
     pkgs.google-chrome
diff --git a/hosts/live/default.nix b/hosts/live/default.nix
index fa63cbb..8621c23 100644
--- a/hosts/live/default.nix
+++ b/hosts/live/default.nix
@@ -1,4 +1,12 @@
-{ inputs, pkgs, modulesPath, nixpkgs, lib, ... }: {
+{
+  inputs,
+  pkgs,
+  modulesPath,
+  nixpkgs,
+  lib,
+  ...
+}:
+{
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   imports = [
     (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")