update sp-cli, fix gnome login
This commit is contained in:
parent
908f8698b5
commit
8c6e03dccf
3 changed files with 38 additions and 9 deletions
27
flake.lock
generated
27
flake.lock
generated
|
|
@ -158,6 +158,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane_3": {
|
||||
"locked": {
|
||||
"lastModified": 1779130139,
|
||||
"narHash": "sha256-BLrtr42azquO7MdGFU5a7KiMl3YpFlTeIXqy1fT5GlQ=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "edb38893982a3338972bb4a2ec7ce7c29ba10fd9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -886,9 +901,7 @@
|
|||
},
|
||||
"servicepoint-cli": {
|
||||
"inputs": {
|
||||
"naersk": [
|
||||
"naersk"
|
||||
],
|
||||
"crane": "crane_3",
|
||||
"nix-filter": [
|
||||
"nix-filter"
|
||||
],
|
||||
|
|
@ -900,11 +913,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771709842,
|
||||
"narHash": "sha256-zbKj2waitgCFE/I4DcV4lWMRkQ7gDOa9QgPXVTao5+g=",
|
||||
"lastModified": 1779909128,
|
||||
"narHash": "sha256-H1NNRXwM1/tpRY+qDgEpfietLZ83oAbac0CHOD8TxjE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "6c731e3f5ac0fc63e3cf1e727856f3a3327fddfb",
|
||||
"revCount": 52,
|
||||
"rev": "0457966ae9927bad1b0b931b8e09e2c03cdde88d",
|
||||
"revCount": 53,
|
||||
"type": "git",
|
||||
"url": "https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@
|
|||
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
naersk.follows = "naersk";
|
||||
nix-filter.follows = "nix-filter";
|
||||
treefmt-nix.follows = "treefmt-nix";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,11 +13,28 @@
|
|||
config = lib.mkIf config.my.gnome.enable (
|
||||
lib.mkMerge [
|
||||
{
|
||||
# Workaround for GDM 50 + NixOS 26.05: greeter PAM session strips PATH so
|
||||
# gdm-wayland-session can't find `gnome-session` and exits 70.
|
||||
# https://github.com/NixOS/nixpkgs/issues/523332 — drop once #523948 lands.
|
||||
security.pam.services.gdm-launch-environment.rules.session.env-greeter = {
|
||||
control = "required";
|
||||
modulePath = "${config.security.pam.package}/lib/security/pam_env.so";
|
||||
settings.conffile = pkgs.writeText "gdm-launch-environment-env-conf" ''
|
||||
PATH DEFAULT="''${PATH}:${pkgs.gnome-session}/bin"
|
||||
XDG_DATA_DIRS DEFAULT="''${XDG_DATA_DIRS}:/run/current-system/sw/share"
|
||||
'';
|
||||
settings.readenv = 0;
|
||||
order = 12200;
|
||||
};
|
||||
|
||||
services = {
|
||||
xserver.excludePackages = [ pkgs.xterm ];
|
||||
|
||||
# Enable the GNOME Desktop Environment.
|
||||
displayManager.gdm.enable = true;
|
||||
displayManager.gdm = {
|
||||
enable = true;
|
||||
debug = true;
|
||||
};
|
||||
desktopManager.gnome = {
|
||||
enable = true;
|
||||
extraGSettingsOverridePackages = [ pkgs.mutter ];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue