diff --git a/Modules/Home/Core/Shell/default.nix b/Modules/Home/Core/Shell/default.nix
index a35bef9..5762a42 100644
--- a/Modules/Home/Core/Shell/default.nix
+++ b/Modules/Home/Core/Shell/default.nix
@@ -5,7 +5,5 @@
     #./nushell.nix
     ./ssh.nix
     ];
-
-   programs.fish.enable = true;
 }
 
diff --git a/Modules/Home/Core/Shell/ssh.nix b/Modules/Home/Core/Shell/ssh.nix
index 65cba32..aef754f 100755
--- a/Modules/Home/Core/Shell/ssh.nix
+++ b/Modules/Home/Core/Shell/ssh.nix
@@ -1,14 +1,26 @@
 { pkgs, config, lib, ... }:
 {
   # // Enable SSHFS service //
-  services.openssh.allowSFTP = true;
-  services.openssh.enable = true;
+  services = {
+   openssh = {
+      enable = true;
+      allowSFTP = true;
+      ports = [ 22 ];
+      settings = {
+        PasswordAuthentication = false;
+        AllowUsers = null; # Allows all users by default. Can be [ "user1" "user2" ]
+        UseDns = true;
+        X11Forwarding = false;
+        PermitRootLogin = "no"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
+    };
+  };
+   autofs = {
+      enable = true;
+      autoMaster = ''
+
+      '';
+    };
+ };
 
   systemd.services.autofs.path = [ pkgs.sshfs ];
-  services.autofs = {
-    enable = true;
-    autoMaster = ''
-      
-    '';
-  };
 }
diff --git a/Modules/Home/Users/config.nix b/Modules/Home/Users/config.nix
index f8712a0..e8f8103 100755
--- a/Modules/Home/Users/config.nix
+++ b/Modules/Home/Users/config.nix
@@ -11,17 +11,21 @@
 time.timeZone = systemSettings.timezone;
 
 # Note this is still broken please check if it is fixed
-# services.localtimed.enable = true;
-# services.automatic-timezoned.enable = true;
-# location.provider = "geoclue2";
-# services.geoclue2.geoProviderUrl = "https://beacondb.net/v1/geolocate";
-i18n.defaultLocale = systemSettings.locale;
+#   services = {
+#     localtimed.enable = true;
+#     automatic-timezoned.enable = true;
+#     geoclue2.geoProviderUrl = "https://beacondb.net/v2/geolocate";
+#   };
+
+#   location.provider = "geoclue2";
+
+  i18n.defaultLocale = systemSettings.locale;
   
-system.stateVersion = "24.11"; # Did you read the comment? - no i did not
+  system.stateVersion = "24.11"; # Did you read the comment? - no i did not
 
-users.users.root.hashedPassword = "!";
-users.users.root.shell = pkgs.shadow; # Disable root login
+  users.users.root.hashedPassword = "!";
+  users.users.root.shell = pkgs.shadow; # Disable root login
 
-services.homed.enable = true;
-services.nscd.enable = true;
+  services.homed.enable = true;
+  services.nscd.enable = true;
 }
diff --git a/Modules/Home/Users/oomfie/users.nix b/Modules/Home/Users/oomfie/users.nix
index 86a7f09..019165a 100755
--- a/Modules/Home/Users/oomfie/users.nix
+++ b/Modules/Home/Users/oomfie/users.nix
@@ -7,4 +7,6 @@
     extraGroups = [ "networkmanager" "wheel" "scanner" "lp" "audio" "docker" ];
     shell = pkgs.${userSettings.sh};
    };
+
+   programs.fish.enable = true;
 }
diff --git a/flake.lock b/flake.lock
index 3415a58..84c1063 100755
--- a/flake.lock
+++ b/flake.lock
@@ -131,11 +131,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1731384210,
-        "narHash": "sha256-tx0rDWEeNIJ+UIAb+4glyknpJai7HU54f8ucUr0GD9E=",
+        "lastModified": 1731470588,
+        "narHash": "sha256-radsH6TieMS9S2+NQgWOV+Md6/Kz7lD+Q1GEmIxvjCY=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "33cbf67f367cf0a1f5c5ecab5877e32cb5796681",
+        "rev": "6cfc4ff20b755e675848c0417da3017a92a206e1",
         "type": "gitlab"
       },
       "original": {
@@ -1127,11 +1127,11 @@
       },
       "locked": {
         "dir": "packaging/nix",
-        "lastModified": 1730836236,
-        "narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=",
+        "lastModified": 1731482559,
+        "narHash": "sha256-anoaUsHmI9b8xRYPzv8XyGLTfiyErtZz2Grrl+37dMQ=",
         "ref": "refs/heads/main",
-        "rev": "90352466d502c40e147cfd11a428dde6c2899ab3",
-        "revCount": 833,
+        "rev": "223cd9e2a5f62a9eede6ab6695b2e522fcf78301",
+        "revCount": 835,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/Open-Wine-Components/umu-launcher/"
diff --git a/flake.nix b/flake.nix
index 80732dd..250ed9b 100755
--- a/flake.nix
+++ b/flake.nix
@@ -83,14 +83,15 @@ inputs = {
     };
 };
 
-#   nixConfig = {
-#     extra-substituters = [
-#       "domain"
-#     ];
-#     extra-trusted-public-keys = [
-#       "randomash:212"
-#     ];
-#   };
+  nixConfig = {
+    extra-substituters = [
+      "https://nix-community.cachix.org"
+      "https://cache.nixos.org/"
+      ];
+    extra-trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
+  };
 
 
 outputs = { self, nixpkgs, nixpkgs-stable, home-manager, arkenfox, lobster, stylix, nixos-generators, lix-module, nix-minecraft, nixos-cosmic, umu, lanzaboote, ... } @ inputs: