diff --git a/hosts/pbp/default.nix b/hosts/pbp/default.nix
index 9f55f75..c160bfa 100644
--- a/hosts/pbp/default.nix
+++ b/hosts/pbp/default.nix
@@ -4,6 +4,6 @@
     ./configuration.nix
   ] ++ suites.base;
 
-  bud.enable = true;
+  bud.enable = false;
   bud.localFlakeClone = "/home/ccr/fleet";
 }
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index 4781df6..b63820f 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -26,7 +26,7 @@ in
       nix-index
       nmap
       ripgrep
-      skim
+      #skim
       tealdeer
       tmux
       usbutils
diff --git a/users/ccr/default.nix b/users/ccr/default.nix
index ad23f44..c0a6bcd 100644
--- a/users/ccr/default.nix
+++ b/users/ccr/default.nix
@@ -25,8 +25,6 @@
       gphoto2
       digikam
       rawtherapee
-      freecad
-      openscad
       deploy-rs.deploy-rs
     ] ++
     (if !stdenv.hostPlatform.isAarch64 then [ wineWowPackages.full ] else [ ])
diff --git a/users/profiles/blender/default.nix b/users/profiles/blender/default.nix
index 053d4bc..1f43e6b 100644
--- a/users/profiles/blender/default.nix
+++ b/users/profiles/blender/default.nix
@@ -1,8 +1,10 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
+    openscad
   ] ++ (if !stdenv.hostPlatform.isAarch64 then [
     blender
+    freecad
   ]
   else [ ]);
 }
diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs/default.nix
index f3f63bd..1db6621 100644
--- a/users/profiles/emacs/default.nix
+++ b/users/profiles/emacs/default.nix
@@ -35,7 +35,6 @@
       fd
       ffmpegthumbnailer
       graphviz-nox
-      haskell-language-server
       hunspell
       hunspellDicts.en_US
       hunspellDicts.it_IT
@@ -59,6 +58,7 @@
       )
     ] ++ (if pkgs.system == "x86_64-linux" then [
       python-language-server
+      haskell-language-server
     ] ++ (with easy-ps; [
       # spago2nix
       nodejs
diff --git a/users/profiles/sway/default.nix b/users/profiles/sway/default.nix
index 5924a84..eae5662 100644
--- a/users/profiles/sway/default.nix
+++ b/users/profiles/sway/default.nix
@@ -57,8 +57,8 @@
               '';
             in
             lib.mkOptionDefault {
-              "${modifier}+x" = "exec ${pkgs.customEmacs}/bin/emacs";
-              "${modifier}+b" = "exec ${pkgs.firefox}/bin/firefox";
+              "${modifier}+x" = "exec emacs";
+              "${modifier}+b" = "exec firefox";
               "${modifier}+s" = "exec ${screenshotScript}";
             };
         };
diff --git a/users/profiles/vscode/default.nix b/users/profiles/vscode/default.nix
index 5ffd529..a7cc608 100644
--- a/users/profiles/vscode/default.nix
+++ b/users/profiles/vscode/default.nix
@@ -29,8 +29,9 @@
   };
 
   home.packages = with pkgs; [
-    haskell-language-server
     stylish-haskell
     ghc
-  ];
+  ] ++ (if pkgs.system == "x86_64-linux" then [
+    haskell-language-server
+  ] else [ ]);
 }