diff --git a/modules/home/de/hyprland/classic.nix b/modules/home/de/hyprland/classic.nix index c750d2b..43d1c62 100644 --- a/modules/home/de/hyprland/classic.nix +++ b/modules/home/de/hyprland/classic.nix @@ -46,7 +46,6 @@ # Manage session bindrl = SUPER CONTROL, L, exec, loginctl lock-session - bindrl = SUPER CONTROL, S, exec, systemctl sleep ''; }; } diff --git a/modules/home/de/hyprland/noctalia.nix b/modules/home/de/hyprland/noctalia.nix index fbda85d..8614bcf 100644 --- a/modules/home/de/hyprland/noctalia.nix +++ b/modules/home/de/hyprland/noctalia.nix @@ -36,7 +36,6 @@ # Manage session bindrl = SUPER CONTROL, L, exec, $ipc lockScreen lock - bindrl = SUPER CONTROL, S, exec, $ipc sessionMenu lockAndSuspend ''; }; } diff --git a/modules/home/programs/hyprland/keybinds.nix b/modules/home/programs/hyprland/keybinds.nix index 8586f39..26c5ba8 100644 --- a/modules/home/programs/hyprland/keybinds.nix +++ b/modules/home/programs/hyprland/keybinds.nix @@ -49,6 +49,7 @@ bindrl = SUPER CONTROL, P, exec, poweroff bindrl = SUPER CONTROL, R, exec, reboot bindrl = SUPER CONTROL, H, exec, systemctl hibernate + bindrl = SUPER CONTROL, S, exec, systemctl sleep bindrl = SUPER CONTROL, B, exec, sleep 1 && hyprctl dispatch dpms off # Control media diff --git a/modules/nixos/services/alloy.nix b/modules/nixos/services/alloy.nix index e22a3c5..ab391b6 100644 --- a/modules/nixos/services/alloy.nix +++ b/modules/nixos/services/alloy.nix @@ -11,8 +11,8 @@ in options.custom.services.alloy = { enable = lib.mkEnableOption ""; domain = lib.mkOption { - type = lib.types.nullOr lib.types.nonEmptyStr; - default = null; + type = lib.types.nonEmptyStr; + default = ""; }; port = lib.mkOption { type = lib.types.port; @@ -128,6 +128,6 @@ in }; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = lib.mkIf (cfg.domain != null) cfg.port; + custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; }; } diff --git a/profiles/core.nix b/profiles/core.nix index 53f02d1..7690326 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -73,8 +73,6 @@ console.keyMap = "de-latin1-nodeadkeys"; - security.sudo.extraConfig = "Defaults pwfeedback"; - sops.secrets."seb-password".neededForUsers = true; users = { mutableUsers = false; diff --git a/profiles/workstation.nix b/profiles/workstation.nix index d338f13..9aac853 100644 --- a/profiles/workstation.nix +++ b/profiles/workstation.nix @@ -25,10 +25,6 @@ services = { sound.enable = true; syncthing.enable = true; - alloy = { - enable = true; - domain = null; - }; }; };