3 files changed, 31 insertions, 38 deletions
diff --git a/hosts/shinji/42-logitech-unify-permissions.rules b/hosts/shinji/42-logitech-unify-permissions.rules
deleted file mode 100644
index e52c9b0..0000000
--- a/hosts/shinji/42-logitech-unify-permissions.rules
+++ /dev/null
@@ -1,31 +0,0 @@
-# This rule was added by Solaar.
-#
-# Allows non-root users to have raw access to Logitech devices.
-# Allowing users to write to the device is potentially dangerous
-# because they could perform firmware updates.
-
-ACTION != "add", GOTO="solaar_end"
-SUBSYSTEM != "hidraw", GOTO="solaar_end"
-
-# USB-connected Logitech receivers and devices
-ATTRS{idVendor}=="046d", GOTO="solaar_apply"
-
-# Lenovo nano receiver
-ATTRS{idVendor}=="17ef", ATTRS{idProduct}=="6042", GOTO="solaar_apply"
-
-# Bluetooth-connected Logitech devices
-KERNELS == "0005:046D:*", GOTO="solaar_apply"
-
-GOTO="solaar_end"
-
-LABEL="solaar_apply"
-
-# Allow any seated user to access the receiver.
-# uaccess: modern ACL-enabled udev
-TAG+="uaccess"
-
-# Grant members of the "plugdev" group access to receiver (useful for SSH users)
-#MODE="0660", GROUP="plugdev"
-
-LABEL="solaar_end"
-# vim: ft=udevrules
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 34e84ec..65222e6 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -3,6 +3,8 @@
 {
   lib,
   pkgs,
+  inputs,
+  system,
   ...
 }: {
   imports = [
@@ -46,7 +48,9 @@
   };
 
   # logitech mouse udev
-  services.udev.extraRules = lib.fileContents ./42-logitech-unify-permissions.rules;
+  services.udev.packages = [
+    inputs.self.packages.${system}.solaar-udev-rules
+  ];
 
   # packages
   environment.systemPackages = with pkgs; [
@@ -64,8 +68,8 @@
 
   # modules
   apps = {
-    astal.enable = true;
-    hyprlock.enable = true;
+    caelestia.enable = true;
+    rofi.enable = true;
     kitty.enable = true;
   };
   browsers = {
@@ -99,4 +103,5 @@
   bluetooth = true;
   network = true;
   tpm = true;
+  hardened = false;
 }
diff --git a/hosts/shinji/hardware.nix b/hosts/shinji/hardware.nix
index f1edca2..1999c83 100644
--- a/hosts/shinji/hardware.nix
+++ b/hosts/shinji/hardware.nix
@@ -30,13 +30,10 @@
   boot.initrd.kernelModules = [
     "vfio_pci"
     "vfio"
-    "vfio_iommu_type1"
   ];
   boot.kernelModules = ["kvm-amd"];
   boot.blacklistedKernelModules = ["nouveau"];
-  boot.kernelParams = [
-    "amd_iommu=on"
-  ];
+  boot.kernelParams = [];
   boot.extraModulePackages = [];
   boot.supportedFilesystems = ["ntfs"];
 
@@ -47,6 +44,28 @@
   hardware.enableRedistributableFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
+  # nvidia
+  services.xserver.videoDrivers = ["nvidia"];
+  hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement = {
+      enable = false;
+      finegrained = false;
+    };
+    prime = {
+      sync.enable = true;
+      amdgpuBusId = "PCI:115:0:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+    open = true;
+    nvidiaSettings = true;
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+  unfreePackages = [
+    "nvidia-x11"
+    "nvidia-settings"
+  ];
+
   # luks device
   boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/ad489bfa-4280-44ea-8ad2-60347b516d60";
   boot.initrd.luks.devices."swap".device = "/dev/disk/by-uuid/550e638d-eade-4d2f-aa39-c38774c91af3";