treewide: restructure modules

make every module contain config attribute
and if module doesn't use module arguments,
don't make it a function

nix-os/account.nix

@@ -4,6 +4,7 @@
   imports = [
     ./unstable-packages.nix
   ];
+  config = {
     users.users.wroclaw = {
       isNormalUser = true;
       description = "Rafał";
@@ -44,4 +45,5 @@
       dataDir = "/home/wroclaw";
       configDir = "/home/wroclaw/.config/syncthing";
     };
+  };
 }

nix-os/core.nix

@@ -10,6 +10,7 @@
     ./module-overrides.nix
     ./nix.nix
   ];
+  config = {
 
     # kernel
     boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -84,4 +85,5 @@
         8022
       ];
     };
+  };
 }

nix-os/docker.nix

@@ -1,7 +1,8 @@
 { lib, config, pkgs, ... }:
 
 {
-  config.virtualisation.docker = {
+  config = {
+    virtualisation.docker = {
       enable = true;
       enableOnBoot = true;
       storageDriver = if config.fileSystems."/".fsType == "btrfs" then "btrfs" else null;
@@ -14,26 +15,27 @@
         bip = "10.127.0.1/16";
       };
     };
-  config.users.users.indocker = {
+    users.users.indocker = {
       isSystemUser = true;
       hashedPassword = "!";
       uid = 900;
       group = "indocker";
     };
-  config.users.groups.indocker = {
+    users.groups.indocker = {
       gid = 900;
     };
-  config.environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [
       docker-compose
     ];
 
     # Docker enables firewall anyway, let's enable the firewall for it if it's disabled
     # TODO: Apply only when config.networking.firewall is false
-  config.networking.firewall = {
+    networking.firewall = {
       enable = lib.mkOverride 90 true;
       allowedTCPPorts = lib.mkOverride 90 [];
       allowedUDPPorts = lib.mkOverride 90 [];
       allowedTCPPortRanges = lib.mkOverride 90 [{ from = 0; to = 65535;}];
       allowedUDPPortRanges = lib.mkOverride 90 [{ from = 0; to = 65535;}];
     };
+  };
 }

nix-os/locale.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   config = {
     # Set your time zone.

nix-os/nvidia.nix

@@ -1,6 +1,7 @@
 { config, lib, pkgs, ...}:
 
 {
+  config = {
     hardware.graphics = {
       enable = true;
       enable32Bit = true;
@@ -25,4 +26,5 @@
       };
     };
     nixpkgs.config.nvidia.acceptLicense = true;
+  };
 }

nix-os/polkit/disable-shutdown.nix

@@ -1,6 +1,5 @@
-{ ... }:
-
 {
+  config = {
     security.polkit.extraConfig = ''
       polkit.addRule(function(action, subject) {
         polkit.log("action=" + action);
@@ -41,4 +40,5 @@
         };
       });
     '';
+  };
 }

nix-os/razer.nix

@@ -18,6 +18,7 @@
     })
   ];
 
+  config = {
     hardware.openrazer = {
       enable = true;
       users = [
@@ -43,4 +44,5 @@
     environment.systemPackages = with pkgs; [
       polychromatic
     ];
+  };
 }

nix-os/shell.nix

@@ -25,6 +25,8 @@ in
   imports = [
     ./unstable-packages.nix
   ];
+
+  config = {
     environment.systemPackages = with pkgs; [
       aliasDrag
       rangerGit
@@ -158,4 +160,5 @@ in
         };
       };
     };
+  };
 }

nix-os/virtualization.nix

@@ -2,6 +2,7 @@
 { lib, config, pkgs, ... }:
 
 {
+  config = {
     #virtualisation.waydroid.enable = true;
     programs.virt-manager.enable = true;
     virtualisation.libvirtd = {
@@ -13,4 +14,5 @@
         ];
       };
     };
+  };
 }

nix-os/xdg-default-apps.nix

@@ -1,6 +1,5 @@
-{ ... }:
-
 {
+  config = {
     xdg.mime.enable = true;
     xdg.mime.defaultApplications = {
       # Browser
@@ -134,4 +133,5 @@
       "image/xbm" = "qimgv.desktop";
       "image/xpm" = "qimgv.desktop";
     };
+  };
 }