diff --git a/configuration/hosts/samhain/hardware-configuration.nix b/configuration/hosts/samhain/hardware-configuration.nix
index 230044c4..338919e9 100644
--- a/configuration/hosts/samhain/hardware-configuration.nix
+++ b/configuration/hosts/samhain/hardware-configuration.nix
@@ -4,49 +4,58 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "zroot/safe/root";
-    fsType = "zfs";
-  };
+  fileSystems."/" =
+    { device = "rpool/safe/root";
+      fsType = "zfs";
+    };
 
-  fileSystems."/home" = {
-    device = "zroot/safe/home";
-    fsType = "zfs";
-  };
+  fileSystems."/home" =
+    { device = "rpool/safe/home";
+      fsType = "zfs";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/50C3-BE99";
-    fsType = "vfat";
-  };
+  fileSystems."/nix" =
+    { device = "rpool/local/nix";
+      fsType = "zfs";
+    };
 
-  fileSystems."/disks/pool-protect" = {
-    device = "zstore/protect";
-    fsType = "zfs";
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/AED6-D0D1";
+      fsType = "vfat";
+    };
 
-  fileSystems."/disks/pool-raw" = {
-    device = "zstore/raw";
-    fsType = "zfs";
-  };
+  fileSystems."/disks/pool-compress" =
+    { device = "zstore/compress";
+      fsType = "zfs";
+    };
 
-  fileSystems."/disks/pool-compress" = {
-    device = "zstore/compress";
-    fsType = "zfs";
-  };
+  fileSystems."/disks/pool-protect" =
+    { device = "zstore/protect";
+      fsType = "zfs";
+    };
 
-  fileSystems."/disks/excess" = {
-    device = "/dev/disk/by-uuid/0af88a48-ccfd-4e54-9652-a5ae7f74e21d";
-    fsType = "xfs";
-  };
+  fileSystems."/disks/pool-raw" =
+    { device = "zstore/raw";
+      fsType = "zfs";
+    };
+
+  fileSystems."/disks/excess" =
+    { device = "/dev/disk/by-uuid/0af88a48-ccfd-4e54-9652-a5ae7f74e21d";
+      fsType = "xfs";
+    };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }];
+    [ { device = "/dev/disk/by-uuid/8f944315-fe1c-4095-90ce-50af03dd5e3f"; }
+      { device = "/dev/disk/by-uuid/89831a0f-93e6-4d30-85e4-09061259f140"; }
+    ];
 
 }
diff --git a/configuration/hosts/samhain/services/torrenting.nix b/configuration/hosts/samhain/services/torrenting.nix
index ab5c254d..07f59b4f 100644
--- a/configuration/hosts/samhain/services/torrenting.nix
+++ b/configuration/hosts/samhain/services/torrenting.nix
@@ -14,7 +14,7 @@
       in {
     enable = true;
     home = "/disks/pool-raw/transmission";
-    downloadDirPermissions = "755";
+    downloadDirPermissions = "777";
     settings = {
       download-dir = "/disks/pool-raw/Public/Media/";
       incomplete-dir = "/disks/pool-raw/Public/Media/.incomplete";
diff --git a/configuration/profiles/common/default.nix b/configuration/profiles/common/default.nix
index 5b27aea4..e2161919 100644
--- a/configuration/profiles/common/default.nix
+++ b/configuration/profiles/common/default.nix
@@ -51,6 +51,7 @@ in {
     rsync
     pv
     progress
+    ffmpeg-full
     bc
     zstd
     file
diff --git a/configuration/profiles/desktop/default.nix b/configuration/profiles/desktop/default.nix
index 5b286eb1..d4b4449e 100644
--- a/configuration/profiles/desktop/default.nix
+++ b/configuration/profiles/desktop/default.nix
@@ -16,20 +16,21 @@ in {
       pkgs.mpv
       pkgs.mumble
       pkgs.vlc
-      nixpkgs-master.pkgs.syncplay
-      nixpkgs-master.pkgs.youtube-dl
+      nixpkgs-master.syncplay
+      nixpkgs-master.youtube-dl
       nixpkgs-master.google-chrome
       pkgs.v4l-utils
       pkgs.transmission-gtk
       pkgs.jdk11
       pkgs.lm_sensors
-      pkgs.discord
+      nixpkgs-master.discord
       pkgs.tdesktop
       pkgs.dino
       pkgs.vegur
       pkgs.nitrogen
       pkgs.terminator
       pkgs.appimage-run
+      pkgs.gparted
       pkgs.scrot
       pkgs.gimp
       pkgs.vscode