diff --git a/hosts/wim/cfg/main.nix b/hosts/wim/cfg/main.nix
deleted file mode 100644
index 05936578..00000000
--- a/hosts/wim/cfg/main.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./security.nix
-  ];
-}
diff --git a/hosts/wim/configuration.nix b/hosts/wim/configuration.nix
index 9d388198..14f67782 100644
--- a/hosts/wim/configuration.nix
+++ b/hosts/wim/configuration.nix
@@ -11,7 +11,7 @@
     ../../modules/proton-bridge.nix
     ../../modules/sddm-wayland.nix
 
-    ./cfg/main.nix
+    ./modules/security.nix
     ./home/main.nix
   ];
 
@@ -22,6 +22,7 @@
       enable = true;
       wifi.backend = "wpa_supplicant";
     };
+    firewall.enable = false;
   };
 
   services = {
diff --git a/hosts/wim/home/dconf.nix b/hosts/wim/home/dconf.nix
index 5b468707..15ffc810 100644
--- a/hosts/wim/home/dconf.nix
+++ b/hosts/wim/home/dconf.nix
@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{ ... }: {
   dconf.settings = {
     "org/virt-manager/virt-manager/connections" = {
       autoconnect = ["qemu:///system"];
diff --git a/hosts/wim/cfg/security.nix b/hosts/wim/modules/security.nix
similarity index 91%
rename from hosts/wim/cfg/security.nix
rename to hosts/wim/modules/security.nix
index d20ffe1a..762e9a7f 100644
--- a/hosts/wim/cfg/security.nix
+++ b/hosts/wim/modules/security.nix
@@ -10,13 +10,6 @@
   };
 
   services.logind.lidSwitch = "lock";
-  services.gnome.gnome-keyring.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  networking.firewall.enable = false;
 
   security.sudo.extraConfig = ''
     Defaults        timestamp_timeout=600
diff --git a/modules/sddm-wayland.nix b/modules/sddm-wayland.nix
index e7fe2fda..81d54404 100644
--- a/modules/sddm-wayland.nix
+++ b/modules/sddm-wayland.nix
@@ -3,25 +3,28 @@
     dracula-theme
   ];
 
-  services.xserver = {
-    enable = true;
-    layout = "ca";
-    displayManager = {
-      sddm = {
-        enable = true;
-        settings = {
-          General = {
-            DisplayServer = "wayland";
-            InputMethod = "";
-          };
-          Wayland.CompositorCommand = "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so";
-          Theme = {
-            Current = "Dracula";
-            CursorTheme = "Dracula-cursors";
-            CursorSize = 24;
+  services = {
+    xserver = {
+      enable = true;
+      layout = "ca";
+      displayManager = {
+        sddm = {
+          enable = true;
+          settings = {
+            General = {
+              DisplayServer = "wayland";
+              InputMethod = "";
+            };
+            Wayland.CompositorCommand = "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so";
+            Theme = {
+              Current = "Dracula";
+              CursorTheme = "Dracula-cursors";
+              CursorSize = 24;
+            };
           };
         };
       };
     };
+    gnome.gnome-keyring.enable = true;
   };
 }