From 951a4c32e804175ffd78b8533957450d9fac909d Mon Sep 17 00:00:00 2001
From: Lukas Heiligenbrunner <lukas.heiligenbrunner@gmail.com>
Date: Sat, 25 Nov 2023 13:55:15 +0100
Subject: [PATCH] fix fingerprint login update kernel

---
 common/configuration.nix    |  8 ++++----
 common/modules/packages.nix |  5 ++++-
 flake.lock                  | 18 +++++++++---------
 flake.nix                   |  1 -
 laptop/configuration.nix    | 29 +++++++++++++++++++++++++++++
 5 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/common/configuration.nix b/common/configuration.nix
index a423190..b36f3fb 100644
--- a/common/configuration.nix
+++ b/common/configuration.nix
@@ -29,10 +29,10 @@
     argsOverride = rec {
       src = pkgs.fetchurl {
             url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-            sha256 = "sha256-2h7X1HyX7XLJNUCRYodAqjxAo8nNc4KHHzztvWBYgjQ=";
+            sha256 = "sha256-c9T2rY3WrCpB7VLCkoiYt8PyUZ7V29sRkgIJo2mZt34=";
       };
-      version = "6.6.1";
-      modDirVersion = "6.6.1";
+      version = "6.6.2";
+      modDirVersion = "6.6.2";
       };
   });
 
@@ -116,6 +116,6 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
+  system.stateVersion = "23.11"; # Did you read the comment?
 
 }
diff --git a/common/modules/packages.nix b/common/modules/packages.nix
index 92fd2d1..e4ea395 100644
--- a/common/modules/packages.nix
+++ b/common/modules/packages.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, allPkgs, ... }:
 
 {
   imports =
@@ -53,6 +53,9 @@
     git
     flutter
     prusa-slicer
+
+    iperf3
+    discord
     
     #cargo
     #rustc
diff --git a/flake.lock b/flake.lock
index 8bac517..7a4688e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700087144,
-        "narHash": "sha256-LJP1RW0hKNWmv2yRhnjkUptMXInKpn/rV6V6ofuZkHU=",
+        "lastModified": 1700847865,
+        "narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ab1459a1fb646c40419c732d05ec0bf2416d4506",
+        "rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1699997707,
-        "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
+        "lastModified": 1700559156,
+        "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
+        "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699781429,
-        "narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
+        "lastModified": 1700612854,
+        "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e44462d6021bfe23dfb24b775cc7c390844f773d",
+        "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ba4e1f8..8e53983 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,6 @@
   inputs = {
     # import nixos packages
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    #nixpkgs.url = "github:NixOS/nixpkgs/gnome";
     # import homemanager
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/laptop/configuration.nix b/laptop/configuration.nix
index 0fbe74a..e2ac6d4 100644
--- a/laptop/configuration.nix
+++ b/laptop/configuration.nix
@@ -1,5 +1,6 @@
 { config, pkgs, lib, ... }:
 
+# latop specific system configs
 {
   imports =
     [
@@ -8,4 +9,32 @@
 
   # hostname
   networking.hostName = "laptop-luki";
+
+  security.pam.services.login.fprintAuth = false;
+  # 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
+        '';
+      };
+
+  # choose regdom for wifi card
+  hardware.wirelessRegulatoryDatabase = true;
+  boot.extraModprobeConfig = ''
+    options cfg80211 ieee80211_regdom="AT"
+  '';
 }