diff --git a/configuration.nix b/configuration.nix
index 5e30e1e..0aa6c58 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,10 +8,14 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
+      ./disko-config.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
+  boot.loader.grub.enable = true;
+  boot.loader.grub.efiSupport = true;
+  boot.loader.grub.efiInstallAsRemovable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "ziltis-desktop"; # Define your hostname.
@@ -89,6 +93,7 @@
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
     git
+    gnumake
   ];
 
 
@@ -139,13 +144,6 @@
 
   security.pam.services.swaylock = {};
 
-  fileSystems = {
-    "/".options = [ "compress=zstd" ];
-    "/home".options = [ "compress=zstd" ];
-    "/nix".options = [ "compress=zstd" "noatime" ];
-#    "/swap".options = [ "noatime" ];
-  };
-
   services.btrfs = {
     autoScrub = {
       enable = true;
diff --git a/iso.nix b/iso.nix
index 968c313..5fd82b9 100644
--- a/iso.nix
+++ b/iso.nix
@@ -10,5 +10,8 @@
 
   environment.systemPackages = with pkgs; [
     networkmanager
+    git
+    wget
+    gnumake
   ];
 }