mashu: Fix merge issue

hosts/mashu.nix

@@ -62,55 +62,4 @@
       kernelModules = [ "kvm-intel" ];
     };
   };
-
-<<<<<<< HEAD
-    powerManagement = {
-      enable = true;
-      cpuFreqGovernor = "powersave";
-=======
-  services.gnome.gnome-settings-daemon.enable = true;
-  # TODO: phosh 0.10.2 does not grab this. Just set it.
-  services.logind.extraConfig = ''
-      HandlePowerKey=suspend
-    '';
-  services.xserver.libinput.touchpad = {
-    tapping = true;
-    disableWhileTyping = true;
-  };
-
-  # TODO: phosh only allows numerical PINs...
-  users.users.alexander.hashedPassword = lib.mkForce "$5$AkihyU/rnc$MrGVtF2d.2CbURQo2oIWdBdDz1ZLAnKum7BOxhUjh88";
-
-  # TODO: It seems like 0.10.2 does not do this by default. So, as a workaround, start some of these
-  #       myself.
-  systemd.user.services = {
-    gsd-media = {
-      description = "GSD media keys handling";
-      wantedBy = [ "default.target" ];
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${pkgs.gnome.gnome-settings-daemon}/libexec/gsd-media-keys";
-        Restart = "always";
-      };
-    };
-    gsd-power = {
-      description = "GSD media keys handling";
-      wantedBy = [ "default.target" ];
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${pkgs.gnome.gnome-settings-daemon}/libexec/gsd-power";
-        Restart = "always";
-      };
-    };
-  };
-  programs.phosh = {
-    enable = true;
-    phocConfig = {
-      outputs = {
-        "eDP-1" = {
-          scale = 2;
-        };
-      };
-    };
-  };
 }