diff --git a/flake.nix b/flake.nix
index 5d84fee..0406252 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,7 +61,7 @@
 
       perSystem = { system, pkgs, ... }:
         rec {
-          formatter = pkgs.nixpkgs-fmt;
+          formatter = pkgs.nixfmt-rfc-style;
           devShells.default = with pkgs; mkShell {
             packages = [
               nixd
diff --git a/hosts/default.nix b/hosts/default.nix
index bf35728..6518fe0 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -5,6 +5,7 @@ let
   commonModules = [
     ./nvim.nix
     ./nix.nix
+    ./modules/zsh
     {
       _module.args = globalArgs;
     }
diff --git a/hosts/desktop-pkgs.nix b/hosts/desktop-pkgs.nix
index 30fe052..df66e3c 100644
--- a/hosts/desktop-pkgs.nix
+++ b/hosts/desktop-pkgs.nix
@@ -36,6 +36,7 @@
     liberation_ttf
   ];
 
+
   programs = {
     git.enable = true;
 
@@ -46,17 +47,6 @@
       };
     };
 
-    zsh = {
-      enable = true;
-      histSize = 30000;
-      enableBashCompletion = true;
-      enableCompletion = true;
-      autosuggestions = {
-        enable = true;
-        highlightStyle = "fg=yellow,bold";
-      };
-    };
-
     adb.enable = true;
     gamemode.enable = true;
   };
diff --git a/hosts/hina/default.nix b/hosts/hina/default.nix
index 2c2c939..814b0f6 100644
--- a/hosts/hina/default.nix
+++ b/hosts/hina/default.nix
@@ -16,7 +16,6 @@
     extraGroups = [ "wheel" ];
     openssh.authorizedKeys.keys = conf.network.commonSSHKeys;
   };
-  programs.zsh.enable = true;
 
   system.stateVersion = "21.11";
 }
diff --git a/hosts/marisa/default.nix b/hosts/marisa/default.nix
index c78728a..45736b6 100644
--- a/hosts/marisa/default.nix
+++ b/hosts/marisa/default.nix
@@ -14,7 +14,6 @@
     extraGroups = [ "wheel" ];
     openssh.authorizedKeys.keys = conf.network.commonSSHKeys;
   };
-  programs.zsh.enable = true;
 
   time.timeZone = "Asia/Kolkata";
   system.stateVersion = "21.05";
diff --git a/hosts/modules/zsh/default.nix b/hosts/modules/zsh/default.nix
new file mode 100644
index 0000000..51f134a
--- /dev/null
+++ b/hosts/modules/zsh/default.nix
@@ -0,0 +1,13 @@
+{ ... }:
+{
+  programs.zsh = {
+    enable = true;
+    histSize = 30000;
+    enableBashCompletion = true;
+    enableCompletion = true;
+    autosuggestions = {
+      enable = true;
+      highlightStyle = "fg=yellow,bold";
+    };
+  };
+}
diff --git a/hosts/remilia/default.nix b/hosts/remilia/default.nix
index 4319a1f..d3378dd 100644
--- a/hosts/remilia/default.nix
+++ b/hosts/remilia/default.nix
@@ -17,7 +17,6 @@
     extraGroups = [ "wheel" ];
     openssh.authorizedKeys.keys = conf.network.commonSSHKeys;
   };
-  programs.zsh.enable = true;
 
   system.stateVersion = "21.11";
 }
diff --git a/hosts/suwako/default.nix b/hosts/suwako/default.nix
index 1137199..1bb72b3 100644
--- a/hosts/suwako/default.nix
+++ b/hosts/suwako/default.nix
@@ -17,7 +17,5 @@
     openssh.authorizedKeys.keys = conf.network.commonSSHKeys;
   };
 
-  programs.zsh.enable = true;
-
   system.stateVersion = "24.05";
 }