diff --git a/home/default.nix b/home/default.nix
index 1cc9305..0b55c09 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ ... }:
 {
   home = {
     username = "alexandre";
@@ -7,7 +7,6 @@
   };
 
   nixpkgs.config.allowUnfree = true;
-  nix.gc.automatic = true;
 
   services.ssh-agent.enable = true;
 
@@ -24,7 +23,7 @@
       enable = true;
       enableDefaultConfig = false;
       settings."*" = {
-        addKeysToAgent = "yes";
+        AddKeysToAgent = "yes";
       };
     };
 
@@ -64,10 +63,5 @@
       enable = true;
       enableTransience = true;
     };
-
-    nh = {
-      enable = true;
-      flake = lib.mkDefault "/home/alexandre/workspace/config";
-    };
   };
 }
diff --git a/home/desktop.nix b/home/desktop.nix
index a179174..47b20d4 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -6,20 +6,12 @@
     man-pages
     man-pages-posix
     dbeaver-bin
-    lmstudio
     qbittorrent
     libreoffice
     kdePackages.skanpage
   ];
 
   programs = {
-    nh.flake = "/home/alexandre/Desktop/config";
-
-    firefox = {
-      enable = true;
-      configPath = ".mozilla/firefox";
-    };
-
     ghostty = {
       enable = true;
       systemd.enable = true;
diff --git a/system/shared/default.nix b/system/shared/default.nix
index 5817b2e..7ed7a24 100644
--- a/system/shared/default.nix
+++ b/system/shared/default.nix
@@ -15,7 +15,6 @@
   nix = {
     package = pkgs.lixPackageSets.stable.lix;
     optimise.automatic = true;
-    gc.automatic = true;
     settings.experimental-features = [
       "nix-command"
       "flakes"
@@ -29,7 +28,6 @@
 
   hardware = {
     enableAllFirmware = true;
-
     graphics = {
       enable = true;
       enable32Bit = true;
@@ -41,15 +39,14 @@
 
     tailscale = {
       enable = true;
-      useRoutingFeatures = lib.mkDefault "both";
       openFirewall = true;
+      useRoutingFeatures = "both";
     };
   };
 
   users.users.alexandre = {
     isNormalUser = true;
     description = "Alexandre Hallaine";
-    initialPassword = "changeme";
     shell = pkgs.fish;
     extraGroups = [
       "networkmanager"
@@ -72,5 +69,10 @@
     git.enable = true;
     fish.enable = true;
     nix-ld.enable = true;
+
+    nh = {
+      enable = true;
+      clean.enable = true;
+    };
   };
 }
diff --git a/system/shared/desktop.nix b/system/shared/desktop.nix
index 268be9c..e079280 100644
--- a/system/shared/desktop.nix
+++ b/system/shared/desktop.nix
@@ -16,7 +16,6 @@
   };
 
   services = {
-    tailscale.useRoutingFeatures = "client";
     displayManager.sddm.enable = true;
     desktopManager.plasma6.enable = true;
 
@@ -46,14 +45,8 @@
   programs = {
     yubikey-manager.enable = true;
     virt-manager.enable = true;
-    partition-manager.enable = true;
     zoom-us.enable = true;
-    gamemode.enable = true;
-
-    steam = {
-      enable = true;
-      gamescopeSession.enable = true;
-    };
+    steam.enable = true;
   };
 
   environment.systemPackages = with pkgs; [