fixes

home-manager/common.nix

@@ -124,8 +124,6 @@ inputs: all: {
         "gfx.webrender.all" = true;
         "svg.context-properties.content.enabled" = true;
 
-        "reader.color_scheme" = "dark";
-
         # # LibreWolf ruins the user agent making sites unusable without RFP, so use the user agent from RFP manually. This also seems sane for compatibility when using Firefox.
         # "general.useragent.override" = "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0";
         # set the user agent to a _realistic_ user agent because cloudflare keeps sniffing my balls

home-manager/modules/ezpcusr.nix

@@ -71,8 +71,6 @@ in {
       };
     };
 
-    services.wpaperd.enable = true;
-
     # xdg.portal = {
     #   config.niri = {
     #     default = [ "gnome" "gtk" ];
@@ -279,10 +277,6 @@ in {
         colorSchemes = {
           generateTemplatesForPredefined = false;
         };
-        ui = {
-          fontDefault = config.stylix.fonts.sansSerif.name;
-          fontFixed = config.stylix.fonts.monospace.name;
-        };
         dock.enabled = false;
         bar = {
           floating = false;

home-manager/modules/gaming.nix

@@ -10,12 +10,6 @@ in {
   options.gaming = {
     enable = mkEnableOption "Enable gaming stuff";
 
-    newWine = mkOption {
-      type = types.bool;
-      default = false;
-      description = "If you want to include wine-staging as new-wine";
-    };
-
     steamService = mkOption {
       type = types.bool;
       description = "Enable running steam as a service";
@@ -35,48 +29,10 @@ in {
       STAGING_RT_PRIORITY_SERVER = 90;
     };
 
-    home.packages = let
-      newwine = pkgs.winePackages.waylandFull.override {
-        wineBuild = "wineWow";
-        wineRelease = "staging";
-      };
-      newwinetricks = pkgs.winetricks.overrideAttrs (old: rec {
-        pathAdd = "${newwine}/bin:" + old.pathAdd;
-        postInstall = ''
-          sed -i \
-            -e '2i PATH="${pathAdd}"' \
-            "$out/bin/winetricks"
-        '';
-      });
-
-      oldwine = pkgs.wineWowPackages.waylandFull;
-      oldwinetricks = pkgs.winetricks.overrideAttrs (old: rec {
-        pathAdd = "${oldwine}/bin:" + old.pathAdd;
-        postInstall = ''
-          sed -i \
-            -e '2i PATH="${pathAdd}"' \
-            "$out/bin/winetricks"
-        '';
-      });
-    in
-      with pkgs;
+    home.packages = with pkgs;
         [
-          oldwine
-          oldwinetricks
-
           sc-controller
         ]
-        ++ lib.optionals cfg.newWine [
-          (
-            pkgs.runCommand "new-wine-stuff"
-            {} ''
-              mkdir -p $out/bin
-              ln -s ${newwine}/bin/wine $out/bin/new-wine
-              ln -s ${newwine}/bin/winecfg $out/bin/new-winecfg
-              ln -s ${newwinetricks}/bin/winetricks $out/bin/new-winetricks
-            ''
-          )
-        ]
         ++ lib.optional cfg.steamService (pkgs.writeShellScriptBin "steam" "${pkgs.systemd}/bin/systemctl --user start steam");
 
     systemd.user.services.scc = mkIf cfg.scService {

modules/workstation.nix

@@ -15,12 +15,6 @@ in {
       description = "The main user of this PC";
     };
 
-    battery = mkOption {
-      type = types.bool;
-      default = false;
-      description = "If this device has a battery";
-    };
-
     fancyBoot = mkOption {
       type = types.bool;
       default = true;
@@ -68,7 +62,7 @@ in {
     services.thermald.enable = lib.mkDefault true;
 
     # Don't kill the battery
-    services.upower.enable = lib.mkDefault cfg.battery;
+    services.upower.enable = lib.mkDefault true;
 
     # Make battery usage and performance sane
     # hardware.system76.power-daemon.enable = lib.mkDefault true;
@@ -77,29 +71,11 @@ in {
     services.power-profiles-daemon.enable = lib.mkDefault false;
     services.system76-scheduler = {
       enable = lib.mkDefault true;
-      exceptions = lib.mkDefault [
-        "include descends=\"schedtool\""
-        "include descends=\"nice\""
-        "include descends=\"chrt\""
-        "include descends=\"taskset\""
-        "include descends=\"ionice\""
-
-        "schedtool"
-        "nice"
-        "chrt"
-        "ionice"
-
-        "dbus"
-        "dbus-broker"
-        "rtkit-daemon"
-        "taskset"
-        "systemd"
-      ];
     };
     services.tuned = {
       enable = lib.mkDefault true;
       settings.dynamic_tuning = lib.mkDefault true;
-      ppdSettings.battery = lib.mkIf cfg.battery {
+      ppdSettings.battery = {
         balanced = lib.mkDefault "balanced-battery";
         power-saver = lib.mkDefault "laptop-battery-powersave";
       };