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,25 +3,28 @@
     dracula-theme
   ];
 
-  services.xserver = {
+  services = {
-    enable = true;
+    xserver = {
-    layout = "ca";
+      enable = true;
-    displayManager = {
+      layout = "ca";
-      sddm = {
+      displayManager = {
-        enable = true;
+        sddm = {
-        settings = {
+          enable = true;
-          General = {
+          settings = {
-            DisplayServer = "wayland";
+            General = {
-            InputMethod = "";
+              DisplayServer = "wayland";
-          };
+              InputMethod = "";
-          Wayland.CompositorCommand = "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so";
+            };
-          Theme = {
+            Wayland.CompositorCommand = "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so";
-            Current = "Dracula";
+            Theme = {
-            CursorTheme = "Dracula-cursors";
+              Current = "Dracula";
-            CursorSize = 24;
+              CursorTheme = "Dracula-cursors";
+              CursorSize = 24;
+            };
           };
         };
       };
     };
+    gnome.gnome-keyring.enable = true;
   };
 }