diff --git a/features/desktopish/default.nix b/features/desktopish/default.nix
index f2fb68c..5e0c017 100644
--- a/features/desktopish/default.nix
+++ b/features/desktopish/default.nix
@@ -10,6 +10,7 @@
     ./autolock.nix
     ./redshift.nix
     ./gnome-things.nix
+    ./guiapps.nix
 
     # WMish things
     ./xmonad
diff --git a/features/desktopish/gnome-things.nix b/features/desktopish/gnome-things.nix
index e76ddc9..d34c689 100644
--- a/features/desktopish/gnome-things.nix
+++ b/features/desktopish/gnome-things.nix
@@ -15,5 +15,4 @@
     gnome-icon-theme
   ];
 
-
 }
diff --git a/features/desktopish/guiapps.nix b/features/desktopish/guiapps.nix
new file mode 100644
index 0000000..a586485
--- /dev/null
+++ b/features/desktopish/guiapps.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  # Apps I use on desktops and laptops
+  environment.systemPackages = with pkgs; [
+    brave
+    vscode
+    nodejs-14_x # Need this for https://nixos.wiki/wiki/Vscode
+  ];
+
+}
diff --git a/features/distributed-build.nix b/features/distributed-build.nix
index 76a1676..8e6639d 100644
--- a/features/distributed-build.nix
+++ b/features/distributed-build.nix
@@ -3,7 +3,7 @@
 # https://nixos.wiki/wiki/Distributed_build
 {
   nix.buildMachines = [{
-    hostName = "ryzen9";
+    hostName = "162.55.241.231";
     system = "x86_64-linux";
     # if the builder supports building for multiple architectures, 
     # replace the previous line by, e.g.,
diff --git a/flake.nix b/flake.nix
index fe1c184..8bf51b3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,10 +59,8 @@
         [
           inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53
           ./features/distributed-build
-          ./features/email
           ./features/desktopish
           ./features/virtualbox.nix
-          ./features/block-socialmedia.nix
           #./features/server-mode.nix
           # ./features/postgrest.nix
         ];
@@ -71,9 +69,8 @@
         [
           inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen
           ./features/distributed-build.nix
-          ./features/email
           ./features/gnome.nix
-          #./features/block-socialmedia.nix
+          ./features/desktopish/guiapps.nix
         ];
       nixosConfigurations.ryzen9 = mkHomeMachine
         ./hosts/ryzen9.nix
diff --git a/home.nix b/home.nix
index afcb695..942bad2 100644
--- a/home.nix
+++ b/home.nix
@@ -154,6 +154,9 @@ rec {
       "p71" = {
         hostname = "192.168.2.25";
       };
+      "ryzen9" = {
+        hostname = "162.55.241.231";
+      };
     };
   };
 
diff --git a/hosts/p71.nix b/hosts/p71.nix
index 4d62ff2..044ea99 100644
--- a/hosts/p71.nix
+++ b/hosts/p71.nix
@@ -60,33 +60,12 @@
   networking.interfaces.wlp4s0.useDHCP = true;
 
   services.openssh.enable = true;
-  services.ipfs = {
-    enable = true;
-    user = "srid";
-  };
   services.netdata.enable = true;
 
   programs = {
     mosh.enable = true;
-    steam.enable = true;
   };
 
-  programs.adb.enable = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    brave
-    mpv
-    nodejs-14_x # Need this for https://nixos.wiki/wiki/Vscode
-    obsidian
-    psmisc
-    ripgrep
-    signal-desktop
-    vscode
-    pulsemixer
-  ];
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.srid = {
     isNormalUser = true;
diff --git a/hosts/x1c7.nix b/hosts/x1c7.nix
index 43ac227..34f9095 100644
--- a/hosts/x1c7.nix
+++ b/hosts/x1c7.nix
@@ -71,15 +71,6 @@
     extraGroups = [ "wheel" "networkmanager" "audio" ]; # Enable ‘sudo’ for the user.
   };
 
-  environment.systemPackages = with pkgs; [
-    brave
-    signal-desktop
-    vscode
-    obsidian
-    inkscape
-    zeroad
-  ];
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave