diff --git a/configuration.nix b/configuration.nix
index 52b9565..70efb95 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -13,6 +13,8 @@
       ./docker.nix
       ./hyprland.nix
       ./networking.nix
+      ./gpu.nix
+      ./sunshine.nix
       #./i3.nix
     ];
     
@@ -27,6 +29,9 @@
     "cgroup_enable=cpuset,cpu,cpuacct,blkio,devices,freezer,net_cls,perf_event,net_prio,hugetlb,pids"
   ];
   boot.supportedFilesystems = [ "ntfs" ];
+  services.zfs.autoScrub.enable = true;
+  services.zfs.trim.enable = true;
+
 #  boot.supportedFilesystems = [ "zfs" ];
 #  boot.zfs.forceImportRoot = false;
 #  networking.hostId = "a44f5fde";
@@ -91,7 +96,7 @@
   xdg.portal = {
     enable = true;
     extraPortals = [
-      pkgs.xdg-desktop-portal
+      pkgs.xdg-desktop-portal-hyprland
     ];
   };
 
@@ -103,6 +108,7 @@
 
   # Enable sound with pipewire.
   hardware.pulseaudio.enable = false;
+
   #sound.enable = true;
   services.flatpak.enable = true;
   services.blueman.enable = true;
@@ -166,7 +172,7 @@
 
   hardware.opengl = {
     enable = true;
-    #driSupport = true;
+    driSupport = true;
     #driSupport32Bit = true;
     extraPackages = with pkgs; [
       vulkan-loader
@@ -175,6 +181,8 @@
       intel-media-driver # LIBVA_DRIVER_NAME=iHD
       intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
       libvdpau-va-gl
+      vaapiVdpau
+      mesa.drivers
     ];
   };
 
diff --git a/gpu.nix b/gpu.nix
new file mode 100644
index 0000000..085481e
--- /dev/null
+++ b/gpu.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  hardware.opengl.extraPackages = with pkgs; [
+    rocmPackages.clr.icd
+  ];
+  environment.systemPackages = [
+    pkgs.rocmPackages.rpp
+	];
+
+}
diff --git a/hyprland.nix b/hyprland.nix
index b085a7e..63ef794 100644
--- a/hyprland.nix
+++ b/hyprland.nix
@@ -29,6 +29,8 @@
     xfce.tumbler
     pavucontrol
     wlr-randr
+    libcanberra-gtk3
+    pamixer
     grim
     discocss
     themechanger
diff --git a/mnt.nix b/mnt.nix
index bbf289b..39644ed 100644
--- a/mnt.nix
+++ b/mnt.nix
@@ -1,14 +1,14 @@
-{ pkgs, ... }:
+{... }:
 
 {
   services.rpcbind.enable = true; # needed for NFS
   systemd.mounts = [{
     type = "nfs";
-    mountConfig = {
-      Options = "noatime";
-    };
     what = "10.27.27.239:/BigNAS";
     where = "/mnt/BigNAS";
+    mountConfig = {
+      Options = "noatime,nofail,x-systemd.device-timeout=5s";
+    };
   }];
 
   systemd.automounts = [{
@@ -18,17 +18,13 @@
     };
     where = "/mnt/BigNAS";
   }];
-  fileSystems."/mnt/NV1" = {
-    device = "/dev/disk/by-uuid/a41cc08d-10f2-40dd-b76a-976764a50cea";
+  fileSystems."/mnt/NVME" = {
+    device = "/dev/disk/by-uuid/15b96913-a018-4ecc-950c-b8cf74b93315";
     fsType = "btrfs";
+    options = [ "compress=zstd" "nofail" "x-systemd.device-timeout=5s" ];
   };
   fileSystems."/mnt/ssd2" = {
     device = "/dev/disk/by-uuid/bc0d1423-5682-4150-906f-b1a154a316ea";
     fsType = "btrfs";
   };
-#  fileSystems."/mnt/ntfs" = {
-#    device = "/dev/disk/by-uuid/c51b755c-24d3-11e6-a186-408d5c1ea148";
-#    fsType = "ntfs-3g";
-#    options = ["rw""uid=1000"];
-#  };
 }
diff --git a/networking.nix b/networking.nix
index 2b36f15..1ce2a9b 100644
--- a/networking.nix
+++ b/networking.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ lib, ... }:
 {
   networking = {
     hostName = "hypr-nix";
@@ -8,6 +8,13 @@
       enp0s31f6.useDHCP = true;
     };
   };
-
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 47984 47989 47990 48010 ];
+    allowedUDPPortRanges = [
+      { from = 47998; to = 48000; }
+      { from = 8000; to = 8010; }
+    ];
+  };
   services.tailscale.enable = true;
 }
diff --git a/packages.nix b/packages.nix
index 136bd22..03a63ca 100644
--- a/packages.nix
+++ b/packages.nix
@@ -12,9 +12,11 @@ in
     libsForQt5.kate
     sublime
     lunarvim
-    unstable.zed-editor
+    vscode
+    #unstable.zed-editor
     
     # Development Tools
+    openjdk
     clang-tools
     gcc
     cmake
@@ -41,6 +43,9 @@ in
     unstable.bun
     air
     tailwindcss
+    google-cloud-sdk-gce
+    kubo
+    hashcat
     
     # Version Control
     git
@@ -81,6 +86,7 @@ in
     
     # System Utilities
     htop
+    vault
     btop
     amdgpu_top
     parted
@@ -100,6 +106,8 @@ in
     nitrogen
     pywal
     ldmtool
+    smartmontools
+    gptfdisk
     
     # Window Managers
     i3
@@ -182,6 +190,7 @@ in
     svt-av1
     rav1e
     libaom
+    sunshine
     
     # Miscellaneous
     fastfetch
diff --git a/result b/result
index e0169c5..5ecaf3e 120000
--- a/result
+++ b/result
@@ -1 +1 @@
-/nix/store/4vlpsmid3byi5r6jp0sb7n1lqjhpb895-redot-redot-4.3-beta.2
\ No newline at end of file
+/nix/store/2hqaqfwyqgx9fpfcpwzf1ajj723z7hk6-nixos-system-hypr-nix-24.05.7376.b134951a4c9f
\ No newline at end of file
diff --git a/sunshine.nix b/sunshine.nix
new file mode 100644
index 0000000..7645fc3
--- /dev/null
+++ b/sunshine.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+{
+  services.sunshine = {
+    enable = true;
+    autoStart = true;
+    capSysAdmin = true;
+    openFirewall = true;
+  };
+
+#security.wrappers.sunshine = {
+#        owner = "root";
+#        group = "root";
+#        capabilities = "cap_sys_admin+p";
+#        source = "${pkgs.sunshine}/bin/sunshine";
+# };
+}
+