9 files changed, 63 insertions, 26 deletions
diff --git a/hosts/kaworu/default.nix b/hosts/kaworu/default.nix
index 5056512..940f3fc 100644
--- a/hosts/kaworu/default.nix
+++ b/hosts/kaworu/default.nix
@@ -1,6 +1,6 @@
 # Kaworu
 # System configuration for my desktop
-{...}: {
+_: {
   imports = [
     ./hardware.nix
   ];
diff --git a/hosts/kaworu/hardware.nix b/hosts/kaworu/hardware.nix
index 8b49109..c3c9a57 100644
--- a/hosts/kaworu/hardware.nix
+++ b/hosts/kaworu/hardware.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   # bootloader
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi = {
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 34e84ec..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 = {
diff --git a/hosts/shinji/hardware.nix b/hosts/shinji/hardware.nix
index a2953be..5a32364 100644
--- a/hosts/shinji/hardware.nix
+++ b/hosts/shinji/hardware.nix
@@ -1,4 +1,15 @@
-{config, ...}: {
+{
+  config,
+  inputs,
+  pkgs,
+  lib,
+  ...
+}: {
+  # external defaults
+  imports = [
+    inputs.nixos-hardware.nixosModules.lenovo-yoga-7-slim-gen8
+  ];
+
   # bootloader
   boot.loader = {
     efi.canTouchEfiVariables = true;
@@ -21,13 +32,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"];
 
@@ -38,8 +46,37 @@
   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";
 
   # root
   fileSystems."/" = {
@@ -56,6 +93,6 @@
 
   # swap
   swapDevices = [
-    {device = "/dev/disk/by-uuid/57caa02d-8569-43e3-8bf9-09dd6f02b191";}
+    {device = "/dev/disk/by-uuid/8a7ce615-f5c0-4b0c-a9a5-bddf2d6c2ab0";}
   ];
 }
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 3d537c7..5560fb4 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -1,6 +1,6 @@
 # Thinkpad
 #System configuration for my thinkpad
-{...}: {
+_: {
   imports = [
     ./hardware.nix
     ./sops.nix
@@ -11,14 +11,15 @@
   hostName = "thinkpad";
   monitors = [
     {
-      name = "eDP-1";
+      port = "eDP-1";
+      laptop = true;
       scale = 1.0;
     }
   ];
 
   # modules
   apps = {
-    astal.enable = true;
+    caelestia.enable = true;
     hyprlock.enable = true;
     kitty.enable = true;
   };
@@ -38,6 +39,7 @@
   # modules
   battery = true;
   bluetooth = true;
+  network = true;
   fingerprint = true;
   tpm = true;
 }
diff --git a/hosts/thinkpad/hardware.nix b/hosts/thinkpad/hardware.nix
index 95f9ffd..109f6c0 100644
--- a/hosts/thinkpad/hardware.nix
+++ b/hosts/thinkpad/hardware.nix
@@ -1,4 +1,4 @@
-{...}: {
+_: {
   # bootloader
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi = {
diff --git a/hosts/work/default.nix b/hosts/work/default.nix
index 7427945..03ad03a 100644
--- a/hosts/work/default.nix
+++ b/hosts/work/default.nix
@@ -2,9 +2,7 @@
 # System configuration for work vm
 {
   lib,
-  config,
   pkgs,
-  inputs,
   ...
 }: {
   # options
@@ -15,7 +13,7 @@
   # packages
   extraHome = {
     home.packages = with pkgs; [
-      inputs.self.packages.${system}.arcanist
+      arcanist
     ];
 
     programs.git = {
diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix
index 3c60f14..f73eb01 100644
--- a/hosts/wsl/default.nix
+++ b/hosts/wsl/default.nix
@@ -25,7 +25,7 @@
       ]))
     gnumake
     texliveFull
-    inputs.self.packages.${system}.arcanist
+    arcanist
   ];
 
   # wsl ssh key
diff --git a/hosts/shinji/42-logitech-unify-permissions.rules b/pkgs/solaar-udev-rules/42-logitech-unify-permissions.rules
index e52c9b0..e52c9b0 100644
--- a/hosts/shinji/42-logitech-unify-permissions.rules
+++ b/pkgs/solaar-udev-rules/42-logitech-unify-permissions.rules