diff --git a/flake.nix b/flake.nix
index 0f4c654..a2b7dc3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -163,6 +163,7 @@
               ./nixos_modules/sesar.nix
               ./nixos_modules/pentablet.nix
               ./nixos_modules/steam-link.nix
+              ./nixos_modules/kdeconnect.nix
 
               { home-manager.users.bertof = import ./thor/hm.nix; }
             ];
@@ -184,6 +185,7 @@
               ./nixos_modules/sesar.nix
               ./nixos_modules/pentablet.nix
               ./nixos_modules/steam-link.nix
+              ./nixos_modules/kdeconnect.nix
 
               { home-manager.users.bertof = import ./odin/hm.nix; }
             ];
diff --git a/nixos_modules/kdeconnect.nix b/nixos_modules/kdeconnect.nix
new file mode 100644
index 0000000..def13a3
--- /dev/null
+++ b/nixos_modules/kdeconnect.nix
@@ -0,0 +1,7 @@
+{
+  # networking.firewall = {
+  #   allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
+  #   allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
+  # };
+  programs.kdeconnect.enable = true;
+}
diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix
index d6275d0..34886de 100644
--- a/odin/common_configuration.nix
+++ b/odin/common_configuration.nix
@@ -42,13 +42,6 @@ with lib; {
     # firewall.allowedUDPPorts = [ ... ];
     # Or disable the firewall altogether.
     # firewall.enable = false;
-
-    firewall.allowedTCPPortRanges = [
-      { from = 1714; to = 1764; } # KDEConnect
-    ];
-    firewall.allowedUDPPortRanges = [
-      { from = 1714; to = 1764; } # KDEConnect
-    ];
   };
 
   services.hardware.bolt.enable = true;
diff --git a/odin/hm.nix b/odin/hm.nix
index 72d5646..c247b7d 100644
--- a/odin/hm.nix
+++ b/odin/hm.nix
@@ -115,8 +115,8 @@
     ../hm_modules/helix.nix
     # ../hm_modules/joystickwake.nix
     ../hm_modules/kakoune.nix
-    # ../hm_modules/keepassxc.nix
     ../hm_modules/kdeconnect.nix
+    # ../hm_modules/keepassxc.nix
     ../hm_modules/kitty.nix
     ../hm_modules/lf.nix
     ../hm_modules/libinput-gestures.nix
diff --git a/thor/configuration.nix b/thor/configuration.nix
index 9454640..2a2b695 100644
--- a/thor/configuration.nix
+++ b/thor/configuration.nix
@@ -75,22 +75,6 @@ with lib; {
     };
     networkmanager.enable = true;
     useDHCP = false;
-
-    firewall.allowedTCPPortRanges = [
-      { from = 1714; to = 1764; } # KDEConnect
-    ];
-    firewall.allowedUDPPortRanges = [
-      { from = 1714; to = 1764; } # KDEConnect
-    ];
-
-    firewall.allowedTCPPorts = [
-      27036
-      27037 # Steam remote play
-    ];
-    firewall.allowedUDPPorts = [
-      27031
-      27036 # Steam remote play
-    ];
   };
 
   time.timeZone = "Europe/Rome";