From b3dd6afe049356cc7dd6aec4e74d6d2530c8a21c Mon Sep 17 00:00:00 2001
From: Aria Nolan <aria@chytrid.org>
Date: Sun, 29 Oct 2023 21:48:09 -0400
Subject: [PATCH] shits fucked

---
 flake.lock                            | 17 +++++++++++++++++
 flake.nix                             | 10 +++++-----
 hosts/JWST/configuration.nix          |  9 +++++----
 hosts/JWST/hardware-configuration.nix |  5 +++++
 users/tacocat/home.nix                |  1 +
 users/tacocat/wayland/river/init      |  4 ++--
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index ef40545..70cc70d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -108,6 +108,22 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1698053470,
+        "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=",
+        "owner": "NixOs",
+        "repo": "nixos-hardware",
+        "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOs",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1697723726,
@@ -128,6 +144,7 @@
       "inputs": {
         "helix": "helix",
         "home-manager": "home-manager",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
       }
     },
diff --git a/flake.nix b/flake.nix
index 9341a60..8316563 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,7 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nixos-hardware.url = "github:NixOs/nixos-hardware/master";
   };
 
   # pass in the urls defined above
@@ -20,6 +21,7 @@
     nixpkgs,
     home-manager,
     helix,
+    nixos-hardware,
     ...
   }: let
     system = "x86_64-linux";
@@ -45,13 +47,12 @@
       specialArgs = {inherit inputs;};
       modules = [
         ./hosts/JWST/configuration.nix
+        nixos-hardware.nixosModules.dell-xps-15-9520
+        nixos-hardware.nixosModules.common-gpu-nvidia-disable
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
-          home-manager.users."tacocat".modules = [
-            ./users/tacocat/home.nix
-            ./users/tacocat/wayland
-          ];
+          home-manager.users."tacocat" = ./users/tacocat/home.nix;
           home-manager.extraSpecialArgs = {inherit inputs;};
         }
       ];
@@ -63,7 +64,6 @@
       extraSpecialArgs = {inherit inputs;}; # Pass flake inputs to our config
       modules = [
         ./users/tacocat/home.nix
-        ./users/tacocat/wayland
       ];
     };
 
diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix
index cd097c8..ddab13a 100644
--- a/hosts/JWST/configuration.nix
+++ b/hosts/JWST/configuration.nix
@@ -14,7 +14,7 @@
 
   boot.loader = {
     efi.canTouchEfiVariables = true;
-    # efi.efiSysMountPoint = "/boot/efi";
+    efi.efiSysMountPoint = "/boot/efi";
     grub = {
       efiSupport = true;
       configurationLimit = 10;
@@ -68,9 +68,9 @@
 
   hardware.opengl = {
     enable = true;
-    extraPackages = with pkgs; [
-      intel-compute-runtime
-    ];
+    #extraPackages = with pkgs; [
+    #  intel-compute-runtime
+    #];
   };
 
   hardware.opentabletdriver.enable = true;
@@ -87,6 +87,7 @@
   };
 
   programs.river.enable = true;
+  programs.sway.enable = true;
   # programs.river.extraPackages = with pkgs; [
   #   swaylock
   #   swayidle
diff --git a/hosts/JWST/hardware-configuration.nix b/hosts/JWST/hardware-configuration.nix
index f29d999..4b9819c 100644
--- a/hosts/JWST/hardware-configuration.nix
+++ b/hosts/JWST/hardware-configuration.nix
@@ -28,6 +28,11 @@
       fsType = "ext4";
     };
 
+  fileSystems."/boot/efi" = 
+    { device = "/dev/disk/by-uuid/F54B-C04F";
+      fsType = "vfat";
+    };
+
   swapDevices =
     [ { device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f"; }
     ];
diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index 1a24f92..8896677 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -49,6 +49,7 @@
     ./shell
     ./helix
     ./emacs
+    ./wayland
   ];
 
   # Let Home Manager install and manage itself.
diff --git a/users/tacocat/wayland/river/init b/users/tacocat/wayland/river/init
index 8c5637c..a7e4edf 100755
--- a/users/tacocat/wayland/river/init
+++ b/users/tacocat/wayland/river/init
@@ -5,7 +5,7 @@
 
 # Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
 
-riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
+# riverctl spawn "dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND _DISPLAY XDG_CURRENT_DESKTOP=river"
 
 riverctl map normal Super+Shift Return spawn 'kitty --single-instance'
 riverctl map normal Super D spawn 'rofi -show drun'
@@ -177,4 +177,4 @@ else
 fi
 
 # autostart apps
-bash "$HOME/.config/river/process"
+# "$HOME/.config/river/process"