diff --git a/TODO.md b/TODO.md
index 88306c4..905364e 100644
--- a/TODO.md
+++ b/TODO.md
@@ -15,9 +15,10 @@
 - [x] options for YUBIKEY to make more sense and control
 - [x] power profiles solution in waybar
 - [x] auto-cpufreq
+- [x] ssh config module
 - [ ] modularity connected via configuration.nix file with home manager (disable gnome, gnome configuration will be disabled too)
 - [ ] neovim
-- [ ] librewolf and firefox fix
+- [ ] librewolf and firefox fix, extensions and bookmarks in librewolf
 - [ ] graph of my system structure
 - [ ] cleanup hyprland subtools (rofi, hyprlock, waybar)
 - [ ] modularize hyprland config into multiple files
@@ -25,7 +26,7 @@
 - [ ] make static background folder and figure out how to simply manage backgrounds across my devices
 - [ ] NVIDIA options
 - [ ] fix plasma manager and extend gnome configuration
-- [ ] merge shell aliases
+- [ ] nix-on-droid
 
 - [ ] update my home page and create new web
 - [ ] fix kde theme in stylix
diff --git a/ginoza/configuration.nix b/ginoza/configuration.nix
index 84f6752..813f1b7 100644
--- a/ginoza/configuration.nix
+++ b/ginoza/configuration.nix
@@ -67,6 +67,7 @@
       lock-on-remove = false;
       notify = false;
     };
+    ssh.client.enable = false;
   };
 
   # Basic programs to enable
diff --git a/kogami/configuration.nix b/kogami/configuration.nix
index 2529329..b7235f4 100644
--- a/kogami/configuration.nix
+++ b/kogami/configuration.nix
@@ -71,6 +71,7 @@
       lock-on-remove = false;
       notify = true;
     };
+    ssh.client.enable = true;
   };
 
   # Basic programs to enable
@@ -78,13 +79,6 @@
   programs.wireshark.enable = true;
   programs.auto-cpufreq.enable = true;
 
-  programs.ssh.extraConfig = ''
-    Host masaoka
-      HostName 192.168.8.140
-      User foglar
-      IdentityFile ~/.ssh/id_masaoka
-  '';
-
   #services.twingate.enable = true;
 
   # Allow unfree packages
diff --git a/nixos/system/packages.nix b/nixos/system/packages.nix
index aeff4c5..7f00b94 100644
--- a/nixos/system/packages.nix
+++ b/nixos/system/packages.nix
@@ -7,6 +7,7 @@
     ./packages/virtual-machines.nix
     ./packages/yubikey.nix
     ./packages/sops/sops.nix
+    ./packages/ssh-client.nix
   ];
 
   program = {
@@ -22,6 +23,7 @@
       lock-on-remove = lib.mkDefault false;
       notify = lib.mkDefault false;
     };
+    ssh.client.enable = lib.mkDefault true;
   };
   sys.desktop.steamdeck.enable = lib.mkDefault false;
   sys.security.sops.enable = lib.mkDefault true;
diff --git a/nixos/system/packages/ssh-client.nix b/nixos/system/packages/ssh-client.nix
new file mode 100644
index 0000000..8997b44
--- /dev/null
+++ b/nixos/system/packages/ssh-client.nix
@@ -0,0 +1,19 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  options = {
+    program.ssh.client.enable = lib.mkEnableOption "enable SSH client configuration";
+  };
+  config = lib.mkIf config.program.ssh.client.enable {
+    programs.ssh = {
+      extraConfig = ''
+        Host masaoka
+          HostName 192.168.8.140
+          User foglar
+          IdentityFile ~/.ssh/id_masaoka
+      '';
+    };
+  };
+}