mirror of
https://github.com/gburd/nix-config.git
synced 2024-07-06 17:57:20 +00:00
change to gnome
This commit is contained in:
parent
2980a96283
commit
2a543acc67
|
@ -1081,11 +1081,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716991068,
|
"lastModified": 1717159533,
|
||||||
"narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=",
|
"narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "25cf937a30bf0801447f6bf544fc7486c6309234",
|
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -63,7 +63,6 @@
|
||||||
{ self
|
{ self
|
||||||
, nix-formatter-pack
|
, nix-formatter-pack
|
||||||
, nixpkgs
|
, nixpkgs
|
||||||
, devshells
|
|
||||||
, ...
|
, ...
|
||||||
} @ inputs:
|
} @ inputs:
|
||||||
let
|
let
|
||||||
|
@ -80,7 +79,7 @@
|
||||||
# .iso images
|
# .iso images
|
||||||
|
|
||||||
# Workstations
|
# Workstations
|
||||||
"gburd@floki" = libx.mkHome { hostname = "floki"; username = "gburd"; desktop = "pantheon"; };
|
"gburd@floki" = libx.mkHome { hostname = "floki"; username = "gburd"; desktop = "gnome"; };
|
||||||
|
|
||||||
# Servers
|
# Servers
|
||||||
};
|
};
|
||||||
|
@ -100,7 +99,7 @@
|
||||||
|
|
||||||
# Workstations
|
# Workstations
|
||||||
# Lenovo Carbon X1 Extreme Gen 5 - x86_64
|
# Lenovo Carbon X1 Extreme Gen 5 - x86_64
|
||||||
floki = libx.mkHost { systemType = "workstation"; hostname = "floki"; username = "gburd"; desktop = "pantheon"; };
|
floki = libx.mkHost { systemType = "workstation"; hostname = "floki"; username = "gburd"; desktop = "gnome"; };
|
||||||
|
|
||||||
# Servers
|
# Servers
|
||||||
# Can be executed locally:
|
# Can be executed locally:
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# RAM: 32GB DDR5
|
# RAM: 32GB DDR5
|
||||||
# SATA: WD_BLACK SN850X 4TB (624331WD) SSD
|
# SATA: WD_BLACK SN850X 4TB (624331WD) SSD
|
||||||
|
|
||||||
{ inputs, lib, pkgs, ... }:
|
{ inputs, config, lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(import ./disks.nix)
|
(import ./disks.nix)
|
||||||
|
@ -104,4 +104,26 @@
|
||||||
services.fprintd.enable = true;
|
services.fprintd.enable = true;
|
||||||
services.fprintd.tod.enable = true;
|
services.fprintd.tod.enable = true;
|
||||||
services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix;
|
services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix;
|
||||||
|
|
||||||
|
security.pam.services.login.fprintAuth = true;
|
||||||
|
# similarly to how other distributions handle the fingerprinting login
|
||||||
|
security.pam.services.gdm-fingerprint = lib.mkIf (config.services.fprintd.enable) {
|
||||||
|
text = ''
|
||||||
|
auth required pam_shells.so
|
||||||
|
auth requisite pam_nologin.so
|
||||||
|
auth requisite pam_faillock.so preauth
|
||||||
|
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
|
||||||
|
auth optional pam_permit.so
|
||||||
|
auth required pam_env.so
|
||||||
|
auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so
|
||||||
|
auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so
|
||||||
|
|
||||||
|
account include login
|
||||||
|
|
||||||
|
password required pam_deny.so
|
||||||
|
|
||||||
|
session include login
|
||||||
|
session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
|
||||||
|
'';
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
|
|
||||||
# https://github.com/NixOS/nixpkgs/issues/154163#issuecomment-1008362877
|
# https://github.com/NixOS/nixpkgs/issues/154163#issuecomment-1008362877
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(final: super: {
|
(_final: super: {
|
||||||
makeModulesClosure = x:
|
makeModulesClosure = x:
|
||||||
super.makeModulesClosure (x // { allowMissing = true; });
|
super.makeModulesClosure (x // { allowMissing = true; });
|
||||||
})
|
})
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(final: super: {
|
(_final: super: {
|
||||||
makeModulesClosure = x:
|
makeModulesClosure = x:
|
||||||
super.makeModulesClosure (x // { allowMissing = true; });
|
super.makeModulesClosure (x // { allowMissing = true; });
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue