diff --git a/flake.nix b/flake.nix index cc4b10a..3a4989a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-06cb-009a-fingerprint-sensor = { - url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor"; - inputs.nixpkgs.follows = "nixpkgs"; - }; hyprland = { type = "git"; url = "https://github.com/hyprwm/Hyprland"; @@ -30,9 +26,13 @@ ghostty = { url = "github:ghostty-org/ghostty"; }; + nixos-06cb-009a-fingerprint-sensor = { + url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor?ref=24.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { nixpkgs, home-manager, nur, ... }@inputs: + outputs = { nixpkgs, home-manager, nur, nixos-06cb-009a-fingerprint-sensor, ... }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -118,7 +118,9 @@ Riva = { user = "user"; }; Kell = { user = "user"; }; Aloria = { user = "user"; }; - Arendia = { user = "user"; }; + Arendia = { user = "user"; modules = [ + nixos-06cb-009a-fingerprint-sensor.nixosModules."06cb-009a-fingerprint-sensor" + ];}; Asturia = { user = "user"; }; }; in diff --git a/home/Arendia.nix b/home/Arendia.nix index 9178424..f948b8e 100644 --- a/home/Arendia.nix +++ b/home/Arendia.nix @@ -15,6 +15,7 @@ texliveFull zed-editor gnome-power-manager + jetbrains.pycharm-professional ]; services.hyprpaper = { diff --git a/hosts/Arendia/default.nix b/hosts/Arendia/default.nix index ddb6106..5d2bca1 100644 --- a/hosts/Arendia/default.nix +++ b/hosts/Arendia/default.nix @@ -44,14 +44,14 @@ in { EnableNetworkConfiguration = true; }; }; - services.fprintd = { + # services."06cb-009a-fingerprint-sensor" = { + # enable = true; + # backend = "python-validity"; + # }; + services."06cb-009a-fingerprint-sensor" = { enable = true; - tod = { - enable = true; - driver = nixos-06cb-009a-fingerprint-sensor.lib.libfprint-2-tod1-vfs0090-bingch { - calib-data-file = ./files/calib-data.bin; - }; - }; + backend = "libfprint-tod"; + calib-data-file = ./files/calib-data-2.bin; }; # virtualisation @@ -90,7 +90,7 @@ in { peers = [{ publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; allowedIPs = [ "0.0.0.0/0" "::/0" ]; - endpoint = "h.thomasave.be:13231"; + endpoint = "ipv4.thomasave.be:13231"; persistentKeepalive = 25; }]; }; @@ -104,7 +104,7 @@ in { peers = [{ publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; allowedIPs = [ "10.0.0.1/8" "192.168.1.2/32" ]; - endpoint = "h.thomasave.be:13231"; + endpoint = "ipv4.thomasave.be:13231"; persistentKeepalive = 25; }]; }; @@ -113,4 +113,8 @@ in { serviceConfig = { Restart = "on-failure"; RestartSec = "2s"; }; unitConfig.StartLimitIntervalSec = 0; }; + environment.systemPackages = with pkgs; [ + gcc + ]; + fonts.fontDir.enable = true; } diff --git a/hosts/Arendia/files/calib-data-2.bin b/hosts/Arendia/files/calib-data-2.bin new file mode 100644 index 0000000..94941e7 Binary files /dev/null and b/hosts/Arendia/files/calib-data-2.bin differ