kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scale, fail at fscrypt

Browse Source
This commit is contained in:
Kopatz
2025-10-29 14:55:56 +01:00
parent 9a61646089
commit d8154fc825
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
home-manager/hyprland/hyprland-settings.nix
View File

@@ -15,6 +15,7 @@ let
hyprctl --instance 0 "keyword misc:allow_session_lock_restore 1" hyprctl --instance 0 "keyword misc:allow_session_lock_restore 1"
hyprctl --instance 0 "dispatch exec hyprlock" 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"; monitor1 = if isPc then "DP-1" else if isLaptop then "eDP-1" else "eDP-1";
monitor2 = "HDMI-A-1"; monitor2 = "HDMI-A-1";
in in
@@ -38,12 +39,12 @@ in
# See https://wiki.hyprland.org/Configuring/Monitors/ # See https://wiki.hyprland.org/Configuring/Monitors/
monitor = monitor =
if isPc then [ if isPc then [
"${monitor2},1920x1080@60,0x0,1" "${monitor2},1920x1080@60,0x0,${scale}"
"${monitor1},2560x1440@144,1920x0,1" "${monitor1},2560x1440@144,1920x0,${scale}"
"Unknown-1,disable" "Unknown-1,disable"
] else if isLaptop then [ ] else if isLaptop then [
# laptop # laptop
"eDP-1,2256x1504@60,0x0,1.33333" "eDP-1,2256x1504@60,0x0,${scale}"
#"DP-3,1920x1080@60,1920x0,1" #"DP-3,1920x1080@60,1920x0,1"
#",preferred,auto,1,mirror,eDP-1" #",preferred,auto,1,mirror,eDP-1"
",preferred,auto,auto" ",preferred,auto,auto"
@@ -74,7 +75,7 @@ in
# Some default env vars. # Some default env vars.
env = 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 [ ++ lib.optionals osConfig.custom.hardware.nvidia.enable [
"LIBVA_DRIVER_NAME,nvidia" "LIBVA_DRIVER_NAME,nvidia"
"GBM_BACKEND,nvidia-drm" "GBM_BACKEND,nvidia-drm"

4
modules/hardware/fingerprint.nix
View File

@@ -9,10 +9,6 @@ in {
services.fprintd = { services.fprintd = {
enable = true; enable = true;
tod = {
enable = true;
driver = pkgs.libfprint-2-tod1-goodix;
};
}; };
}; };
} }

6
systems/laptop/configuration.nix
View File

@@ -76,7 +76,7 @@ in
firmware.enable = true; firmware.enable = true;
ssd.enable = true; ssd.enable = true;
#tablet.enable = true; #tablet.enable = true;
#fingerprint.enable = true; fingerprint.enable = true;
}; };
services = { services = {
syncthing.enable = true; syncthing.enable = true;
@@ -102,13 +102,15 @@ in
}; };
nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" "electron-28.3.3" ]; nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" "electron-28.3.3" ];
services.fprintd.enable = true;
hardware.cpu.amd.ryzen-smu.enable = true; hardware.cpu.amd.ryzen-smu.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nvtopPackages.amd nvtopPackages.amd
ryzenadj ryzenadj
prismlauncher prismlauncher
#fscrypt-experimental
]; ];
# don't think there is a way to unlock this with fingerprint
#security.pam.enableFscrypt = true;
#services.joycond.enable = true; #services.joycond.enable = true;