idk a bunch of things

got the merge working

hosts/modules/colmena.nix

@@ -1,20 +0,0 @@
-{}: {
-  # Colmena's latest stable version is
-  # unusable so get latest unstable version.
-  colmena = let
-    src = pkgsBuild.fetchFromGitHub {
-      owner = "zhaofengli";
-      repo = "colmena";
-      rev = "47b6414d800c8471e98ca072bc0835345741a56a";
-      sha256 = "rINodqeUuezuCWOnpJgrH7u9vJ86fYT+Dj8Mu8T/IBc=";
-    };
-    flake =
-      pkgsBuild.callPackage "${src}/flake.nix" {
-      };
-  in
-    flake.packages."${system}".colmena;
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    colmena = pkgs.callPackage
-  };
-}

hosts/modules/steam.nix

@@ -52,6 +52,5 @@
     # lutris
 
     bottles
-    heroic
   ];
 }