From 6726deff6217ee319ef52bf7faa778d9c2505f65 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Mon, 1 Apr 2024 18:21:57 -0400 Subject: [PATCH] port flake settings to nix settings Signed-off-by: ahuston-0 --- .../systems/artemision/configuration.nix | 10 ++-- .../alice/systems/artemision/fingerprint.nix | 53 ++++++++++--------- users/alice/systems/configuration.nix | 25 +++++++++ 3 files changed, 59 insertions(+), 29 deletions(-) diff --git a/users/alice/systems/artemision/configuration.nix b/users/alice/systems/artemision/configuration.nix index 99aea47..a01686b 100644 --- a/users/alice/systems/artemision/configuration.nix +++ b/users/alice/systems/artemision/configuration.nix @@ -53,11 +53,11 @@ sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; -# services.fwupd.package = -# (import (builtins.fetchTarball { -# url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz"; -# sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk"; -# }) { inherit (pkgs) system; }).fwupd; + # services.fwupd.package = + # (import (builtins.fetchTarball { + # url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz"; + # sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk"; + # }) { inherit (pkgs) system; }).fwupd; services.fprintd.enable = true; diff --git a/users/alice/systems/artemision/fingerprint.nix b/users/alice/systems/artemision/fingerprint.nix index 0ffda8f..1391756 100644 --- a/users/alice/systems/artemision/fingerprint.nix +++ b/users/alice/systems/artemision/fingerprint.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: # borrowed from https://github.com/NixOS/nixpkgs/issues/171136 # and https://wiki.archlinux.org/title/fprint#Login_configuration @@ -10,27 +15,27 @@ # to generate this its going to look something like this # rg "fprintd" --follow /etc/pam.d | sed -nr 's/\/etc\/pam.d\/(\w+)/\1/p' | cut -d ':' -f 1 | awk '{printf "security.pam.services.%s.rules.auth.fprintd.order=11501;\n",$1}' -security.pam.services.passwd.rules.auth.fprintd.order=11501; -security.pam.services.auth.rules.auth.fprintd.order=11501; -security.pam.services.chpasswd.rules.auth.fprintd.order=11501; -security.pam.services.groupdel.rules.auth.fprintd.order=11501; -security.pam.services.groupadd.rules.auth.fprintd.order=11501; -security.pam.services.useradd.rules.auth.fprintd.order=11501; -security.pam.services.i3lock.rules.auth.fprintd.order=11501; -security.pam.services.systemd-user.rules.auth.fprintd.order=11501; -security.pam.services.sudo.rules.auth.fprintd.order=11501; -security.pam.services.userdel.rules.auth.fprintd.order=11501; -security.pam.services.chfn.rules.auth.fprintd.order=11501; -security.pam.services.su.rules.auth.fprintd.order=11501; -security.pam.services.usermod.rules.auth.fprintd.order=11501; -security.pam.services.groupmems.rules.auth.fprintd.order=11501; -security.pam.services.chsh.rules.auth.fprintd.order=11501; -security.pam.services.i3lock-color.rules.auth.fprintd.order=11501; -security.pam.services.xscreensaver.rules.auth.fprintd.order=11501; -security.pam.services.xlock.rules.auth.fprintd.order=11501; -security.pam.services.polkit-1.rules.auth.fprintd.order=11501; -security.pam.services.vlock.rules.auth.fprintd.order=11501; -security.pam.services.runuser-l.rules.auth.fprintd.order=11501; -security.pam.services.groupmod.rules.auth.fprintd.order=11501; -security.pam.services.runuser.rules.auth.fprintd.order=11501; + security.pam.services.passwd.rules.auth.fprintd.order = 11501; + security.pam.services.auth.rules.auth.fprintd.order = 11501; + security.pam.services.chpasswd.rules.auth.fprintd.order = 11501; + security.pam.services.groupdel.rules.auth.fprintd.order = 11501; + security.pam.services.groupadd.rules.auth.fprintd.order = 11501; + security.pam.services.useradd.rules.auth.fprintd.order = 11501; + security.pam.services.i3lock.rules.auth.fprintd.order = 11501; + security.pam.services.systemd-user.rules.auth.fprintd.order = 11501; + security.pam.services.sudo.rules.auth.fprintd.order = 11501; + security.pam.services.userdel.rules.auth.fprintd.order = 11501; + security.pam.services.chfn.rules.auth.fprintd.order = 11501; + security.pam.services.su.rules.auth.fprintd.order = 11501; + security.pam.services.usermod.rules.auth.fprintd.order = 11501; + security.pam.services.groupmems.rules.auth.fprintd.order = 11501; + security.pam.services.chsh.rules.auth.fprintd.order = 11501; + security.pam.services.i3lock-color.rules.auth.fprintd.order = 11501; + security.pam.services.xscreensaver.rules.auth.fprintd.order = 11501; + security.pam.services.xlock.rules.auth.fprintd.order = 11501; + security.pam.services.polkit-1.rules.auth.fprintd.order = 11501; + security.pam.services.vlock.rules.auth.fprintd.order = 11501; + security.pam.services.runuser-l.rules.auth.fprintd.order = 11501; + security.pam.services.groupmod.rules.auth.fprintd.order = 11501; + security.pam.services.runuser.rules.auth.fprintd.order = 11501; } diff --git a/users/alice/systems/configuration.nix b/users/alice/systems/configuration.nix index 197eec7..80d59bd 100644 --- a/users/alice/systems/configuration.nix +++ b/users/alice/systems/configuration.nix @@ -9,4 +9,29 @@ imports = [ ./non-server.nix ]; services.fwupd.enable = true; + + nix.settings = { + substituters = [ + "https://cache.nixos.org/?priority=1&want-mass-query=true" + "https://attic.alicehuston.xyz/cache-nix-dot?priority=4&want-mass-query=true" + "https://cache.alicehuston.xyz/?priority=5&want-mass-query=true" + "https://nix-community.cachix.org/?priority=10&want-mass-query=true" + ]; + trusted-substituters = [ + "https://cache.nixos.org" + "https://attic.alicehuston.xyz/cache-nix-dot" + "https://cache.alicehuston.xyz" + "https://nix-community.cachix.org" + ]; + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "cache.alicehuston.xyz:SJAm8HJVTWUjwcTTLAoi/5E1gUOJ0GWum2suPPv7CUo=%" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache-nix-dot:0hp/F6mUJXNyZeLBPNBjmyEh8gWsNVH+zkuwlWMmwXg=" + ]; + trusted-users = [ + "root" + "@wheel" + ]; + }; }