diff --git a/system/default.nix b/system/default.nix index 1ffbb72..324352a 100755 --- a/system/default.nix +++ b/system/default.nix @@ -137,14 +137,19 @@ }) ]; - security.pam.services.niri.enableGnomeKeyring = config.services.gnome.gnome-keyring.enable; - security.pam.services.swaylock = { - name = "swaylock"; - enableGnomeKeyring = config.services.gnome.gnome-keyring.enable; - gnupg.enable = true; - gnupg.noAutostart = true; + security = { + pam.services = { + niri.enableGnomeKeyring = config.services.gnome.gnome-keyring.enable; + swaylock = { + name = "swaylock"; + enableGnomeKeyring = config.services.gnome.gnome-keyring.enable; + gnupg.enable = true; + gnupg.noAutostart = true; + }; + }; + sudo.wheelNeedsPassword = false; + polkit.enable = true; }; - security.polkit.enable = true; networking.firewall.enable = false; networking.networkmanager.enable = true; documentation.man.enable = true; diff --git a/system/hosts/alien/default.nix b/system/hosts/alien/default.nix index ea98627..849a622 100644 --- a/system/hosts/alien/default.nix +++ b/system/hosts/alien/default.nix @@ -61,21 +61,6 @@ "nvidia" ]; - services.displayManager = { - autoLogin = { - enable = false; - user = "sckova"; - }; - }; - - environment = { - loginShellInit = '' - [[ "$(tty)" = "/dev/tty1" ]] && ./gs.sh - ''; - }; - - security.sudo.wheelNeedsPassword = false; - hardware.nvidia = { modesetting.enable = true; powerManagement.enable = false; @@ -83,13 +68,6 @@ open = false; }; - services.sunshine = { - enable = true; - autoStart = true; - capSysAdmin = true; - openFirewall = true; - }; - # virtualization settings virtualisation = { diff --git a/system/hosts/alien/gs.sh b/system/hosts/alien/gs.sh deleted file mode 100644 index 40cd18b..0000000 --- a/system/hosts/alien/gs.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -set -xeuo pipefail - -gamescopeArgs=( - --adaptive-sync # VRR support - --hdr-enabled - --mangoapp # performance overlay - --rt - --steam -) -steamArgs=( - -pipewire-dmabuf - -tenfoot -) -mangoConfig=( - cpu_temp - gpu_temp - ram - vram -) -mangoVars=( - MANGOHUD=1 - MANGOHUD_CONFIG="$(IFS=,; echo "${mangoConfig[*]}")" -) - -export "${mangoVars[@]}" -exec gamescope "${gamescopeArgs[@]}" -- steam "${steamArgs[@]}" diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix index 61efae0..0154ded 100644 --- a/system/hosts/peach/default.nix +++ b/system/hosts/peach/default.nix @@ -58,6 +58,4 @@ in ''; }; }; - - security.sudo.wheelNeedsPassword = false; }