From d8154fc82505ebe07bcc49d3d044cd1ebeb15a12 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Wed, 29 Oct 2025 14:55:56 +0100 Subject: [PATCH] scale, fail at fscrypt --- home-manager/hyprland/hyprland-settings.nix | 9 +++++---- modules/hardware/fingerprint.nix | 4 ---- systems/laptop/configuration.nix | 6 ++++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/home-manager/hyprland/hyprland-settings.nix b/home-manager/hyprland/hyprland-settings.nix index 8b98b11..522e8da 100644 --- a/home-manager/hyprland/hyprland-settings.nix +++ b/home-manager/hyprland/hyprland-settings.nix @@ -15,6 +15,7 @@ let hyprctl --instance 0 "keyword misc:allow_session_lock_restore 1" hyprctl --instance 0 "dispatch exec hyprlock" ''; + scale = if isLaptop then "1.33333" else "1"; monitor1 = if isPc then "DP-1" else if isLaptop then "eDP-1" else "eDP-1"; monitor2 = "HDMI-A-1"; in @@ -38,12 +39,12 @@ in # See https://wiki.hyprland.org/Configuring/Monitors/ monitor = if isPc then [ - "${monitor2},1920x1080@60,0x0,1" - "${monitor1},2560x1440@144,1920x0,1" + "${monitor2},1920x1080@60,0x0,${scale}" + "${monitor1},2560x1440@144,1920x0,${scale}" "Unknown-1,disable" ] else if isLaptop then [ # laptop - "eDP-1,2256x1504@60,0x0,1.33333" + "eDP-1,2256x1504@60,0x0,${scale}" #"DP-3,1920x1080@60,1920x0,1" #",preferred,auto,1,mirror,eDP-1" ",preferred,auto,auto" @@ -74,7 +75,7 @@ in # Some default env vars. env = - [ "XCURSOR_SIZE,24" "NIXOS_OZONE_WL,1" ] + [ "XCURSOR_SIZE,24" "NIXOS_OZONE_WL,1" "GDK_SCALE,${scale}" ] ++ lib.optionals osConfig.custom.hardware.nvidia.enable [ "LIBVA_DRIVER_NAME,nvidia" "GBM_BACKEND,nvidia-drm" diff --git a/modules/hardware/fingerprint.nix b/modules/hardware/fingerprint.nix index a25697f..d146875 100644 --- a/modules/hardware/fingerprint.nix +++ b/modules/hardware/fingerprint.nix @@ -9,10 +9,6 @@ in { services.fprintd = { enable = true; - tod = { - enable = true; - driver = pkgs.libfprint-2-tod1-goodix; - }; }; }; } diff --git a/systems/laptop/configuration.nix b/systems/laptop/configuration.nix index 68b4c63..82e3e09 100644 --- a/systems/laptop/configuration.nix +++ b/systems/laptop/configuration.nix @@ -76,7 +76,7 @@ in firmware.enable = true; ssd.enable = true; #tablet.enable = true; - #fingerprint.enable = true; + fingerprint.enable = true; }; services = { syncthing.enable = true; @@ -102,13 +102,15 @@ in }; nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" "electron-28.3.3" ]; - services.fprintd.enable = true; hardware.cpu.amd.ryzen-smu.enable = true; environment.systemPackages = with pkgs; [ nvtopPackages.amd ryzenadj prismlauncher + #fscrypt-experimental ]; + # don't think there is a way to unlock this with fingerprint + #security.pam.enableFscrypt = true; #services.joycond.enable = true;