From 06b95616e269602c996f8a1e7566260b9e6341e4 Mon Sep 17 00:00:00 2001 From: iFargle Date: Sun, 27 Aug 2023 19:50:23 +0900 Subject: [PATCH] Test --- .../hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix | 3 +-- lib/default.nix | 5 ++--- nixos/common/desktops/hyprland/default.nix | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix index aa9c1973..7470b660 100644 --- a/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix +++ b/home-manager/hosts/nixos-laptop/desktops/hyprland/hyprland-conf.nix @@ -262,8 +262,7 @@ swayidle -w \ timeout 60 'swaylock -f' \ timeout 90 'hyprctl dispatch dpms off' \ - timeout 300 'systemctl suspend' \ - timeout 900 'systemctl hibernate' \ + timeout 300 'systemctl suspend-then-hibernate' \ resume 'hyprctl dispatch dpms on' \ before-sleep 'swaylock -f' diff --git a/lib/default.nix b/lib/default.nix index 88922627..2dfe1a6a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -15,9 +15,8 @@ specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu; }; modules = [ ../nixos - inputs.sops-nix.nixosModules.sops # Handle secrets - inputs.lanzaboote.nixosModules.lanzaboote # SecureBoot Configuration - inputs.nur.nixosModules.nur # NixOS User Repository + inputs.sops-nix.nixosModules.sops + inputs.lanzaboote.nixosModules.lanzaboote ] ++ (inputs.nixpkgs.lib.optionals (installer != null) [ installer ]); }; diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix index 3d0b6d56..f8a29cdc 100644 --- a/nixos/common/desktops/hyprland/default.nix +++ b/nixos/common/desktops/hyprland/default.nix @@ -95,7 +95,7 @@ wlogout ranger # TUI file manager xdg-utils # Utilities for better X/Wayland integration - inputs.nixpkgs-wayland.pkgs.wayprompt + wayprompt ]; # Enable sound with pipewire.