diff --git a/modules/common.nix b/modules/common.nix
index 7bea49c..b001c44 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -12,7 +12,7 @@
     initrd = {
       luks.devices = {
         "root" = {
-          device = "/dev/sda1"; # Change to your actual encrypted partition
+          device = "/dev/sda1"; # Encrypted root partition
           preLVM = true;
           allowDiscards = true; # Enable if using an SSD with TRIM support
         };
@@ -20,34 +20,36 @@
       systemd.enable = true; # Required for LUKS support
       availableKernelModules = [ "dm-crypt" "dm-mod" "ext4" ]; # Required for LUKS support
     };
-    kernelParams = [ "root=/dev/mapper/root" "cryptdevice=/dev/sda1:root" ]; # Required for LUKS support
+    
+    # Kernel parameters for root and cryptsetup
+    kernelParams = [ "root=/dev/mapper/root" "cryptdevice=/dev/sda1:root" ];
   };
 
   # File systems
   fileSystems."/" = {
-    device = "/dev/sda1"; # LUKS unlocked device
+    device = "/dev/mapper/root"; # LUKS unlocked device
     fsType = "ext4";
   };
 
   # EFI partition mount (usually /boot or /boot/efi)
   fileSystems."/boot" = {
-    device = "/dev/sda2"; # Change to your actual EFI partition
+    device = "/dev/sda2"; # EFI partition
     fsType = "vfat";
     options = [ "nofail" "defaults" ];
   };
 
-  swapDevices = [{ device = "/swapfile"; size = 4096; }];
+  # Swap file (4GB)
+  swapDevices = [
+    {
+      device = "/swapfile";
+      size = 4096; # 4GB
+    }
+  ];
 
-  # Locales and timezone
+  # Locale and timezone
   time.timeZone = "Europe/London";
   i18n.defaultLocale = "en_GB.UTF-8";
 
-  # UFW Firewall
-  networking.firewall = {
-    enable = true;
-    allowedTCPPorts = [ 22 ]; # Allow SSH
-  };
-
   # Enable SSH
   services.openssh = {
     enable = true;
@@ -56,4 +58,16 @@
       PasswordAuthentication = false;
     };
   };
+
+  # Enable Docker
+  virtualisation.docker.enable = true;
+
+  # PipeWire for audio
+  services.pipewire = {
+    enable = true;
+    pulse.enable = true;
+  };
+
+  # Bluetooth
+  services.blueman.enable = true;
 }
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index 49d80dd..6635cbe 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -22,6 +22,10 @@
     spotify-player
     bitwarden
     freshfetch # Fetch utility
-    cryptsetup # LUKS support
+    git
+    cryptsetup
+    parted
+    vim
+    htop
   ];
 }
diff --git a/modules/networking.nix b/modules/networking.nix
index 0431ef8..de6d020 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -10,6 +10,10 @@
         };
       };
     };
+    firewall = {
+      enable = true;
+      allowedTCPPorts = [ 22 ]; # Allow SSH
+    };
     useDHCP = true;
   };
 }