home-manager/modules/colors.nix

@@ -41,7 +41,6 @@ let
   mustache = scheme: name: src:
     pkgs.stdenv.mkDerivation (
       {
-        # TODO add template name
         name = lib.strings.sanitizeDerivationName name;
         inherit src;
         data = pkgs.writeText "${name}-data" (builtins.toJSON scheme);
@@ -75,11 +74,6 @@ in
       type = types.attrsOf (types.attrsOf types.int);
     };
 
-    base16Split = mkOption {
-      readOnly = true;
-      type = types.attrsOf (types.attrsOf types.str);
-    };
-
     base16 = mkOption {
       readOnly = true;
       type = types.attrsOf types.str;
@@ -203,7 +197,6 @@ in
         # Read only utility attributes
         colors.base16 = cfg.favColors.base16;
         colors.base16Rgb = builtins.mapAttrs hexToRgb cfg.favColors.base16;
-        colors.base16Split = builtins.mapAttrs splitHex cfg.favColors.base16;
 
         # Element
         xdg.configFile."Riot/config.json".text = builtins.toJSON elementConfig;

modules/ezpc.nix

@@ -84,26 +84,23 @@ let
 
         steam-run = steam.run;
 
-        newwine = (pkgs.wineFull.override { wineBuild = "wine64"; wineRelease = "staging"; });
+        newwine = (pkgs.wineFull.override { wineBuild = "wineWow"; wineRelease = "staging"; });
         newwinetricks = pkgs.winetricks.override { wine = newwine; };
 
-        oldwine = (pkgs.wineFull.override { wineBuild = "wine64"; });
+        oldwine = (pkgs.wineFull.override { wineBuild = "wineWow"; });
         oldwinetricks = pkgs.winetricks.override { wine = oldwine; };
       in
       with pkgs; ([
+        steam
+        steam-run
         xlibs.xf86inputjoystick
         oldwine
         oldwinetricks
-      ] ++ (if !cfg.flatSteam then [
-        steam
-        steam-run
         (writeScriptBin "steam-run-native" ''
           #!${pkgs.stdenv.shell}
           ${(steam.override { nativeOnly = true; }).run}/bin/steam-run $@
         '')
-      ] else [
-        # steam-run-native
-      ]) ++ (
+      ] ++ (
         if cfg.newWine then [
           (
             pkgs.runCommand "new-wine-stuff"
@@ -145,12 +142,6 @@ in
       description = "If this PC is used for gaming";
     };
 
-    flatSteam = mkOption {
-      type = types.bool;
-      default = false;
-      description = "If you use the flatpak Steam instead of NixOS";
-    };
-
     touchscreen = mkOption {
       type = types.bool;
       default = false;