Updated config and install script to hopefully work with encryption

modules/common.nix

@@ -2,36 +2,33 @@
 
 {
   # Bootloader: systemd-boot with EFI support
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-    # Kernel parameters for root
-    kernelParams = [ "root=/dev/sda1" ];
+  # Use systemd-boot instead of GRUB
+  boot.loader = {
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+
+  boot.initrd = {
+    supportedFilesystems = [ "ext4" ];
+    luks.devices."cryptroot".device = "/dev/disk/by-partlabel/cryptroot";
   };
 
-  # File systems
   fileSystems."/" = {
-    device = "/dev/sda1"; # root partition
+    device = "/dev/mapper/cryptroot";
     fsType = "ext4";
   };
 
-  # EFI partition mount (usually /boot or /boot/efi)
   fileSystems."/boot" = {
-    device = "/dev/sda2"; # EFI partition
+    device = "/dev/disk/by-partlabel/ESP";
     fsType = "vfat";
-    options = [ "nofail" "defaults" ];
   };
 
-  # Swap file (4GB)
-  swapDevices = [
-    {
-      device = "/swapfile";
-      size = 4096; # 4GB
-    }
-  ];
+  swapDevices = [{
+    device = "/swapfile";
+    size = 4096;
+  }];
 
   # Locale and timezone
   time.timeZone = "Europe/London";

modules/user.nix

@@ -4,7 +4,7 @@
   users.users."luke-else" = {
     isNormalUser = true;
     home = "/home/luke-else";
-    shell = pkgs.bash;
+    shell = pkgs.zsh;
     extraGroups = [ "wheel" "networkmanager" "docker" ];
   };