From 74df3dd11fed0563be79e2ef47cd3c6eec150bde Mon Sep 17 00:00:00 2001 From: KaitoTLex Date: Wed, 22 Jan 2025 23:47:07 -0800 Subject: [PATCH] fixxed? --- hosts/kuroko/configuration.nix | 32 +++++++++++++------------------- users/kaitotlex/home.nix | 4 ++++ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/hosts/kuroko/configuration.nix b/hosts/kuroko/configuration.nix index 87f3f5b..8aed561 100644 --- a/hosts/kuroko/configuration.nix +++ b/hosts/kuroko/configuration.nix @@ -19,38 +19,32 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; virtualisation.waydroid.enable = true; - boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelPackages = pkgs.linuxPackages_5_15; #systemdefaults networking.hostName = "kuroko"; # Define your hostname. services.ratbagd.enable = true; hardware.pulseaudio.support32Bit = true; boot.kernelParams = [ - "quiet" - "splash" - "boot.shell_on_fail" - "rd.systemd.show_status=false" - "rd.udev.log_level=3" - "udev.log_priority=3" "mem_sleep_default=deep" ]; - systemd.sleep.extraConfig = '' - AllowSuspend=yes - AllowHibernation=yes - AllowHybridSleep=yes - AllowSuspendThenHibernate=yes - ''; + # systemd.sleep.extraConfig = '' + # AllowSuspend=yes + # AllowHibernation=yes + # AllowHybridSleep=yes + # AllowSuspendThenHibernate=yes + # ''; #Nvidia Hardware begins services.xserver.videoDrivers = [ "nvidia" - # "amdgpu" + "amdgpu" ]; hardware.graphics.enable = true; hardware.graphics.enable32Bit = true; hardware.nvidia = { # custom option defined in graphics/default.nix - usePatchedAquamarine = true; + #usePatchedAquamarine = true; # Modesetting is required. modesetting.enable = lib.mkForce true; @@ -63,7 +57,7 @@ # Fine-grained power management. Turns off GPU when not in use. # Experimental and only works on modern Nvidia GPUs (Turing or newer). - powerManagement.finegrained = lib.mkForce true; + powerManagement.finegrained = lib.mkForce false; # Use the NVidia open source kernel module (not to be confused with the # independent third-party "nouveau" open source driver). @@ -76,7 +70,7 @@ # Enable the Nvidia settings menu, # accessible via `nvidia-settings`. - nvidiaSettings = false; + nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. package = config.boot.kernelPackages.nvidiaPackages.beta; @@ -88,8 +82,8 @@ }; # Make sure to use the correct Bus ID values for your system! #intelBusId = "PCI:"; - nvidiaBusId = "PCI:01:0:0"; - amdgpuBusId = "PCI:08:0:0"; + nvidiaBusId = "PCI:01:00:0"; + amdgpuBusId = "PCI:08:00:0"; }; }; diff --git a/users/kaitotlex/home.nix b/users/kaitotlex/home.nix index 76ba5eb..804c0b5 100644 --- a/users/kaitotlex/home.nix +++ b/users/kaitotlex/home.nix @@ -223,6 +223,10 @@ enable = true; userName = "KaitoTLex"; userEmail = "wlin@kaitotlex.systems"; + signing = { + signByDefault = true; + key = "2AE6771F14386F9B85E48685A9209668BFA39C0E"; + }; }; programs.neovim.defaultEditor = true;