diff --git a/flake.lock b/flake.lock index 922f87a..b95f5c7 100644 --- a/flake.lock +++ b/flake.lock @@ -54,6 +54,24 @@ "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" } }, + "elanmoc2": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1731852525, + "narHash": "sha256-t3wgLs3I38Ijc/JuxUKuVGZFF3eeYeFNibps5wbSsv4=", + "owner": "sandptel", + "repo": "elanmoc2", + "rev": "8b049aa1f184b34b7f6829472b10ea8453bd5806", + "type": "github" + }, + "original": { + "owner": "sandptel", + "repo": "elanmoc2", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -305,16 +323,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736241350, - "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -367,6 +385,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1736241350, + "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nuscht-search": { "inputs": { "flake-utils": "flake-utils", @@ -393,11 +427,12 @@ "root": { "inputs": { "catppuccin": "catppuccin", + "elanmoc2": "elanmoc2", "ghostty": "ghostty", "hardware": "hardware", "home-manager": "home-manager_2", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", "zen-browser": "zen-browser" diff --git a/flake.nix b/flake.nix index 8810110..967e03f 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,12 @@ # Hardware specific tweaks and performance optimizations. hardware = { url = "github:NixOS/nixos-hardware/master"; }; + # Support for ElanTech fingerprint scanner 04f3:0c00 + elanmoc2 = { + url = "github:sandptel/elanmoc2"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Catppuccin theme nix configuration. catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix index 7a195fd..db665de 100644 --- a/homes/x86_64-linux/jo@puzzlevision/default.nix +++ b/homes/x86_64-linux/jo@puzzlevision/default.nix @@ -38,6 +38,8 @@ g4music bitwarden-desktop youtube-music + ungoogled-chromium + firefox ### Development avra diff --git a/systems/x86_64-linux/puzzlevision/default.nix b/systems/x86_64-linux/puzzlevision/default.nix index 8e6a8ea..ea54db3 100644 --- a/systems/x86_64-linux/puzzlevision/default.nix +++ b/systems/x86_64-linux/puzzlevision/default.nix @@ -13,6 +13,7 @@ inputs.hardware.nixosModules.common-pc-laptop inputs.hardware.nixosModules.common-cpu-intel inputs.hardware.nixosModules.common-pc-laptop-ssd + inputs.elanmoc2.nixosModules.elanmoc2 ]; # Configure Sops @@ -46,6 +47,9 @@ # Enable printing. services.printing.enable = true; + # Enable fingerprint support for ElanTech scanner 04f3:0c00 + services.fprintd.elanmoc2.enable=true; + # Enable docker virtualisation.docker.enable = true;