3 files changed, 40 insertions, 42 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 1ae7d56..750b22a 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -1,10 +1,6 @@
 # Shinji
 # System configuration for my laptop
-{
-  lib,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./hardware.nix
     ./sops.nix
@@ -13,9 +9,11 @@
 
   # options
   hostName = "shinji";
+  cores = 16;
   monitors = [
     {
       port = "eDP-1";
+      laptop = true;
       scale = 1.25;
       bitdepth = 10;
     }
@@ -41,18 +39,18 @@
   # set power btn to suspend
   services.logind.settings.Login = {
     HandlePowerKey = "suspend";
-    HandeLidSwitch = "suspend";
-    HandeLidSwitchDocked = "suspend";
   };
 
   # logitech mouse udev
-  services.udev.extraRules = lib.fileContents ./42-logitech-unify-permissions.rules;
+  services.udev.packages = [
+    pkgs.solaar-udev-rules
+  ];
 
   # packages
   environment.systemPackages = with pkgs; [
     # wine
     winetricks
-    wineWowPackages.staging
+    wineWow64Packages.staging
     # android
     android-tools
     scrcpy
@@ -64,8 +62,10 @@
 
   # modules
   apps = {
-    astal.enable = true;
+    caelestia.enable = true;
     hyprlock.enable = true;
+    rofi.enable = true;
+    kanshi.enable = true;
     kitty.enable = true;
   };
   browsers = {
@@ -99,5 +99,4 @@
   bluetooth = true;
   network = true;
   tpm = true;
-  hardened = true;
 }
diff --git a/hosts/shinji/hardware.nix b/hosts/shinji/hardware.nix
index b35c2a2..5a32364 100644
--- a/hosts/shinji/hardware.nix
+++ b/hosts/shinji/hardware.nix
@@ -1,6 +1,8 @@
 {
   config,
   inputs,
+  pkgs,
+  lib,
   ...
 }: {
   # external defaults
@@ -44,6 +46,34 @@
   hardware.enableRedistributableFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
 
+  # nvidia
+  services.xserver.videoDrivers = ["modesetting" "nvidia"];
+  hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement = {
+      enable = false;
+      finegrained = false;
+    };
+    prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = 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"
+  ];
+
+  # nvidia brokie
+  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_18;
+
   # 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";