2 files changed, 17 insertions, 14 deletions
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 65222e6..750b22a 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -1,12 +1,6 @@
 # Shinji
 # System configuration for my laptop
-{
-  lib,
-  pkgs,
-  inputs,
-  system,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ./hardware.nix
     ./sops.nix
@@ -15,9 +9,11 @@
 
   # options
   hostName = "shinji";
+  cores = 16;
   monitors = [
     {
       port = "eDP-1";
+      laptop = true;
       scale = 1.25;
       bitdepth = 10;
     }
@@ -43,20 +39,18 @@
   # set power btn to suspend
   services.logind.settings.Login = {
     HandlePowerKey = "suspend";
-    HandeLidSwitch = "suspend";
-    HandeLidSwitchDocked = "suspend";
   };
 
   # logitech mouse udev
   services.udev.packages = [
-    inputs.self.packages.${system}.solaar-udev-rules
+    pkgs.solaar-udev-rules
   ];
 
   # packages
   environment.systemPackages = with pkgs; [
     # wine
     winetricks
-    wineWowPackages.staging
+    wineWow64Packages.staging
     # android
     android-tools
     scrcpy
@@ -69,7 +63,9 @@
   # modules
   apps = {
     caelestia.enable = true;
+    hyprlock.enable = true;
     rofi.enable = true;
+    kanshi.enable = true;
     kitty.enable = true;
   };
   browsers = {
@@ -103,5 +99,4 @@
   bluetooth = true;
   network = true;
   tpm = true;
-  hardened = false;
 }
diff --git a/hosts/shinji/hardware.nix b/hosts/shinji/hardware.nix
index 1999c83..5a32364 100644
--- a/hosts/shinji/hardware.nix
+++ b/hosts/shinji/hardware.nix
@@ -1,6 +1,8 @@
 {
   config,
   inputs,
+  pkgs,
+  lib,
   ...
 }: {
   # external defaults
@@ -45,7 +47,7 @@
   hardware.cpu.amd.updateMicrocode = true;
 
   # nvidia
-  services.xserver.videoDrivers = ["nvidia"];
+  services.xserver.videoDrivers = ["modesetting" "nvidia"];
   hardware.nvidia = {
     modesetting.enable = true;
     powerManagement = {
@@ -53,7 +55,10 @@
       finegrained = false;
     };
     prime = {
-      sync.enable = true;
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
       amdgpuBusId = "PCI:115:0:0";
       nvidiaBusId = "PCI:1:0:0";
     };
@@ -66,6 +71,9 @@
     "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";