Merge branch 'master' of git.wizbos.club:notgne2/nixfiles

modules/ezpc.nix

@@ -59,14 +59,10 @@ let
 
     # Set some X11 props
     services.xserver = {
-      enable = lib.mkDefault (cfg.gfx == "nvidia");
+      enable = lib.mkDefault false;
       layout = lib.mkDefault "us";
       libinput.enable = true;
-
-      # automatic gfx drivers
-      videoDrivers = mkIf (cfg.gfx != null) [ cfg.gfx ];
     };
-    boot.initrd.kernelModules = mkIf (cfg.gfx != null && cfg.gfx == "amdgpu") [ cfg.gfx ];
     security.pam.services = {
       swaylock.text = ''
         auth include login
@@ -172,19 +168,6 @@ in
       description = "If you use the flatpak Steam instead of NixOS";
     };
 
-    touchscreen = mkOption {
-      type = types.bool;
-      default = false;
-      description = "If this PC has a touchscreen";
-    };
-
-    gfx = mkOption {
-      type = types.nullOr types.str;
-      default = null;
-      description = "Type of your PC's graphics card";
-      example = "intel";
-    };
-
     print = mkOption {
       type = types.bool;
       default = false;
@@ -203,12 +186,6 @@ in
       description = "If this PC has bluetooth support";
     };
 
-    tiling = mkOption {
-      type = types.bool;
-      default = true;
-      description = "If you are based and redpilled, and want a tiling WM (deprecated, default)";
-    };
-
     newWine = mkOption {
       type = types.bool;
       default = false;

modules/workstation.nix

@@ -19,6 +19,7 @@ in
       enable = true;
       driSupport32Bit = true;
       extraPackages = with pkgs; [
+        intel-media-driver
         vaapiIntel
         vaapiVdpau
         libvdpau-va-gl