From b11d530780c7b9e4d9cea059338f4075f2449e9c Mon Sep 17 00:00:00 2001
From: zuckerberg <zuckerberg@neet.dev>
Date: Tue, 29 Jun 2021 23:08:01 -0400
Subject: [PATCH] Get ray working

---
 common/pc/de.nix                        |  1 -
 machines/ray/configuration.nix          | 17 ++---------------
 machines/ray/hardware-configuration.nix | 10 +++++-----
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/common/pc/de.nix b/common/pc/de.nix
index f7dc268..0da4bb2 100644
--- a/common/pc/de.nix
+++ b/common/pc/de.nix
@@ -30,7 +30,6 @@ in {
     # Applications
     users.users.googlebot.packages = with pkgs; [
       chromium keepassxc mumble tigervnc bluez-tools vscodium element-desktop mpv
-      libva-utils ffmpeg-full
     ];
 
     # Networking
diff --git a/machines/ray/configuration.nix b/machines/ray/configuration.nix
index ddf8894..6f5dacd 100644
--- a/machines/ray/configuration.nix
+++ b/machines/ray/configuration.nix
@@ -1,28 +1,16 @@
-{ config, pkgs, fetchurl, ... }:
+{ config, pkgs, fetchurl, lib, ... }:
 
 {
   imports = [
     ./hardware-configuration.nix
   ];
 
-  # 2plyinzleibb3r2jfdrzsfflwxsimdfipw2ynbfuueuvydeigwxu2kid.onion
-
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   nix.flakes.enable = true;
 
   efi.enable = true;
 
-  # luks = {
-  #   enable = true;
-  #   device = {
-  #     path = "/dev/disk/by-uuid/fbe946d3-414f-4c2e-bb24-b845870fde6c";
-  #     allowDiscards = true;
-  #   };
-  # };
-
   boot.initrd.luks.devices."enc-pv" = {
-    device = "/dev/disk/by-uuid/fbe946d3-414f-4c2e-bb24-b845870fde6c";
+    device = "/dev/disk/by-uuid/d71ebe1f-7c49-454d-b28b-1dc54cf280e5";
     allowDiscards = true;
   };
 
@@ -31,4 +19,3 @@
   de.enable = true;
   de.touchpad.enable = true;
 }
-
diff --git a/machines/ray/hardware-configuration.nix b/machines/ray/hardware-configuration.nix
index e17866c..b5c977d 100644
--- a/machines/ray/hardware-configuration.nix
+++ b/machines/ray/hardware-configuration.nix
@@ -14,26 +14,26 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/mapper/vg-root";
+    { device = "/dev/disk/by-uuid/4ba62b93-d30e-4638-b68f-c830e6edde48";
       fsType = "btrfs";
       options = [ "subvol=root" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/mapper/vg-root";
+    { device = "/dev/disk/by-uuid/4ba62b93-d30e-4638-b68f-c830e6edde48";
       fsType = "btrfs";
       options = [ "subvol=home" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/CD65-4596";
+    { device = "/dev/disk/by-uuid/8C47-F740";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/b5f28078-9dae-42c2-a21e-54b67954cf82"; }
+    [ { device = "/dev/disk/by-uuid/2aee96fd-5132-480f-a798-c6b87be2ffd9"; }
     ];
 
   # high-resolution display
   hardware.video.hidpi.enable = lib.mkDefault true;
-}
\ No newline at end of file
+}