From e7e1fa8e517da443af24e20225fe1bcdde96c330 Mon Sep 17 00:00:00 2001
From: stitchy <stitchy@stitchy.moe>
Date: Thu, 29 Feb 2024 16:07:01 -0800
Subject: [PATCH] mal

---
 hosts/malachite/hardware-configuration.nix | 75 +++++++++++++++++-----
 users/stitchynyan/default.nix              |  9 +++
 users/stitchynyan/home.nix                 |  3 +
 3 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/hosts/malachite/hardware-configuration.nix b/hosts/malachite/hardware-configuration.nix
index 3f19b0e..fb3dae3 100644
--- a/hosts/malachite/hardware-configuration.nix
+++ b/hosts/malachite/hardware-configuration.nix
@@ -10,27 +10,74 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/8e30bb30-eacf-4d7d-bcec-c2b39982de13";
+  boot.kernelParams = [
+    "loglevel=3"
+    "iommu=pt"
+    "intel_iommu=on"
+  ];
+
+  fileSystems = {
+    "/" =
+      { device = "/dev/disk/by-uuid/8e30bb30-eacf-4d7d-bcec-c2b39982de13";
+        fsType = "btrfs";
+        options = [ "subvol=nix" ];
+      };
+    "/home" = {
+      device = "/dev/disk/by-uuid/8e30bb30-eacf-4d7d-bcec-c2b39982de13";
       fsType = "btrfs";
-      options = [ "subvol=nix" ];
+      options = [ "subvol=homes/stitchymain" ];
     };
-
-  boot.initrd.luks.devices."luksdev".device = "/dev/disk/by-uuid/775b3331-6045-474a-8b9e-523f31a1a8a2";
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/CB12-5062";
-      fsType = "vfat";
-    };
-
-  fileSystems."/nix/store" =
-    { device = "/dev/disk/by-uuid/8e30bb30-eacf-4d7d-bcec-c2b39982de13";
+    "/nix/store" = {
+      device = "/dev/disk/by-uuid/8e30bb30-eacf-4d7d-bcec-c2b39982de13";
       fsType = "btrfs";
       options = [ "subvol=store" ];
     };
+    "/persist" = {
+      device = "/dev/disk/by-uuid/8e30bb30-eacf-4d7d-bcec-c2b39982de13";
+      fsType = "btrfs";
+      options = [ "subvol=@persist" ];
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/CB12-5062";
+      fsType = "vfat";
+    };
+    "/home/stitchynyan/Music" = {
+      device = "/dev/disk/by-uuid/feb8239f-5d09-4184-8e46-52185beaa040";
+      fsType = "btrfs";
+      options = [ "subvol=music/stitchtunes" "x-systemd.automount" ];
+    };
+    "/home/stitchynyan/Pictures" = {
+      device = "/dev/disk/by-uuid/feb8239f-5d09-4184-8e46-52185beaa040";
+      fsType = "btrfs";
+      options = [ "subvol=pictures/stitchpics" "x-systemd.automount" ];
+    };
+    "/home/stitchynyan/Programs/Steam" = {
+      device = "/dev/disk/by-uuid/feb8239f-5d09-4184-8e46-52185beaa040";
+      fsType = "btrfs";
+      options = [ "subvol=games/stitchgames" "x-systemd.automount" ];
+    };
+    "/home/stitchynyan/Videos" = {
+      device = "/dev/disk/by-uuid/feb8239f-5d09-4184-8e46-52185beaa040";
+      fsType = "btrfs";
+      options = [ "subvol=videos/stitchshows" "x-systemd.automount" ];
+    };
+    "/home/stitchynyan/VirtualMachines" = {
+      device = "/dev/disk/by-uuid/feb8239f-5d09-4184-8e46-52185beaa040";
+      fsType = "btrfs";
+      options = [ "subvol=virtualmachines/stitchvms" "x-systemd.automount" ];
+    };
+  };
+
+  boot.initrd.luks.devices."luksdev".device = "/dev/disk/by-uuid/775b3331-6045-474a-8b9e-523f31a1a8a2";
+
+  environment.etc."crypttab".text = ''
+    data /dev/disk/by-uuid/15510fe2-5b98-4148-8710-deb8f5bd68e6 /persist/secrets/drive.key
+  '';
 
   swapDevices = [ ];
 
+  services.xserver.videoDrivers = ["nvidia"];
+
   hardware = { 
     opengl = {
       enable = true;
@@ -44,8 +91,6 @@
     };
   };
 
-  
-
   networking.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/users/stitchynyan/default.nix b/users/stitchynyan/default.nix
index fa0e59b..3ba4b90 100644
--- a/users/stitchynyan/default.nix
+++ b/users/stitchynyan/default.nix
@@ -7,7 +7,16 @@
       "osu-lazer"
       "steam"
       "steam-original"
+      "steam-run"
+      "nvidia-x11"
+      "nvidia-settings"
+      "cudatoolkit"
       ];
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+  };
+  hardware.steam-hardware.enable = true;
 
   programs = {
     hyprland.enable = true;
diff --git a/users/stitchynyan/home.nix b/users/stitchynyan/home.nix
index 13ca684..0a563c0 100644
--- a/users/stitchynyan/home.nix
+++ b/users/stitchynyan/home.nix
@@ -45,6 +45,9 @@
     qt5ct
     qt6ct
     mpv
+    #steamvr?
+    procps
+    usbutils
   ];
   #programs.hyprland.enable = true;
   # hyprland.homeManagerModules.default