diff --git a/configuration/hosts/samhain/configuration.nix b/configuration/hosts/samhain/configuration.nix
index 8d4f5f15..3b86913e 100644
--- a/configuration/hosts/samhain/configuration.nix
+++ b/configuration/hosts/samhain/configuration.nix
@@ -26,10 +26,10 @@
 
   services.transmission = {
     enable = true;
-    home = "/disk/BigEXT/transmission";
+    home = "/disk/pool-raw/transmission";
     settings = {
-      download-dir = "/disks/BigEXT/Share/";
-      incomplete-dir = "/disks/BigEXT/Share/.incomplete";
+      download-dir = "/disks/pool-raw/Public/Media/";
+      incomplete-dir = "/disks/pool-raw/Public/Media/.incomplete";
       incomplete-dir-enabled = true;
       rpc-bind-address = "0.0.0.0";
       rpc-whitelist = "127.0.0.1,192.168.1.*";
@@ -41,8 +41,8 @@
     securityType = "user";
     extraConfig = ''
       workgroup = WORKGROUP
-      server string = smbnix
-      netbios name = smbnix
+      server string = samhain
+      netbios name = samhain
       security = user 
       #use sendfile = yes
       #max protocol = smb2
@@ -53,7 +53,7 @@
     '';
     shares = {
       public = {
-        path = "/disks/BigEXT/Share";
+        path = "/disks/pool-raw/Public";
         browseable = "yes";
         "read only" = "no";
         "guest ok" = "yes";
diff --git a/configuration/hosts/samhain/hardware-configuration.nix b/configuration/hosts/samhain/hardware-configuration.nix
index 2d879d1c..40145538 100644
--- a/configuration/hosts/samhain/hardware-configuration.nix
+++ b/configuration/hosts/samhain/hardware-configuration.nix
@@ -4,43 +4,54 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
+  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 = "zroot/safe/root";
+      fsType = "zfs";
+    };
 
-  fileSystems."/home" = {
-    device = "zroot/safe/home";
-    fsType = "zfs";
-  };
+  fileSystems."/home" =
+    { device = "zroot/safe/home";
+      fsType = "zfs";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/50C3-BE99";
-    fsType = "vfat";
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/50C3-BE99";
+      fsType = "vfat";
+    };
 
-  # fileSystems."/disks/BigExfat" =
-  #   { device = "/dev/disk/by-uuid/5F0E-F368";
-  #     fsType = "exfat";
-  #   };
+  fileSystems."/disks/BigEXT" =
+    { device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291";
+      fsType = "ext4";
+    };
 
-  fileSystems."/disks/BigEXT" = {
-    device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291";
-    fsType = "ext4";
-  };
+  boot.initrd.luks.devices."mewmapper".device = "/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db";
 
-  boot.initrd.luks.devices."mewmapper".device =
-    "/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db";
+  fileSystems."/disks/pool-compress" =
+    { device = "zstore/compress";
+      fsType = "zfs";
+    };
+
+  fileSystems."/disks/pool-raw" =
+    { device = "zstore/raw";
+      fsType = "zfs";
+    };
+
+  fileSystems."/disks/pool-protect" =
+    { device = "zstore/protect";
+      fsType = "zfs";
+    };
 
   swapDevices =
-    [{ device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }];
+    [ { device = "/dev/disk/by-uuid/88595373-9566-401b-8c9b-03bbc8314f1b"; }
+    ];
 
 }
diff --git a/configuration/profiles/common/default.nix b/configuration/profiles/common/default.nix
index 0a4bad80..48401235 100644
--- a/configuration/profiles/common/default.nix
+++ b/configuration/profiles/common/default.nix
@@ -5,13 +5,17 @@ let
     url = "https://github.com/nix-community/home-manager";
     rev = "a98ec6ec158686387d66654ea96153ec06be33d7";
   };
+  nixpkgs-master = import
+    (fetchTarball "https://github.com/NixOS/nixpkgs/archive/master.tar.gz") {
+     config.allowUnfree = true;
+   };
 in {
   imports = [ ../../../modules "${home-manager}/nixos" ./pbb.nix ./users.nix ];
 
   nixpkgs.overlays =
     [ (self: super: import ../../../pkgs { nixpkgs = super.path; }) ];
 
-  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+  #boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
   #boot.kernelParams = [ "quiet" ];
 
   nixpkgs.config = { allowUnfree = true; };
diff --git a/configuration/profiles/desktop/default.nix b/configuration/profiles/desktop/default.nix
index 961f6e51..a3e06084 100644
--- a/configuration/profiles/desktop/default.nix
+++ b/configuration/profiles/desktop/default.nix
@@ -17,6 +17,7 @@ in {
       nixpkgs-master.pkgs.syncplay
       nixpkgs-master.pkgs.youtube-dl
       nixpkgs-master.google-chrome
+      pkgs.v4l-utils
       pkgs.transmission-gtk
       pkgs.jdk11
       pkgs.lm_sensors