From cc9a943a04cdb885fc384f7aa7acfed31a2ea8dd Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Tue, 30 Jul 2024 19:41:21 -0500
Subject: [PATCH] oops

---
 nixos/modules/nixos/de/gnome.nix                |  1 +
 nixos/modules/nixos/default.nix                 | 11 +++++------
 nixos/modules/nixos/hardware/nvidia/default.nix |  4 ++--
 nixos/modules/nixos/services/podman/default.nix |  2 +-
 nixos/modules/nixos/system/samba/default.nix    |  5 ++---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/nixos/de/gnome.nix b/nixos/modules/nixos/de/gnome.nix
index 6eee784..dae3777 100644
--- a/nixos/modules/nixos/de/gnome.nix
+++ b/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; };
     };
diff --git a/nixos/modules/nixos/default.nix b/nixos/modules/nixos/default.nix
index 7a826dd..a7c1bf5 100644
--- a/nixos/modules/nixos/default.nix
+++ b/nixos/modules/nixos/default.nix
@@ -49,12 +49,11 @@ with lib;
       description = "System purpose";
       default = "Development";
     };
-  };
-
-  monitoring.prometheus.scrapeConfigs = mkOption {
-    type = lib.types.listOf lib.types.attrs;
-    description = "Prometheus scrape targets";
-    default = [ ];
+    monitoring.prometheus.scrapeConfigs = mkOption {
+      type = lib.types.listOf lib.types.attrs;
+      description = "Prometheus scrape targets";
+      default = [ ];
+    };
   };
 
   config = {
diff --git a/nixos/modules/nixos/hardware/nvidia/default.nix b/nixos/modules/nixos/hardware/nvidia/default.nix
index 5cd3cc8..eeb9182 100644
--- a/nixos/modules/nixos/hardware/nvidia/default.nix
+++ b/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;
diff --git a/nixos/modules/nixos/services/podman/default.nix b/nixos/modules/nixos/services/podman/default.nix
index 858e260..3cbcc28 100644
--- a/nixos/modules/nixos/services/podman/default.nix
+++ b/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";
diff --git a/nixos/modules/nixos/system/samba/default.nix b/nixos/modules/nixos/system/samba/default.nix
index 0ff12d4..b811072 100644
--- a/nixos/modules/nixos/system/samba/default.nix
+++ b/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;
       };
     };