oops

nixos/modules/nixos/de/gnome.nix

@@ -6,6 +6,7 @@ in
 {
   options = {
     mySystem.de.gnome = {
+      enable = mkEnableOption "GNOME" // { default = true; };
       systrayicons = mkEnableOption "Enable systray icons" // { default = true; };
       gsconnect = mkEnableOption "Enable gsconnect (KDEConnect for GNOME)" // { default = true; };
     };

nixos/modules/nixos/default.nix

@@ -49,13 +49,12 @@ with lib;
       description = "System purpose";
       default = "Development";
     };
-  };
-
     monitoring.prometheus.scrapeConfigs = mkOption {
       type = lib.types.listOf lib.types.attrs;
       description = "Prometheus scrape targets";
       default = [ ];
     };
+  };
 
   config = {
     systemd.tmpfiles.rules = [

nixos/modules/nixos/hardware/nvidia/default.nix

@@ -18,13 +18,13 @@ in
         driSupport32Bit = true;
       };
 
-      hardware.opengl.extraPackages = with pkgs; [
+      opengl.extraPackages = with pkgs; [
         vaapiVdpau
       ];
 
       # This is for the benefit of VSCODE running natively in wayland
 
-      hardware.nvidia = {
+      nvidia = {
 
         # Modesetting is required.
         modesetting.enable = true;

nixos/modules/nixos/services/podman/default.nix

@@ -40,7 +40,7 @@ in
       networking.firewall.interfaces.podman0.allowedUDPPorts = [ 53 ];
 
       # extra user for containers
-      users = {
+      users.users = {
         kah = {
           uid = 568;
           group = "kah";

nixos/modules/nixos/system/samba/default.nix

@@ -18,10 +18,9 @@ in
 
   config = lib.mkIf cfg.enable {
     services = {
-      samaba = {
+      samba = {
         enable = true;
-        inherit (cfg) extraConfig;
-        inherit (cfg) shares;
+        inherit (cfg) extraConfig shares;
         openFirewall = true;
       };
     };