more of the same

share/amd/default.nix

@@ -33,20 +33,8 @@ in
       };
     };
 
-    # Hardware configs
-    hardware = {
-      # Enable graphics
-      graphics = {
-        enable = true;
-        enable32Bit = true;
-        # extraPackages = [ pkgsVersion.mesa ];
-        # extraPackages32 = [ pkgsVersion.pkgsi686Linux.mesa ];
-      };
-    };
-
     # Configure polkit
-    security.polkit = {
-      # enable = cfg.corectrl.enablePolkit;
+    security.polkit = lib.mkIf cfg.corectrl.enablePolkit {
       extraConfig = ''
         polkit.addRule(function(action, subject) {
           if ((action.id == "org.corectrl.helper.init" ||

share/disko/default-hardware-config.nix

@@ -1,53 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  fileSystems."/" =
-    { device = "none";
-      fsType = "tmpfs";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-label/ESP";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-label/btrfs-root";
-      fsType = "btrfs";
-      options = [ "subvol=nix" "compress=zstd" "noatime" ];
-    };
-
-  fileSystems."/etc" =
-    { device = "/dev/disk/by-label/btrfs-root";
-      fsType = "btrfs";
-      options = [ "subvol=etc" "compress=zstd" "noatime"  ];
-    };
-
-  fileSystems."/var/log" =
-    { device = "/dev/disk/by-label/btrfs-root";
-      fsType = "btrfs";
-      options = [ "subvol=log" "compress=zstd" "noatime"  ];
-    };
-
-  fileSystems."/root" =
-    { device = "/dev/disk/by-label/btrfs-root";
-      fsType = "btrfs";
-      options = [ "subvol=root" "compress=zstd" "noatime"  ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-label/btrfs-root";
-      fsType = "btrfs";
-      options = [ "subvol=home" "compress=zstd" ];
-    };
-
-  swapDevices = [ ];
-}

share/nvidia/default.nix

@@ -44,12 +44,6 @@ in
         # accessible via `nvidia-settings`.
         nvidiaSettings = cfg.nvidiaSettings;
       };
-
-      # Enable graphics
-      graphics = {
-        enable = true;
-        enable32Bit = true;
-      };
     };
 
     # Services configs