diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index 46e12c8..a49b121 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -9,13 +9,17 @@ [ "nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; - boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ "quiet" "splash" "boot.shell_on_fail" "udev.log_priority=3" "rd.systemd.show_status=auto" + # Improve s2idle sleep behavior on AMD + "rtc_cmos.use_acpi_alarm=1" + "acpi.prefer_microsoft_dsm_guid=1" + "amd_pstate=active" ]; boot.extraModulePackages = [ ]; boot.plymouth = { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 79e5214..6ee3d10 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -27,13 +27,9 @@ in }; desktop = { enable = true; - cosmic.enable = false; - kde.enable = false; crypto.enable = true; - gnome.enable = false; tiler = { enable = true; - hyprland.enable = false; niri.enable = true; }; }; @@ -59,10 +55,12 @@ in # Tailscale services.tailscale.enable = true; services.tailscale.extraDaemonFlags = [ "--statedir=/var/lib/tailscale" ]; - # Desktop Env - services.displayManager.gdm.enable = true; - services.displayManager.gdm.wayland = true; - services.displayManager.defaultSession = "niri"; + # Desktop Env - DankGreeter + programs.dank-material-shell.greeter = { + enable = true; + compositor.name = "niri"; + configHome = "/home/${user.name}"; + }; # home manager - only configure if skyg.user.enable is true home-manager.users.${user.name} = lib.mkIf config.skyg.user.enable { # Add Functions diff --git a/modules/lib.nix b/modules/lib.nix index 15c2e6a..3c9b683 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -27,6 +27,7 @@ let home-manager.nixosModules.default nix-flatpak.nixosModules.nix-flatpak specialArgs.dms.nixosModules.dank-material-shell + specialArgs.dms.nixosModules.greeter specialArgs.nix-index-database.nixosModules.nix-index { programs.nix-index-database.comma.enable = true; } ]; diff --git a/modules/nixos/common/hardware/laptop-power.nix b/modules/nixos/common/hardware/laptop-power.nix index bcbe10d..6fa9700 100644 --- a/modules/nixos/common/hardware/laptop-power.nix +++ b/modules/nixos/common/hardware/laptop-power.nix @@ -53,13 +53,13 @@ in turbo = "auto"; }; }; - systemd.sleep.extraConfig = "HibernateDelaySec=30m"; + systemd.sleep.extraConfig = "HibernateDelaySec=5m"; # Logind services.logind = { settings = { Login = { - HandleLidSwitchExternalPower = "suspend-then-hibernate"; - HandleLidSwitch = "suspend-then-hibernate"; + HandleLidSwitchExternalPower = "hibernate"; + HandleLidSwitch = "hibernate"; HandlePowerKey = "lock"; HandleRFKillKey = "ignore"; };