refactor: get rid of cfg folder in wim

hosts/wim/cfg/main.nix

@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./security.nix
-  ];
-}

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 = {

hosts/wim/home/dconf.nix

@@ -1,6 +1,4 @@
-{ ... }:
-
-{
+{ ... }: {
   dconf.settings = {
     "org/virt-manager/virt-manager/connections" = {
       autoconnect = ["qemu:///system"];

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

modules/sddm-wayland.nix

@@ -3,7 +3,8 @@
     dracula-theme
   ];
 
-  services.xserver = {
+  services = {
+    xserver = {
       enable = true;
       layout = "ca";
       displayManager = {
@@ -24,4 +25,6 @@
         };
       };
     };
+    gnome.gnome-keyring.enable = true;
+  };
 }