diff --git a/Makefile b/Makefile
deleted file mode 100644
index c55cabd..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-rebuild-all: rebuild-local rebuild-freun-dev rebuild-apu
-
-rebuild-local:
-	nh os switch sourcehut:~repomaa/NixOS -- --option tarball-ttl 0
-
-rebuild-freun-dev:
-	ssh -t jokke@freun.dev nh os switch sourcehut:~repomaa/NixOS -- --option tarball-ttl 0
-
-rebuild-apu:
-	ssh -t jokke@apu nh os switch sourcehut:~repomaa/NixOS -- --option tarball-ttl 0
-
-evaluate-all: evaluate-radish evaluate-freun-dev evaluate-apu
-
-evaluate-radish:
-	nixos-rebuild dry-build --flake '.#radish' | nom
-
-evaluate-freun-dev:
-	nixos-rebuild dry-build --flake '.#freun-dev' | nom
-
-evaluate-apu:
-	nixos-rebuild dry-build --flake '.#apu' | nom
diff --git a/flake.nix b/flake.nix
index 763a868..0645c68 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,7 +61,15 @@
         perSystem = { pkgs, ... }: {
           devShells.default = pkgs.mkShell {
             packages = with pkgs; [
-              nix-output-monitor
+              (writeShellScriptBin "switch" ''
+                ${nh}/bin/nh os switch .
+              '')
+              (writeShellScriptBin "deploy" ''
+                ${openssh}/bin/ssh -t "$1" nh os switch sourcehut:~repomaa/NixOS -- --option tarball-ttl 0
+              '')
+              (writeShellScriptBin "evaluate" ''
+                ${nix}/bin/nix build --dry-run ".#nixosConfigurations.$1.config.system.build.toplevel" | ${nix-output-monitor}/bin/nom
+              '')
             ];
           };
         };