diff options
| author | Mark Nipper <nipsy@bitgnome.net> | 2025-11-13 10:58:06 -0800 |
|---|---|---|
| committer | Mark Nipper <nipsy@bitgnome.net> | 2025-11-13 10:58:06 -0800 |
| commit | 69b115187e165c7b09248849e3cff0ef3177ccf9 (patch) | |
| tree | f3bdd55ec8e0084bab44ce666d30d9b5b8014cd9 | |
| parent | bc2790ad997853ca3672daadd64d335dc60e8a20 (diff) | |
| download | nix-69b115187e165c7b09248849e3cff0ef3177ccf9.tar nix-69b115187e165c7b09248849e3cff0ef3177ccf9.tar.gz nix-69b115187e165c7b09248849e3cff0ef3177ccf9.tar.bz2 nix-69b115187e165c7b09248849e3cff0ef3177ccf9.tar.lz nix-69b115187e165c7b09248849e3cff0ef3177ccf9.tar.xz nix-69b115187e165c7b09248849e3cff0ef3177ccf9.tar.zst nix-69b115187e165c7b09248849e3cff0ef3177ccf9.zip | |
Revert to xorg @caladan
| -rw-r--r-- | hosts/caladan/default.nix | 4 | ||||
| -rw-r--r-- | hosts/common/optional/services/xorg.nix | 44 |
2 files changed, 28 insertions, 20 deletions
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index 6d55113..20612a4 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -79,8 +79,8 @@ ../common/optional/sdr.nix ../common/optional/services/chrony.nix ../common/optional/services/openssh.nix - ../common/optional/services/wayland.nix - #../common/optional/services/xorg.nix + #../common/optional/services/wayland.nix + ../common/optional/services/xorg.nix ../common/optional/sound.nix ../common/optional/wdt.nix ../common/optional/zfs.nix diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix index d45ebb7..16075bf 100644 --- a/hosts/common/optional/services/xorg.nix +++ b/hosts/common/optional/services/xorg.nix @@ -5,7 +5,7 @@ pkgs.evince pkgs.feh pkgs.gcr - #pkgs.master.geeqie + #pkgs.geeqie pkgs.ghostty pkgs.gimp3 #pkgs.gimp-with-plugins @@ -15,6 +15,7 @@ pkgs.kdePackages.okular pkgs.libreoffice pkgs.libva-utils + pkgs.mangohud pkgs.mesa-demos pkgs.mpv pkgs.polkit_gnome @@ -45,24 +46,31 @@ #package = pkgs.master.firefox; }; - security.polkit = { - enable = true; - extraConfig = '' - polkit.addRule(function(action, subject) { - if ( - subject.isInGroup("users") - && ( - action.id == "org.freedesktop.login1.reboot" || - action.id == "org.freedesktop.login1.reboot-multiple-sessions" || - action.id == "org.freedesktop.login1.power-off" || - action.id == "org.freedesktop.login1.power-off-multiple-sessions" + security = { + pam = { + loginLimits = [ + { domain = "@users"; item = "rtprio"; type = "-"; value = 1; } + ]; + }; + polkit = { + enable = true; + extraConfig = '' + polkit.addRule(function(action, subject) { + if ( + subject.isInGroup("users") + && ( + action.id == "org.freedesktop.login1.reboot" || + action.id == "org.freedesktop.login1.reboot-multiple-sessions" || + action.id == "org.freedesktop.login1.power-off" || + action.id == "org.freedesktop.login1.power-off-multiple-sessions" + ) ) - ) - { - return polkit.Result.YES; - } - }) - ''; + { + return polkit.Result.YES; + } + }) + ''; + }; }; services = { |